[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/, eclass/, profiles/arch/powerpc/ppc64/, ...

2023-11-08 Thread Andrew Ammerlaan 
commit: 784bf231299964f1ef28fb33534ee916bc377bca
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov  8 13:22:06 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 07:27:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784bf231

*/*: move sys-kernel/installkernel-systemd-boot to 
sys-kernel/installkernel-systemd

This reflects better that we don't necessarily need the systemd bootloader
to use the systemd kernel-install system.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 eclass/kernel-install.eclass| 2 +-
 profiles/arch/powerpc/ppc64/package.mask| 2 +-
 profiles/features/prefix/package.mask   | 2 +-
 profiles/updates/4Q-2023| 1 +
 sys-apps/debianutils/debianutils-5.14.ebuild| 2 +-
 sys-apps/debianutils/debianutils-5.7.ebuild | 2 +-
 sys-apps/debianutils/debianutils-5.8.ebuild | 2 +-
 sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild   | 2 +-
 .../files/00-00machineid-directory.install  | 2 +-
 .../files/installkernel-systemd-2-r2-00-00machineid-directory.install}  | 2 +-
 .../installkernel-systemd-2-r1.ebuild}  | 0
 .../installkernel-systemd-2-r3.ebuild}  | 0
 .../installkernel-systemd-2-r4.ebuild}  | 0
 .../{installkernel-systemd-boot => installkernel-systemd}/metadata.xml  | 0
 14 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index c1b9798a9ff9..03638cd2c57b 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -50,7 +50,7 @@ RESTRICT+="
 IDEPEND="
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
initramfs? ( >=sys-kernel/dracut-049-r3 )"
 # needed by objtool that is installed along with the kernel and used

diff --git a/profiles/arch/powerpc/ppc64/package.mask 
b/profiles/arch/powerpc/ppc64/package.mask
index ddeda73b9834..8b4559de7a95 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -7,7 +7,7 @@
 
 # Sam James  (2022-10-08)
 # sys-boot/gnu-efi isn't keyworded here right now
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
 
 # Michał Górny  (2022-08-25)
 # Only ppc64le binpkg is provided.

diff --git a/profiles/features/prefix/package.mask 
b/profiles/features/prefix/package.mask
index 32df49a3a6c4..3a54bbdc93cb 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,6 +13,6 @@ gnome-extra/gnome-user-share
 gnome-extra/office-runner
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
 sys-process/systemd-cron
 www-misc/profile-sync-daemon

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index a543f3f9d4c7..a72fa0f84d1b 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -17,3 +17,4 @@ move dev-python/python-discid dev-python/discid
 move dev-python/py-amqp dev-python/amqp
 move dev-python/pyre2 dev-python/fb-re2
 move dev-python/python-sshpubkeys dev-python/sshpubkeys
+move sys-kernel/installkernel-systemd-boot sys-kernel/installkernel-systemd

diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild 
b/sys-apps/debianutils/debianutils-5.14.ebuild
index f56e99e6a6b0..c71e9cb0196b 100644
--- a/sys-apps/debianutils/debianutils-5.14.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
)
 "

diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild 
b/sys-apps/debianutils/debianutils-5.7.ebuild
index 358f820b7322..0cc841149e59 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
)"
 

diff --git a/sys-apps/debianutils/debianutils-5.8.ebuild 
b/sys-apps/debianutils/debianutils-5.8.ebuild
index 3bd7fca2ed79..1909cc22de71 100644
--- a/sys-apps/debianutils/debianutils-5.8.ebuild
+++ b/sys-apps/debianutils/debianutils-5.8.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-11-08 Thread Andrew Ammerlaan 
commit: eb476ae53b32f8bcf11fd1cbdef4a272bee67aad
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov  8 13:14:18 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 07:27:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb476ae5

sys-kernel/installkernel-systemd-boot: allow systemd(-utils)[kernel-install]

We can use kernel-install with other boot loaders if we provide suitable
plugins in /usr/lib/kernel/install. This is part of the effort to
allow users to use other initrd generators for the dist-kernels.

And make kernel-install verbose, otherwise it doesn't output anything at all
during dist-kernel install.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../installkernel-systemd-boot-2-r4.ebuild | 37 ++
 1 file changed, 37 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
new file mode 100644
index ..d7515ea40e93
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ppc64 x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
+   sys-apps/systemd[kernel-install(-)]
+   sys-apps/systemd-utils[boot]
+   sys-apps/systemd-utils[kernel-install(-)]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}" --verbose
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+}

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-10-15 Thread Sam James 
commit: d8139eeaa48ba16b399aff35986af5077286b3bd
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:39:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:39:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8139eea

sys-kernel/installkernel-systemd-boot: fix filename

Didn't realise PF was used.

Fixes: 4f05b0b3d50b919a7e352e78dbbd2c26732a
Signed-off-by: Sam James  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index e496a6f3c948..6ecb8c8f7702 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -30,6 +30,6 @@ src_install() {
EOF
 
exeinto /usr/lib/kernel/install.d/
-   newexe "${FILESDIR}/${PF}-00-00machineid-directory.install" \
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
00-00machineid-directory.install
 }

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-10-15 Thread Sam James 
commit: 4f05b0b3d50b919a7e352e78dbbd2c26732a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:05:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:05:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f05

sys-kernel/installkernel-systemd-boot: fix systemd dep for boot

Signed-off-by: Sam James  gentoo.org>

 ...systemd-boot-2-r2.ebuild => installkernel-systemd-boot-2-r3.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
similarity index 93%
rename from 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
rename to 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index 724e9cd11d64..adaa42b26cdc 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 RDEPEND="
!sys-kernel/installkernel-gentoo
|| (
-   sys-apps/systemd
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
sys-apps/systemd-utils[boot]
)
 "

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-10-15 Thread Sam James 
commit: 439e47a0a3a335569731de370e9e793f50fccab4
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:06:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439e47a0

sys-kernel/installkernel-systemd-boot: stabilize 2-r3 for amd64, arm64, ppc64, 
x86

Signed-off-by: Sam James  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index adaa42b26cdc..e496a6f3c948 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-09-07 Thread WANG Xuerui 
commit: 4f0356796bb38bb04101d87840b891783d2f3a6e
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Sep  7 20:34:36 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Sep  7 20:36:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f035679

sys-kernel/installkernel-systemd-boot: keyword 2-r2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
index ddf32065d8d1..724e9cd11d64 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/files/, ...

2023-06-22 Thread Andrew Ammerlaan 
commit: 0a05585bfc3f37c69d8b694205339499860a0b42
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jun 20 19:08:06 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jun 22 06:28:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a05585b

sys-kernel/installkernel-systemd-boot: no mkdir machineid if using uki

Uki's are installed to ESP/Linux, we don't need this empty directory

Plus an EAPI bump while we are touching the package

Signed-off-by: Andrew Ammerlaan  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/31559
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...temd-boot-2-r2-00-00machineid-directory.install | 32 
 .../installkernel-systemd-boot-2-r2.ebuild | 34 ++
 2 files changed, 66 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
 
b/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
new file mode 100644
index ..5fa3bbeffc04
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# this file is installed by sys-kernel/installkernel-systemd-boot
+
+COMMAND="${1}"
+ENTRY_DIR_ABS="${3}"
+
+# this is exported by kernel-install
+if [ -z "${KERNEL_INSTALL_MACHINE_ID}" ]; then
+   exit 0
+fi
+
+if [ "${KERNEL_INSTALL_LAYOUT}" = "uki" ]; then
+   exit 0
+fi
+
+if [ "${COMMAND}" != "add" ]; then
+   exit 0
+fi
+
+# If the machine-id dir does not exist (e.g. $ESP/)
+# create it. It receives values directly from kernel-install.
+# This is the only function of this plugin.
+MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
+if ! [ -d "${MACHINE_ID_DIR}" ]; then
+   if [ "${KERNEL_INSTALL_VERBOSE}" = "1" ]; then
+   echo "+mkdir -v -p ${MACHINE_ID_DIR}"
+   mkdir -v -p "${MACHINE_ID_DIR}"
+   else
+   mkdir -p "${MACHINE_ID_DIR}"
+   fi
+fi

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
new file mode 100644
index ..ddf32065d8d1
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd
+   sys-apps/systemd-utils[boot]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}"
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PF}-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+}

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2023-06-14 Thread Sam James 
commit: a8654342a707fdd8f95f4a7069a8a36a21aebd37
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 02:25:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 02:25:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8654342

sys-kernel/installkernel-systemd-boot: drop sys-apps/systemd-boot dep

We don't want Portage to try cling to this obsolete meta which just
depends on systemd-utils[boot] anyway.

Signed-off-by: Sam James  gentoo.org>

 ...l-systemd-boot-2.ebuild => installkernel-systemd-boot-2-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
similarity index 85%
rename from 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
rename to 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
index 9c598e9ea948..b4b0308233e7 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 x86"
 
-RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] 
sys-boot/systemd-boot )
+RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] )
!

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2022-10-03 Thread Sam James 
commit: 3df5e8adbd093eb218813eaf3b1a0bd674512e99
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  3 23:17:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  3 23:17:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df5e8ad

sys-kernel/installkernel-systemd-boot: allow sys-apps/systemd-utils[boot]

Signed-off-by: Sam James  gentoo.org>

 ...rnel-systemd-boot-1.ebuild => installkernel-systemd-boot-2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
similarity index 85%
rename from 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
rename to 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
index ebc400e603b6..9c598e9ea948 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 x86"
 
-RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
+RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] 
sys-boot/systemd-boot )
!

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2021-07-27 Thread Georgy Yakovlev 
commit: 1bb7dca6245ad33c1dd65bb804b6559c169f8f78
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jul 27 20:21:12 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 27 21:26:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb7dca6

sys-kernel/installkernel-systemd-boot: drop 0

Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../installkernel-systemd-boot-0.ebuild| 27 --
 1 file changed, 27 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
deleted file mode 100644
index a1a285aa84d..000
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
-   !

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/files/

2021-06-26 Thread Georgy Yakovlev 
commit: ee0a3af749ed32d85b585a426f4829388f9f84e5
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jun 26 23:00:50 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jun 26 23:00:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0a3af7

sys-kernel/installkernel-systemd-boot: strip exec bit from file

Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../installkernel-systemd-boot/files/00-00machineid-directory.install | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install 
b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
old mode 100755
new mode 100644

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/, ...

2021-06-26 Thread Georgy Yakovlev 
commit: 41da652a218b9413cb24174f03c812d04b138c9e
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jun 11 04:35:06 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jun 26 22:02:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41da652a

sys-kernel/installkernel-systemd-boot: bump, create machine-id dir

add a plugin to create proper directory for kernels.
without it /usr/lib/kernel/install.d/00-entry-directory.install
will silently exit and kernel will not be installed at all.

Closes: https://github.com/gentoo/gentoo/pull/21195
Closes: https://bugs.gentoo.org/794646
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../files/00-00machineid-directory.install | 28 +
 .../installkernel-systemd-boot-1.ebuild| 29 ++
 2 files changed, 57 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install 
b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
new file mode 100755
index 000..70b966fbf4b
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# this file is installed by sys-kernel/installkernel-systemd-boot
+
+COMMAND="${1}"
+ENTRY_DIR_ABS="${3}"
+
+# this is exported by kernel-install
+if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
+exit 0
+fi
+
+if [[ $COMMAND != add ]]; then
+exit 0
+fi
+
+# If the machine-id dir does not exist (e.g. $ESP/)
+# create it. It receives values directly from kernel-install.
+# This is the only function of this plugin.
+MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
+if ! [[ -d "${MACHINE_ID_DIR}" ]]; then
+   if [[ "${KERNEL_INSTALL_VERBOSE}" -gt 0 ]]; then
+   echo "+mkdir -v -p ${MACHINE_ID_DIR}"
+   mkdir -v -p "${MACHINE_ID_DIR}"
+   else
+   mkdir -p "${MACHINE_ID_DIR}"
+   fi
+fi

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
new file mode 100644
index 000..ebc400e603b
--- /dev/null
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 x86"
+
+RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
+   !

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2020-10-23 Thread Georgy Yakovlev 
commit: e7fdcc6f835273311a25d28cac1d36f3b271792c
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Oct 24 02:35:39 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Oct 24 04:54:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fdcc6f

sys-kernel/installkernel-systemd-boot: add arm64 keyword

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
index 26fa6943927..46c5cb7afe3 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
!

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2020-10-23 Thread Georgy Yakovlev 
commit: f43485af26013221df7dd03caffeb588949bd413
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Oct 24 02:36:10 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Oct 24 04:54:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f43485af

sys-kernel/installkernel-systemd-boot: add ppc64 keyword

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
index 46c5cb7afe3..a1a285aa84d 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
!

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2020-04-22 Thread Mikle Kolyada 
commit: e7471fcfbbece57689ebae333271bc1b6540feb9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Apr 22 13:52:33 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Apr 22 13:52:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7471fcf

sys-kernel/installkernel-systemd-boot: amd64 stable wrt bug #717676

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
index da493fef7b7..6d413fcfe1d 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
!

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2020-01-04 Thread Michał Górny 
commit: b2cf1be3d6a6428173242bf9066d2d04b42d6c54
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan  4 15:03:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan  4 15:03:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2cf1be3

sys-kernel/installkernel-systemd-boot: Reassign to dist-kernel@

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/installkernel-systemd-boot/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/installkernel-systemd-boot/metadata.xml 
b/sys-kernel/installkernel-systemd-boot/metadata.xml
index 0319eec4c8b..20e07cdc2be 100644
--- a/sys-kernel/installkernel-systemd-boot/metadata.xml
+++ b/sys-kernel/installkernel-systemd-boot/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   mgo...@gentoo.org
-   Michał Górny
+   
+   dist-ker...@gentoo.org
+   Distribution Kernel Project

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/

2020-01-02 Thread Michał Górny 
commit: 76e38b40cd09de02486cc89a2bae01fbbea81692
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan  2 10:54:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan  2 10:55:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e38b40

sys-kernel/installkernel-systemd-boot: Fix blocker for stable

Signed-off-by: Michał Górny  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
index 725a7967a3e..da493fef7b7 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
-   !