History

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.

Michal Marek committed 14 years ago

Commit fe04ddf1 parent 24cc7fb3 files · +4 −4Browse files

Showing the changes to scripts (2 of 3 files). Show all

Unified · Split

2 files
  1. scripts/Makefile.fwinst +2 −2
  2. scripts/package/buildtar +1 −1
scripts/Makefile.fwinst+2−2
@@ -27,7 +27,7 @@ endif · 26 unmodified lines
27installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))27installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
28 28
29installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))29installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
30installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./30installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
31 31
32# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.32# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
33PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs33PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) · 8 unmodified lines
42$(installed-fw-dirs):42$(installed-fw-dirs):
43 $(call cmd,mkdir)43 $(call cmd,mkdir)
44 44
45$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)45$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)
46 $(call cmd,install)46 $(call cmd,install)
47 47
48PHONY += __fw_install __fw_modinst FORCE48PHONY += __fw_install __fw_modinst FORCE
scripts/package/buildtar+1−1
@@ -109,7 +109,7 @@ esac · 108 unmodified lines
109 if tar --owner=root --group=root --help >/dev/null 2>&1; then109 if tar --owner=root --group=root --help >/dev/null 2>&1; then
110 opts="--owner=root --group=root"110 opts="--owner=root --group=root"
111 fi111 fi
112 tar cf - . $opts | ${compress} > "${tarball}${file_ext}"112 tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
113)113)
114 114
115echo "Tarball successfully created in ${tarball}${file_ext}"115echo "Tarball successfully created in ${tarball}${file_ext}"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t