From: Jan Kiszka <[email protected]> This brings a change in the custom kernel name definition as well as in the u-boot-script config file. Moreover, we can drop the explicit init installation because it's now part of the distro conf. And ROOTFS_DEV is history as well.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 4 +--- conf/multiconfig/espressobin-jailhouse.conf | 2 -- conf/multiconfig/orangepi-zero-jailhouse.conf | 2 -- kas.yml | 2 +- recipes-core/customizations/files/postinst-espressobin | 3 ++- recipes-core/customizations/files/postinst-orangepi-zero | 3 ++- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index 3300154..6a7b9b0 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -11,8 +11,6 @@ require conf/distro/debian-stretch.conf -IMAGE_PREINSTALL += "init" - -KERNEL_NAME = "jailhouse-${DISTRO_ARCH}" +KERNEL_NAME = "jailhouse" PREFERRED_VERSION_jailhouse ?= "0.10" diff --git a/conf/multiconfig/espressobin-jailhouse.conf b/conf/multiconfig/espressobin-jailhouse.conf index 2cf9389..e3d5208 100644 --- a/conf/multiconfig/espressobin-jailhouse.conf +++ b/conf/multiconfig/espressobin-jailhouse.conf @@ -16,5 +16,3 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE = "wic-img" WKS_FILE = "espressobin" - -ROOTFS_DEV = "mmcblk0p1" diff --git a/conf/multiconfig/orangepi-zero-jailhouse.conf b/conf/multiconfig/orangepi-zero-jailhouse.conf index f04da2c..1131176 100644 --- a/conf/multiconfig/orangepi-zero-jailhouse.conf +++ b/conf/multiconfig/orangepi-zero-jailhouse.conf @@ -18,8 +18,6 @@ IMAGE_TYPE = "wic-img" WKS_FILE = "orangepi-zero" IMAGER_INSTALL += "u-boot-sunxi" -ROOTFS_DEV = "mmcblk0p1" - DISTRO_APT_SOURCES_append = " conf/distro/debian-buster.list" DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.orangepi-zero.conf" diff --git a/kas.yml b/kas.yml index 87de901..56d2ed3 100644 --- a/kas.yml +++ b/kas.yml @@ -19,7 +19,7 @@ repos: isar: url: https://github.com/ilbers/isar - refspec: e231e88b447cdad1a233ad29ff23545bc50f398b + refspec: ab95bf498eb08a9b76f2fec1502a6447c2ba4678 layers: meta: meta-isar: diff --git a/recipes-core/customizations/files/postinst-espressobin b/recipes-core/customizations/files/postinst-espressobin index 74f150f..fe8e43c 100644 --- a/recipes-core/customizations/files/postinst-espressobin +++ b/recipes-core/customizations/files/postinst-espressobin @@ -1,5 +1,6 @@ cat << EOF > /etc/default/u-boot-script -KERNEL_ARGS_APPEND="root=/dev/mmcblk0p1 rw rootwait mem=768M" +ROOT_PARTITION=1 +KERNEL_ARGS="root=/dev/mmcblk0p1 rw rootwait mem=768M" NO_INITRD="yes" SCRIPT_PREPEND=" setenv devtype mmc diff --git a/recipes-core/customizations/files/postinst-orangepi-zero b/recipes-core/customizations/files/postinst-orangepi-zero index 3fb7387..c3d97cb 100644 --- a/recipes-core/customizations/files/postinst-orangepi-zero +++ b/recipes-core/customizations/files/postinst-orangepi-zero @@ -1,5 +1,6 @@ cat << EOF > /etc/default/u-boot-script -KERNEL_ARGS_APPEND="root=/dev/mmcblk0p1 mem=128M vmalloc=512M" +ROOT_PARTITION=1 +KERNEL_ARGS="root=/dev/mmcblk0p1 mem=128M vmalloc=512M" NO_INITRD="yes" SCRIPT_PREPEND="setenv fdt_high 0xffffffff" EOF -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
