Avoid 'rpm -q' bug for 'make pkg'

RPM version 4.9.0 has been observed to generate extra debug
messages in certain cases.  These debug messages prevent us
from cleanly acquiring the architecture.  This is clearly
an upstream RPM bug which will get fixed.  But until then
a safe solution is to pipe the result through 'tail -1'
to just grab the architecture bit we care about.

Example 'rpm -qp spl-0.6.0-rc4.src.rpm --qf %{arch}' output:

Freeing read locks for locker 0x166: 28031/47480843735008
Freeing read locks for locker 0x168: 28031/47480843735008
x86_64

diff --git a/Makefile.in b/Makefile.in
index e5304d0a0104d44e63417e84e858f70e37abd039..e47e16f0b8f70cc670caac20867260e15e57a802 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -910,7 +910,7 @@ deb-modules: deb-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \
@@ -919,7 +919,7 @@ deb-modules: deb-local rpm-modules
 deb-utils: deb-local rpm-utils
        name=${PACKAGE}; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-deb $$pkg1; \
        $(RM) $$pkg1
@@ -939,7 +939,7 @@ tgz-modules: tgz-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \
@@ -948,7 +948,7 @@ tgz-modules: tgz-local rpm-modules
 tgz-utils: tgz-local rpm-utils
        name=${PACKAGE}; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \
        $(RM) $$pkg1

diff --git a/config/deb.am b/config/deb.am
index 766655dcf5e38cb26a43d9cf63033126a8b0f6a8..ce84cfa9ccb9d41b7755bb53b653cc8e17ccbad1 100644 (file)
--- a/config/deb.am
+++ b/config/deb.am
@@ -32,7 +32,7 @@ deb-modules: deb-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \
@@ -41,7 +41,7 @@ deb-modules: deb-local rpm-modules
 deb-utils: deb-local rpm-utils
        name=${PACKAGE}; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-deb $$pkg1; \
        $(RM) $$pkg1

diff --git a/config/tgz.am b/config/tgz.am
index 57d2eee3bd6d7f0c792d59cf47c460e5b044be1b..bbc204a65a29b9cd982c403a7ab5c2918e5b451b 100644 (file)
--- a/config/tgz.am
+++ b/config/tgz.am
@@ -25,7 +25,7 @@ tgz-modules: tgz-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \
@@ -34,7 +34,7 @@ tgz-modules: tgz-local rpm-modules
 tgz-utils: tgz-local rpm-utils
        name=${PACKAGE}; \
        version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \
        $(RM) $$pkg1