| Message ID | 20230718165848.14392-1-msuchanek@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Revert "kbuild: Hack for depmod not handling X.Y versions" | expand |
On Wed, Jul 19, 2023 at 1:58 AM Michal Suchanek <msuchanek@suse.de> wrote: > > Remove hack for ancient version of module-init-tools that was added in > Linux 3.0. > > Since then module-init-tools was replaced with kmod. > > This hack adds an additional indirection, and causes confusing errors > to be printed when depmod fails. > > Reverts commit 8fc62e594253 ("kbuild: Do not write to builddir in modules_install") > Reverts commit bfe5424a8b31 ("kbuild: Hack for depmod not handling X.Y versions") > > Link: https://lore.kernel.org/linux-modules/CAK7LNAQMs3QBYfWcLkmOQdbbq7cj=7wWbK=AWhdTC2rAsKHXzQ@mail.gmail.com/ > > Signed-off-by: Michal Suchanek <msuchanek@suse.de> Applied to linux-kbuild. Thanks. > --- > scripts/depmod.sh | 27 +-------------------------- > 1 file changed, 1 insertion(+), 26 deletions(-) > > diff --git a/scripts/depmod.sh b/scripts/depmod.sh > index 3643b4f896ed..fca689ba4f21 100755 > --- a/scripts/depmod.sh > +++ b/scripts/depmod.sh > @@ -23,33 +23,8 @@ 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" > fi > -"$DEPMOD" "$@" "$KERNELRELEASE" > -ret=$? > - > -if $depmod_hack_needed; then > - rm -f "$symlink" > -fi > - > -exit $ret > +exec "$DEPMOD" "$@" "$KERNELRELEASE" > -- > 2.41.0 >
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index 3643b4f896ed..fca689ba4f21 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -23,33 +23,8 @@ 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" fi -"$DEPMOD" "$@" "$KERNELRELEASE" -ret=$? - -if $depmod_hack_needed; then - rm -f "$symlink" -fi - -exit $ret +exec "$DEPMOD" "$@" "$KERNELRELEASE"
Remove hack for ancient version of module-init-tools that was added in Linux 3.0. Since then module-init-tools was replaced with kmod. This hack adds an additional indirection, and causes confusing errors to be printed when depmod fails. Reverts commit 8fc62e594253 ("kbuild: Do not write to builddir in modules_install") Reverts commit bfe5424a8b31 ("kbuild: Hack for depmod not handling X.Y versions") Link: https://lore.kernel.org/linux-modules/CAK7LNAQMs3QBYfWcLkmOQdbbq7cj=7wWbK=AWhdTC2rAsKHXzQ@mail.gmail.com/ Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- scripts/depmod.sh | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-)