summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-09 13:15:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-26 15:30:39 +0000
commitccfa84bf186e6c98cac6fe4bc5cb910970697f7b (patch)
tree6aa68ff9bbbc0dc93febf9425dd028915594531c
parent316333ec91a3f5b8db2b198bd45807f93ac95246 (diff)
downloadpoky-ccfa84bf186e6c98cac6fe4bc5cb910970697f7b.tar.gz
opkg: Fix patch glitches
The original patch contained some text which shouldn't have been there and used brackets in configure which isn't a great idea. Tweak the patch to resolve this. (From OE-Core rev: 7ab4b11228d66811ff767e31fd3f024c790d4b68) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 63cbf187fe189c99645fe3afee8a6361a9a32cdc) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch b/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch
index 285d258c63..4578fa33be 100644
--- a/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch
+++ b/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch
@@ -9,13 +9,12 @@ Index: opkg-0.4.4/configure.ac
9=================================================================== 9===================================================================
10--- opkg-0.4.4.orig/configure.ac 10--- opkg-0.4.4.orig/configure.ac
11+++ opkg-0.4.4/configure.ac 11+++ opkg-0.4.4/configure.ac
12@@ -281,7 +281,12 @@ AC_FUNC_UTIME_NULL 12@@ -281,7 +281,11 @@ AC_FUNC_UTIME_NULL
13 AC_FUNC_VPRINTF 13 AC_FUNC_VPRINTF
14 AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime]) 14 AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
15 15
16-CLEAN_DATE=`date +"%B %Y" | tr -d '\n'` 16-CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
17+1607446883 17+if ! test -z "$SOURCE_DATE_EPOCH" ; then
18+if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
19+ CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'` 18+ CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'`
20+else 19+else
21+ CLEAN_DATE=`date +"%B %Y" | tr -d '\n'` 20+ CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`