Apply precheckin.sh to the sources

Signed-off-by: David Greaves <david.greaves@jolla.com>
sailfishos · Jul 5, 2018 · f46cb71 · f46cb71
1 parent 07e76b2
commit f46cb71
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 88 deletions.
diff --git a/sb2-tools-aarch64.spec b/sb2-tools-aarch64.spec
@@ -1,11 +1,11 @@
-%define __strip /bin/true
 %define packages_in_tools autoconf automake bash binutils bzip2 bzip2-libs ccache cmake coreutils cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp grep groff gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu52 libidn liblua libmount libsb2 libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python python-libs qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite tar util-linux xz xz-libs zip zlib
 %define cross_compilers   cross-aarch64-gcc cross-aarch64-binutils
-%global _python_bytecompile_errors_terminate_build 0
 %define _target_cpu aarch64
+# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
+%global __os_install_post %{nil}
 
 Name:          sb2-tools-aarch64-inject
-Version:       1.0+git3
+Version:       1.0+git4
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -51,7 +51,6 @@ cat > filestoignore << EOF
 /etc/mtab
 /usr/share/man
 /root
-/var/lib/rpm
 /usr/bin/chfn
 /usr/bin/chsh
 /etc/securetty
@@ -67,17 +66,26 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 # Copy files to buildroot and preserve permissions.
-tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-# Add quotas around the lines as filenames contain spaces.
-sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
-cat filestoinclude2
+tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - ) > filesincluded
+# Add back "/" prefix, add double quotes to protect file names with spaces, use %%dir directive for
+# directories to prevent "File listed twice" warnings.
+sed -i filesincluded -e '
+    # First line is special - it is the root directory
+    1s,^\./$,%%dir /,
+    t
+    # Lines ending with / are special - they are directory paths
+    s,^\(.*\)/$,%%dir "/\1",
+    t
+    # Everything else
+    s,^.*$,"/&",
+    '
+cat filesincluded
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
 chmod 0400 %buildroot/etc/gshadow
 mkdir -p %buildroot/var/log
 mkdir -p %buildroot/root/
-mkdir -p %buildroot/var/lib/rpm/
 mkdir -p %buildroot/etc/
 touch %buildroot/etc/securetty
 mkdir -p %buildroot/var/cache/ldconfig/
@@ -92,11 +100,10 @@ touch %buildroot/etc/sb2-tools-template
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f filestoinclude2
+%files -f filesincluded
 %defattr(-,root,root)
 %dir /var/log
 %dir /root/
-%dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
 /etc/securetty
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow

diff --git a/sb2-tools-armv6l.spec b/sb2-tools-armv6l.spec
@@ -1,11 +1,11 @@
-%define __strip /bin/true
 %define packages_in_tools autoconf automake bash binutils bzip2 bzip2-libs ccache cmake coreutils cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp grep groff gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu52 libidn liblua libmount libsb2 libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python python-libs qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite tar util-linux xz xz-libs zip zlib
 %define cross_compilers   cross-armv6l-gcc cross-armv6l-binutils
-%global _python_bytecompile_errors_terminate_build 0
 %define _target_cpu armv6l
+# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
+%global __os_install_post %{nil}
 
 Name:          sb2-tools-armv6l-inject
-Version:       1.0+git3
+Version:       1.0+git4
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -51,7 +51,6 @@ cat > filestoignore << EOF
 /etc/mtab
 /usr/share/man
 /root
-/var/lib/rpm
 /usr/bin/chfn
 /usr/bin/chsh
 /etc/securetty
