* [PATCH 1/3] rpi: Introduce bootconfig-rpi package
2022-03-21 13:42 [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
@ 2022-03-21 13:42 ` Anton Mikanovich
2022-03-21 13:42 ` [PATCH 2/3] rpi: Migrate to WIC Anton Mikanovich
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Anton Mikanovich @ 2022-03-21 13:42 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
Move boot/config.txt and boot/cmdline.txt handling for Raspberry into
bootconfig-${MACHINE} package to make them universal for any Raspberry
Pi target.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
meta-isar/classes/rpi-sdimg.bbclass | 13 ---------
.../conf/distro/raspbian-configscript.sh | 6 ----
meta-isar/conf/machine/rpi-common.conf | 3 +-
meta-isar/conf/multiconfig/rpi-stretch.conf | 3 +-
.../bootconfig-rpi/bootconfig-rpi.bb | 28 +++++++++++++++++++
.../bootconfig-rpi/files/cmdline.txt.tmpl | 1 +
.../bootconfig-rpi/files/config.txt | 5 ++++
.../recipes-bsp/bootconfig-rpi/files/postinst | 9 ++++++
8 files changed, 47 insertions(+), 21 deletions(-)
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/cmdline.txt.tmpl
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/config.txt
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/postinst
diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass
index 4bde61b..e36970c 100644
--- a/meta-isar/classes/rpi-sdimg.bbclass
+++ b/meta-isar/classes/rpi-sdimg.bbclass
@@ -49,19 +49,6 @@ do_rpi_sdimg () {
rm -f ${WORKDIR}/boot.img
mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
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/* ::/
diff --git a/meta-isar/conf/distro/raspbian-configscript.sh b/meta-isar/conf/distro/raspbian-configscript.sh
index fca2265..d66fa03 100644
--- a/meta-isar/conf/distro/raspbian-configscript.sh
+++ b/meta-isar/conf/distro/raspbian-configscript.sh
@@ -13,9 +13,3 @@ if [ -f /etc/inittab ]; then
echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \
>> /etc/inittab
fi
-
-KERNEL_IMAGE="$(find /boot -maxdepth 1 -name "vmlinuz*" -printf "%P\n")"
-
-cat > /boot/config.txt << EOF
-kernel=$KERNEL_IMAGE
-EOF
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index ff73e09..b508d2a 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -21,4 +21,5 @@ IMAGE_PREINSTALL += " \
systemd-sysv \
"
-IMAGE_INSTALL += "expand-on-first-boot"
+IMAGE_INSTALL += "expand-on-first-boot \
+ bootconfig-${MACHINE}"
diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf
index fccb1e6..63f9adc 100644
--- a/meta-isar/conf/multiconfig/rpi-stretch.conf
+++ b/meta-isar/conf/multiconfig/rpi-stretch.conf
@@ -33,4 +33,5 @@ IMAGE_PREINSTALL += " \
vim \
"
-IMAGE_INSTALL += "sshd-regen-keys"
+IMAGE_INSTALL += "sshd-regen-keys \
+ bootconfig-${MACHINE}"
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb b/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb
new file mode 100644
index 0000000..648c728
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb
@@ -0,0 +1,28 @@
+# This software is a part of ISAR.
+# Copyright (C) 2022 ilbers GmbH
+
+DESCRIPTION = "Boot config for Raspberry PI boards"
+MAINTAINER = "isar-users <isar-users@googlegroups.com>"
+
+SRC_URI = "file://config.txt \
+ file://cmdline.txt.tmpl"
+
+inherit dpkg-raw
+
+TEMPLATE_VARS = "MACHINE_SERIAL BAUDRATE_TTY"
+TEMPLATE_FILES = "cmdline.txt.tmpl"
+
+# Exceptions for RPi1
+SRC_URI_append_rpi = " file://postinst"
+SRC_URI_remove_rpi = "file://cmdline.txt.tmpl"
+TEMPLATE_FILES_remove_rpi = "cmdline.txt.tmpl"
+
+PN = "bootconfig-${MACHINE}"
+
+do_install() {
+ install -v -d ${D}/boot/
+ install -v -m 644 ${WORKDIR}/config.txt ${D}/boot/
+ if [ -f "${WORKDIR}/cmdline.txt" ]; then
+ install -v -m 644 ${WORKDIR}/cmdline.txt ${D}/boot/
+ fi
+}
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi/files/cmdline.txt.tmpl b/meta-isar/recipes-bsp/bootconfig-rpi/files/cmdline.txt.tmpl
new file mode 100644
index 0000000..a243bd2
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi/files/cmdline.txt.tmpl
@@ -0,0 +1 @@
+console=${MACHINE_SERIAL},${BAUDRATE_TTY} console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes rootwait quiet
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi/files/config.txt b/meta-isar/recipes-bsp/bootconfig-rpi/files/config.txt
new file mode 100644
index 0000000..417d53f
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi/files/config.txt
@@ -0,0 +1,5 @@
+[pi3]
+# Restore UART0/ttyAMA0 over GPIOs 14 & 15
+dtoverlay=miniuart-bt
+
+[all]
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi/files/postinst b/meta-isar/recipes-bsp/bootconfig-rpi/files/postinst
new file mode 100644
index 0000000..ba6d4e2
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi/files/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+KERNEL_IMAGE="$(find /boot -maxdepth 1 -name "vmlinuz*" -printf "%P\n")"
+
+cat > /boot/config.txt << EOF
+kernel=$KERNEL_IMAGE
+EOF
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/3] rpi: Migrate to WIC
2022-03-21 13:42 [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
2022-03-21 13:42 ` [PATCH 1/3] rpi: Introduce bootconfig-rpi package Anton Mikanovich
@ 2022-03-21 13:42 ` Anton Mikanovich
2022-03-21 13:42 ` [PATCH 3/3] doc: Change rpi-sdimg related documentation Anton Mikanovich
2022-03-28 17:50 ` [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
3 siblings, 0 replies; 5+ messages in thread
From: Anton Mikanovich @ 2022-03-21 13:42 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
Migrate all Raspberry Pi targets from custom rpi-sdimg image type to
more generic WIC image type. Create rpi-sdimg.wks instead.
Make rpi-sdimg.bbclass not used in any targets deprecated.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
RECIPE-API-CHANGELOG.md | 8 +-
meta-isar/classes/rpi-sdimg.bbclass | 88 +++----------------
meta-isar/conf/machine/rpi-common.conf | 13 ++-
meta-isar/conf/machine/rpi.conf | 3 +-
meta-isar/conf/multiconfig/rpi-stretch.conf | 10 +++
.../scripts/lib/wic/canned-wks/rpi-sdimg.wks | 5 ++
6 files changed, 49 insertions(+), 78 deletions(-)
create mode 100644 meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index cad15a8..5913dd2 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -342,4 +342,10 @@ The bitbake variable defines the respective environment variable which is availa
When cross compiling, `cross` is added to the `DEB_BUILD_PROFILES` environment variable.
Please note, that manually exported versions of the variables are overwritten.
-For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec.
\ No newline at end of file
+For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec.
+
+### `rpi-sdimg.bbclass` class is now deprecated and will be removed soon
+
+It was replaced by WIC and no more needed.
+Machines that use `rpi-sdimg` image type should be modified to use `wic` type
+with `rpi-sdimg` wks file instead.
diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass
index e36970c..010c573 100644
--- a/meta-isar/classes/rpi-sdimg.bbclass
+++ b/meta-isar/classes/rpi-sdimg.bbclass
@@ -3,84 +3,22 @@
#
# Based on SD class from meta-raspberrypi
-inherit ext4-img
+inherit wic-img
-# Boot partition volume id
-BOOTDD_VOLUME_ID ?= "${MACHINE}"
+WKS_FILE ?= "rpi-sdimg"
-# Boot partition size [in KiB]
-BOOT_SPACE ?= "40960"
+WIC_IMAGER_INSTALL = "parted \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3-distutils \
+ bmap-tools"
-# Set alignment to 4MB [in KiB]
-IMAGE_ROOTFS_ALIGNMENT = "4096"
+IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
+ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
-SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.sdimg"
-SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}"
+IMAGE_INSTALL += "bootconfig-${MACHINE}"
-do_rpi_sdimg[cleandirs] = "${WORKDIR}/rpi_sdimg/"
-do_rpi_sdimg () {
- # Align partitions
- ROOTFS_SIZE=$(du -b ${SDIMG_ROOTFS} | cut -f 1)
- ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} + 1)
- ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % 1024)
- ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} / 1024)
- ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % ${IMAGE_ROOTFS_ALIGNMENT} + ${IMAGE_ROOTFS_ALIGNMENT})
-
- BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
- BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
- SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE})
-
- echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
-
- #Initialize sdcard image file
- dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
-
- # Create partition table
- parted -s ${SDIMG} mklabel msdos
- # Create boot partition and mark it as bootable
- parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
- parted -s ${SDIMG} set 1 boot on
- # Create rootfs partition to the end of disk
- parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
- parted ${SDIMG} print
-
- # Create a vfat image with boot files
- 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
- cp -a ${IMAGE_ROOTFS}/boot ${WORKDIR}/rpi_sdimg/
-
- 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
- dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-}
-
-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
-}
-
-do_ext4_image[prefuncs] += " empty_boot_folder"
-do_ext4_image[postfuncs] += " restore_boot_folder"
-
-empty_boot_folder() {
- sudo mv ${IMAGE_ROOTFS}/boot ${WORKDIR}/boot.orig
- sudo mkdir -p ${IMAGE_ROOTFS}/boot
-}
-
-restore_boot_folder() {
- sudo rm -rf ${IMAGE_ROOTFS}/boot
- sudo mv ${WORKDIR}/boot.orig ${IMAGE_ROOTFS}/boot
+python do_wic_image_prepend() {
+ bb.warn("rpi-sdimg image type is deprecated, please change to wic.")
}
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index b508d2a..8d6dff9 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -5,7 +5,8 @@ BOOT_SPACE ?= "81920"
MACHINE_SERIAL ?= "serial0"
BAUDRATE_TTY ?= "115200"
-IMAGE_FSTYPES ?= "rpi-sdimg"
+IMAGE_FSTYPES ?= "wic-img"
+WKS_FILE ?= "rpi-sdimg"
KERNEL_TYPE = "raspios"
KERNEL_IMAGE_PKG ?= "raspberrypi-kernel"
@@ -23,3 +24,13 @@ IMAGE_PREINSTALL += " \
IMAGE_INSTALL += "expand-on-first-boot \
bootconfig-${MACHINE}"
+
+WIC_IMAGER_INSTALL = "parted \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3-distutils \
+ bmap-tools"
+
+IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
+ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf
index 61852a9..0ab701c 100644
--- a/meta-isar/conf/machine/rpi.conf
+++ b/meta-isar/conf/machine/rpi.conf
@@ -4,4 +4,5 @@
MACHINE_SERIAL ?= "ttyAMA0"
BAUDRATE_TTY ?= "9600"
-IMAGE_FSTYPES ?= "rpi-sdimg"
+IMAGE_FSTYPES ?= "wic-img"
+WKS_FILE ?= "rpi-sdimg"
diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf
index 63f9adc..3c9470e 100644
--- a/meta-isar/conf/multiconfig/rpi-stretch.conf
+++ b/meta-isar/conf/multiconfig/rpi-stretch.conf
@@ -35,3 +35,13 @@ IMAGE_PREINSTALL += " \
IMAGE_INSTALL += "sshd-regen-keys \
bootconfig-${MACHINE}"
+
+WIC_IMAGER_INSTALL = "parted \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3 \
+ bmap-tools"
+
+IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
+ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks
new file mode 100644
index 0000000..c788213
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks
@@ -0,0 +1,5 @@
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 10
+
+part / --source rootfs --ondisk mmcblk0 --fstype=ext2 --label root --align 4096 --exclude-path=boot
+
+bootloader
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 3/3] doc: Change rpi-sdimg related documentation
2022-03-21 13:42 [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
2022-03-21 13:42 ` [PATCH 1/3] rpi: Introduce bootconfig-rpi package Anton Mikanovich
2022-03-21 13:42 ` [PATCH 2/3] rpi: Migrate to WIC Anton Mikanovich
@ 2022-03-21 13:42 ` Anton Mikanovich
2022-03-28 17:50 ` [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
3 siblings, 0 replies; 5+ messages in thread
From: Anton Mikanovich @ 2022-03-21 13:42 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
Image type rpi-sdimg was replaced by wic, so some doc changes needed.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
doc/user_manual.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 466bf8e..b950ff7 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -208,7 +208,7 @@ tmp/deploy/images/qemui386/isar-image-base-debian-stretch-qemui386.wic.img
tmp/deploy/images/qemui386/isar-image-base-debian-buster-qemui386.wic.img
tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img
tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic.img
-tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
+tmp/deploy/images/rpi/isar-image-base-raspbian-stretch-rpi.wic.img
```
### Generate full disk image
@@ -461,7 +461,6 @@ image to be generated may be specified through the `IMAGE_FSTYPES` variable.
Currently, the following image types are provided:
- `ext4` - Raw ext4 filesystem image (default option for `qemuarm` machine).
- - `rpi-sdimg` - A complete, partitioned Raspberry Pi SD card image (default option for the `rpi` machine).
- `wic-img` - A full disk image with user-specified partitions created and populated using the wic tool.
- `ubi-img` - A image for use on mtd nand partitions employing UBI
- `vm-img` - A image for use on VirtualBox or VMware
@@ -540,7 +539,8 @@ IMAGE_PREINSTALL = "linux-image-rpi-rpfv \
KERNEL_IMAGE = "vmlinuz-4.4.0-1-rpi"
INITRD_IMAGE = "initrd.img-4.4.0-1-rpi"
MACHINE_SERIAL = "ttyAMA0"
-IMAGE_FSTYPES = "rpi-sdimg"
+IMAGE_FSTYPES = "wic-img"
+WKS_FILE = "rpi-sdimg"
```
To add new machine user should perform the following steps:
@@ -604,7 +604,6 @@ IMAGE_FSTYPES = "my-image"
Isar contains additional image type classes that can be used as reference:
- `ext4-img`
- - `rpi-sdimg`
- `targz-img`
- `ubifs-img`
- `ubi-img`
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] Replace rpi-sdimg by wic
2022-03-21 13:42 [PATCH 0/3] Replace rpi-sdimg by wic Anton Mikanovich
` (2 preceding siblings ...)
2022-03-21 13:42 ` [PATCH 3/3] doc: Change rpi-sdimg related documentation Anton Mikanovich
@ 2022-03-28 17:50 ` Anton Mikanovich
3 siblings, 0 replies; 5+ messages in thread
From: Anton Mikanovich @ 2022-03-28 17:50 UTC (permalink / raw)
To: isar-users
21.03.2022 16:42, Anton Mikanovich wrote:
> Make Raspberry Pi targets to use WIC for image generation.
>
> Anton Mikanovich (3):
> rpi: Introduce bootconfig-rpi package
> rpi: Migrate to WIC
> doc: Change rpi-sdimg related documentation
>
> RECIPE-API-CHANGELOG.md | 8 +-
> doc/user_manual.md | 7 +-
> meta-isar/classes/rpi-sdimg.bbclass | 101 +++---------------
> .../conf/distro/raspbian-configscript.sh | 6 --
> meta-isar/conf/machine/rpi-common.conf | 16 ++-
> meta-isar/conf/machine/rpi.conf | 3 +-
> meta-isar/conf/multiconfig/rpi-stretch.conf | 13 ++-
> .../bootconfig-rpi/bootconfig-rpi.bb | 28 +++++
> .../bootconfig-rpi/files/cmdline.txt.tmpl | 1 +
> .../bootconfig-rpi/files/config.txt | 5 +
> .../recipes-bsp/bootconfig-rpi/files/postinst | 9 ++
> .../scripts/lib/wic/canned-wks/rpi-sdimg.wks | 5 +
> 12 files changed, 99 insertions(+), 103 deletions(-)
> create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb
> create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/cmdline.txt.tmpl
> create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/config.txt
> create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi/files/postinst
> create mode 100644 meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks
Applied to next.
^ permalink raw reply [flat|nested] 5+ messages in thread