summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMo Zhou <cdluminate@gmail.com>2019-08-10 14:20:53 +0000
committerBenda Xu <heroxbd@gentoo.org>2019-09-28 10:41:17 +0800
commitb006a6fc53f2e545778f5ed516914bf07cacce5a (patch)
tree6be105992d2f7a1770a3108bf80175612576dfa8
parentnet-misc/autossh: use http:// for HOMEPAGE and SRC_URI (diff)
downloadgentoo-b006a6fc53f2e545778f5ed516914bf07cacce5a.tar.gz
gentoo-b006a6fc53f2e545778f5ed516914bf07cacce5a.tar.bz2
gentoo-b006a6fc53f2e545778f5ed516914bf07cacce5a.zip
Prefix profile exp to dev migration.
1. eudev, elogind and pam are available. 2. Move rpath masks into features/prefix/rpath. 3. Mask systemd and its reverse dependencies. Closes: https://github.com/gentoo/gentoo/pull/12555 Closes: https://github.com/gentoo/gentoo/pull/12678 Signed-off-by: Benda Xu <heroxbd@gentoo.org>
-rw-r--r--profiles/features/prefix/package.mask42
-rw-r--r--profiles/features/prefix/package.use.mask12
-rw-r--r--profiles/features/prefix/rpath/package.mask22
-rw-r--r--profiles/features/prefix/rpath/use.mask21
-rw-r--r--profiles/features/prefix/standalone/package.use.mask2
-rw-r--r--profiles/features/prefix/use.mask11
-rw-r--r--profiles/profiles.desc2
7 files changed, 77 insertions, 35 deletions
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
index 6c331738314b..c2367c0c1f86 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -1,22 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Jeremy Olexa <darkside@gentoo.org> (2009-06-30)
-# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
-# system should be used.
-sys-libs/pam
-sys-auth/pambase
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# systemd is set to invade pid 1, which is not possible for Prefix.
+# The following are its reverse dependencies.
+sys-apps/systemd
+dev-libs/libreport
+app-admin/abrt
+app-admin/gnome-abrt
+app-admin/systemdgenie
+dev-python/python-systemd
+games-util/gamemode
+gnome-extra/gnome-logs
+gnome-extra/gnome-user-share
+gnome-extra/office-runner
+kde-misc/systemd-kcm
+<sys-apps/bolt-0.5
+sys-apps/gentoo-systemd-integration
+sys-apps/systemd-readahead
+sys-process/systemd-cron
+www-misc/profile-sync-daemon
+<x11-wm/mutter-3.30
+<gnome-base/gnome-shell-3.30
+<virtual/service-manager-1
-# Jeremy Olexa <darkside@gentoo.org> (2009-06-02)
-# If you have MacFuse or some other implementation of fuse installed, you can
-# probably use this by placing sys-fs/fuse in package.provided, bug 272210
-net-fs/curlftpfs
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-12-02)
-# Reported to work. However, you will need to package.provide some deps.
-# See bug 248809 for more details.
-net-fs/openafs
-
-# Fabian Groffen <grobian@gentoo.org> (2008-01-11)
-# Screws up things, see bug #204998
-<sys-devel/gcc-3.4.0
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index bb3817c570ac..b54fd4ab047d 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,6 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# avoid gnome-extra/gnome-user-share, which depends on systemd.
+gnome-base/gnome-extra-apps share
+
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# avoid sys-apps/systemd
+net-analyzer/wireshark sdjournal
+sys-apps/dbus-broker launcher
+www-servers/uwsgi uwsgi_plugins_systemd_logger
+
# Benda Xu <heroxbd@gentoo.org> (2016-07-28)
# Needs root privilege.
sys-fs/eudev hwdb kmod
diff --git a/profiles/features/prefix/rpath/package.mask b/profiles/features/prefix/rpath/package.mask
new file mode 100644
index 000000000000..e3f46170a20a
--- /dev/null
+++ b/profiles/features/prefix/rpath/package.mask
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Jeremy Olexa <darkside@gentoo.org> (2009-06-30)
+# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
+# system should be used.
+sys-libs/pam
+sys-auth/pambase
+
+# Jeremy Olexa <darkside@gentoo.org> (2008-12-02)
+# Reported to work. However, you will need to package.provide some deps.
+# See bug 248809 for more details.
+net-fs/openafs
+
+# Jeremy Olexa <darkside@gentoo.org> (2009-06-02)
+# If you have MacFuse or some other implementation of fuse installed, you can
+# probably use this by placing sys-fs/fuse in package.provided, bug 272210
+net-fs/curlftpfs
+
+# Fabian Groffen <grobian@gentoo.org> (2008-01-11)
+# Screws up things, see bug #204998
+<sys-devel/gcc-3.4.0
diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask
index 0ad2254fd545..297038e128fb 100644
--- a/profiles/features/prefix/rpath/use.mask
+++ b/profiles/features/prefix/rpath/use.mask
@@ -1,12 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# Migrated from features/prefix:
+# USE flags inherited by the base/use.defaults file that shouldn't be
+# in Prefix rpath.
+cups
+# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
+# auth system.
+pam
+# USE=udev just does not make sense in Gentoo Prefix. bug 293480
+udev
+
+# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
+# Not supported
+eselect-ldso
+
# prefix-guest USE flag should be set in prefix rpath profiles
-prefix-guest
# multilib is never going to work as expected in Prefix rpath
multilib
-
-# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
-# Not supported
-eselect-ldso
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
index 9b7d78715112..7653e7fd7c1d 100644
--- a/profiles/features/prefix/standalone/package.use.mask
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Benda Xu <heroxbd@gentoo.org> (2019-01-26)
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
index 4340ef9aa4c4..be9e1433e84b 100644
--- a/profiles/features/prefix/use.mask
+++ b/profiles/features/prefix/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# prefix USE flag should always be unmasked in prefix profiles
@@ -8,12 +8,7 @@
-userland_GNU
# USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
-cups
gpm
-# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
-# auth system.
-pam
-
-# USE=udev just does not make sense in Gentoo Prefix. bug 293480
-udev
+# need to invade pid 1, which is not possible for Prefix.
+systemd
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b45c90b1902e..79d81595933a 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -258,7 +258,7 @@ ppc64-linux prefix/linux/ppc64 exp
x86-linux prefix/linux/x86 exp
# Linux Standalone Profiles
-amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+ exp
+amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+ dev
amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+ exp
amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+ exp
x86-linux default/linux/x86/17.0/prefix/kernel-3.2+ exp