diff --git a/Makefile.in b/Makefile.in index ef53f9bd8..903bbe26c 100644 --- 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 5a165ca7d..18b56547b 100644 --- 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 625d7a370..1c13858ff 100644 --- 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; \