From 8762a1b325e8c17f1a1a3a4b1623e2c159154cf4 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Thu, 21 Mar 2019 20:51:50 +0200 Subject: [PATCH] profiles: Add targets/desktop/gnome/systemd and gate relevant via it Add a new targets/desktop/gnome/systemd profile, which parents targets/desktop/gnome and targets/systemd, like the specific gnome systemd profiles did. Change all these specific user exposed desktop/gnome/systemd profiles to go through that instead of directly to targets/systemd. This will allow us to do package.use, make.defaults (default USE flags) and other tweaks separate from the main gnome profile, which is now also used for non-systemd (elogind). Signed-off-by: Mart Raudsepp --- profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent | 2 +- .../linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent | 2 +- .../linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent | 2 +- .../ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent | 2 +- .../ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent | 2 +- .../ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent | 2 +- .../ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent | 2 +- profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent | 2 +- profiles/targets/desktop/gnome/systemd/eapi | 1 + profiles/targets/desktop/gnome/systemd/parent | 2 ++ 21 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 profiles/targets/desktop/gnome/systemd/eapi create mode 100644 profiles/targets/desktop/gnome/systemd/parent diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent +++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent index f7739b405877..2122741fb81c 100644 --- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../targets/systemd +../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent index f7739b405877..2122741fb81c 100644 --- a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../targets/systemd +../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent index 5d9d87f6d91e..288aeccdce82 100644 --- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../../targets/systemd +../../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent index 5d9d87f6d91e..288aeccdce82 100644 --- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../../targets/systemd +../../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent index 5d9d87f6d91e..288aeccdce82 100644 --- a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../../targets/systemd +../../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent index 5d9d87f6d91e..288aeccdce82 100644 --- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent +++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../../../targets/systemd +../../../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent index 44f88d3e2df0..f5c1ae438de4 100644 --- a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent +++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent @@ -1,2 +1,2 @@ .. -../../../../../../../targets/systemd +../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/targets/desktop/gnome/systemd/eapi b/profiles/targets/desktop/gnome/systemd/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/targets/desktop/gnome/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/targets/desktop/gnome/systemd/parent b/profiles/targets/desktop/gnome/systemd/parent new file mode 100644 index 000000000000..ead73795d6d7 --- /dev/null +++ b/profiles/targets/desktop/gnome/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../systemd -- 2.26.2