This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 68a36e26b1077d0baf1b57014eef64af3d7f4072 (commit) via 347db51aa5b10e6b9b301b4e7ac6a490bd7613e2 (commit) from 820e90db0f2cd2ee81a3e978a2c9315e08307ac2 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 68a36e26b1077d0baf1b57014eef64af3d7f4072 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 5 23:28:15 2018 +0100

aarch64: Remove -multi suffix from kernel

This gets in the way for authoring the CD and we will never have any other kernels but the main one.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 347db51aa5b10e6b9b301b4e7ac6a490bd7613e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 5 23:27:24 2018 +0100

linux: Simplify compiling and installing the kernel

There was loads of duplicated code which could have been made shorter by adding one variable.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: ...4-ipfire-multi => kernel.config.aarch64-ipfire} | 0 lfs/linux | 37 ++++++++-------------- make.sh | 13 +------- 3 files changed, 15 insertions(+), 35 deletions(-) rename config/kernel/{kernel.config.aarch64-ipfire-multi => kernel.config.aarch64-ipfire} (100%)

Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire-multi b/config/kernel/kernel.config.aarch64-ipfire similarity index 100% rename from config/kernel/kernel.config.aarch64-ipfire-multi rename to config/kernel/kernel.config.aarch64-ipfire diff --git a/lfs/linux b/lfs/linux index 4355daa9f..f4700859c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,16 +37,22 @@ CXXFLAGS = PAK_VER = 75 DEPS = ""

+KERNEL_ARCH = $(BUILD_ARCH) +KERNEL_TARGET = bzImage +HEADERS_ARCH = $(BUILD_PLATFORM) + ifeq "$(BUILD_ARCH)" "i586" KERNEL_ARCH = i386 -else - KERNEL_ARCH = $(BUILD_ARCH) endif

ifeq "$(BUILD_ARCH)" "aarch64" HEADERS_ARCH = arm64 -else - HEADERS_ARCH = $(BUILD_PLATFORM) + KERNEL_ARCH = arm64 + KERNEL_TARGET = Image +endif + +ifeq "$(BUILD_ARCH)" "armv5tel" + KERNEL_TARGET = zImage endif

VERSUFIX=ipfire$(KCFG) @@ -171,26 +177,11 @@ else cd $(DIR_APP) && make clean cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile

-ifeq "$(KCFG)" "-kirkwood" - cd $(DIR_APP) && make $(MAKETUNING) zImage modules - cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) -# cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX) -else -ifeq "$(KCFG)" "-multi" -ifeq "$(BUILD_ARCH)" "armv5tel" - cd $(DIR_APP) && make $(MAKETUNING) zImage modules - cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) -endif -ifeq "$(BUILD_ARCH)" "aarch64" - cd $(DIR_APP) && make $(MAKETUNING) Image modules - cd $(DIR_APP) && cp -v arch/arm64/boot/Image /boot/vmlinuz-$(VER)-$(VERSUFIX) -endif -else - cd $(DIR_APP) && make $(MAKETUNING) bzImage modules - cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX) -endif -endif + # Build the kernel + cd $(DIR_APP) && make $(MAKETUNING) $(KERNEL_TARGET) modules

+ # Install the kernel + cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/$(KERNEL_TARGET) /boot/vmlinuz-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX) cd $(DIR_APP) && make $(MAKETUNING) modules_install diff --git a/make.sh b/make.sh index cfb06fcd0..47e1420d8 100755 --- a/make.sh +++ b/make.sh @@ -1093,7 +1093,7 @@ buildipfire() { lfsmake2 elfutils

case "${BUILD_ARCH}" in - x86_64) + x86_64|aarch64) lfsmake2 linux KCFG="" # lfsmake2 backports KCFG="" # lfsmake2 e1000e KCFG="" @@ -1137,17 +1137,6 @@ buildipfire() { # lfsmake2 backports KCFG="-multi" # lfsmake2 e1000e KCFG="-multi" # lfsmake2 igb KCFG="-multi" -# lfsmake2 ixgbe KCFG="-multi" - lfsmake2 xtables-addons KCFG="-multi" - lfsmake2 linux-initrd KCFG="-multi" - ;; - - aarch64) - # arm multi platform (RPi3, OrangePi PC2 ...) kernel build - lfsmake2 linux KCFG="-multi" -# lfsmake2 backports KCFG="-multi" -# lfsmake2 e1000e KCFG="-multi" -# lfsmake2 igb KCFG="-multi" # lfsmake2 ixgbe KCFG="-multi" lfsmake2 xtables-addons KCFG="-multi" lfsmake2 linux-initrd KCFG="-multi"

hooks/post-receive -- IPFire 2.x development tree