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

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

[Mike Gilbert]

commit:     e9a1e4cee06ec3deaaa558121800a2e20fcef552
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:34:10 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 15:02:11 2022 +0000
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 <floppym <AT> 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 000000000000..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 000000000000..ccf6210af230
--- /dev/null
+++ b/profiles/features/merged-usr/use.force
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (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 000000000000..4d844aa3ab3c
--- /dev/null
+++ b/profiles/features/merged-usr/use.mask
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (2022-08-30)
+# Mask split-usr.
+split-usr

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

[Mike Gilbert]

commit:     4d030c34a85eeb34a4e543eca5e367eaf194ac88
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 20:44:00 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 15:02:17 2022 +0000
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 <floppym <AT> 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 000000000000..f6b244c0bf14
--- /dev/null
+++ b/profiles/features/merged-usr/make.defaults
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (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/

[Mike Gilbert]

commit:     3f1ae1315d7a67ddace3bcc81db9ec9a7c7b0ce0
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 17:02:42 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 17:02:42 2022 +0000
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 <floppym <AT> 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 <floppym@gentoo.org> (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/*"