Image manifest support
cover Image manifest support
The following change since commit 25a75e83550fab0f9d2486b13ec9ab6339b6a8b0:
linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:15 +0000)
is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/manifest
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/manifest
Paul Eggleton (1):
classes/image: write image manifest
meta/classes/image.bbclass | 15 +++++++++------ meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 14 -------------- scripts/opkg-query-helper.py | 9 +++++++++ 6 files changed, 24 insertions(+), 20 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/1 classes/image: write image manifest
Write a list of installed packages to a .manifest file next to the image, so we can find out what went into the image after it has been constructed without necessarily having to have buildhistory enabled (although that will provide more detail.) We can make use of this for example in the testimage class associated code that checks for installed packages for determining whether or not to run specific tests.
Note: this replaces the previous ipk-specific manifest code with something that works for ipk, rpm and deb, and instead of a pruned status file, packages are listed one per line, in the following format:
<packagename> <packagearch> <version>
Tests for all three backends have shown that the performance impact of this change is negligible (about 1.5s max).
Implements [YOCTO #5410]
--- meta/classes/image.bbclass | 15 +++++++++------ meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 14 -------------- scripts/opkg-query-helper.py | 9 +++++++++ 6 files changed, 24 insertions(+), 20 deletions(-)
meta/classes/image.bbclass +9 -6
@@ -179,6 +179,9 @@ ROOTFS_POSTPROCESS_COMMAND_prepend = "run_intercept_scriptlets; " ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}' # Enable postinst logging if debug-tweaks is enabled ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' +# Write manifest +IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" +ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
@@ -381,6 +384,11 @@ fakeroot do_rootfs () { ${IMAGE_POSTPROCESS_COMMAND} ${MACHINE_POSTPROCESS_COMMAND} + + if [ -n "${IMAGE_LINK_NAME}" -a -f "${IMAGE_MANIFEST}" ]; then + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest + ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest + fi } insert_feed_uris () {
@@ -602,12 +610,7 @@ make_zimage_symlink_relative () { } write_image_manifest () { - rootfs_${IMAGE_PKGTYPE}_write_manifest - - if [ -n "${IMAGE_LINK_NAME}" ]; then - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest - ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest - fi + list_installed_packages ver | sort > ${IMAGE_MANIFEST} } # Make login manager(s) enable automatic login.
meta/classes/populate_sdk_deb.bbclass +2 -0
@@ -84,6 +84,8 @@ list_installed_packages() { echo "$pkg $fullpath $pkgarch" fi done + elif [ "$1" = "ver" ] ; then + ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch} ${Version}\n' else ${DPKG_QUERY_COMMAND} -W -f='${Package}\n' fi
meta/classes/populate_sdk_ipk.bbclass +2 -0
@@ -70,6 +70,8 @@ list_installed_packages() { echo "$pkg $fullpath $pkgarch" fi done + elif [ "$1" = "ver" ] ; then + opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -v else opkg-cl ${OPKG_ARGS} list_installed | awk '{ print $1 }' fi
meta/classes/populate_sdk_rpm.bbclass +2 -0
@@ -162,6 +162,8 @@ list_installed_packages() { ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe arch elif [ "$1" = "file" ]; then ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe file + elif [ "$1" = "ver" ]; then + ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{VERSION}\n]" | translate_smart_to_oe arch else ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe fi
meta/classes/rootfs_ipk.bbclass +0 -14
@@ -118,20 +118,6 @@ save_postinsts () { done } -rootfs_ipk_write_manifest() { - manifest=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest - cp ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/status $manifest - - sed '/Depends/d' -i $manifest - sed '/Status/d' -i $manifest - sed '/Architecture/d' -i $manifest - sed '/Installed-Time/d' -i $manifest - sed '/Auto-Installed/d' -i $manifest - sed '/Recommends/d' -i $manifest - sed '/Provides/d' -i $manifest - sed '/Conflicts/d' -i $manifest -} - remove_packaging_data_files() { rm -rf ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg # We need the directory for the package manager lock
scripts/opkg-query-helper.py +9 -0
@@ -28,6 +28,7 @@ import re archmode = False filemode = False +vermode = False args = [] for arg in sys.argv[1:]:
@@ -35,6 +36,8 @@ for arg in sys.argv[1:]: archmode = True elif arg == '-f': filemode = True + elif arg == '-v': + vermode = True else: args.append(arg)
@@ -60,6 +63,12 @@ for line in fileinput.input(args): elif line.startswith("Architecture:"): arch = line.split(": ")[1] print("%s %s_%s_%s.ipk %s" % (pkg,pkg,ver,arch,arch)) + elif vermode: + if line.startswith("Version:"): + ver = line.split(": ")[1] + elif line.startswith("Architecture:"): + arch = line.split(": ")[1] + print("%s %s %s" % (pkg,arch,ver)) else: if line.startswith("Depends:"): depval = line.split(": ")[1]
Signature · 1 line
1.8.1.2
Would you mind summarizing the differences between this and the already emitted image license manifest in deploy/license?
Quoted 30 lines · Paul Eggleton
The following change since commit
25a75e83550fab0f9d2486b13ec9ab6339b6a8b0:linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package
(2013-11-25 16:14:15 +0000)is available in the git repository at:
git://git.openembedded.org/openembedded-core-contribpaule/manifesthttp://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/manifest
Paul Eggleton (1):
classes/image: write image manifestmeta/classes/image.bbclass | 15 +++++++++------ meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 14 -------------- scripts/opkg-query-helper.py | 9 +++++++++ 6 files changed, 24 insertions(+), 20 deletions(-)--
1.8.1.2_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics
Hi Chris,
Quoted 2 lines · On Wednesday 27 November 2013 12:02:41 Chris Larson wrote:
Would you mind summarizing the differences between this and the already emitted image license manifest in deploy/license?
Actually I hadn't appreciated that there is a plain package list in that directory now in addition to the license manifest; however with this version:
1) It's right next to the image(s) instead of in another directory
2) The package version is in the same file next to the package name rather than in a separate file where fields are spread over multiple lines (which is harder to process)
3) It includes the package architecture
4) This isn't for licensing purposes, so it doesn't include any license information
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 16 lines · Paul Eggleton
Quoted 2 lines · On Wednesday 27 November 2013 12:02:41 Chris Larson wrote:
Would you mind summarizing the differences between this and the already emitted image license manifest in deploy/license?
Actually I hadn't appreciated that there is a plain package list in that directory now in addition to the license manifest; however with this version:
1) It's right next to the image(s) instead of in another directory
2) The package version is in the same file next to the package name rather than
in a separate file where fields are spread over multiple lines (which is harder
to process)
Quoted 4 lines
3) It includes the package architecture
4) This isn't for licensing purposes, so it doesn't include any license information
Understood, thanks. I’ll have to take a look. At Mentor we’ve been using the license manifest coupled with
https://github.com/MentorEmbedded/meta-mentor/blob/master/classes/deploy-license-manifest.bbclass.
We’ll probably keep both, use yours for more convenient user examination, and keep the rest for sending off to legal departments and whatnot.
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics