diff --git a/aports/device-nokia-rx51/APKBUILD b/aports/device-nokia-rx51/APKBUILD index f6f23f1b..ae52cb28 100644 --- a/aports/device-nokia-rx51/APKBUILD +++ b/aports/device-nokia-rx51/APKBUILD @@ -29,6 +29,6 @@ package() { } sha512sums="7eb602ae1f6002a928f2a5cf12edf21ffe76e6e378907f73da6b6df98016bf5f3e256f93a4187a354069631f283a2f0769b5acf05445e42d8f630966b36dfa6b deviceinfo -dbbab330a9a136ec22c52bf6376049d6598c01e784f9a8a1da144f56621a086c5e52a10afac5c067c9ca921354d76babeea81e0eac2d407a1aae448e7ddee3b4 uboot-script.cmd +36fdcdc32e75ad82402d7f8dc6ec5879002513b3552ae4cf755df52f2c3df7b12c3ab0aae8ea8207a7fa22240b88f8098fd283298d08f923f9b07b7964289b83 uboot-script.cmd 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a backlight-enable.sh 98c554a709d6e8da5835bd792d833355d830fca1cfea12ec7fe4f41d1d1126389c51a8a392a7f94093473c19263cc6846cc40d7e179c2facf12db2d68ff923f9 90-touchscreen-dev.rules" diff --git a/aports/device-nokia-rx51/uboot-script.cmd b/aports/device-nokia-rx51/uboot-script.cmd index 8c5a8e51..2c0bd657 100644 --- a/aports/device-nokia-rx51/uboot-script.cmd +++ b/aports/device-nokia-rx51/uboot-script.cmd @@ -3,7 +3,7 @@ setenv mmcpart 1 setenv mmctype ext2 setenv setup_omap_atag 1 setenv bootargs init=/init.sh rw console=tty0 console=tty02 omapfb_vram=7M omapfb.mode=lcd:848x480-16 nokia-modem.pm=0 -setenv mmckernfile /uImage +setenv mmckernfile /uImage-nokia-rx51 setenv mmcinitrdfile /uInitrd-nokia-rx51 setenv mmcscriptfile echo Loading initramfs diff --git a/aports/linux-nokia-rx51/APKBUILD b/aports/linux-nokia-rx51/APKBUILD index 1fb2531b..153e1392 100644 --- a/aports/linux-nokia-rx51/APKBUILD +++ b/aports/linux-nokia-rx51/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=2 arch="armhf" pkgdesc="Mainline Linux for the Nokia N900" @@ -99,7 +99,7 @@ package() { mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n postmarketos -d zImage-dtb uImage install -Dm644 "$srcdir/build/arch/arm/boot/uImage" \ - "$pkgdir/boot/uImage" + "$pkgdir/boot/uImage-$_flavor" install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \ "$pkgdir/boot/vmlinuz-$_flavor" diff --git a/pmb/flasher/export.py b/pmb/flasher/export.py index ae1084b8..950070bf 100644 --- a/pmb/flasher/export.py +++ b/pmb/flasher/export.py @@ -36,6 +36,7 @@ def export(args, flavor, folder): " contains initramfs and kernel", "initramfs-" + flavor: "Initramfs", "uInitrd-" + flavor: "Initramfs, legacy u-boot image format", + "uImage-" + flavor: "Kernel, legacy u-boot image format", "vmlinuz-" + flavor: "Linux kernel", args.device + ".img": "System partition", }