diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-support/libutempter | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/libutempter')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb | 1 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb index 8c84cb376..b8a700b7b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb @@ -12,6 +12,7 @@ PV = "1.1.6-alt2+git${SRCPV}" SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ file://0001-Fix-macro-error.patch \ + file://0002-Proper-macro-path-generation.patch \ file://libutempter-remove-glibc-assumption.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch new file mode 100644 index 000000000..2a866c079 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -0,0 +1,34 @@ +From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001 +From: iddinev <xidinev@gmail.com> +Date: Mon, 18 Mar 2019 15:45:20 +0200 +Subject: [PATCH] Proper macro path generation. + +Signed-off-by: iddinev <xidinev@gmail.com> +--- + libutempter/iface.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git libutempter/iface.c libutempter/iface.c +index 27793f0..c1c0ee9 100644 +--- libutempter/iface.c ++++ libutempter/iface.c +@@ -44,13 +44,12 @@ + #endif + + #ifdef LIBEXECDIR +-# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +-# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) ++# define UTEMPTER_DEFAULT_PATHNAME XSTR_PATH(LIBEXECDIR)"/utempter/utempter" + #else +-# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter ++# define UTEMPTER_DEFAULT_PATHNAME STR_PATH(/usr/lib/libtempter/utempter/utempter) + #endif + #define STR_PATH(RAW_STR) #RAW_STR +-#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH) ++#define XSTR_PATH(STR) STR_PATH(STR) + + static const char *utempter_pathname; + static int saved_fd = -1; +-- +2.7.4 + |