Add dependency package to ensure proper rebuilds

Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
sailfishos · Feb 28, 2013 · 336b6a2 · 336b6a2
1 parent 411cdea
commit 336b6a2
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 21 deletions.
diff --git a/sb2-tools-armv6l.spec b/sb2-tools-armv6l.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-armv7hl.spec b/sb2-tools-armv7hl.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-armv7l.spec b/sb2-tools-armv7l.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+shellquote "arch i486 targets armv7l: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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-armv7tnhl.spec b/sb2-tools-armv7tnhl.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+shellquote "arch i486 targets armv7tnhl: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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-i486.spec b/sb2-tools-i486.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+shellquote "arch i486 targets i486: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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-mipsel.spec b/sb2-tools-mipsel.spec
@@ -22,6 +22,15 @@ Summary:       SB2 cross tools
 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!
 
+
+%package dependency
+Summary: Dependency for sb2 host side
+Group: Development/Tools
+
+%description dependency
+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!
+
 %prep
 
 %build
@@ -66,7 +75,7 @@ shellquote()
 #        arg=${arg//\$/\$}   # already needs quoting ;(
 #        arg=${arg/\"/\\\"}  # dito
 #        arg=${arg//\`/\`}   # dito
-        arg=${arg//\\|/\|}
+        arg=${arg//\\ |/\|}
         arg=${arg//\\|/|}
         echo "$arg"
     done
@@ -86,8 +95,19 @@ 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
+shellquote "arch i486 targets mipsel: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
 rm -rf $RPM_BUILD_ROOT
@@ -97,4 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /root/
 %dir /var/lib/rpm/
 %dir /var/cache/ldconfig/
-/etc/securetty
+/etc/securetty
+
+%files dependency
+%defattr(-,root,root)
+/etc/sb2-tools-template
diff --git a/sb2-tools-template.changes b/sb2-tools-template.changes
@@ -1,3 +1,6 @@
+* Thu Feb 28 2013 Carsten Munk <carsten.munk@jollamobile.com> - 1.0
+- Add dependency package for builds to depend on to ensure rebuilds are done properly
+
 * Thu Nov 01 2012 David Greaves <david@dgreaves.com> - 1.0
 - Add i486 cross-target