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 ef53f9bd8f0478f518eb3b39fc41d39219b7ab18..903bbe26c25710bb7181d8c580c52e329ed6b66a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -947,7 +947,7 @@ deb-modules: deb-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
@@ -956,7 +956,7 @@ deb-modules: deb-local rpm-modules
 deb-utils: deb-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \
@@ -978,7 +978,7 @@ tgz-modules: tgz-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
@@ -987,7 +987,7 @@ tgz-modules: tgz-local rpm-modules
 tgz-utils: tgz-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \

diff --git a/config/deb.am b/config/deb.am
index 5a165ca7da76abc3c4cfb610b5b9ca415079ccee..18b56547bc040979d123964be3bdb4e4b3c0c6e0 100644 (file)
--- a/config/deb.am
+++ b/config/deb.am
@@ -18,7 +18,7 @@ deb-modules: deb-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
@@ -27,7 +27,7 @@ deb-modules: deb-local rpm-modules
 deb-utils: deb-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \

diff --git a/config/tgz.am b/config/tgz.am
index 625d7a370f90b95688e916d36c4f655c508e7acf..1c13858ff5cf33f6a1ec7558849e4e8d2a98b920 100644 (file)
--- a/config/tgz.am
+++ b/config/tgz.am
@@ -11,7 +11,7 @@ tgz-modules: tgz-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
@@ -20,7 +20,7 @@ tgz-modules: tgz-local rpm-modules
 tgz-utils: tgz-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_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; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \