public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel-bin/
Date: Thu,  2 Jan 2020 13:19:47 +0000 (UTC)	[thread overview]
Message-ID: <1577971182.b26cada012ec1134770f90e79990d10ccb2744cc.mgorny@gentoo> (raw)

commit:     b26cada012ec1134770f90e79990d10ccb2744cc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 13:14:29 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 13:19:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26cada0

sys-kernel/vanilla-kernel-bin: Create linux symlink when none

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

 .../vanilla-kernel-bin-5.4.7.ebuild                | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
index c7f50b935aa..998f07ed5e9 100644
--- a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
+++ b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
@@ -147,19 +147,25 @@ pkg_postinst() {
 		eend ${?} || die "Installing the kernel failed"
 	fi
 
-	local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
-	local symlink_ver=${symlink_target#linux-}
-	if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
-	then
-		local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
-		# if the current target is either being replaced, or still
-		# installed (probably depclean candidate), update the symlink
-		if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
-				has_version -r "~${symlink_pkg}"
+	if [[ ! -e ${EROOT}/usr/src/linux ]]; then
+		ebegin "Creating /usr/src/linux symlink"
+		ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+		eend ${?}
+	else
+		local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
+		local symlink_ver=${symlink_target#linux-}
+		if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
 		then
-			ebegin "Updating /usr/src/linux symlink"
-			ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
-			eend ${?}
+			local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
+			# if the current target is either being replaced, or still
+			# installed (probably depclean candidate), update the symlink
+			if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
+					has_version -r "~${symlink_pkg}"
+			then
+				ebegin "Updating /usr/src/linux symlink"
+				ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+				eend ${?}
+			fi
 		fi
 	fi
 }


             reply	other threads:[~2020-01-02 13:19 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-02 13:19 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-15  8:01 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel-bin/ Mikle Kolyada
2020-02-14  8:48 Michał Górny
2020-02-12 20:36 Michał Górny
2020-02-12 15:47 Michał Górny
2020-02-12 12:09 Michał Górny
2020-02-06 20:43 Michał Górny
2020-02-06 17:09 Michał Górny
2020-02-03  5:37 Michał Górny
2020-02-03  5:37 Michał Górny
2020-02-03  5:37 Michał Górny
2020-01-30 19:29 Michał Górny
2020-01-28 18:24 Michał Górny
2020-01-27 11:26 Michał Górny
2020-01-24 19:18 Michał Górny
2020-01-24 19:18 Michał Górny
2020-01-18 16:06 Michał Górny
2020-01-18 16:06 Michał Górny
2020-01-18 16:06 Michał Górny
2020-01-15 11:44 Michał Górny
2020-01-15 10:37 Michał Górny
2020-01-13 14:18 Michał Górny
2020-01-13 11:50 Michał Górny
2020-01-09 21:36 Michał Górny
2020-01-09 21:36 Michał Górny
2020-01-09 21:00 Michał Górny
2020-01-09 21:00 Michał Górny
2020-01-09 16:10 Michał Górny
2020-01-09 16:10 Michał Górny
2020-01-04 15:09 Michał Górny
2020-01-01 22:00 Michał Górny
2020-01-01 22:00 Michał Górny
2019-12-29 12:57 Michał Górny
2019-12-28 20:34 Michał Górny
2019-12-25 22:49 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1577971182.b26cada012ec1134770f90e79990d10ccb2744cc.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox