Move to Debian bookworm (12)

Allows to drop the custom swig version. On the npm side, we can skip python-is-python3 now. And as EFI Boot Guard is now an official Debian package, we need to be more precise with which arch we need for imaging. Signed-off-by: Jan Kiszka <[email protected]>
arulcse2008 · Jun 25, 2023 · f8c3f6e · f8c3f6e
1 parent cde8531
commit f8c3f6e
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 1,057 deletions.
diff --git a/classes/npm.bbclass b/classes/npm.bbclass
@@ -35,10 +35,7 @@ NPM_ARCH ?= "${@npm_arch_map(d.getVar('DISTRO_ARCH'), d)}"
 NPM_CLASS_PACKAGE ?= "npm"
 OWN_NPM_CLASS_PACKAGE ?= "0"
 
-# needed as gyp from bullseye does not establish /usr/bin/python
-NPM_EXTRA_DEPS = "${@'python-is-python3' if d.getVar('NPM_REBUILD') == '1' else ''}"
-
-DEBIAN_BUILD_DEPENDS =. "${@'python, libnode72,' if d.getVar('NPM_REBUILD') == '1' else ''}"
+DEBIAN_BUILD_DEPENDS =. "${@'python3, libnode108,' if d.getVar('NPM_REBUILD') == '1' else ''}"
 DEBIAN_BUILD_DEPENDS =. "${NPM_CLASS_PACKAGE},"
 DEBIAN_DEPENDS =. "\${shlibs:Depends}, \${misc:Depends},"
 
@@ -141,9 +138,9 @@ do_install_npm() {
                     -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
                     -o Dir::Etc::sourceparts="-" \
                     -o APT::Get::List-Cleanup="0"
-    ${install_cmd} --download-only ${NPM_CLASS_PACKAGE} ${NPM_EXTRA_DEPS}
+    ${install_cmd} --download-only ${NPM_CLASS_PACKAGE}
     deb_dl_dir_export "${BUILDCHROOT_DIR}" ${BASE_DISTRO}-${BASE_DISTRO_CODENAME}
-    ${install_cmd} ${NPM_CLASS_PACKAGE} ${NPM_EXTRA_DEPS}
+    ${install_cmd} ${NPM_CLASS_PACKAGE}
 
     npm_fetch_undo_mounts
 }

diff --git a/conf/distro/iot2050-debian.conf b/conf/distro/iot2050-debian.conf
@@ -10,7 +10,7 @@
 # COPYING.MIT file in the top-level directory.
 #
 
-require conf/distro/debian-bullseye.conf
+require conf/distro/debian-bookworm.conf
 
 DISTRO_NAME = "IOT2050 Debian System"
 

diff --git a/recipes-app/mraa/mraa_2.2.0+git.bb b/recipes-app/mraa/mraa_2.2.0+git.bb
@@ -20,8 +20,6 @@ SRCREV = "8b1c54934e80edc2d36abac9d9c96fe1e01cb669"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "swig"
-
 DEBIAN_BUILD_DEPENDS = " \
     cmake, \
     swig4.0, \

diff --git a/recipes-core/images/iot2050-image-swu-example.bb b/recipes-core/images/iot2050-image-swu-example.bb
@@ -22,7 +22,7 @@ WKS_FILE:secureboot = "iot2050-swu-secure.wks.in"
 IMAGE_FSTYPES += "swu"
 SWU_ROOTFS_TYPE:secureboot = "verity"
 
-WIC_IMAGER_INSTALL += "efibootguard"
+WIC_IMAGER_INSTALL += "efibootguard:${DISTRO_ARCH}"
 # watchdog is managed by U-Boot - disable
 WDOG_TIMEOUT = "0"
 WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_DEPLOY_FILE DTB_FILES"

diff --git a/recipes-devtools/swig/files/0001-Introduce-macros-to-support-both-Handle-and-Local-ty.patch b/recipes-devtools/swig/files/0001-Introduce-macros-to-support-both-Handle-and-Local-ty.patch