diff options
author | Matei Valeanu <Matei.Valeanu@enea.com> | 2021-04-08 15:08:37 +0200 |
---|---|---|
committer | Matei Valeanu <Matei.Valeanu@enea.com> | 2021-04-08 15:08:37 +0200 |
commit | 1a0d008b62062b3bdfa97ec4761347c0d0c4e652 (patch) | |
tree | f52d946fd5d8941984ee1aac8aa06853fd1a1b80 /images | |
parent | 119b192b3ea3ab2b71e9bd86cbc2dcf900ab5b52 (diff) | |
parent | 23ed226a4b4b7c1cac2c52e6808631d9f0d6f652 (diff) | |
download | meta-el-nfv-access-1a0d008b62062b3bdfa97ec4761347c0d0c4e652.tar.gz |
Merge branch 'develop'hotfix_EDGESC-6custom_CPDX-3546EE240_HotFix1
Diffstat (limited to 'images')
-rw-r--r-- | images/core-image-minimal-initramfs.bbappend | 6 | ||||
-rw-r--r-- | images/enea-nfv-access-common.inc | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend index e743bb3..67ab251 100644 --- a/images/core-image-minimal-initramfs.bbappend +++ b/images/core-image-minimal-initramfs.bbappend | |||
@@ -1,9 +1,12 @@ | |||
1 | PACKAGE_INSTALL += " nfv-installer kernel-modules" | 1 | PACKAGE_INSTALL += " nfv-installer kernel-modules ixgbe" |
2 | 2 | ||
3 | # ostree-switchroot is used by the init script to switch root to the | 3 | # ostree-switchroot is used by the init script to switch root to the |
4 | # ostree version specified in the kernel command line | 4 | # ostree version specified in the kernel command line |
5 | PACKAGE_INSTALL_append_sota = " ostree-switchroot" | 5 | PACKAGE_INSTALL_append_sota = " ostree-switchroot" |
6 | 6 | ||
7 | # run-postinsts does not belong in the minimal initramfs | ||
8 | PACKAGE_INSTALL_remove = "run-postinsts" | ||
9 | |||
7 | create_enea_symlink() { | 10 | create_enea_symlink() { |
8 | # enea image used in bare metal installation | 11 | # enea image used in bare metal installation |
9 | cd ${DEPLOY_DIR_IMAGE} | 12 | cd ${DEPLOY_DIR_IMAGE} |
@@ -12,4 +15,3 @@ create_enea_symlink() { | |||
12 | } | 15 | } |
13 | 16 | ||
14 | IMAGE_POSTPROCESS_COMMAND_append += " create_enea_symlink;" | 17 | IMAGE_POSTPROCESS_COMMAND_append += " create_enea_symlink;" |
15 | |||
diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 3f9fc84..5472056 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc | |||
@@ -7,6 +7,17 @@ IMAGE_INSTALL += " \ | |||
7 | kernel-modules \ | 7 | kernel-modules \ |
8 | " | 8 | " |
9 | 9 | ||
10 | # run-postinsts duplicates dpkg-configure if package_deb is used | ||
11 | PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" | ||
12 | |||
13 | # After installing packages inside the rootfs, remove backup DPKG status file | ||
14 | rootfs_postinstall_dpkg_cleanup () { | ||
15 | if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then | ||
16 | rm -f ${IMAGE_ROOTFS}/var/lib/dpkg/status-old | ||
17 | fi | ||
18 | } | ||
19 | ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" | ||
20 | |||
10 | IMAGE_FSTYPES = "ext4 ext4.gz tar.gz" | 21 | IMAGE_FSTYPES = "ext4 ext4.gz tar.gz" |
11 | 22 | ||
12 | # Add ostree specific image types if sota support is set | 23 | # Add ostree specific image types if sota support is set |