[gentoo-commits] repo/gentoo:master commit in: profiles/features/merged-usr/, profiles/releases/17.0/, ...

2024-04-16 Thread Sam James 
commit: 5674137a39abeaa635c087fec1019a6cbdc2d40b
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 16 20:43:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 20:43:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5674137a

profiles: mask >=sys-process/systemd-cron-2.3.4-r1 on split-usr

>=systemd-255 needs merged-usr.

Bug: https://bugs.gentoo.org/928893
Signed-off-by: Sam James  gentoo.org>

 profiles/features/merged-usr/package.mask | 3 ++-
 profiles/features/split-usr/package.mask  | 3 ++-
 profiles/releases/17.0/package.mask   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/profiles/features/merged-usr/package.mask 
b/profiles/features/merged-usr/package.mask
index 96ac454f8384..b416adef06bf 100644
--- a/profiles/features/merged-usr/package.mask
+++ b/profiles/features/merged-usr/package.mask
@@ -1,6 +1,7 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas K. Hüttel  (2023-12-07)
 # Can be used on a merged-usr profile.
 ->=sys-apps/systemd-255
+->=sys-process/systemd-cron-2.3.4-r1

diff --git a/profiles/features/split-usr/package.mask 
b/profiles/features/split-usr/package.mask
index 3c95fbece0e9..3a36d4e86369 100644
--- a/profiles/features/split-usr/package.mask
+++ b/profiles/features/split-usr/package.mask
@@ -1,7 +1,8 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas K. Hüttel  (2023-12-07)
 # Does not support split-usr filesystem geometry. Please migrate to
 # a merged-usr profile.
 >=sys-apps/systemd-255
+>=sys-process/systemd-cron-2.3.4-r1

diff --git a/profiles/releases/17.0/package.mask 
b/profiles/releases/17.0/package.mask
index 3c95fbece0e9..3a36d4e86369 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -1,7 +1,8 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas K. Hüttel  (2023-12-07)
 # Does not support split-usr filesystem geometry. Please migrate to
 # a merged-usr profile.
 >=sys-apps/systemd-255
+>=sys-process/systemd-cron-2.3.4-r1

[gentoo-commits] repo/gentoo:master commit in: profiles/features/merged-usr/

2022-11-23 Thread Mike Gilbert 
commit: 3f1ae1315d7a67ddace3bcc81db9ec9a7c7b0ce0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 23 17:02:42 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 23 17:02:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1ae131

profiles/features/merged-usr: add /usr/lib/modules/* to UNINSTALL_IGNORE

Signed-off-by: Mike Gilbert  gentoo.org>

 profiles/features/merged-usr/make.defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/features/merged-usr/make.defaults 
b/profiles/features/merged-usr/make.defaults
index f6b244c0bf14..6df2f8cf94ab 100644
--- a/profiles/features/merged-usr/make.defaults
+++ b/profiles/features/merged-usr/make.defaults
@@ -1,3 +1,4 @@
 # Mike Gilbert  (2022-08-31)
 # Avoid removing merged-usr symlinks.
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin 
/usr/sbin"
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"

[gentoo-commits] repo/gentoo:master commit in: profiles/features/merged-usr/

2022-09-03 Thread Mike Gilbert 
commit: 4d030c34a85eeb34a4e543eca5e367eaf194ac88
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Aug 31 20:44:00 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Sep  3 15:02:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d030c34

profiles/features/merged-usr: add symlinks to UNINSTALL_IGNORE

Signed-off-by: Mike Gilbert  gentoo.org>

 profiles/features/merged-usr/make.defaults | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/features/merged-usr/make.defaults 
b/profiles/features/merged-usr/make.defaults
new file mode 100644
index ..f6b244c0bf14
--- /dev/null
+++ b/profiles/features/merged-usr/make.defaults
@@ -0,0 +1,3 @@
+# Mike Gilbert  (2022-08-31)
+# Avoid removing merged-usr symlinks.
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin 
/usr/sbin"

[gentoo-commits] repo/gentoo:master commit in: profiles/features/merged-usr/

2022-09-03 Thread Mike Gilbert 
commit: e9a1e4cee06ec3deaaa558121800a2e20fcef552
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 30 15:34:10 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Sep  3 15:02:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a1e4ce

profiles/features/merged-usr: unforce/mask 'split-usr' USE flag

Signed-off-by: Mike Gilbert  gentoo.org>

 profiles/features/merged-usr/eapi  | 1 +
 profiles/features/merged-usr/use.force | 3 +++
 profiles/features/merged-usr/use.mask  | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/profiles/features/merged-usr/eapi 
b/profiles/features/merged-usr/eapi
new file mode 100644
index ..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/merged-usr/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/features/merged-usr/use.force 
b/profiles/features/merged-usr/use.force
new file mode 100644
index ..ccf6210af230
--- /dev/null
+++ b/profiles/features/merged-usr/use.force
@@ -0,0 +1,3 @@
+# Mike Gilbert  (2022-08-30)
+# Un-force split-usr.
+-split-usr

diff --git a/profiles/features/merged-usr/use.mask 
b/profiles/features/merged-usr/use.mask
new file mode 100644
index ..4d844aa3ab3c
--- /dev/null
+++ b/profiles/features/merged-usr/use.mask
@@ -0,0 +1,3 @@
+# Mike Gilbert  (2022-08-30)
+# Mask split-usr.
+split-usr