* [PATCH 0/3] Pending patches from O.S. Systems' tree
@ 2012-02-29 5:41 Otavio Salvador
2012-02-29 5:41 ` [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty Otavio Salvador
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-02-29 5:41 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 61216d2743502ef38955054aad6a4f2ed63e6d43:
licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES (2012-02-28 17:51:42 +0000)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD
Otavio Salvador (3):
image.bbclass: do not create image manifest link if IMAGE_LINK_NAME
is empty
image_types.bbclass: properly support IMAGE_LINK_NAME as empty
image_types.bbclass: fix bzip2 and xz compression commands
meta/classes/image.bbclass | 6 ++++--
meta/classes/image_types.bbclass | 18 +++++++++++-------
2 files changed, 15 insertions(+), 9 deletions(-)
--
1.7.2.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty
2012-02-29 5:41 [PATCH 0/3] Pending patches from O.S. Systems' tree Otavio Salvador
@ 2012-02-29 5:41 ` Otavio Salvador
2012-02-29 5:41 ` [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty Otavio Salvador
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-02-29 5:41 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/image.bbclass | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4db55ff..ec75cc1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -322,8 +322,10 @@ make_zimage_symlink_relative () {
write_image_manifest () {
rootfs_${IMAGE_PKGTYPE}_write_manifest
- rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
- ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.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
}
# Make login manager(s) enable automatic login.
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty
2012-02-29 5:41 [PATCH 0/3] Pending patches from O.S. Systems' tree Otavio Salvador
2012-02-29 5:41 ` [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty Otavio Salvador
@ 2012-02-29 5:41 ` Otavio Salvador
2012-02-29 12:56 ` Richard Purdie
2012-02-29 5:41 ` [PATCH 3/3] image_types.bbclass: fix bzip2 and xz compression commands Otavio Salvador
2012-02-29 13:00 ` [PATCH 0/3] Pending patches from O.S. Systems' tree Richard Purdie
3 siblings, 1 reply; 6+ messages in thread
From: Otavio Salvador @ 2012-02-29 5:41 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/image_types.bbclass | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 74071c1..f9ed49f 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -25,7 +25,9 @@ def get_imagecmds(d):
types.append("ext3")
types.remove("live")
- cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"
+ if len(d.getVar('IMAGE_LINK_NAME', True)) > 0:
+ cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"
+
for type in types:
ccmd = []
subimages = []
@@ -55,10 +57,12 @@ runimagecmd () {
# Now create the needed compressed versions
cd ${DEPLOY_DIR_IMAGE}/
${ccmd}
- # And create the symlinks
- for type in ${subimages}; do
- ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
- done
+ # And create the symlinks
+ if [ -n "${IMAGE_LINK_NAME}" ]; then
+ for type in ${subimages}; do
+ ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
+ done
+ fi
}
def imagetypes_getdepends(d):
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] image_types.bbclass: fix bzip2 and xz compression commands
2012-02-29 5:41 [PATCH 0/3] Pending patches from O.S. Systems' tree Otavio Salvador
2012-02-29 5:41 ` [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty Otavio Salvador
2012-02-29 5:41 ` [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty Otavio Salvador
@ 2012-02-29 5:41 ` Otavio Salvador
2012-02-29 13:00 ` [PATCH 0/3] Pending patches from O.S. Systems' tree Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-02-29 5:41 UTC (permalink / raw)
To: openembedded-core
We need to use -f (force) or the command fails in the image file
already exists.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/image_types.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index f9ed49f..0c25a92 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -188,8 +188,8 @@ IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lz
COMPRESSIONTYPES = "gz bz2 lzma xz"
COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
-COMPRESS_CMD_bz2 = "bzip2 -k ${IMAGE_NAME}.rootfs.${type}"
-COMPRESS_CMD_xz = "xz -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}"
+COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
+COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}"
COMPRESS_DEPENDS_lzma = "xz-native"
COMPRESS_DEPENDS_gz = ""
COMPRESS_DEPENDS_bz2 = ""
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty
2012-02-29 5:41 ` [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty Otavio Salvador
@ 2012-02-29 12:56 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-02-29 12:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-02-29 at 05:41 +0000, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> meta/classes/image_types.bbclass | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
> index 74071c1..f9ed49f 100644
> --- a/meta/classes/image_types.bbclass
> +++ b/meta/classes/image_types.bbclass
> @@ -25,7 +25,9 @@ def get_imagecmds(d):
> types.append("ext3")
> types.remove("live")
>
> - cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"
> + if len(d.getVar('IMAGE_LINK_NAME', True)) > 0:
> + cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"
> +
I took this but I removed the unneeded len() above.
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] Pending patches from O.S. Systems' tree
2012-02-29 5:41 [PATCH 0/3] Pending patches from O.S. Systems' tree Otavio Salvador
` (2 preceding siblings ...)
2012-02-29 5:41 ` [PATCH 3/3] image_types.bbclass: fix bzip2 and xz compression commands Otavio Salvador
@ 2012-02-29 13:00 ` Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-02-29 13:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-02-29 at 05:41 +0000, Otavio Salvador wrote:
> The following changes since commit 61216d2743502ef38955054aad6a4f2ed63e6d43:
>
> licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES (2012-02-28 17:51:42 +0000)
>
> are available in the git repository at:
> git://github.com/OSSystems/oe-core master
> https://github.com/OSSystems/oe-core/tree/HEAD
>
> Otavio Salvador (3):
> image.bbclass: do not create image manifest link if IMAGE_LINK_NAME
> is empty
> image_types.bbclass: properly support IMAGE_LINK_NAME as empty
> image_types.bbclass: fix bzip2 and xz compression commands
Merged to master, thanks (with one tweak I've mentioned).
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-29 13:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 5:41 [PATCH 0/3] Pending patches from O.S. Systems' tree Otavio Salvador
2012-02-29 5:41 ` [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty Otavio Salvador
2012-02-29 5:41 ` [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty Otavio Salvador
2012-02-29 12:56 ` Richard Purdie
2012-02-29 5:41 ` [PATCH 3/3] image_types.bbclass: fix bzip2 and xz compression commands Otavio Salvador
2012-02-29 13:00 ` [PATCH 0/3] Pending patches from O.S. Systems' tree Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox