summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb/lsb-release
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-08-25 20:21:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 14:05:12 +0100
commitbac4bc9aa6a1f2fcf2ce9644925615185cc8e847 (patch)
tree9ef8ba7038907331db8f6d1f57f2915b3b6cf410 /meta/recipes-extended/lsb/lsb-release
parent1af3e4bea666e944a610025ca8979098b59b1174 (diff)
downloadpoky-bac4bc9aa6a1f2fcf2ce9644925615185cc8e847.tar.gz
Remove LSB support
LSB as a standard isn't current and isn't well suited to embedded anyway. Its putting artifical constraints on the system and with modern layer technology, would now be better off as its own layer. As such its time to split it out. The only part with some (marginal) usage is lsb_release, which is split from the lsb package into an own lsb-release package. (From OE-Core rev: fb064356af615d67d85b65942103bf943d84d290) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb/lsb-release')
-rw-r--r--meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch b/meta/recipes-extended/lsb/lsb-release/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-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch
@@ -0,0 +1,38 @@
1From cba901945c5a6da9586550498f8e3787c57c3098 Mon Sep 17 00:00:00 2001
2From: Athanasios Oikonomou <athoik@gmail.com>
3Date: Fri, 17 Feb 2017 21:04:04 +0200
4Subject: [PATCH] fix lsb_release to work with busybox head and find
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Athanasios Oikonomou <athoik@gmail.com>
8
9diff --git a/lsb_release b/lsb_release
10index e7d6024..233b8c1 100755
11--- a/lsb_release
12+++ b/lsb_release
13@@ -209,7 +209,7 @@ EASE ($DISTRIB_CODENAME)"
14 || [ -n "$(echo $DISTRIB_DESCRIPTION | \
15 sed -e "s/.*$DESCSTR_DELI.*//")" ]
16 then
17- TMP_DISTRIB_DESC=$(head -1 $FILENAME 2>/dev/null)
18+ TMP_DISTRIB_DESC=$(head -n 1 $FILENAME 2>/dev/null)
19 [ -z "$DISTRIB_DESCRIPTION" ] \
20 && DISTRIB_DESCRIPTION=$TMP_DISTRIB_DESC
21 else
22@@ -249,10 +249,10 @@ GetDistribInfo() {
23 then
24 CHECKFIRST=$(find $INFO_ROOT/ -maxdepth 1 \
25 -name \*$INFO_DISTRIB_SUFFIX \
26- -and ! -name $INFO_LSB_FILE \
27- -and -type f \
28+ -type f \
29 2>/dev/null \
30- | head -1 ) # keep one of the files found (if many)
31+ | grep -v $INFO_LSB_FILE \
32+ | head -n 1 ) # keep one of the files found (if many)
33 fi
34 InitDistribInfo $CHECKFIRST
35 fi
36--
372.1.4
38