linux-kbuild.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michal Koutný" <mkoutny@suse.com>
To: linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org,
	linux-kbuild@vger.kernel.org
Cc: "Masahiro Yamada" <masahiroy@kernel.org>,
	"Michal Suchánek" <msuchanek@suse.de>
Subject: [PATCH] depmod: Remove version parsing hack
Date: Wed, 23 Aug 2023 19:06:32 +0200	[thread overview]
Message-ID: <20230823170632.14377-1-mkoutny@suse.com> (raw)

When kbuild on usr-merged distro like:

        make INSTALL_MOD_PATH="$BUILD_DIR_C/mods" \
             MODLIB="$BUILD_DIR_C/mods/usr/lib/modules/$release" \
             modules_install

(notice the '/usr' insert)

where
        release=$(make -s kernelrelease)

depmod fails:

>   DEPMOD  /var/tmp/build/mods/usr/lib/modules/6.5.0-rc5-default
> ln: failed to create symbolic link '/var/tmp/build/mods/lib/modules/99.98.6.5.0-rc5-default': No such file or directory
> depmod: ERROR: could not open directory /var/tmp/build/mods/usr/lib/modules/99.98.6.5.0-rc5-default: No such file or directory
> depmod: FATAL: could not search modules: No such file or directory

I used kmod-30-8.1.x86_64 (openSUSE Tumbleweed with usr-merge).

The explicit MODLIB doesn't cut it because of another path dependency in
depmod's hack. That provision was added in commit bfe5424a8b31 ("kbuild:
Hack for depmod not handling X.Y versions") (2011, v3.0).
It says the hack is needed for module-init-tools < 3.13, 3.13 is from
2011 too. Actually, it seems to be a cautious action between 2.6.xx
series and an expected 3.0 but it ended up as 3.0.0 and SUBLEVEL=0
has been since then (so even the busybox's depmod should work without
the hack).

Remove the hack to make builds with custom INSTALL_MOD_PATH on
usr-merged distros possible.

Link: https://lore.kernel.org/r/CAK7LNAT6mQ0EpwmKUCBhv9Acaf_qyGq4hu%3DXvSWRuZ-pNAFWVw@mail.gmail.com/
Signed-off-by: Michal Koutný <mkoutny@suse.com>
---
 scripts/depmod.sh | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 3643b4f896ed..84311255e4bf 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -23,24 +23,6 @@ if [ -z $(command -v $DEPMOD) ]; then
 	exit 0
 fi
 
-# older versions of depmod require the version string to start with three
-# numbers, so we cheat with a symlink here
-depmod_hack_needed=true
-tmp_dir=$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX)
-mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE"
-if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then
-	if test -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep" -o \
-		-e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep.bin"; then
-		depmod_hack_needed=false
-	fi
-fi
-rm -rf "$tmp_dir"
-if $depmod_hack_needed; then
-	symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
-	ln -s "$KERNELRELEASE" "$symlink"
-	KERNELRELEASE=99.98.$KERNELRELEASE
-fi
-
 set -- -ae -F System.map
 if test -n "$INSTALL_MOD_PATH"; then
 	set -- "$@" -b "$INSTALL_MOD_PATH"
-- 
2.41.0


             reply	other threads:[~2023-08-23 17:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-23 17:06 Michal Koutný [this message]
2023-08-23 17:31 ` [PATCH] depmod: Remove version parsing hack Michal Suchánek
2023-08-23 17:36   ` Michal Koutný

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=20230823170632.14377-1-mkoutny@suse.com \
    --to=mkoutny@suse.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-modules@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=msuchanek@suse.de \
    /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;
as well as URLs for NNTP newsgroup(s).