mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-01 02:21:16 +00:00
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: Andi Kleen <andi@firstfloor.org> Suggested-by: Ben Hutchings <ben@decadent.org.uk> Cc: <stable@kernel.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
24cc7fb69a
commit
fe04ddf7c2
3 changed files with 4 additions and 4 deletions
|
@ -138,7 +138,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
|
||||||
KBUILD_CFLAGS += $(mflags-y)
|
KBUILD_CFLAGS += $(mflags-y)
|
||||||
KBUILD_AFLAGS += $(mflags-y)
|
KBUILD_AFLAGS += $(mflags-y)
|
||||||
|
|
||||||
archscripts: scripts_basic
|
archscripts:
|
||||||
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
|
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
|
@ -27,7 +27,7 @@ endif
|
||||||
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
|
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
|
||||||
|
|
||||||
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
|
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.
|
# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
|
||||||
PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
|
PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
|
||||||
|
@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
|
||||||
$(installed-fw-dirs):
|
$(installed-fw-dirs):
|
||||||
$(call cmd,mkdir)
|
$(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)
|
$(call cmd,install)
|
||||||
|
|
||||||
PHONY += __fw_install __fw_modinst FORCE
|
PHONY += __fw_install __fw_modinst FORCE
|
||||||
|
|
|
@ -109,7 +109,7 @@ esac
|
||||||
if tar --owner=root --group=root --help >/dev/null 2>&1; then
|
if tar --owner=root --group=root --help >/dev/null 2>&1; then
|
||||||
opts="--owner=root --group=root"
|
opts="--owner=root --group=root"
|
||||||
fi
|
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}"
|
echo "Tarball successfully created in ${tarball}${file_ext}"
|
||||||
|
|
Loading…
Reference in a new issue