From 9fe1b9748769e23cf1faf625af586fc3c7ff68df Mon Sep 17 00:00:00 2001 From: Wolfgang Müller Date: Thu, 28 Apr 2022 16:57:56 +0200 Subject: Rename group-musl to libc-musl This more clearly describes what this profile does. --- group-musl/package.accept_keywords/02-group-musl | 2 -- group-musl/package.use/02-group-musl | 1 - .../net-misc/openssh/disable-utpm-in-musl.patch | 18 ------------------ group-musl/repos.conf/musl.conf | 5 ----- libc-musl/package.accept_keywords/02-libc-musl | 2 ++ libc-musl/package.use/02-libc-musl | 1 + .../net-misc/openssh/disable-utpm-in-musl.patch | 18 ++++++++++++++++++ libc-musl/repos.conf/musl.conf | 5 +++++ 8 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 group-musl/package.accept_keywords/02-group-musl delete mode 100644 group-musl/package.use/02-group-musl delete mode 100644 group-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch delete mode 100644 group-musl/repos.conf/musl.conf create mode 100644 libc-musl/package.accept_keywords/02-libc-musl create mode 100644 libc-musl/package.use/02-libc-musl create mode 100644 libc-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch create mode 100644 libc-musl/repos.conf/musl.conf diff --git a/group-musl/package.accept_keywords/02-group-musl b/group-musl/package.accept_keywords/02-group-musl deleted file mode 100644 index 743d09f..0000000 --- a/group-musl/package.accept_keywords/02-group-musl +++ /dev/null @@ -1,2 +0,0 @@ -net-analyzer/mtr -sys-apps/smartmontools diff --git a/group-musl/package.use/02-group-musl b/group-musl/package.use/02-group-musl deleted file mode 100644 index ac1e264..0000000 --- a/group-musl/package.use/02-group-musl +++ /dev/null @@ -1 +0,0 @@ -*/* -utempter diff --git a/group-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch b/group-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch deleted file mode 100644 index d028988..0000000 --- a/group-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 9022ee9c..f0b40947 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -904,6 +904,13 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) - else - AC_MSG_RESULT([architecture not supported]) - fi -+ case "$host" in -+ *-*-linux-musl*) -+ AC_DEFINE([DISABLE_UTMP], [1], [Define if you don't want to use utmp]) -+ AC_DEFINE([DISABLE_WTMP], [1], [Define if you don't want to use wtmp]) -+ ;; -+ esac -+ - ;; - mips-sony-bsd|mips-sony-newsos4) - AC_DEFINE([NEED_SETPGRP], [1], [Need setpgrp to acquire controlling tty]) diff --git a/group-musl/repos.conf/musl.conf b/group-musl/repos.conf/musl.conf deleted file mode 100644 index e228810..0000000 --- a/group-musl/repos.conf/musl.conf +++ /dev/null @@ -1,5 +0,0 @@ -[musl] -location = /var/portage/repos/musl -sync-type = git -sync-uri = https://anongit.gentoo.org/git/proj/musl.git -auto-sync = yes diff --git a/libc-musl/package.accept_keywords/02-libc-musl b/libc-musl/package.accept_keywords/02-libc-musl new file mode 100644 index 0000000..743d09f --- /dev/null +++ b/libc-musl/package.accept_keywords/02-libc-musl @@ -0,0 +1,2 @@ +net-analyzer/mtr +sys-apps/smartmontools diff --git a/libc-musl/package.use/02-libc-musl b/libc-musl/package.use/02-libc-musl new file mode 100644 index 0000000..ac1e264 --- /dev/null +++ b/libc-musl/package.use/02-libc-musl @@ -0,0 +1 @@ +*/* -utempter diff --git a/libc-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch b/libc-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch new file mode 100644 index 0000000..d028988 --- /dev/null +++ b/libc-musl/patches/net-misc/openssh/disable-utpm-in-musl.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index 9022ee9c..f0b40947 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -904,6 +904,13 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + else + AC_MSG_RESULT([architecture not supported]) + fi ++ case "$host" in ++ *-*-linux-musl*) ++ AC_DEFINE([DISABLE_UTMP], [1], [Define if you don't want to use utmp]) ++ AC_DEFINE([DISABLE_WTMP], [1], [Define if you don't want to use wtmp]) ++ ;; ++ esac ++ + ;; + mips-sony-bsd|mips-sony-newsos4) + AC_DEFINE([NEED_SETPGRP], [1], [Need setpgrp to acquire controlling tty]) diff --git a/libc-musl/repos.conf/musl.conf b/libc-musl/repos.conf/musl.conf new file mode 100644 index 0000000..e228810 --- /dev/null +++ b/libc-musl/repos.conf/musl.conf @@ -0,0 +1,5 @@ +[musl] +location = /var/portage/repos/musl +sync-type = git +sync-uri = https://anongit.gentoo.org/git/proj/musl.git +auto-sync = yes -- cgit v1.2.3-2-gb3c3