diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-08-30 14:17:33 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-09-03 15:59:40 -0400 |
commit | ac0b214d5f41ef74559f528969f5597d4165ee92 (patch) | |
tree | a3f063102aeabe79612adb99397a095978a26e39 /recipes-extended/diod/files | |
parent | 82b71666fe016551c1a3042f7454f047954e74df (diff) | |
download | meta-virtualization-ac0b214d5f41ef74559f528969f5597d4165ee92.tar.gz |
diod: support usrmerge
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/diod/files')
-rw-r--r-- | recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch b/recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch new file mode 100644 index 00000000..8b70d8fa --- /dev/null +++ b/recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 365159534b1981dfe291ecc05d2455f32652a166 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Aug 2019 18:00:39 +0800 | ||
4 | Subject: [PATCH] drod: add option to config systemddir | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Not need to send upstream, since upstream have refactor | ||
9 | related code, but not released. and this version release | ||
10 | 4 years ago, not proper to just backport one or more | ||
11 | commits, this patch maybe could be dropped after upgrade. | ||
12 | |||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | --- | ||
15 | configure.ac | 9 +++++++++ | ||
16 | scripts/Makefile.am | 2 +- | ||
17 | 2 files changed, 10 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 1cb8579..3e4a5ec 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -25,6 +25,15 @@ AC_DEFINE([_GNU_SOURCE], 1, | ||
24 | [Define _GNU_SOURCE so that we get all necessary prototypes]) | ||
25 | |||
26 | ## | ||
27 | +#Add option to config systemddir | ||
28 | +## | ||
29 | +AC_ARG_WITH([systemddir], | ||
30 | + [AS_HELP_STRING([--with-systemddir=DIR], [systemd dir])], | ||
31 | + [systemddir=$withval], | ||
32 | + [systemddir="/lib/systemd/system"]) | ||
33 | +AC_SUBST([systemddir], [$systemddir]) | ||
34 | + | ||
35 | +## | ||
36 | # Checks for programs | ||
37 | ## | ||
38 | AC_PROG_CC | ||
39 | diff --git a/scripts/Makefile.am b/scripts/Makefile.am | ||
40 | index 2aba728..40822b7 100644 | ||
41 | --- a/scripts/Makefile.am | ||
42 | +++ b/scripts/Makefile.am | ||
43 | @@ -1,4 +1,4 @@ | ||
44 | -systemddir=/lib/systemd/system | ||
45 | +systemddir=@systemddir@ | ||
46 | |||
47 | install-data-local: | ||
48 | $(top_srcdir)/config/install-sh -m 755 ./auto.diod \ | ||
49 | -- | ||
50 | 2.7.4 | ||
51 | |||