diff options
4 files changed, 0 insertions, 110 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc index 3755b02e..25c099cc 100644 --- a/common/conf/machine/include/amd-common-configurations.inc +++ b/common/conf/machine/include/amd-common-configurations.inc @@ -52,7 +52,6 @@ EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" # because NOISO = "1" by default (See c787dcd in oe-core). # Therefore, we do as follows: IMAGE_FSTYPES += "wic iso" -IMAGE_FSTYPES += "${@bb.utils.contains('COMBINED_FEATURES', 'swupdate', 'ext4.swu', '', d)}" NOISO = "0" NOHDD = "1" diff --git a/common/mentor-swupdate/recipes-core/images/core-image-minimal-install-initramfs.bbappend b/common/mentor-swupdate/recipes-core/images/core-image-minimal-install-initramfs.bbappend deleted file mode 100644 index 473c5fd0..00000000 --- a/common/mentor-swupdate/recipes-core/images/core-image-minimal-install-initramfs.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# The local.conf.append fragments from meta-mentor-swupdate -# add this post-proc command which is not applicable to ramfs -# images so drop it to avoid build failures. -IMAGE_POSTPROCESS_COMMAND_remove = "swupdate_deploy_description;" diff --git a/meta-v1000/files/v1000/compound/postinstall.sh.bbin b/meta-v1000/files/v1000/compound/postinstall.sh.bbin deleted file mode 100644 index da55a516..00000000 --- a/meta-v1000/files/v1000/compound/postinstall.sh.bbin +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -printf "kernel=%d\nrootfs=%d\n" 1 1 > /tmp/swupdate_type - diff --git a/meta-v1000/files/v1000/compound/sw-description.bbin b/meta-v1000/files/v1000/compound/sw-description.bbin deleted file mode 100644 index a8e06e5e..00000000 --- a/meta-v1000/files/v1000/compound/sw-description.bbin +++ /dev/null @@ -1,101 +0,0 @@ -software = -{ - version = "1.0"; - hardware-compatibility = [ "1.0" ]; - stable: - { - platform0: - { - images: ( - { - filename = "${image}"; - device = "/dev/mmcblk0p2"; - installed-directly = TRUE; - } - ); - files: ( - { - filename = "bzImage"; - path = "/boot/bzImageA"; - type = "rawfile"; - } - ); - scripts: ( - { - filename = "postinstall.sh"; - type = "postinstall"; - } - ); - }; - platform1: - { - images: ( - { - filename = "${image}"; - device = "/dev/mmcblk0p3"; - installed-directly = TRUE; - } - ); - files: ( - { - filename = "bzImage"; - path = "/boot/bzImageA"; - type = "rawfile"; - } - ); - scripts: ( - { - filename = "postinstall.sh"; - encrypted = false; - } - ); - }; - platform2: - { - images: ( - { - filename = "${image}"; - device = "/dev/mmcblk0p2"; - installed-directly = TRUE; - } - ); - files: ( - { - filename = "bzImage"; - path = "/boot/bzImageB"; - type = "rawfile"; - } - ); - scripts: ( - { - filename = "postinstall.sh"; - type = "postinstall"; - } - ); - }; - platform3: - { - images: ( - { - filename = "${image}"; - device = "/dev/mmcblk0p3"; - installed-directly = TRUE; - } - ); - files: ( - { - filename = "bzImage"; - path = "/boot/bzImageB"; - type = "rawfile"; - } - ); - scripts: ( - { - filename = "postinstall.sh"; - type = "postinstall"; - } - ); - - }; - }; -} |