Merge branch 'master' into 'master'

Merge changes from merproject This MR contains all commits from merproject trunk. Mainly this means going to non-baselibs build and some package tweaking. Has not had a full reverse deps rebuild (basic build with a test of new CMake does work). Could someone with the necessary rights please trigger that.
sailfishos · Jun 18, 2015 · 470dcb4 · 470dcb4
2 parents 70b60b2 + be83798
commit 470dcb4
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 471 deletions.
diff --git a/baselibs.conf b/baselibs.conf
diff --git a/precheckin.sh b/precheckin.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 ARCHS="armv6l armv7l armv7hl armv7thl armv7tnhl mipsel aarch64 i486"
 
-echo -n "arch i486 targets " > baselibs.conf
 for x in $ARCHS; do
 	cp -v sb2-tools-template-rpmlintrc sb2-tools-$x-rpmlintrc
-	sed "s/@ARCH@/$x/g" sb2-tools-template.spec | sed "s/ExclusiveArch: nothing/ExclusiveArch: %{ix86}/g" > sb2-tools-$x.spec	
-	echo -n "$x:inject " >> baselibs.conf
+	sed "s/@ARCH@/$x/g" sb2-tools-template.spec | sed "s/ExclusiveArch: nothing//g" > sb2-tools-$x.spec	
 done
diff --git a/sb2-tools-aarch64.spec b/sb2-tools-aarch64.spec
@@ -1,21 +1,18 @@
 %define __strip /bin/true
-%define architecture_target aarch64
-%define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols
-%define cross_compilers   cross-aarch64-gcc cross-aarch64-binutils 
+%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols%define cross_compilers   cross-aarch64-gcc cross-aarch64-binutils 
 %global _python_bytecompile_errors_terminate_build 0
+%define _target_cpu aarch64
 
-Name:          sb2-tools-aarch64
+Name:          sb2-tools-aarch64-inject
 Version:       1.0
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
 BuildRequires: %packages_in_tools
 BuildRequires: %cross_compilers
-ExclusiveArch: %{ix86}
+
 Source100: sb2-tools-aarch64-rpmlintrc
-Source101: baselibs.conf
-Source102: precheckin.sh
+Source101: precheckin.sh
 
 # no auto requirements - they're generated
 License:       BSD
@@ -27,11 +24,11 @@ This is a package providing %packages_in_tools %cross_compilers for SB2 tools di
 It is not intended to be used in a normal system!
 
 
-%package dependency
+%package -n sb2-tools-aarch64-dependency-inject
 Summary: Dependency for sb2 host side
 Group: Development/Tools
 
-%description dependency
+%description -n sb2-tools-aarch64-dependency-inject
 This is a package providing %packages_in_tools %cross_compilers for SB2 tools directory
 It is not intended to be used in a normal system!
 
