diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2023-08-28 11:58:15 +0200 |
|---|---|---|
| committer | Simon Horman <horms@kernel.org> | 2023-09-01 09:37:34 +0200 |
| commit | c3f35ff06e54daf452ac49a4381cf2643c934866 (patch) | |
| tree | f8938a11398e24dde848a7806fab536052f4576f | |
| parent | 056c179cd3c2af0c3bd2762a8a3bfd1340278e9e (diff) | |
| download | kexec-tools-c3f35ff06e54daf452ac49a4381cf2643c934866.tar.gz | |
build: fix tarball creation
The fix in 41b77edac did not work, bsdtar still complains about
"hardlink pointing to itself".
Simplify the code instead: since the staging directory contains
exactly the files we want, just package it as a whole.
Signed-off-by: Leah Neukirchen <leah@vuxu.org>
Signed-off-by: Simon Horman <horms@kernel.org>
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 09bbd5cd..3cad22a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,8 +179,6 @@ GENERATED_SRCS:= $(SPEC) TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar TARBALL.gz=$(TARBALL).gz SRCS:= $(dist) -PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) -PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) MAN_PAGES:=$(KEXEC_MANPAGE) $(VMCORE_DMESG_MANPAGE) BINARIES_i386:=$(KEXEC_TEST) @@ -223,8 +221,7 @@ $(TARBALL): $(SRCS) $(GENERATED_SRCS) $(MKDIR) $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(TAR) -c $(SRCS) $(GENERATED_SRCS) | \ $(TAR) -C $(PACKAGE_NAME)-$(PACKAGE_VERSION) -x - $(TAR) -cf $@ $(PSRCS) - $(TAR) -rf $@ $(PGSRCS) + $(TAR) -cf $@ $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(RM) -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(TARBALL.gz): $(TARBALL) |