From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7070864246706274304 X-Received: by 2002:ac2:4c46:0:b0:445:8fa6:2ac9 with SMTP id o6-20020ac24c46000000b004458fa62ac9mr16561513lfk.431.1646313873041; Thu, 03 Mar 2022 05:24:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc07:0:b0:247:b308:7b8c with SMTP id b7-20020a2ebc07000000b00247b3087b8cls448883ljf.0.gmail; Thu, 03 Mar 2022 05:24:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5KeL9OYyF9dAa94L+jCwQIdsfUPuEXeDKrv4ehaM3U3G200fZd4Et670oYLopr2AKWNtR X-Received: by 2002:a2e:880a:0:b0:244:7dd:9256 with SMTP id x10-20020a2e880a000000b0024407dd9256mr23867210ljh.525.1646313871887; Thu, 03 Mar 2022 05:24:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646313871; cv=none; d=google.com; s=arc-20160816; b=SyTJa6fluUA0X2D2MkiNW33vUYL0djCQDaiEDIjxRGugWzbxdVQNa53/fgeoHAZiBl 6BQQqIOjovx72p2BEW95JFns2YcWs9y2nxr4pZDpmUmAZ81K7NHNZlut0MboMpm5SB/N BNBZcQeWPv3eF+i+1GtkawoU9SvqtwLBOcQU+lL6cFYYT9Dh39E3e6Red4Kwd4PUdhA/ uZrZYzOYY1xY5kEOEjJPdHLmZtP3bgrnBMO6UVfIYNpB5NViO9wLvj8q2kO2eVcF7T7T G31LhrHv/sSFcJ0fHjdFA70wx0C0aJj5nuXmshOIULq3zxdPGs/4txmtBUOQ82WBAh5Y TH6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=Eocn0BHJub2TC7unutRqKeneIqfH+hcqlM3zN/6UEhI=; b=absL+dfZ4H3gL5UO8+rxT2Q38MJ62MUwD2bCk0lTMB39Rwhr24ljuayPs3CQCdv4JR u3HxyNXG9I+Ujs1TxxE86TEqx3mUaQffKhSQm9q67EMZ+2pu2VtKDZwqThEx/1VFWOUz UjqhcogYaHDAwihR0zujUxwMasp4hwLPKJ655debr3i0qwb3Zh3XskjS7V+GDtyVcr6A OHXE6jg6w3t5F/gCfU18+yU7rKKeVP/tv0s0FeijYUB1/z8IQUD8Ju4pjq4qkSoA0PNP ANSmRgj8gzwWBg2lvwxdTrCjrfwnPTr7c1ca4jrTaXCITKP1GxSV8G42RjQOxkMbehOB 04oQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of work@hennsch.de designates 2a01:488:42:1000:50ed:842d:: as permitted sender) smtp.mailfrom=work@hennsch.de Return-Path: Received: from wp038.webpack.hosteurope.de (wp038.webpack.hosteurope.de. [2a01:488:42:1000:50ed:842d::]) by gmr-mx.google.com with ESMTPS id c1-20020ac25f61000000b004431470c1acsi108527lfc.4.2022.03.03.05.24.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 05:24:31 -0800 (PST) Received-SPF: pass (google.com: domain of work@hennsch.de designates 2a01:488:42:1000:50ed:842d:: as permitted sender) client-ip=2a01:488:42:1000:50ed:842d::; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of work@hennsch.de designates 2a01:488:42:1000:50ed:842d:: as permitted sender) smtp.mailfrom=work@hennsch.de Received: from [2003:a:d7a:1f00:9610:3eff:feb8:7861] (helo=md1za8fc.ad001.siemens.net); authenticated by wp038.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1nPlRW-000848-Ui; Thu, 03 Mar 2022 14:24:31 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: vijaikumar.kanagarajan@gmail.com, Henning Schild Subject: [PATCH 1/2] meta-isar/raspbios: get rid of distro config script Date: Thu, 3 Mar 2022 14:24:24 +0100 Message-Id: <20220303132425.31172-1-work@hennsch.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;work@hennsch.de;1646313871;e566aef6; X-HE-SMSGID: 1nPlRW-000848-Ui X-TUID: g2l9VTEvfKgq From: Henning Schild All the steps are actually related to "imaging" and not to the rootfs. Move stuff to imaging class and out of configure script. Signed-off-by: Henning Schild --- meta-isar/classes/rpi-sdimg.bbclass | 31 ++++++++++++++++++- meta-isar/conf/distro/raspios-bullseye.conf | 1 - meta-isar/conf/distro/raspios-configscript.sh | 29 ----------------- 3 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 meta-isar/conf/distro/raspios-configscript.sh diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 1efc1c405d9b..dde121d2616e 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -17,6 +17,7 @@ IMAGE_ROOTFS_ALIGNMENT = "4096" SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.sdimg" SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}" +do_rpi_sdimg[cleandirs] = "${WORKDIR}/rpi_sdimg/" do_rpi_sdimg () { # Align partitions ROOTFS_SIZE=$(du -b ${SDIMG_ROOTFS} | cut -f 1) @@ -47,7 +48,22 @@ do_rpi_sdimg () { BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') rm -f ${WORKDIR}/boot.img mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - mcopy -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}/boot/* ::/ + cp -a ${IMAGE_ROOTFS}/boot ${WORKDIR}/rpi_sdimg/ + cat > ${WORKDIR}/rpi_sdimg/boot/config.txt << EOF +[pi3] +# Restore UART0/ttyAMA0 over GPIOs 14 & 15 +dtoverlay=miniuart-bt + +[all] +EOF + + cat > ${WORKDIR}/rpi_sdimg/boot/cmdline.txt << EOF +console=${MACHINE_SERIAL},${BAUDRATE_TTY} console=tty1 \ +root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes \ +rootwait quiet +EOF + + mcopy -i ${WORKDIR}/boot.img -s ${WORKDIR}/rpi_sdimg/boot/* ::/ # Burn Partitions dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync @@ -55,3 +71,16 @@ do_rpi_sdimg () { } addtask rpi_sdimg before do_build after do_ext4_image + +do_ext4_image[prefuncs] += " append_boot_fstab" +do_ext4_image[postfuncs] += " restore_fstab" + +append_boot_fstab() { + grep boot ${IMAGE_ROOTFS} && return 0 + cp -f ${IMAGE_ROOTFS}/etc/fstab ${WORKDIR}/fstab.orig + echo "/dev/mmcblk0p1 /boot vfat defaults 0 2" | sudo tee -a ${IMAGE_ROOTFS}/etc/fstab +} + +restore_fstab() { + sudo cp -f ${WORKDIR}/fstab.orig ${IMAGE_ROOTFS}/etc/fstab +} diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf index cf8cb8996d86..5e4a09c9d941 100644 --- a/meta-isar/conf/distro/raspios-bullseye.conf +++ b/meta-isar/conf/distro/raspios-bullseye.conf @@ -16,7 +16,6 @@ DISTRO_APT_SOURCES_arm64 ?= "conf/distro/raspios-bullseye-64.list" DISTRO_BOOTSTRAP_KEYS = "http://raspbian.raspberrypi.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" DISTRO_BOOTSTRAP_KEYS_arm64 = "" -DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspios-configscript.sh" DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8" THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key;sha256sum=76603890d82a492175caf17aba68dc73acb1189c9fd58ec0c19145dfa3866d56" diff --git a/meta-isar/conf/distro/raspios-configscript.sh b/meta-isar/conf/distro/raspios-configscript.sh deleted file mode 100644 index 6120a379c75e..000000000000 --- a/meta-isar/conf/distro/raspios-configscript.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -set -e - -readonly MACHINE_SERIAL="$1" -readonly BAUDRATE_TTY="$2" - -cat > /boot/config.txt << EOF -[pi3] -# Restore UART0/ttyAMA0 over GPIOs 14 & 15 -dtoverlay=miniuart-bt - -[all] -EOF - -cat > /boot/cmdline.txt << EOF -console=${MACHINE_SERIAL},${BAUDRATE_TTY} console=tty1 \ -root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes \ -rootwait quiet -EOF - -cat > /etc/fstab << EOF -proc /proc proc defaults 0 0 -/dev/mmcblk0p1 /boot vfat defaults 0 2 -/dev/mmcblk0p2 / ext4 defaults,noatime 0 1 -EOF -- 2.34.1