Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe04ddf7 authored by Michal Marek's avatar Michal Marek
Browse files

kbuild: Do not package /boot and /lib in make tar-pkg 



There were reports of users destroying their Fedora installs by a kernel
tarball that replaces the /lib -> /usr/lib symlink. Let's remove the
toplevel directories from the tarball to prevent this from happening.

Reported-by: default avatarAndi Kleen <andi@firstfloor.org>
Suggested-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: <stable@kernel.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 24cc7fb6

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,) 
KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)



archscripts: scripts_basic

archscripts:

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs



###

scripts/Makefile.fwinst

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ endif 
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))



installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))

installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./

installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.



# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.

PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) 
$(installed-fw-dirs):

	$(call cmd,mkdir)



$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)

$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)

	$(call cmd,install)



PHONY +=  __fw_install __fw_modinst FORCE

scripts/package/buildtar

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ esac 
	if tar --owner=root --group=root --help >/dev/null 2>&1; then

		opts="--owner=root --group=root"

	fi

	tar cf - . $opts | ${compress} > "${tarball}${file_ext}"

	tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"

)



echo "Tarball successfully created in ${tarball}${file_ext}"