diff options
| author | John Klug <john.klug@multitech.com> | 2022-03-08 17:41:23 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2022-03-09 17:03:57 -0600 |
| commit | 1d378689dcb8c45457749e3290b492613be96fa5 (patch) | |
| tree | a0fe02cd2ee91d94a06e5ff1f788b68845717b96 | |
| parent | e0ef9c832b51f7efe296e332fbd5a8c4e6ac5d53 (diff) | |
| download | meta-mlinux-atmel-1d378689dcb8c45457749e3290b492613be96fa5.tar.gz meta-mlinux-atmel-1d378689dcb8c45457749e3290b492613be96fa5.tar.bz2 meta-mlinux-atmel-1d378689dcb8c45457749e3290b492613be96fa5.zip | |
Add OverlayFS to mLinux
4 files changed, 18 insertions, 1 deletions
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb index 0cf4c92..7d654e2 100644 --- a/recipes-core/images/mlinux-minimal-image.bb +++ b/recipes-core/images/mlinux-minimal-image.bb @@ -11,6 +11,8 @@ IMAGE_LINGUAS = "" IMAGE_FEATURES_append = " ssh-server-openssh package-management" # Don't wipe out CORE_FEATURES from minimal image +MLINUX_OVERLAYFS = "overlayfs-init-jffs2" + CORE_FEATURES_append = " \ packagegroup-core-boot packagegroup-distro-base \ packagegroup-base-ext2 \ @@ -26,6 +28,7 @@ CORE_FEATURES_append = " \ mlinux-feed-configs \ useradd \ mts-io-sysfs \ + ${MLINUX_OVERLAYFS} \ " CORE_FEATURES_append = " mtd-utils mtd-utils-jffs2 fstab-jffs2" diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade index 360b553..5568357 100755 --- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade +++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade @@ -1,4 +1,6 @@ #!/bin/bash +PERSISTENT_DIR="/var/persistent/" +ERASE_PERSISTENT="${PERSISTENT_DIR}/mts_do_erase_persistent" dofile=/var/volatile/do_flash_upgrade dofactoryreset=0 id=$(id -u) @@ -120,6 +122,7 @@ if (( $tobeflashed )); then sleep 1 poweroff else + ((KEEP_PERSISTENT)) || touch "$ERASE_PERSISTENT" logger -s -t firmware_upgrade "Rebooting" sleep 1 reboot diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade.config b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade.config new file mode 100644 index 0000000..de3fece --- /dev/null +++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade.config @@ -0,0 +1,8 @@ +# mlinux firmware upgrade configuration + +# If you know that you never install packages that +# conflict with a new image install, set this parameter +# to "1" to keep the persistent data. This saves the +# overlay. This will break opkg if any packages were +# installed. +KEEP_PERSISTENT=0 diff --git a/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend index 39c0807..f91edbd 100644 --- a/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend +++ b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend @@ -1,13 +1,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PR .= ".mlinux1" +PR .= ".mlinux2" SRC_URI += " \ file://mlinux-firmware-upgrade \ + file://mlinux-firmware-upgrade.config \ " do_install_append() { install -d ${D}${sbindir} ${D}${sbindir} install -m 755 ${WORKDIR}/mlinux-firmware-upgrade ${D}${sbindir} + install -d ${D}${sbindir} ${D}${sysconfdir}/default + install -m 755 ${WORKDIR}/mlinux-firmware-upgrade.config ${D}${sysconfdir}/default } |