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

The following changes were made:

Browse Source 
* Split off libc files into separate package (linux-libc)
  * Corrected issue with missing files in linux-headers
This commit is contained in:
Jay Larson
2017-06-11 17:00:57 -05:00
parent 4c7bb6a047
commit 9c94dc2f94
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@@ -39,6 +39,8 @@ LINUX-FIRMWARE := $(PWD)/linux-firmware
LINUX-FIRMWARE-ROOT := $(LINUX-FIRMWARE)/ROOT
LINUX-HEADERS := $(PWD)/linux-headers-$(KERNVER)-$(SNAPVER)
LINUX-HEADERS-ROOT := $(LINUX-HEADERS)/ROOT
LINUX-LIBC := $(PWD)/linux-libc
LINUX-LIBC-ROOT := $(LINUX-LIBC)/ROOT
include /usr/share/snap/Makefile.snaplinux
@@ -53,7 +55,7 @@ $(LINUX-DOC-ROOT): $(LINUX-HEADERS-ROOT)
-exec gzip {} \; && \
cd $(LINUX-DOC) && make -f ../Makefile.linux-doc && mv *.snap ../
$(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT)
$(LINUX-HEADERS-ROOT): $(LINUX-LIBC-ROOT)
@HEADERS=$(LINUX-HEADERS-ROOT)/usr/src/linux-headers-$(VERSION) && \
install -v -d $(LINUX-HEADERS)/SNAP && \
install -v -d $(LINUX-HEADERS-ROOT) && \
@@ -63,16 +65,24 @@ $(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT)
install -v -d -m 755 $(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION) && \
ln -sf /usr/src/linux-headers-$(VERSION) \
$(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION)/build && \
cd $(SRCDIR) && make headers_install \
INSTALL_HDR_PATH=$(LINUX-HEADERS-ROOT)/usr && \
cp -vrp {include,Makefile,Module.symvers,scripts} $$HEADERS && \
cp -vrp arch/x86/include/uapi $$HEADERS/arch/x86/include/uapi && \
cp -vp arch/x86/Makefile $$HEADERS/arch/x86/Makefile && \
cd $(SRCDIR) && find {include,arch/x86*} \( -name \*.h -o \
-name Kbuild -o -name Makefile -o -name \*.conf \) \
-exec cp --parents {} $$HEADERS \; && \
find scripts/ -type f -exec cp --parents {} $$HEADERS \; && \
cp {.config,Makefile,Module.symvers} $$HEADERS && \
cp -vp arch/x86/kernel/asm-offsets.s \
$$HEADERS/arch/x86/kernel/asm-offsets.s && \
cd $(LINUX-HEADERS) && make -f ../Makefile.linux-headers && \
mv *.snap ../
$(LINUX-LIBC-ROOT): $(LINUX-FIRMWARE-ROOT)
install -v -d $(LINUX-LIBC)/SNAP && \
install -v -d $(LINUX-LIBC-ROOT) && \
install -v -d -m 755 $(LINUX-LIBC-ROOT)/usr && \
cd $(SRCDIR) && make headers_install \
INSTALL_HDR_PATH=$(LINUX-LIBC-ROOT)/usr && \
cd $(LINUX-LIBC) && make -f ../Makefile.linux-libc && mv *.snap ../
$(LINUX-FIRMWARE-ROOT): $(SRCDIR)/arch/x86_64/boot/bzImage
@install -v -d $(LINUX-FIRMWARE)/SNAP && \
install -v -d $(LINUX-FIRMWARE-ROOT)/lib/firmware && \
@@ -129,6 +139,7 @@ clean:
@rm -rvf $(ROOT) \
$(LINUX-DOC) \
$(LINUX-FIRMWARE) \
$(LINUX-LIBC) \
$(LINUX-HEADERS) \
$(SNAPINFO) \
$(MANIFEST) \