diff options
Diffstat (limited to 'meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch')
-rw-r--r-- | meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch | 38 |
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 @@ | |||
1 | From cba901945c5a6da9586550498f8e3787c57c3098 Mon Sep 17 00:00:00 2001 | ||
2 | From: Athanasios Oikonomou <athoik@gmail.com> | ||
3 | Date: Fri, 17 Feb 2017 21:04:04 +0200 | ||
4 | Subject: [PATCH] fix lsb_release to work with busybox head and find | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Athanasios Oikonomou <athoik@gmail.com> | ||
8 | |||
9 | diff --git a/lsb_release b/lsb_release | ||
10 | index 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 | -- | ||
37 | 2.1.4 | ||
38 | |||