public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Steve Sakoman" <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 05/17] opkg: Fix patch glitches
Date: Mon, 15 Feb 2021 04:37:16 -1000	[thread overview]
Message-ID: <0807c033f13e49e2891bbc69858a4cf5221c8f2c.1613399659.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1613399659.git.steve@sakoman.com>

From: Richard Purdie <richard.purdie@linuxfoundation.org>

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 63cbf187fe189c99645fe3afee8a6361a9a32cdc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch | 5 ++---
 1 file 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
 ===================================================================
 --- opkg-0.4.4.orig/configure.ac
 +++ opkg-0.4.4/configure.ac
-@@ -281,7 +281,12 @@ AC_FUNC_UTIME_NULL
+@@ -281,7 +281,11 @@ AC_FUNC_UTIME_NULL
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
  
 -CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
-+1607446883
-+if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
++if ! test -z "$SOURCE_DATE_EPOCH" ; then
 +    CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'`
 +else
 +    CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
-- 
2.25.1


  parent reply	other threads:[~2021-02-15 14:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-15 14:37 [OE-core][dunfell 00/17] Patch review Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 01/17] uninative: Upgrade to 2.10 Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 02/17] image_types: Ensure tar archives are reproducible Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 03/17] image_types.bbclass: tar: use posix format instead of gnu Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 04/17] opkg: Fix build reproducibility issue Steve Sakoman
2021-02-15 14:37 ` Steve Sakoman [this message]
2021-02-15 14:37 ` [OE-core][dunfell 06/17] oe-pkgdata-util: Check if environment script is initialized Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 07/17] libgcrypt: Whitelisted CVEs Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 08/17] libcroco: Added CVE Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 09/17] p11-kit: upgrade 0.23.20 -> 0.23.21 Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 10/17] p11-kit: upgrade 0.23.21 -> 0.23.22 Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 11/17] gcc-9.3.inc: Fix potential runtime crash Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 12/17] python3: split python target configuration into own class Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 13/17] python3-pycairo: use python3targetconfig Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 14/17] distutils3-base.bbclass: " Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 15/17] meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 16/17] gpgme: use python3targetconfig Steve Sakoman
2021-02-15 14:37 ` [OE-core][dunfell 17/17] python3targetconfig.bbclass: Make py3 dep and tasks only for target recipes Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0807c033f13e49e2891bbc69858a4cf5221c8f2c.1613399659.git.steve@sakoman.com \
    --to=steve@sakoman.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox