domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kirkwood: image: fix unwanted 2nd inclusion of kernel

Browse Source 
In commit d2e18dae28 ("kirkwood: cleanup image build code") the image
build code was refactored, setting KERNEL_IN_UBI=0 which doesn't work as
the KERNEL_IN_UBI needs to be unset in order to make it working as
intended, which leads to factory images with two kernels in them:

 binwalk --keep-going openwrt-kirkwood-cisco_on100-squashfs-factory.bin
 MD5 Checksum:  c33e3d1eb0cb632bf0a4dc287592eb70
 DECIMAL   	HEX       	DESCRIPTION
 -------------------------------------------------------------------------------
 0         	0x0       	uImage header [...] "ARM OpenWrt Linux-4.14.123"
 5769216   	0x580800  	uImage header [...] "ARM OpenWrt Linux-4.14.123"

Cc: Mathias Kresin <dev@kresin.me>
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2285
Fixes: d2e18dae28 ("kirkwood: cleanup image build code")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar
2019-06-05 11:25:44 +02:00
parent 6c5bfaac84
commit 0e1d07af1d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/kirkwood/image/Makefile
View File

@@ -32,7 +32,7 @@ define Device/cisco_on100
DEVICE_DTS := kirkwood-on100 DEVICE_DTS := kirkwood-on100
DEVICE_PACKAGES := kmod-i2c-mv64xxx DEVICE_PACKAGES := kmod-i2c-mv64xxx
KERNEL_SIZE := 5376k KERNEL_SIZE := 5376k
KERNEL_IN_UBI := 0 KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
BOARD_NAME := on100 BOARD_NAME := on100
@@ -71,7 +71,7 @@ define Device/iom_ix2_200
SUBPAGESIZE := 256 SUBPAGESIZE := 256
BLOCKSIZE := 16KiB BLOCKSIZE := 16KiB
KERNEL_SIZE := 3072k KERNEL_SIZE := 3072k
KERNEL_IN_UBI := 0 KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE_SIZE := 32505856 IMAGE_SIZE := 32505856
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
@@ -83,7 +83,7 @@ define Device/linksys_audi
DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
DEVICE_DTS := kirkwood-linksys-audi DEVICE_DTS := kirkwood-linksys-audi
KERNEL_SIZE := 2624k KERNEL_SIZE := 2624k
KERNEL_IN_UBI := 0 KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
BOARD_NAME := linksys-audi BOARD_NAME := linksys-audi
@@ -96,7 +96,7 @@ define Device/linksys_viper
DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
DEVICE_DTS := kirkwood-linksys-viper DEVICE_DTS := kirkwood-linksys-viper
KERNEL_SIZE := 2688k KERNEL_SIZE := 2688k
KERNEL_IN_UBI := 0 KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
BOARD_NAME := linksys-viper BOARD_NAME := linksys-viper