remove $$arch() from rpm target in Makefile

[pallotron]

it seems rpmbuild result RPMs are not put inside a $$(arch) subdirectory. so the mv command that is supposed to move the RPMs into $(DESTDIR) is failing. getting rid of arch fixes the problem.

[centos-ci]

Can one of the admins verify this patch?

[haraldh]

hmm, my rpmbuild does.

[pallotron]

We are building this using mock... not sure if it's related...

[pallotron]

See the path where RPMs are written when I run make rpm, then the mv tries to move RPMs inside x86_64 and can't find the directory:

Checking for unpackaged file(s): /usr/lib/rpm/check-files /tmp/rpmbuild-dracut.EOF6yb/BUILDROOT/dracut-045-1.fc27.x86_64
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-045-1.fc27.src.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-network-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-fips-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-fips-aesni-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-caps-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-live-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-config-generic-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-config-rescue-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-tools-045-1.fc27.x86_64.rpm
Wrote: /tmp/rpmbuild-dracut.EOF6yb/dracut-debuginfo-045-1.fc27.x86_64.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.VyJJ5r
+ umask 022
+ cd /tmp/rpmbuild-dracut.EOF6yb/BUILD
+ cd dracut-045
+ rm -rf -- /tmp/rpmbuild-dracut.EOF6yb/BUILDROOT/dracut-045-1.fc27.x86_64
+ exit 0
mv: cannot stat '/tmp/rpmbuild-dracut.EOF6yb/x86_64/*.rpm': No such file or directory
dracut-045-1.fc27.src.rpm

[pallotron]

https://gist.github.com/pallotron/1ef5225701180c2c240d6dfcd0825b24

this is the rpmbuild temporary directory content, as you can see no x86_64 and look where the RPMs are stored...

[haraldh]

•   ( mv "$$rpmbuild"/{,$$(arch)/}*.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
  

works for me .. will fix

[pallotron]

yeah that works too, I will amend my PR.