From 66b679046213ec944434d0f4d6a2e26043a99084 Mon Sep 17 00:00:00 2001
From: nidailiang <794929503@qq.com>
Date: Sun, 24 Jan 2021 22:24:24 -0500
Subject: [PATCH] add 16 pkgs to support rpmlist, fix autobuild script and fix
 the changelog date error in patches

---
 conf/aarch32_support_list.yaml                | 72 +++++++++++++++----
 .../0001-e2fsprogs-add-arm32-support.patch    |  2 +-
 .../0001-iptables-add-arm32-support.patch     |  2 +-
 .../pam/spec/0001-pam-add-arm32-support.patch |  2 +-
 tools/auto_build_pkgs.sh                      | 42 +++++++----
 5 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/conf/aarch32_support_list.yaml b/conf/aarch32_support_list.yaml
index 1d65cc0..c74301f 100644
--- a/conf/aarch32_support_list.yaml
+++ b/conf/aarch32_support_list.yaml
@@ -23,19 +23,67 @@ packages:
   src:
     branch:openEuler-20.03-LTS
     version: 4.4.8-4
-- name: fuse
+- name: btrfs-progs
   src:
-    branch:openEuler-20.03-LTS
-    version: 2.9.9-0
-- name: iptables
+    branch: openEuler-20.03-LTS
+    version: 4.17.1-3
+- name: libcap-ng
   src:
-    branch:openEuler-20.03-LTS
-    version: 1.8.1-4
-- name: e2fsprogs
+    branch: openEuler-20.03-LTS
+    version: 0.7.9-7
+- name: libmnl
   src:
-    branch:openEuler-20.03-LTS
-    version: 1.45.3-4
-- name: pam
+    branch: openEuler-20.03-LTS
+    version: 1.0.4-10
+- name: libnfnetlink
   src:
-    branch:openEuler-20.03-LTS
-    version: 1.3.1-8
+    branch: openEuler-20.03-LTS
+    version: 1.0.1-15
+- name: libpcap
+  src:
+    branch: openEuler-20.03-LTS
+    version: 1.9.1-4
+- name: libselinux
+  src:
+    branch: openEuler-20.03-LTS
+    version: 2.9-1
+- name: libsepol
+  src:
+    branch: openEuler-20.03-LTS
+    version: 2.9-1
+- name: libtomcrypt
+  src:
+    branch: openEuler-20.03-LTS
+    version: 1.18.2-3
+- name: libtommath
+  src:
+    branch: openEuler-20.03-LTS
+    version: 1.0.1-5
+- name: lzo
+  src:
+    branch: openEuler-20.03-LTS
+    version: 2.10-1
+- name: ncurses
+  src:
+    branch: openEuler-20.03-LTS
+    version: 6.1-14
+- name: pcre2
+  src:
+    branch: openEuler-20.03-LTS
+    version: 10.33-2
+- name: readline
+  src:
+    branch: openEuler-20.03-LTS
+    version: 7.0-13
+- name: tzdata
+  src:
+    branch: openEuler-20.03-LTS
+    version: 2019b-10
+- name: zlib
+  src:
+    branch: openEuler-20.03-LTS
+    version: 1.2.11-17
+- name: zstd
+  src:
+    branch: openEuler-20.03-LTS
+    version: 1.3.6-3
diff --git a/patches/e2fsprogs/spec/0001-e2fsprogs-add-arm32-support.patch b/patches/e2fsprogs/spec/0001-e2fsprogs-add-arm32-support.patch
index f2a2efa..5bbe13a 100644
--- a/patches/e2fsprogs/spec/0001-e2fsprogs-add-arm32-support.patch
+++ b/patches/e2fsprogs/spec/0001-e2fsprogs-add-arm32-support.patch
@@ -47,7 +47,7 @@ index 87f135c..f847a58 100644
  
 +
  %changelog
-+* Thur Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.45.3-5
++* Thu Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.45.3-5
 +- add arm32 support
 +
  * Mon Feb 3 2020 luoshijie <luoshijie1@huawei.com> - 1.45.3-4
