[v2,2/4] systemd: Do not force removing resolved from PACKAGECONFIG

Submitted by Khem Raj on Feb. 28, 2020, 12:04 a.m. | Patch ID: 170626

Details

Message ID 20200228000437.1848815-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Feb. 28, 2020, 12:04 a.m.
This needs __UAPI_DEF_ETHHDR to be set to 0 which now
taken care by CFLAGS

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Fix typo in append

 meta/recipes-core/systemd/systemd_244.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
index 5d863410b8..a56a28a189 100644
--- a/meta/recipes-core/systemd/systemd_244.3.bb
+++ b/meta/recipes-core/systemd/systemd_244.3.bb
@@ -98,12 +98,13 @@  PACKAGECONFIG_remove_libc-musl = " \
     nss \
     nss-mymachines \
     nss-resolve \
-    resolved \
     smack \
     sysusers \
     utmp \
 "
 
+CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0"
+
 # Use the upstream systemd serial-getty@.service and rely on
 # systemd-getty-generator instead of using the OE-core specific
 # systemd-serialgetty.bb - not enabled by default.

Comments

Andre McCurdy Feb. 29, 2020, 5:02 a.m.
On Thu, Feb 27, 2020 at 4:04 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> This needs __UAPI_DEF_ETHHDR to be set to 0 which now
> taken care by CFLAGS
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Fix typo in append

Looks like this arrived too late. The v1 patch is already in master.

>  meta/recipes-core/systemd/systemd_244.3.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
> index 5d863410b8..a56a28a189 100644
> --- a/meta/recipes-core/systemd/systemd_244.3.bb
> +++ b/meta/recipes-core/systemd/systemd_244.3.bb
> @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \
>      nss \
>      nss-mymachines \
>      nss-resolve \
> -    resolved \
>      smack \
>      sysusers \
>      utmp \
>  "
>
> +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0"
> +
>  # Use the upstream systemd serial-getty@.service and rely on
>  # systemd-getty-generator instead of using the OE-core specific
>  # systemd-serialgetty.bb - not enabled by default.
> --
> 2.25.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Feb. 29, 2020, 6:34 a.m.
On Fri, Feb 28, 2020 at 9:02 PM Andre McCurdy <armccurdy@gmail.com> wrote:

> On Thu, Feb 27, 2020 at 4:04 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > This needs __UAPI_DEF_ETHHDR to be set to 0 which now
> > taken care by CFLAGS
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > v2: Fix typo in append
>
> Looks like this arrived too late. The v1 patch is already in master.
>

No worries will rebase and resend


> >  meta/recipes-core/systemd/systemd_244.3.bb | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/systemd/systemd_244.3.bb
> b/meta/recipes-core/systemd/systemd_244.3.bb
> > index 5d863410b8..a56a28a189 100644
> > --- a/meta/recipes-core/systemd/systemd_244.3.bb
> > +++ b/meta/recipes-core/systemd/systemd_244.3.bb
> > @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \
> >      nss \
> >      nss-mymachines \
> >      nss-resolve \
> > -    resolved \
> >      smack \
> >      sysusers \
> >      utmp \
> >  "
> >
> > +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0"
> > +
> >  # Use the upstream systemd serial-getty@.service and rely on
> >  # systemd-getty-generator instead of using the OE-core specific
> >  # systemd-serialgetty.bb - not enabled by default.
> > --
> > 2.25.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>