device/testing/device-nokia-rm846/APKBUILD → device/testing/device-nokia-sand/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-nokia-rm846
+pkgname=device-nokia-sand
 pkgdesc="Lumia 620"
 pkgver=0.1
 pkgrel=3
@@ -7,7 +7,7 @@ url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-nokia-rm846 mkbootimg mdss-fb-init-hack mesa-dri-swrast"
+depends="postmarketos-base linux-nokia-sand mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -18,4 +18,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 }
-sha512sums="726416e68be38030301067af174e20799e3949f24403f0d246bf4c1c0ad2b0a320ca3bf0e7933ff14bffdc84318e69b0bb25f59202e73b4d9c2bc2c8a9fc8956  deviceinfo"
+sha512sums="
+07108161ccae2fbc29d969a88fac08c51072951c24b4a7909428fd5d281e8d43ce593d3c33a2629da17bc574b1b24617aae63f27020ff4f2cbd36b1cb4f6a825  deviceinfo
+"

device/testing/device-nokia-rm846/deviceinfo → device/testing/device-nokia-sand/deviceinfo

@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Nokia Lumia 620"
 deviceinfo_manufacturer="Nokia"
-deviceinfo_codename="nokia-rm846"
+deviceinfo_codename="nokia-sand"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""

device/testing/linux-nokia-rm846/APKBUILD → device/testing/linux-nokia-sand/APKBUILD

 # Kernel config based on: arch/arm/configs/lineage_zeal_defconfig
 
-pkgname=linux-nokia-rm846
+pkgname=linux-nokia-sand
 pkgver=3.4.0
 pkgrel=3
 pkgdesc="Lumia 620 kernel fork"
 arch="armv7"
 _carch="arm"
-_flavor="nokia-rm846"
+_flavor="nokia-sand"
 url="https://kernel.org"
 license="GPL2"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -62,8 +62,10 @@ package() {
 		return 1
 	fi
 }
-sha512sums="6a576c9bfb645083d1d8477daae647ee44f15732414cb73a585d1c7e27c5481ccdcd98d6e8fe100b61400f1c3186a3339c2d438fb605177e1d11832e93dbc70b  linux-nokia-rm846-28fe134696ce748ddaaf3633d3e345d3509276bd.tar.gz
-2486c86d2debe239a339d03a7ebddd34ef32a19694f88c71373d6ae3a08fd7ce21ee408225236d9ca25ff9a35c95e9df288f16655709a0c4e5682256c99c6c25  config-nokia-rm846.armv7
+sha512sums="
+6a576c9bfb645083d1d8477daae647ee44f15732414cb73a585d1c7e27c5481ccdcd98d6e8fe100b61400f1c3186a3339c2d438fb605177e1d11832e93dbc70b  linux-nokia-sand-28fe134696ce748ddaaf3633d3e345d3509276bd.tar.gz
+2486c86d2debe239a339d03a7ebddd34ef32a19694f88c71373d6ae3a08fd7ce21ee408225236d9ca25ff9a35c95e9df288f16655709a0c4e5682256c99c6c25  config-nokia-sand.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  psmouse_base.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
+"

main/postmarketos-mkinitfs/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-mkinitfs
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
@@ -54,8 +54,8 @@ check() {
 sha512sums="
 4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135  00-default.modules
 1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67  init.sh.in
-e72adfb06745ad596a02837c8d52837490a7940f4d5589b8937155ee1be1bc4176d79d3f24c40882d20592d00c23c2daf3ef1ceba6ef05cadb76906084373f1b  init_functions.sh
+393791a7db328d45db7c3b7836ed93208f8b64a6c08a219d31f5a51a167b75ac32407179ae33ef3f72e33fae35c48f676cf526dae190b231d1a766b9a0ad0fb6  init_functions.sh
 54c8ea6c4b5313c0ca82bbc40498a35d4b5cbcdbf950dc01b5025238ea6b8caa2f9a9ee57a269fb78673fbcac186c33243188458ecda45deb3354d5d8a77fdfe  mkinitfs.sh
-0b89d1c43516d1be154fcf51082a89ab9dbff7de5f8dc3964399514584752b2356d34958923e66250af4639eb98b94f51ac9046c2d69c608fcf12794f78c2cca  mkinitfs_functions.sh
+d092986d6700ba823d968a576d73db128b1180889fae5f973cd012536c30746141f890b8f05e6a17b49812851e25f3df19ef08c70d4dff6bb1e85b5f4fab6b07  mkinitfs_functions.sh
 c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622  mkinitfs_test.sh
 "

main/postmarketos-mkinitfs/init_functions.sh

@@ -49,7 +49,7 @@ setup_firmware_path() {
 		echo "Kernel does not support setting the firmware image search path. Skipping."
 		return
 	fi
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3037
 	echo -n /lib/firmware/postmarketos >$SYS
 }
 

main/postmarketos-mkinitfs/mkinitfs_functions.sh

@@ -313,12 +313,12 @@ create_uboot_files()
 	require_package "mkimage" "u-boot-tools" "generate_legacy_uboot_initfs"
 
 	echo "==> initramfs: creating uInitrd"
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	mkimage -A $arch -T ramdisk -C none -n uInitrd -d "$outfile" \
 		"${outfile/initramfs-/uInitrd-}" || exit 1
 
 	echo "==> kernel: creating uImage"
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	kernelfile="${outfile/initramfs-/vmlinuz-}"
 	if [ "${deviceinfo_append_dtb}" = "true" ]; then
 		kernelfile="${kernelfile}-dtb"
@@ -328,7 +328,7 @@ create_uboot_files()
 		deviceinfo_legacy_uboot_load_address="80008000"
 	fi
 
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	mkimage -A $arch -O linux -T kernel -C none -a "$deviceinfo_legacy_uboot_load_address" \
 		-e "$deviceinfo_legacy_uboot_load_address" \
 		-n postmarketos -d "$kernelfile" "${outfile/initramfs-/uImage-}" || exit 1
@@ -338,7 +338,7 @@ create_uboot_files()
 create_bootimg()
 {
 	[ "${deviceinfo_generate_bootimg}" = "true" ] || return
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	bootimg="${outfile/initramfs-/boot.img-}"
 
 	if [ "${deviceinfo_bootimg_pxa}" = "true" ]; then
@@ -353,7 +353,7 @@ create_bootimg()
 	_base="${deviceinfo_flash_offset_base}"
 	[ -z "$_base" ] && _base="0x10000000"
 
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	kernelfile="${outfile/initramfs-/vmlinuz-}"
 	if [ "${deviceinfo_append_dtb}" = "true" ]; then
 		kernelfile="${kernelfile}-dtb"
@@ -419,15 +419,15 @@ create_bootimg()
 		if [ "${deviceinfo_bootimg_blobpack}" = "sign" ]; then
 			_flags="-s"
 		fi
-		# shellcheck disable=SC2039
+		# shellcheck disable=SC3060
 		blobpack $_flags "${outfile/initramfs-/blob-}" \
 				LNX "$bootimg" || exit 1
-		# shellcheck disable=SC2039
+		# shellcheck disable=SC3060
 		mv "${outfile/initramfs-/blob-}" "$bootimg"
 	fi
 	if [ "${deviceinfo_bootimg_append_seandroidenforce}" = "true" ]; then
 		echo "==> initramfs: appending 'SEANDROIDENFORCE' to boot.img"
-		# shellcheck disable=SC2039 disable=SC2039
+		# shellcheck disable=SC3037
 		echo -n "SEANDROIDENFORCE" >> "$bootimg"
 	fi
 }
@@ -460,7 +460,7 @@ append_or_copy_dtb()
 		fi
 		dtb="$dtb /usr/share/dtb/$filename.dtb"
 	done
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	kernel="${outfile/initramfs-/vmlinuz-}"
 	if [ "${deviceinfo_append_dtb}" = "true" ]; then
 		echo "==> kernel: appending device-tree ${deviceinfo_dtb}"
@@ -485,7 +485,7 @@ add_mtk_header()
 	rm "$outfile-orig"
 
 	echo "==> kernel: adding Mediatek header"
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3060
 	kernel="${outfile/initramfs-/vmlinuz-}"
 	rm -f "${kernel}-mtk"
 	mtk-mkimage KERNEL "$kernel" "${kernel}-mtk"