@@ -68,7 +65,8 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-
+sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
+cat filestoinclude2
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
@@ -85,46 +83,6 @@ cat > %{buildroot}/etc/hosts << EOF
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 EOF
-
-shellquote()
-{
-    for arg; do
-        arg=${arg//\\/\\\\}
-#        arg=${arg//\$/\$}   # already needs quoting ;(
-#        arg=${arg/\"/\\\"}  # dito
-#        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\ |/\|}
-        arg=${arg//\\|/|}
-        echo "$arg"
-    done
-}
-
-echo "Creating baselibs_new.conf"
-echo ""
-rm -rRf /tmp/baselibs_new.conf || true
-shellquote "arch i486 targets aarch64:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-shellquote "arch i486 targets aarch64:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}-dependency" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-cat /tmp/baselibs_new.conf > %{_sourcedir}/baselibs.conf
 touch %buildroot/etc/sb2-tools-template
 
 %clean
@@ -140,6 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/gshadow
 
-%files dependency
+%files -n sb2-tools-aarch64-dependency-inject
 %defattr(-,root,root)
 /etc/sb2-tools-template
diff --git a/sb2-tools-armv6l.spec b/sb2-tools-armv6l.spec
@@ -1,21 +1,18 @@
 %define __strip /bin/true
-%define architecture_target armv6l
-%define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols
-%define cross_compilers   cross-armv6l-gcc cross-armv6l-binutils 
+%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols%define cross_compilers   cross-armv6l-gcc cross-armv6l-binutils 
 %global _python_bytecompile_errors_terminate_build 0
+%define _target_cpu armv6l
 
-Name:          sb2-tools-armv6l
+Name:          sb2-tools-armv6l-inject
 Version:       1.0
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
 BuildRequires: %packages_in_tools
 BuildRequires: %cross_compilers
-ExclusiveArch: %{ix86}
+
 Source100: sb2-tools-armv6l-rpmlintrc
-Source101: baselibs.conf
-Source102: precheckin.sh
+Source101: precheckin.sh
 
 # no auto requirements - they're generated
 License:       BSD
@@ -27,11 +24,11 @@ This is a package providing %packages_in_tools %cross_compilers for SB2 tools di
 It is not intended to be used in a normal system!
 
 
-%package dependency
+%package -n sb2-tools-armv6l-dependency-inject
 Summary: Dependency for sb2 host side
 Group: Development/Tools
 
-%description dependency
+%description -n sb2-tools-armv6l-dependency-inject
 This is a package providing %packages_in_tools %cross_compilers for SB2 tools directory
 It is not intended to be used in a normal system!
 
@@ -68,7 +65,8 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-
+sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
+cat filestoinclude2
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
@@ -85,46 +83,6 @@ cat > %{buildroot}/etc/hosts << EOF
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 EOF
-
-shellquote()
-{
-    for arg; do
-        arg=${arg//\\/\\\\}
-#        arg=${arg//\$/\$}   # already needs quoting ;(
-#        arg=${arg/\"/\\\"}  # dito
-#        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\ |/\|}
-        arg=${arg//\\|/|}
-        echo "$arg"
-    done
-}
-
-echo "Creating baselibs_new.conf"
-echo ""
-rm -rRf /tmp/baselibs_new.conf || true
-shellquote "arch i486 targets armv6l:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-shellquote "arch i486 targets armv6l:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}-dependency" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-cat /tmp/baselibs_new.conf > %{_sourcedir}/baselibs.conf
 touch %buildroot/etc/sb2-tools-template
 
 %clean
@@ -140,6 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/gshadow
 
-%files dependency
+%files -n sb2-tools-armv6l-dependency-inject
 %defattr(-,root,root)
 /etc/sb2-tools-template
diff --git a/sb2-tools-armv7hl.spec b/sb2-tools-armv7hl.spec
@@ -1,21 +1,18 @@
 %define __strip /bin/true
-%define architecture_target armv7hl
-%define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols
-%define cross_compilers   cross-armv7hl-gcc cross-armv7hl-binutils 
+%define packages_in_tools  fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache python python-libs zip xz doxygen fontconfig freetype expat cmake libarchive libcurl libxml2 libidn libicu52 libmount libsmartcols%define cross_compilers   cross-armv7hl-gcc cross-armv7hl-binutils 
 %global _python_bytecompile_errors_terminate_build 0
+%define _target_cpu armv7hl
 
-Name:          sb2-tools-armv7hl
+Name:          sb2-tools-armv7hl-inject
 Version:       1.0
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
 BuildRequires: %packages_in_tools
 BuildRequires: %cross_compilers
-ExclusiveArch: %{ix86}
+
 Source100: sb2-tools-armv7hl-rpmlintrc
-Source101: baselibs.conf
-Source102: precheckin.sh
+Source101: precheckin.sh
 
 # no auto requirements - they're generated
 License:       BSD
@@ -27,11 +24,11 @@ This is a package providing %packages_in_tools %cross_compilers for SB2 tools di
 It is not intended to be used in a normal system!
 
 
-%package dependency
+%package -n sb2-tools-armv7hl-dependency-inject
 Summary: Dependency for sb2 host side
 Group: Development/Tools
 
-%description dependency
+%description -n sb2-tools-armv7hl-dependency-inject
 This is a package providing %packages_in_tools %cross_compilers for SB2 tools directory
 It is not intended to be used in a normal system!
 
@@ -68,7 +65,8 @@ cat > filestoignore << EOF
 EOF
 grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
 tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
-
+sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
+cat filestoinclude2
 sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
 sed 's|:.*$|:*::|' < /etc/group > %{buildroot}/etc/gshadow
 chmod 0400 %buildroot/etc/shadow
@@ -85,46 +83,6 @@ cat > %{buildroot}/etc/hosts << EOF
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 EOF
-
-shellquote()
-{
-    for arg; do
-        arg=${arg//\\/\\\\}
-#        arg=${arg//\$/\$}   # already needs quoting ;(
-#        arg=${arg/\"/\\\"}  # dito
-#        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\ |/\|}
-        arg=${arg//\\|/|}
-        echo "$arg"
-    done
-}
-
-echo "Creating baselibs_new.conf"
-echo ""
-rm -rRf /tmp/baselibs_new.conf || true
-shellquote "arch i486 targets armv7hl:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-shellquote "arch i486 targets armv7hl:inject" >> /tmp/baselibs_new.conf
-shellquote "%{name}-dependency" >> /tmp/baselibs_new.conf
-shellquote "  targettype x86 block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype 32bit block!" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject autoreqprov off" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject extension -inject" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject +/" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_mandir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject -%{_docdir}" >> /tmp/baselibs_new.conf
-shellquote "  targettype inject config    -/sb2-config$" >> /tmp/baselibs_new.conf
-
-cat /tmp/baselibs_new.conf > %{_sourcedir}/baselibs.conf
 touch %buildroot/etc/sb2-tools-template
 
 %clean
@@ -140,6 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/shadow
 %verify(not md5 size mtime) %attr(0400,root,root) %config(noreplace) /etc/gshadow
 
-%files dependency
+%files -n sb2-tools-armv7hl-dependency-inject
 %defattr(-,root,root)
 /etc/sb2-tools-template