[meta-virtualization] [PATCH 2/2] diod: support usrmerge

Bruce Ashfield bruce.ashfield at gmail.com
Tue Sep 3 13:00:32 PDT 2019


merged

Bruce

On Fri, Aug 30, 2019 at 2:20 AM <changqing.li at windriver.com> wrote:
>
> From: Changqing Li <changqing.li at windriver.com>
>
> Signed-off-by: Changqing Li <changqing.li at windriver.com>
> ---
>  recipes-extended/diod/diod_1.0.24.bb               |  3 ++
>  ...0001-drod-add-option-to-config-systemddir.patch | 51 ++++++++++++++++++++++
>  2 files changed, 54 insertions(+)
>  create mode 100644 recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch
>
> diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb
> index bb5707e..a4a8528 100644
> --- a/recipes-extended/diod/diod_1.0.24.bb
> +++ b/recipes-extended/diod/diod_1.0.24.bb
> @@ -16,9 +16,12 @@ SRC_URI = "git://github.com/chaos/diod.git;protocol=git \
>             file://0001-build-allow-builds-to-work-with-separate-build-dir.patch \
>             file://0002-auto.diod.in-remove-bashisms.patch \
>             file://0001-diod-ops.c-add-header-file-for-makedev.patch \
> +           file://0001-drod-add-option-to-config-systemddir.patch \
>            "
>  DEPENDS = "libcap ncurses tcp-wrappers lua"
>
> +EXTRA_OECONF = "--with-systemddir=${systemd_unitdir}/system"
> +
>  S = "${WORKDIR}/git"
>
>  inherit autotools systemd
> 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 0000000..8b70d8f
> --- /dev/null
> +++ b/recipes-extended/diod/files/0001-drod-add-option-to-config-systemddir.patch
> @@ -0,0 +1,51 @@
> +From 365159534b1981dfe291ecc05d2455f32652a166 Mon Sep 17 00:00:00 2001
> +From: Changqing Li <changqing.li at windriver.com>
> +Date: Mon, 26 Aug 2019 18:00:39 +0800
> +Subject: [PATCH] drod: add option to config systemddir
> +
> +Upstream-Status: Pending
> +
> +Not need to send upstream, since upstream have refactor
> +related code, but not released. and this version release
> +4 years ago, not proper to just backport one or more
> +commits, this patch maybe could be dropped after upgrade.
> +
> +Signed-off-by: Changqing Li <changqing.li at windriver.com>
> +---
> + configure.ac        | 9 +++++++++
> + scripts/Makefile.am | 2 +-
> + 2 files changed, 10 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 1cb8579..3e4a5ec 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -25,6 +25,15 @@ AC_DEFINE([_GNU_SOURCE], 1,
> +           [Define _GNU_SOURCE so that we get all necessary prototypes])
> +
> + ##
> ++#Add option to config systemddir
> ++##
> ++AC_ARG_WITH([systemddir],
> ++  [AS_HELP_STRING([--with-systemddir=DIR], [systemd dir])],
> ++  [systemddir=$withval],
> ++  [systemddir="/lib/systemd/system"])
> ++AC_SUBST([systemddir], [$systemddir])
> ++
> ++##
> + # Checks for programs
> + ##
> + AC_PROG_CC
> +diff --git a/scripts/Makefile.am b/scripts/Makefile.am
> +index 2aba728..40822b7 100644
> +--- a/scripts/Makefile.am
> ++++ b/scripts/Makefile.am
> +@@ -1,4 +1,4 @@
> +-systemddir=/lib/systemd/system
> ++systemddir=@systemddir@
> +
> + install-data-local:
> +       $(top_srcdir)/config/install-sh -m 755 ./auto.diod \
> +--
> +2.7.4
> +
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


More information about the meta-virtualization mailing list