mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
ntpsec: Add -D_GNU_SOURCE and fix building with devtool
wscript detects .git directory and if its present them invokes git describe --dirty which does not work on the devtool created git repository, since its synthesized. Add GNU_SOURCE define to get strptime() definition Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+29
@@ -0,0 +1,29 @@
|
|||||||
|
From 9a7dead72f41e79979625c9bdef2fb638427d3d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Mon, 22 Aug 2022 20:54:17 -0700
|
||||||
|
Subject: [PATCH] wscript: Widen the search for tags
|
||||||
|
|
||||||
|
Default is to look for annotated tags, howveer when using devtool we
|
||||||
|
create our own git tree from release tarballs which will have tags but
|
||||||
|
they are not annotated, therefore broaden the search to include all tags
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE-specific]
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
wscript | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/wscript b/wscript
|
||||||
|
index 879ded1..dff835d 100644
|
||||||
|
--- a/wscript
|
||||||
|
+++ b/wscript
|
||||||
|
@@ -177,7 +177,7 @@ def configure(ctx):
|
||||||
|
if build_desc:
|
||||||
|
build_desc = ' ' + build_desc
|
||||||
|
if ctx.env.BIN_GIT:
|
||||||
|
- cmd = ctx.env.BIN_GIT + shlex.split("describe --dirty")
|
||||||
|
+ cmd = ctx.env.BIN_GIT + shlex.split("describe --tags --dirty")
|
||||||
|
git_short_hash = ctx.cmd_and_log(cmd).strip()
|
||||||
|
git_short_hash = '-'.join(git_short_hash.split('-')[1:])
|
||||||
|
|
||||||
@@ -16,7 +16,9 @@ SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \
|
|||||||
file://0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch \
|
file://0001-ntpd-ntp_sandbox.c-allow-clone3-for-glibc-2.34-in-se.patch \
|
||||||
file://0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch \
|
file://0001-ntpd-ntp_sandbox.c-allow-newfstatat-on-all-archs-for.patch \
|
||||||
file://0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch \
|
file://0002-ntpd-ntp_sandbox.c-match-riscv-to-aarch-in-seccomp-f.patch \
|
||||||
file://volatiles.ntpsec"
|
file://volatiles.ntpsec \
|
||||||
|
file://0001-wscript-Widen-the-search-for-tags.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a"
|
SRC_URI[sha256sum] = "f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a"
|
||||||
|
|
||||||
@@ -56,7 +58,7 @@ export PYTAG = "cpython${@ d.getVar('PYTHON_BASEVERSION').replace('.', '')}"
|
|||||||
export pyext_PATTERN = "%s.so"
|
export pyext_PATTERN = "%s.so"
|
||||||
export PYTHON_LDFLAGS = "-lpthread -ldl"
|
export PYTHON_LDFLAGS = "-lpthread -ldl"
|
||||||
|
|
||||||
CFLAGS:append = " -I${PYTHON_INCLUDE_DIR}"
|
CFLAGS:append = " -I${PYTHON_INCLUDE_DIR} -D_GNU_SOURCE"
|
||||||
|
|
||||||
EXTRA_OECONF = "--cross-compiler='${CC}' \
|
EXTRA_OECONF = "--cross-compiler='${CC}' \
|
||||||
--cross-cflags='${CFLAGS}' \
|
--cross-cflags='${CFLAGS}' \
|
||||||
|
|||||||
Reference in New Issue
Block a user