@@ -67,17 +66,26 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 # Copy files to buildroot and preserve permissions.
-tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-# Add quotas around the lines as filenames contain spaces.
-sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
-cat filestoinclude2
+tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - ) > filesincluded
+# Add back "/" prefix, add double quotes to protect file names with spaces, use %%dir directive for
+# directories to prevent "File listed twice" warnings.
+sed -i filesincluded -e '
+    # First line is special - it is the root directory
+    1s,^\./$,%%dir /,
+    t
+    # Lines ending with / are special - they are directory paths
+    s,^\(.*\)/$,%%dir "/\1",
+    t
+    # Everything else
+    s,^.*$,"/&",
+    '
+cat filesincluded
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
 chmod 0400 %buildroot/etc/gshadow
 mkdir -p %buildroot/var/log
 mkdir -p %buildroot/root/
-mkdir -p %buildroot/var/lib/rpm/
 mkdir -p %buildroot/etc/
 touch %buildroot/etc/securetty
 mkdir -p %buildroot/var/cache/ldconfig/
@@ -92,11 +100,10 @@ touch %buildroot/etc/sb2-tools-template
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f filestoinclude2
+%files -f filesincluded
 %defattr(-,root,root)
 %dir /var/log
 %dir /root/
-%dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
 /etc/securetty
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow

diff --git a/sb2-tools-armv7hl.spec b/sb2-tools-armv7hl.spec
@@ -1,11 +1,11 @@
-%define __strip /bin/true
 %define packages_in_tools autoconf automake bash binutils bzip2 bzip2-libs ccache cmake coreutils cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp grep groff gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu52 libidn liblua libmount libsb2 libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python python-libs qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite tar util-linux xz xz-libs zip zlib
 %define cross_compilers   cross-armv7hl-gcc cross-armv7hl-binutils
-%global _python_bytecompile_errors_terminate_build 0
 %define _target_cpu armv7hl
+# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
+%global __os_install_post %{nil}
 
 Name:          sb2-tools-armv7hl-inject
-Version:       1.0+git3
+Version:       1.0+git4
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -51,7 +51,6 @@ cat > filestoignore << EOF
 /etc/mtab
 /usr/share/man
 /root
-/var/lib/rpm
 /usr/bin/chfn
 /usr/bin/chsh
 /etc/securetty
@@ -67,17 +66,26 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 # Copy files to buildroot and preserve permissions.
-tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-# Add quotas around the lines as filenames contain spaces.
-sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
-cat filestoinclude2
+tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - ) > filesincluded
+# Add back "/" prefix, add double quotes to protect file names with spaces, use %%dir directive for
+# directories to prevent "File listed twice" warnings.
+sed -i filesincluded -e '
+    # First line is special - it is the root directory
+    1s,^\./$,%%dir /,
+    t
+    # Lines ending with / are special - they are directory paths
+    s,^\(.*\)/$,%%dir "/\1",
+    t
+    # Everything else
+    s,^.*$,"/&",
+    '
+cat filesincluded
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
 chmod 0400 %buildroot/etc/gshadow
 mkdir -p %buildroot/var/log
 mkdir -p %buildroot/root/
-mkdir -p %buildroot/var/lib/rpm/
 mkdir -p %buildroot/etc/
 touch %buildroot/etc/securetty
 mkdir -p %buildroot/var/cache/ldconfig/
@@ -92,11 +100,10 @@ touch %buildroot/etc/sb2-tools-template
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f filestoinclude2
+%files -f filesincluded
 %defattr(-,root,root)
 %dir /var/log
 %dir /root/
-%dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
 /etc/securetty
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow

diff --git a/sb2-tools-armv7l.spec b/sb2-tools-armv7l.spec
@@ -1,11 +1,11 @@
-%define __strip /bin/true
 %define packages_in_tools autoconf automake bash binutils bzip2 bzip2-libs ccache cmake coreutils cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp grep groff gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu52 libidn liblua libmount libsb2 libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python python-libs qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite tar util-linux xz xz-libs zip zlib
 %define cross_compilers   cross-armv7l-gcc cross-armv7l-binutils
-%global _python_bytecompile_errors_terminate_build 0
 %define _target_cpu armv7l
+# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
+%global __os_install_post %{nil}
 
 Name:          sb2-tools-armv7l-inject
-Version:       1.0+git3
+Version:       1.0+git4
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -51,7 +51,6 @@ cat > filestoignore << EOF
 /etc/mtab
 /usr/share/man
 /root
-/var/lib/rpm
 /usr/bin/chfn
 /usr/bin/chsh
 /etc/securetty
@@ -67,17 +66,26 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 # Copy files to buildroot and preserve permissions.
-tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-# Add quotas around the lines as filenames contain spaces.
-sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
-cat filestoinclude2
+tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - ) > filesincluded
+# Add back "/" prefix, add double quotes to protect file names with spaces, use %%dir directive for
+# directories to prevent "File listed twice" warnings.
+sed -i filesincluded -e '
+    # First line is special - it is the root directory
+    1s,^\./$,%%dir /,
+    t
+    # Lines ending with / are special - they are directory paths
+    s,^\(.*\)/$,%%dir "/\1",
+    t
+    # Everything else
+    s,^.*$,"/&",
+    '
+cat filesincluded
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
 chmod 0400 %buildroot/etc/gshadow
 mkdir -p %buildroot/var/log
 mkdir -p %buildroot/root/
-mkdir -p %buildroot/var/lib/rpm/
 mkdir -p %buildroot/etc/
 touch %buildroot/etc/securetty
 mkdir -p %buildroot/var/cache/ldconfig/
@@ -92,11 +100,10 @@ touch %buildroot/etc/sb2-tools-template
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f filestoinclude2
+%files -f filesincluded
 %defattr(-,root,root)
 %dir /var/log
 %dir /root/
-%dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
 /etc/securetty
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow

diff --git a/sb2-tools-armv7thl.spec b/sb2-tools-armv7thl.spec
@@ -1,11 +1,11 @@
-%define __strip /bin/true
 %define packages_in_tools autoconf automake bash binutils bzip2 bzip2-libs ccache cmake coreutils cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp grep groff gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu52 libidn liblua libmount libsb2 libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python python-libs qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite tar util-linux xz xz-libs zip zlib
 %define cross_compilers   cross-armv7thl-gcc cross-armv7thl-binutils
-%global _python_bytecompile_errors_terminate_build 0
 %define _target_cpu armv7thl
+# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
+%global __os_install_post %{nil}
 
 Name:          sb2-tools-armv7thl-inject
-Version:       1.0+git3
+Version:       1.0+git4
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -51,7 +51,6 @@ cat > filestoignore << EOF
 /etc/mtab
 /usr/share/man
 /root
-/var/lib/rpm
 /usr/bin/chfn
 /usr/bin/chsh
 /etc/securetty
@@ -67,17 +66,26 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 # Copy files to buildroot and preserve permissions.
-tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-# Add quotas around the lines as filenames contain spaces.
-sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
-cat filestoinclude2
+tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - ) > filesincluded
+# Add back "/" prefix, add double quotes to protect file names with spaces, use %%dir directive for
+# directories to prevent "File listed twice" warnings.
+sed -i filesincluded -e '
+    # First line is special - it is the root directory
+    1s,^\./$,%%dir /,
+    t
+    # Lines ending with / are special - they are directory paths
+    s,^\(.*\)/$,%%dir "/\1",
+    t
+    # Everything else
+    s,^.*$,"/&",
+    '
+cat filesincluded
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
 chmod 0400 %buildroot/etc/gshadow
 mkdir -p %buildroot/var/log
 mkdir -p %buildroot/root/
-mkdir -p %buildroot/var/lib/rpm/
 mkdir -p %buildroot/etc/
 touch %buildroot/etc/securetty
 mkdir -p %buildroot/var/cache/ldconfig/
@@ -92,11 +100,10 @@ touch %buildroot/etc/sb2-tools-template
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f filestoinclude2
+%files -f filesincluded
 %defattr(-,root,root)
 %dir /var/log
 %dir /root/
-%dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
 /etc/securetty
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow