helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-22 05:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntpsec: Add -D_GNU_SOURCE and fix building with devtool

Browse Source 
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:
Khem Raj 2022-08-22 21:29:32 -07:00
parent f6eb4c82bb
commit 375be9fd60
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Widen-the-search-for-tags.patch Normal file
View File

@ -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:])

6
meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
View File

@ -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-newfstatat-on-all-archs-for.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"
@ -56,7 +58,7 @@ export PYTAG = "cpython${@ d.getVar('PYTHON_BASEVERSION').replace('.', '')}"
export pyext_PATTERN = "%s.so"
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}' \
--cross-cflags='${CFLAGS}' \