update defconfigs

device-xiaomi-angelican/APKBUILD

@@ -33,7 +33,7 @@ package() {
 }
 
 sha512sums="
-1899f05fbfa569cb8b37af5b639e6b2c809e0c8a3effe4cb119c41415e970fc157055fa98c222552feaf05313148b588d3f0fb2ec6813f59dfad1ecaeda1d8f1  deviceinfo
+48f02a53d7957efbce6176456299f9bb8890da5d3c5f679d83b267426e93e06ea7534aa527249cbf3add7e783c090259195f8720216eb7192e70087cc3bfd5ae  deviceinfo
 87a1e3b1f31a7a2717992621eaad272d8ad7e2dca7346e7fcd583e70eb73d817bcfc32b51c322e19ccf575fa0ef3ea7f6279e3176abc4db0c5d49336b9971d05  BT_FW.cfg
 3f973f1ae3f24dd9aa087976cc5965aad41c4a0065f69b3e20c1ebe44e34ee2821312f9610b0c8db6b7b6782cb196afca557f86819514e3873d0be468c588ef4  Himax_firmware.bin
 43bea79d5af5ada68eb96b5947c88f385f15d7691c6868bf54dcc31ca7175b037422d7e19065b2e24a511de6d60082b11676b7e8e0b3dccbc66a09c1d64e1f1d  Himax_mpfw.bin

device-xiaomi-angelican/deviceinfo

@@ -8,7 +8,8 @@ deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-angelican"
 deviceinfo_year="2020"
 deviceinfo_dtb="mediatek/merged"
-deviceinfo_modules_initfs=""
+deviceinfo_modules_initfs="debug-shell"
+deviceinfo_kernel_cmdline_append="pmos.debug-shell"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,6 +20,7 @@ deviceinfo_screen_width="720"
 deviceinfo_screen_height="1600"
 
 # Bootloader related
+deviceinfo_create_initfs_extra="true"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off"
 deviceinfo_generate_bootimg="true"

linux-xiaomi-angelican/003-fix-check-lxdialog-makefile.patch

@@ -0,0 +1,25 @@
+It seems that newer versions of GNU Make do not allow to use variables before
+defining it.
+
+diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
+index 844bc9da..911c6ba1 100644
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -192,6 +192,8 @@ clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
+ clean-files     += mconf qconf gconf nconf
+ clean-files     += config.pot linux.pot
+ 
++HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
++
+ # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
+ PHONY += $(obj)/dochecklxdialog
+ $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
+@@ -217,8 +219,6 @@ HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+ HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
+                           -Wno-missing-prototypes
+ 
+-HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+-
+ HOSTLOADLIBES_nconf	= $(shell \
+ 				pkg-config --libs menu panel ncurses 2>/dev/null \
+ 				|| echo "-lmenu -lpanel -lncurses"  )

linux-xiaomi-angelican/004-fix-check-lxdialog.patch

@@ -0,0 +1,15 @@
+Fix pre-ANSI C code in check-lxdialog.sh.
+
+diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
+index 9d2a4c58..364eaecb 100644
+--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
++++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
+@@ -43,7 +43,7 @@ trap "rm -f $tmp" 0 1 2 3 15
+ check() {
+         $cc -x c - -o $tmp 2>/dev/null <<'EOF'
+ #include CURSES_LOC
+-main() {}
++int main() { return 0; }
+ EOF
+ 	if [ $? != 0 ]; then
+ 	    echo " *** Unable to find the ncurses libraries or the"       1>&2

linux-xiaomi-angelican/APKBUILD

@@ -31,6 +31,8 @@ source="
 	$_config
 	001-touchscreen-firmware-loading-time.patch
 	002-battery-percentage.patch
+	003-fix-check-lxdialog-makefile.patch
+	004-fix-check-lxdialog.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -53,16 +55,18 @@ package() {
 	make dtbs_install O="$_outdir" ARCH="$_carch" \
 		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
 
-  make modules_install O="$_outdir" ARCH="$_carch" \
+#  make modules_install O="$_outdir" ARCH="$_carch" \
-    INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs \
+#    INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs \
-    INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1
+#    INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1
 
 	cat "$pkgdir"/boot/dtbs/mediatek/*.dtb > "$pkgdir"/boot/dtbs/mediatek/merged.dtb
 }
 
 sha512sums="
 beeaa1b5b5d3e6f635508c6f421051080f7fdc296909db7448e4c706b6a54755badc2ea0c1316dbf0a1d394dbea15266a84dfa36d9818c8df99747484c9175b6  linux-xiaomi-angelican-5b52fedbe4d7c6809b5040f7486a8b72812f3fba.tar.gz
-ce3893cf439868f4b0a6ed5a47de99cc6e2a3cd68cb132e3c43d64bf1ef509a6df9a38d0984cb0f36d0c4ee5170e07185532f4749f61c33dd3e2c5d8385cdfd2  config-xiaomi-angelican.aarch64
+27dd6f087358de4597005b97eef6c8dafcded0a2f6f6700c78d63d961ea9f16255e0ee8881d6d8ca9a618e9c1ca0088320775beb23a4aad95a54d269673a514e  config-xiaomi-angelican.aarch64
 3fc36011ab030382f6b74e3821dcc75a236e12fe38bf18639fededc6c49a8c809d9ca1af5a9f2ed83f5f412a383918db14b4af48eda7087ec5997ca00e018152  001-touchscreen-firmware-loading-time.patch
 2ed25978e3c91addf7e568b68ccb6036aa581da0981ec75527e25d15d0ee7dfed97100376e58ce6a6c07ef8a96210a30c0ad91b3cea29528aa89fc59980691bf  002-battery-percentage.patch
+c33fad9de627e72f12e61e728fa1ec53ef15259c7790392a997cc7269e60e45da9534d58851c3b348a1729aaa134d1df305e33546e8a1f3654462f2c3c1d9563  003-fix-check-lxdialog-makefile.patch
+182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5  004-fix-check-lxdialog.patch
 "