diff --git a/patches/iptables/spec/0001-iptables-add-arm32-support.patch b/patches/iptables/spec/0001-iptables-add-arm32-support.patch
index 702f94a..f9be94f 100644
--- a/patches/iptables/spec/0001-iptables-add-arm32-support.patch
+++ b/patches/iptables/spec/0001-iptables-add-arm32-support.patch
@@ -91,7 +91,7 @@ index 154257f..25c6728 100644
  %{_mandir}/*
  
  %changelog
-+* Thur Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.8.1-5
++* Thu Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.8.1-5
 +- add arm32 support
 +
  * Sat Jan 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.8.1-4
diff --git a/patches/pam/spec/0001-pam-add-arm32-support.patch b/patches/pam/spec/0001-pam-add-arm32-support.patch
index 9464894..b12c5ef 100644
--- a/patches/pam/spec/0001-pam-add-arm32-support.patch
+++ b/patches/pam/spec/0001-pam-add-arm32-support.patch
@@ -60,7 +60,7 @@ index 1ace7cb..aea0ff2 100644
  
  
  %changelog
-+* Thur Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.3.1-9
++* Thu Jan 14 2021 chentt_tt <chen_tingting1@hoperun.com> - 1.3.1-9
 +- add arm32 support
 +
  * Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.1-8
diff --git a/tools/auto_build_pkgs.sh b/tools/auto_build_pkgs.sh
index aa8c78f..305d33c 100644
--- a/tools/auto_build_pkgs.sh
+++ b/tools/auto_build_pkgs.sh
@@ -13,8 +13,8 @@ mock_repo_file="/etc/mock/templates/fedora-29.tpl"
 output_dir=output
 local_repo_dir=$work_dir/$output_dir/repo
 download_prefix="https://repo.openeuler.org/openEuler-20.03-LTS/source/Packages"
-download_suffix=".oe1.src.rpm"
-oe_src_dir="oe_src_dir"
+download_suffix=".src.rpm"
+src_dir="src_dir"
 
 ###build function###
 build_pkg()
@@ -24,29 +24,43 @@ build_pkg()
     cat $config_file | grep -i '^- name:' | awk '{print $3}' | grep -w -i $pkg_name > /dev/null || exit $ERROR_NOT_FOUND_PKGS
 
     local pkg_version=$(cat $config_file | grep  "^- name: $pkg_name"  -A3 | grep version | awk '{print $2}')
-    local rpm_name=$pkg_name-$pkg_version$download_suffix
+    local pkg_branch=$(cat $config_file | grep  "^- name: $pkg_name"  -A3 | grep branch | awk '{print $2}')
+
     mkdir -p ./$output_dir/$pkg_name
     pushd ./$output_dir/$pkg_name
-    if [ ! -d $oe_src_dir ] ;
+    if [ ! -d $src_dir ] ;
     then
-        mkdir $oe_src_dir
+        mkdir $src_dir
     fi
 
-    ###download oe src rpm###
-    if [ ! -f $oe_src_dir/$rpm_name ];then
-        wget $download_prefix/$rpm_name -P $oe_src_dir
-    fi
+    rm -rf $src_dir/*
     
-    if [ ! -f $oe_src_dir $pkg_name.spec ];
-    then
+    ###src rpm exists###
+    if [ $pkg_branch != 'None' ]; then
+        ###download oe src rpm###
+        local rpm_name=$pkg_name-$pkg_version.oe1$download_suffix
+        if [ ! -f $src_dir/$rpm_name ];then
+            wget $download_prefix/$rpm_name -P $src_dir
+        fi
+
         ###get old spec###
-        rpm2cpio $oe_src_dir/$rpm_name | cpio -idm  -D $oe_src_dir $pkg_name.spec
+        rpm2cpio $src_dir/$rpm_name | cpio -idm  -D $src_dir $pkg_name.spec
     
         ###patching spec###
-        patch -d $oe_src_dir/ < $(ls $patches_dir/$pkg_name/spec/*.patch | sort -u)
+        if [ -d $work_dir/patches/$pkg_name ]; then
+            patch -d $src_dir/ < $(ls $patches_dir/$pkg_name/spec/*.patch | sort -u)
+        fi
+    else
+        local rpm_name=$pkg_name-$pkg_version$download_suffix
+        mkdir -p /root/rpmbuild/SOURCES
+	\cp -r $work_dir/src/$pkg_name/* /root/rpmbuild/SOURCES/
+	\cp $work_dir/src/$pkg_name/$pkg_name.spec $src_dir
+        rpmbuild -bs $src_dir/$pkg_name.spec
+	\cp /root/rpmbuild/SRPMS/$rpm_name $src_dir
     fi
+
     ###starting build###
-    mock -r fedora-29-armhfp  --resultdir=. ./$oe_src_dir/$rpm_name --spec oe_src_dir/$pkg_name.spec --nocheck --macro-file=$tools_dir/rpmmacros_openeuler  --no-cleanup-after
+    mock -r fedora-29-armhfp --resultdir=. ./$src_dir/$rpm_name --spec src_dir/$pkg_name.spec --nocheck --macro-file=$tools_dir/rpmmacros_openeuler  --no-cleanup-after
     popd
 }
 
-- 
Gitee