main/linux-3.16.37
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* removed mounting tmp filesystems from user (now done by snap)
  * split off separate doc package
  * Added package name override to prevent duplicated version string in name
  * removed version string from file name (Makefile.linux-headers)
This commit is contained in:
Jay Larson
2017-05-22 09:33:23 -05:00
parent 9957ddd7b9
commit 2de20ac6fa
6 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Makefile
View File

@@ -16,36 +16,55 @@ BRIEF = The Linux kernel
DESC = Linux is a clone of the operating system Unix, written from scratch \
by Linus Torvalds with assistance from a loosely-knit team of hackers \
across the Net.
SNAPVER = 3
export SNAPVER = 4
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches
export KERNVER := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')
export VERSION := $(SNAPVER)
export VERSION := $(KERNVER)-$(SNAPVER)
LINUX-FIRMWARE := $(PWD)/linux-firmware
# This overrids the package file name in Makefile.snaplinux
# This is necessary due to the kernel version string being
# a part of the package name
SNAP = $(PACKAGE)-$(SNAPVER).snap
LINUX-DOC := $(PWD)/linux-doc-$(KERNVER)
LINUX-DOC-ROOT := $(LINUX-DOC)/ROOT
LINUX-FIRMWARE := $(PWD)/linux-firmware-$(KERNVER)
LINUX-FIRMWARE-ROOT := $(LINUX-FIRMWARE)/ROOT
LINUX-HEADERS := $(PWD)/linux-headers-$(KERNVER)
LINUX-HEADERS-ROOT := $(LINUX-HEADERS)/ROOT
include /usr/share/snap/Makefile.snaplinux
$(LINUX-DOC-ROOT): $(LINUX-HEADERS-ROOT)
@install -v -d $(LINUX-DOC)/SNAP && \
install -v -d $(LINUX-DOC-ROOT) && \
install -d -m 755 \
$(LINUX-DOC-ROOT)/usr/share/doc/linux-$(VERSION) && \
cp -r $(SRCDIR)/Documentation/* \
$(LINUX-DOC-ROOT)/usr/share/doc/linux-$(VERSION) && \
find $(LINUX-DOC-ROOT) -name \*.txt -o -name \*.html \
-exec gzip {} \; && \
cd $(LINUX-DOC) && make -f ../Makefile.linux-doc && mv *.snap ../
$(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT)
@install -v -d $(LINUX-HEADERS)/SNAP && \
install -v -d $(LINUX-HEADERS-ROOT) && \
cd $(SRCDIR) && make headers_install \
INSTALL_HDR_PATH=$(LINUX-HEADERS-ROOT)/usr && \
cd $(LINUX-HEADERS) && make -f \
../Makefile.linux-headers-$(KERNVER) && \
../Makefile.linux-headers && \
mv *.snap ../
$(LINUX-FIRMWARE-ROOT): $(SRCDIR)/arch/x86_64/boot/bzImage
@install -v -d $(LINUX-FIRMWARE)/SNAP && \
install -v -d $(LINUX-FIRMWARE-ROOT) && \
install -v -d $(LINUX-FIRMWARE-ROOT)/lib/firmware && \
cd $(SRCDIR) && make firmware_install \
INSTALL_FW_PATH=$(LINUX-FIRMWARE-ROOT) && \
INSTALL_FW_PATH=$(LINUX-FIRMWARE-ROOT)/lib/firmware && \
cd $(LINUX-FIRMWARE) && make -f \
../Makefile.linux-firmware && mv *.snap ../
@@ -67,11 +86,11 @@ $(SRCDIR)/Makefile: $(ARCHIVE)
$(SRCDIR)/arch/x86_64/boot/bzImage: $(SRCDIR)/Makefile
@cd $(SRCDIR); \
make mrproper
@cp SNAP/config-$(KERNVER)-$(VERSION) $(SRCDIR)/.config
@cp SNAP/config $(SRCDIR)/.config
@cd $(SRCDIR); \
make
$(ROOT): $(LINUX-HEADERS-ROOT)
$(ROOT): $(LINUX-DOC-ROOT)
@if [ -d $(ROOT) ]; then \
touch $(ROOT); \
else \
@@ -83,14 +102,12 @@ $(ROOT): $(LINUX-HEADERS-ROOT)
rm -rf $(ROOT)/lib/firmware && \
install -d -m 755 $(ROOT)/boot && \
install -d -m 755 $(ROOT)/etc/modprobe.d && \
install -d -m 755 $(ROOT)/usr/share/doc/linux-$(KERNVER)-$(VERSION) && \
install -m 644 .config $(ROOT)/boot/config-$(KERNVER)-$(VERSION) && \
install -m 644 .config $(ROOT)/boot/config-$(VERSION) && \
install -m 644 System.map \
$(ROOT)/boot/System.map-$(KERNVER)-$(VERSION) && \
$(ROOT)/boot/System.map-$(VERSION) && \
install -m 644 arch/x86_64/boot/bzImage \
$(ROOT)/boot/vmlinuz-$(KERNVER)-$(VERSION) && \
install -m 644 ../SNAP/usb.conf $(ROOT)/etc/modprobe.d/usb.conf && \
cp -r Documentation/* $(ROOT)/usr/share/doc/linux-$(KERNVER)-$(VERSION)
$(ROOT)/boot/vmlinuz-$(VERSION) && \
install -m 644 ../SNAP/usb.conf $(ROOT)/etc/modprobe.d/usb.conf
test: $(ROOT)
@cd $(SRCDIR); \