commit: 90c396f5dd36f9602032a27dd417e6adf4874e9b
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 20:55:48 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 21:23:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c396f5
sys-kernel/gentoo-kernel-bin: fix dbts check cond
migration to gpkg lost dtbs installation completely.
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
...-kernel-bin-5.10.159.ebuild => gentoo-kernel-bin-5.10.159-r1.ebuild} | 2 +-
...-kernel-bin-5.10.160.ebuild => gentoo-kernel-bin-5.10.160-r1.ebuild} | 2 +-
...-kernel-bin-5.10.161.ebuild => gentoo-kernel-bin-5.10.161-r1.ebuild} | 2 +-
...oo-kernel-bin-5.15.83.ebuild => gentoo-kernel-bin-5.15.83-r1.ebuild} | 2 +-
...oo-kernel-bin-5.15.84.ebuild => gentoo-kernel-bin-5.15.84-r1.ebuild} | 2 +-
...oo-kernel-bin-5.15.85.ebuild => gentoo-kernel-bin-5.15.85-r1.ebuild} | 2 +-
...oo-kernel-bin-5.4.227.ebuild => gentoo-kernel-bin-5.4.227-r1.ebuild} | 2 +-
...oo-kernel-bin-5.4.228.ebuild => gentoo-kernel-bin-5.4.228-r1.ebuild} | 2 +-
...ntoo-kernel-bin-6.0.13.ebuild => gentoo-kernel-bin-6.0.13-r1.ebuild} | 2 +-
...ntoo-kernel-bin-6.0.15.ebuild => gentoo-kernel-bin-6.0.14-r1.ebuild} | 2 +-
...ntoo-kernel-bin-6.0.14.ebuild => gentoo-kernel-bin-6.0.15-r1.ebuild} | 2 +-
...gentoo-kernel-bin-6.1.1.ebuild => gentoo-kernel-bin-6.1.1-r1.ebuild} | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159-r1.ebuild
index 8f9a87c041fc..b20e2174d7ef 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.159-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160-r1.ebuild
index 7d5170bdeef7..f1f891eadcf2 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.160-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161-r1.ebuild
index 53a4e2a6b96e..04eab1fbd0cd 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.161-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83-r1.ebuild
index 7745a774a549..0fc3adee012c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.83-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84-r1.ebuild
index cb9e8972e872..173be83892d3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.84-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85-r1.ebuild
index cb9e8972e872..173be83892d3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227-r1.ebuild
index 9633b9065aaf..ea1c470722eb 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.227-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228-r1.ebuild
index 7f0646b257c3..7a69338d4c27 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.228-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13-r1.ebuild
index 2f8f3d790587..00650e13196d 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.13-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14-r1.ebuild
index 480f0764cb5f..7634c204448c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.ebuild
index 480f0764cb5f..7634c204448c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.14.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.ebuild
similarity index 98%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.ebuild
index 87c9891fee64..c8200881ca18 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.ebuild
@@ -111,7 +111,7 @@ src_install() {
mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
# FIXME: requires proper mount-boot
- if [[ -d boot/dtbs ]]; then
+ if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
mv "${BINPKG}"/image/boot "${ED}"/ || die
fi
