From a99bbe8fa8872789c376fee8121e5632b63931e7 Mon Sep 17 00:00:00 2001 From: pallotron Date: Thu, 30 Mar 2017 05:53:36 -0700 Subject: [PATCH 1/2] remove $$arch() from rpm target in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c5afc1aaca..0cfb6cae22 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ rpm: dracut-$(VERSION).tar.xz syncheck rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \ --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \ --define "_rpmdir $$PWD" -ba dracut.spec; ) && \ - ( mv "$$rpmbuild"/$$(arch)/*.rpm $(DESTDIR).; mv "$$rpmbuild"/*.src.rpm $(DESTDIR).;rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm ) + ( mv "$$rpmbuild"/*.rpm $(DESTDIR).; mv "$$rpmbuild"/*.src.rpm $(DESTDIR).;rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm ) syncheck: @ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \ From 15d103f911337ea813641497c8168a7087f38ae0 Mon Sep 17 00:00:00 2001 From: pallotron Date: Fri, 31 Mar 2017 04:43:08 -0700 Subject: [PATCH 2/2] better fix from @haraldh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0cfb6cae22..64b46e75fb 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ rpm: dracut-$(VERSION).tar.xz syncheck rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \ --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \ --define "_rpmdir $$PWD" -ba dracut.spec; ) && \ - ( mv "$$rpmbuild"/*.rpm $(DESTDIR).; mv "$$rpmbuild"/*.src.rpm $(DESTDIR).;rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm ) + ( mv "$$rpmbuild"/{,$$(arch)/}*.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm ) syncheck: @ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \