summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cve-check.bbclass2
-rw-r--r--meta/classes/image-vm.bbclass8
-rw-r--r--meta/classes/image.bbclass5
-rw-r--r--meta/classes/qemuboot.bbclass3
-rw-r--r--meta/classes/rootfs-postcommands.bbclass3
-rw-r--r--meta/conf/documentation.conf1
-rw-r--r--meta/lib/oeqa/selftest/buildoptions.py16
7 files changed, 1 insertions, 37 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 8251ca7c97..1425a40554 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -92,8 +92,6 @@ python cve_check_write_rootfs_manifest () {
92 manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name) 92 manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name)
93 # If we already have another manifest, update symlinks 93 # If we already have another manifest, update symlinks
94 if os.path.exists(os.path.realpath(manifest_link)): 94 if os.path.exists(os.path.realpath(manifest_link)):
95 if d.getVar('RM_OLD_IMAGE', True) == "1":
96 os.remove(os.path.realpath(manifest_link))
97 os.remove(manifest_link) 95 os.remove(manifest_link)
98 os.symlink(os.path.basename(manifest_name), manifest_link) 96 os.symlink(os.path.basename(manifest_name), manifest_link)
99 bb.plain("Image CVE report stored in: %s" % manifest_name) 97 bb.plain("Image CVE report stored in: %s" % manifest_name)
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 32c6550037..2f35d6b4d1 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -106,10 +106,6 @@ build_boot_dd() {
106 106
107 cd ${IMGDEPLOYDIR} 107 cd ${IMGDEPLOYDIR}
108 108
109 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ]; then
110 rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect)
111 fi
112
113 ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect 109 ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect
114} 110}
115 111
@@ -147,10 +143,6 @@ run_qemu_img (){
147 type="$1" 143 type="$1"
148 qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type 144 qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type
149 145
150 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type ]; then
151 rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type)
152 fi
153
154 ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type 146 ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type
155} 147}
156create_vmdk_image () { 148create_vmdk_image () {
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 915500a2f5..6111f6d266 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -117,7 +117,7 @@ python () {
117def rootfs_variables(d): 117def rootfs_variables(d):
118 from oe.rootfs import variable_depends 118 from oe.rootfs import variable_depends
119 variables = ['IMAGE_DEVICE_TABLE','IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE', 119 variables = ['IMAGE_DEVICE_TABLE','IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE',
120 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 120 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
121 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', 121 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
122 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', 122 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
123 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY'] 123 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY']
@@ -588,9 +588,6 @@ python create_symlinks() {
588 if os.path.exists(os.path.join(deploy_dir, src)): 588 if os.path.exists(os.path.join(deploy_dir, src)):
589 bb.note("Creating symlink: %s -> %s" % (dst, src)) 589 bb.note("Creating symlink: %s -> %s" % (dst, src))
590 if os.path.islink(dst): 590 if os.path.islink(dst):
591 if d.getVar('RM_OLD_IMAGE', True) == "1" and \
592 os.path.exists(os.path.realpath(dst)):
593 os.remove(os.path.realpath(dst))
594 os.remove(dst) 591 os.remove(dst)
595 os.symlink(src, dst) 592 os.symlink(src, dst)
596 else: 593 else:
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index ef9a128796..b5cc93dc93 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -76,9 +76,6 @@ python write_qemuboot_conf() {
76 with open(qemuboot, 'w') as f: 76 with open(qemuboot, 'w') as f:
77 cf.write(f) 77 cf.write(f)
78 78
79 if d.getVar('RM_OLD_IMAGE', True) == "1" and os.path.exists(qemuboot_link):
80 os.remove(os.path.realpath(qemuboot_link))
81
82 if os.path.lexists(qemuboot_link): 79 if os.path.lexists(qemuboot_link):
83 os.remove(qemuboot_link) 80 os.remove(qemuboot_link)
84 os.symlink(os.path.basename(qemuboot), qemuboot_link) 81 os.symlink(os.path.basename(qemuboot), qemuboot_link)
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 07e265c5ac..0c7ceea542 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -232,9 +232,6 @@ python write_image_manifest () {
232 if os.path.exists(manifest_name): 232 if os.path.exists(manifest_name):
233 manifest_link = deploy_dir + "/" + link_name + ".manifest" 233 manifest_link = deploy_dir + "/" + link_name + ".manifest"
234 if os.path.lexists(manifest_link): 234 if os.path.lexists(manifest_link):
235 if d.getVar('RM_OLD_IMAGE', True) == "1" and \
236 os.path.exists(os.path.realpath(manifest_link)):
237 os.remove(os.path.realpath(manifest_link))
238 os.remove(manifest_link) 235 os.remove(manifest_link)
239 os.symlink(os.path.basename(manifest_name), manifest_link) 236 os.symlink(os.path.basename(manifest_name), manifest_link)
240} 237}
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 51c4116983..06527cb99b 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -349,7 +349,6 @@ QMAKE_PROFILES[doc] = "Specifies your own subset of .pro files to be built for u
349RCONFLICTS[doc] = "The list of packages that conflict with another package. Note that the package will not be installed if the conflicting packages are not first removed." 349RCONFLICTS[doc] = "The list of packages that conflict with another package. Note that the package will not be installed if the conflicting packages are not first removed."
350RDEPENDS[doc] = "Lists a package's runtime dependencies (i.e. other packages) that must be installed for the package to be built. They must be the names of other packages as listed in the PACKAGES variable, not recipe names (PN)." 350RDEPENDS[doc] = "Lists a package's runtime dependencies (i.e. other packages) that must be installed for the package to be built. They must be the names of other packages as listed in the PACKAGES variable, not recipe names (PN)."
351REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the distro_features_check class, this variable identifies distribution features that must exist in the current configuration in order for the OpenEmbedded build system to build the recipe." 351REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the distro_features_check class, this variable identifies distribution features that must exist in the current configuration in order for the OpenEmbedded build system to build the recipe."
352RM_OLD_IMAGE[doc] = "Reclaims disk space by removing previously built versions of the same image from the images directory pointed to by the DEPLOY_DIR variable."
353RM_WORK_EXCLUDE[doc] = "With rm_work enabled, this variable specifies a list of packages whose work directories should not be removed." 352RM_WORK_EXCLUDE[doc] = "With rm_work enabled, this variable specifies a list of packages whose work directories should not be removed."
354ROOTFS[doc] = "Indicates a filesystem image to include as the root filesystem." 353ROOTFS[doc] = "Indicates a filesystem image to include as the root filesystem."
355ROOTFS_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing commands once the OpenEmbedded build system has created the root filesystem." 354ROOTFS_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing commands once the OpenEmbedded build system has created the root filesystem."
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py
index 86e4836b83..9487898b07 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -30,22 +30,6 @@ class ImageOptionsTests(oeSelfTest):
30 incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) 30 incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed)
31 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) 31 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
32 32
33 @testcase(925)
34 def test_rm_old_image(self):
35 bitbake("core-image-minimal")
36 deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target="core-image-minimal")
37 imagename = get_bb_var("IMAGE_LINK_NAME", target="core-image-minimal")
38 deploydir_files = os.listdir(deploydir)
39 track_original_files = []
40 for image_file in deploydir_files:
41 if imagename in image_file and os.path.islink(os.path.join(deploydir, image_file)):
42 track_original_files.append(os.path.realpath(os.path.join(deploydir, image_file)))
43 self.write_config("RM_OLD_IMAGE = \"1\"")
44 bitbake("-C rootfs core-image-minimal")
45 deploydir_files = os.listdir(deploydir)
46 remaining_not_expected = [path for path in track_original_files if os.path.basename(path) in deploydir_files]
47 self.assertFalse(remaining_not_expected, msg="\nThe following image files were not removed: %s" % ', '.join(map(str, remaining_not_expected)))
48
49 @testcase(286) 33 @testcase(286)
50 def test_ccache_tool(self): 34 def test_ccache_tool(self):
51 bitbake("ccache-native") 35 bitbake("ccache-native")