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

The following changes were made:

Browse Source 
* Added dependency for linux-firmware to kernel package
  * Re-built with updated Makefile.snaplinux to correct package name/version
  * Other various tweaks to correct package names and versions
  * etc/modprobe.d/usb.conf now managed by usher
  * Makefile will now use LOCALVERSION from config for the build version
This commit is contained in:
Jay Larson
2017-06-02 11:34:52 -05:00
parent 2d3bc3ed38
commit 4c7bb6a047
6 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@@ -9,14 +9,14 @@
# GNU General Public License for more details. # GNU General Public License for more details.
export SRCPKG = $(shell echo $(PWD)|sed 's/.*\///') export SRCPKG = $(shell echo $(PWD)|sed 's/.*\///')
export DEPENDS = mkinitramfs
export ARCH = x86_64 export ARCH = x86_64
export URL = https://www.kernel.org/ export URL = https://www.kernel.org/
BRIEF = The Linux kernel BRIEF = The Linux kernel
DESC = Linux is a clone of the operating system Unix, written from scratch \ 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 \ by Linus Torvalds with assistance from a loosely-knit team of hackers \
across the Net. across the Net.
export SNAPVER = 6 export SNAPVER = $(shell grep '^CONFIG_LOCALVERSION=' SNAP/config| \
sed 's/.*="\-\|"$$//g')
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -24,18 +24,20 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
export KERNVER := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//') export KERNVER := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')
export VERSION := $(KERNVER)-$(SNAPVER) export VERSION := $(KERNVER)-$(SNAPVER)
export DEPENDS = mkinitramfs,linux-firmware
# This overrids the package file name in Makefile.snaplinux # This overrids the package file name in Makefile.snaplinux
# This is necessary due to the kernel version string being # This is necessary due to the kernel version string being
# a part of the package name # a part of the package name
SNAP = $(PACKAGE)-$(SNAPVER).snap PACKAGE = $(shell echo $(PWD)|sed 's/.*\///')-$(SNAPVER)
PKGFILE = $(PACKAGE).snap
LINUX-DOC := $(PWD)/linux-doc-$(KERNVER) LINUX-DOC := $(PWD)/linux-doc-$(KERNVER)
LINUX-DOC-ROOT := $(LINUX-DOC)/ROOT LINUX-DOC-ROOT := $(LINUX-DOC)/ROOT
LINUX-FIRMWARE := $(PWD)/linux-firmware-$(KERNVER) LINUX-FIRMWARE := $(PWD)/linux-firmware
LINUX-FIRMWARE-ROOT := $(LINUX-FIRMWARE)/ROOT LINUX-FIRMWARE-ROOT := $(LINUX-FIRMWARE)/ROOT
LINUX-HEADERS := $(PWD)/linux-headers-$(KERNVER) LINUX-HEADERS := $(PWD)/linux-headers-$(KERNVER)-$(SNAPVER)
LINUX-HEADERS-ROOT := $(LINUX-HEADERS)/ROOT LINUX-HEADERS-ROOT := $(LINUX-HEADERS)/ROOT
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -44,21 +46,30 @@ $(LINUX-DOC-ROOT): $(LINUX-HEADERS-ROOT)
@install -v -d $(LINUX-DOC)/SNAP && \ @install -v -d $(LINUX-DOC)/SNAP && \
install -v -d $(LINUX-DOC-ROOT) && \ install -v -d $(LINUX-DOC-ROOT) && \
install -d -m 755 \ install -d -m 755 \
$(LINUX-DOC-ROOT)/usr/share/doc/linux-$(VERSION) && \ $(LINUX-DOC-ROOT)/usr/share/doc/linux-$(KERNVER) && \
cp -r $(SRCDIR)/Documentation/* \ cp -r $(SRCDIR)/Documentation/* \
$(LINUX-DOC-ROOT)/usr/share/doc/linux-$(VERSION) && \ $(LINUX-DOC-ROOT)/usr/share/doc/linux-$(KERNVER) && \
find $(LINUX-DOC-ROOT) -name \*.txt -o -name \*.html \ find $(LINUX-DOC-ROOT) -name \*.txt -o -name \*.html \
-exec gzip {} \; && \ -exec gzip {} \; && \
cd $(LINUX-DOC) && make -f ../Makefile.linux-doc && mv *.snap ../ cd $(LINUX-DOC) && make -f ../Makefile.linux-doc && mv *.snap ../
$(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT) $(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT)
@HDR=$(LINUX-HEADERS-ROOT)/usr/src/linux-headers-$(VERSION) && \ @HEADERS=$(LINUX-HEADERS-ROOT)/usr/src/linux-headers-$(VERSION) && \
install -v -d $(LINUX-HEADERS)/SNAP && \ install -v -d $(LINUX-HEADERS)/SNAP && \
install -v -d $(LINUX-HEADERS-ROOT) && \ install -v -d $(LINUX-HEADERS-ROOT) && \
install -v -d -m 755 $$HEADERS && \
install -v -d -m 755 $$HEADERS/arch/x86/kernel && \
install -v -d -m 755 $$HEADERS/arch/x86/include && \
install -v -d -m 755 $(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION) && \ install -v -d -m 755 $(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION) && \
ln -sf /usr/src/linux-headers-$(VERSION) \ ln -sf /usr/src/linux-headers-$(VERSION) \
$(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION)/source && \ $(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION)/build && \
cd $(SRCDIR) && make headers_install INSTALL_HDR_PATH=$$HDR && \ 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 && \
cp -vp arch/x86/kernel/asm-offsets.s \
$$HEADERS/arch/x86/kernel/asm-offsets.s && \
cd $(LINUX-HEADERS) && make -f ../Makefile.linux-headers && \ cd $(LINUX-HEADERS) && make -f ../Makefile.linux-headers && \
mv *.snap ../ mv *.snap ../
@@ -102,12 +113,13 @@ $(ROOT): $(LINUX-DOC-ROOT)
rm -rf $(ROOT)/lib/firmware && \ rm -rf $(ROOT)/lib/firmware && \
install -d -m 755 $(ROOT)/boot && \ install -d -m 755 $(ROOT)/boot && \
install -d -m 755 $(ROOT)/etc/modprobe.d && \ install -d -m 755 $(ROOT)/etc/modprobe.d && \
install -d -m 755 $(ROOT)/usr/share/linux-$(VERSION) && \
install -m 644 .config $(ROOT)/boot/config-$(VERSION) && \ install -m 644 .config $(ROOT)/boot/config-$(VERSION) && \
install -m 644 System.map \ install -m 644 System.map \
$(ROOT)/boot/System.map-$(VERSION) && \ $(ROOT)/boot/System.map-$(VERSION) && \
install -m 644 arch/x86_64/boot/bzImage \ install -m 644 arch/x86_64/boot/bzImage \
$(ROOT)/boot/vmlinuz-$(VERSION) && \ $(ROOT)/boot/vmlinuz-$(VERSION) && \
install -m 644 ../SNAP/usb.conf $(ROOT)/etc/modprobe.d/usb.conf install -m 644 ../SNAP/usb.conf $(ROOT)/usr/share/linux-$(VERSION)
test: $(ROOT) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \

4
Makefile.linux-doc
View File

@@ -8,8 +8,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS =
BRIEF = Documentation for The Linux kernel BRIEF = Documentation for The Linux kernel
DESC = Detailed documentation describing the Linux kernel DESC = Detailed documentation describing the Linux kernel
SNAP = $(PACKAGE)-$(SNAPVER).snap PACKAGE = $(shell echo $(PWD)|sed 's/.*\///')
PKGFILE = $(PACKAGE)-$(SNAPVER).snap
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

2
Makefile.linux-firmware
View File

@@ -11,7 +11,5 @@
DEPENDS = DEPENDS =
BRIEF = Firmware for the Linux kernel BRIEF = Firmware for the Linux kernel
DESC = This provides the firmware necessary for some Linux kernel modules DESC = This provides the firmware necessary for some Linux kernel modules
VERSION = $(KERNVER)-$(SNAPVER)
SNAP = $(PACKAGE)-$(SNAPVER).snap
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

4
Makefile.linux-headers
View File

@@ -8,9 +8,11 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS =
BRIEF = Header files for The Linux kernel BRIEF = Header files for The Linux kernel
DESC = This provides the header files that are generally used to compile \ DESC = This provides the header files that are generally used to compile \
kernel modules kernel modules
SNAP = $(PACKAGE)-$(SNAPVER).snap PACKAGE = $(shell echo $(PWD)|sed 's/.*\///')
PKGFILE = $(PACKAGE).snap
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

2
SNAP/config
View File

@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="" CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set # CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-6" CONFIG_LOCALVERSION="-7"
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_BZIP2=y

5
SNAP/usher
View File

@@ -18,6 +18,11 @@ case $1 in
mkinitramfs ${VERSION} mkinitramfs ${VERSION}
grub-mkconfig -o /boot/grub/grub.cfg grub-mkconfig -o /boot/grub/grub.cfg
fi fi
if [ ! -f ${TARGET}/etc/modprobe.d/usb.conf ]; then
cp ${TARGET}/usr/share/linux-${VERSION}/usb.conf \
${TARGET}/etc/modprobe.d/usb.conf
fi
;; ;;
prerm) prerm)
exit 0 exit 0