diff options
| author |   Athanasios Oikonomou <athoik@gmail.com> | 2017-02-17 21:50:52 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:29:19 -0800 |
| commit | 9b036ac92073cadd26819def37ac0199f1ec9934 (patch) | |
| tree | b4ea09aa0bea8bde23684c679eaa6e43e341f43e | |
| parent | 0e0122ab57ffaf0119b9614b9ac4833d7acb997b (diff) | |
| download | openembedded-core-contrib-9b036ac92073cadd26819def37ac0199f1ec9934.tar.gz | |
lsb: lsb_release script incompatible with busybox head and find
Busybox implementation only supports head -1 option if ENABLE_INCLUDE_SUSv2
or ENABLE_FEATURE_FANCY_HEAD configuration options are enabled. Also the -and
option for find is only supported if ENABLE_DESKTOP configuration option is
enabled. These configuration options are not enabled in several builds, which is
why this patch is needed.
[YOCTO #11041]
Signed-off-by: Athanasios Oikonomou <athoik@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-extended/lsb/lsb_4.1.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch b/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch new file mode 100644 index 0000000000..0175752067 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch @@ -0,0 +1,38 @@ +From cba901945c5a6da9586550498f8e3787c57c3098 Mon Sep 17 00:00:00 2001 +From: Athanasios Oikonomou <athoik@gmail.com> +Date: Fri, 17 Feb 2017 21:04:04 +0200 +Subject: [PATCH] fix lsb_release to work with busybox head and find + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Athanasios Oikonomou <athoik@gmail.com> + +diff --git a/lsb_release b/lsb_release +index e7d6024..233b8c1 100755 +--- a/lsb_release ++++ b/lsb_release +@@ -209,7 +209,7 @@ EASE ($DISTRIB_CODENAME)" + || [ -n "$(echo $DISTRIB_DESCRIPTION | \ + sed -e "s/.*$DESCSTR_DELI.*//")" ] + then +- TMP_DISTRIB_DESC=$(head -1 $FILENAME 2>/dev/null) ++ TMP_DISTRIB_DESC=$(head -n 1 $FILENAME 2>/dev/null) + [ -z "$DISTRIB_DESCRIPTION" ] \ + && DISTRIB_DESCRIPTION=$TMP_DISTRIB_DESC + else +@@ -249,10 +249,10 @@ GetDistribInfo() { + then + CHECKFIRST=$(find $INFO_ROOT/ -maxdepth 1 \ + -name \*$INFO_DISTRIB_SUFFIX \ +- -and ! -name $INFO_LSB_FILE \ +- -and -type f \ ++ -type f \ + 2>/dev/null \ +- | head -1 ) # keep one of the files found (if many) ++ | grep -v $INFO_LSB_FILE \ ++ | head -n 1 ) # keep one of the files found (if many) + fi + InitDistribInfo $CHECKFIRST + fi +-- +2.1.4 + diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index ece0eab0ff..b4e8832c70 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -15,6 +15,7 @@ RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} lsbinitscripts" LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ + file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ file://init-functions \ file://lsb_killproc \ file://lsb_log_message \ |