Bug#705842: mklibs : cosmetic, remove unneeded default path libs ending /
Package: mklibs
Version: 0.1.35
Severity: minor
Tags: d-i patch
The default exist since I use mklibs (inside a chroot) using this command:
/usr/bin/mklibs -v -L /usr/lib/libc_pic \
-d /installer/initramfs/lib \
/installer/initramfs/bin/* \
/installer/initramfs/sbin/* \
/installer/initramfs/usr/bin/* \
/installer/initramfs/usr/sbin/* \
/installer/initramfs/lib/udev/*_id
That produce lines like
...
reducing libcom_err.so.2
No pic file found for /lib//libcom_err.so.2 ; copying
reducing libdl.so.2
/lib//libdl.so.2 13123L
/installer/initramfs/lib/libdl.so.2-so 5106L
/installer/initramfs/lib/libdl.so.2-so-stripped 4592L
Removing final / on default lib path remove the duplicates like when using
/usr/bin/mklibs -v -D -L /lib:/usr/lib:/usr/lib/libc_pic
So change the default lib path for both mklibs and mklibs-copy
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = multiarch(["/lib", "/usr/lib", "/usr/X11R6/lib"])
-- System Information:
Debian Release: 6.0.7
APT prefers stable
APT policy: (990, 'stable'), (500, 'stable-updates')
Architecture: i386 (i686)
>From 59cf379b9f525f53345ea5d3f3538c46d875cbca Mon Sep 17 00:00:00 2001
From: Gilles Espinasse <g.esp@free.fr>
Date: Sat, 20 Apr 2013 21:41:02 +0200
Subject: [PATCH] mklibs : cosmetic, remove unneeded default path libs ending /
mklibs -v -L /usr/lib/libc_pic -d ... display // on path of
each 'No pic file found for' line and on the line just under
'reducing lib...'
mklibs -v -D -L /lib:/usr/lib:/usr/lib/libc_pic -d ... remove
the duplicated / on each 'No pic file found for' line and on
the line just under 'reducing lib...'
That should prove the ending / is not needed.
Signed-off-by: Gilles Espinasse <g.esp@free.fr>
---
src/mklibs | 2 +-
src/mklibs-copy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mklibs b/src/mklibs
index ef15147..4b2e2ad 100755
--- a/src/mklibs
+++ b/src/mklibs
@@ -340,7 +340,7 @@ lib_path = []
dest_path = "DEST"
ldlib = "LDLIB"
include_default_lib_path = "yes"
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = multiarch(["/lib", "/usr/lib", "/usr/X11R6/lib"])
libc_extras_dir = "/usr/lib/libc_pic"
libc_extras_dir_default = True
libdir = "lib"
diff --git a/src/mklibs-copy b/src/mklibs-copy
index 564bd1b..0702956 100755
--- a/src/mklibs-copy
+++ b/src/mklibs-copy
@@ -146,7 +146,7 @@ lib_rpath = []
lib_path = main.options.library_dir
dest_path = main.options.dest_dir
ldlib = main.options.ldlib
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = multiarch(["/lib", "/usr/lib", "/usr/X11R6/lib"])
target = ""
root = main.options.root
include_default_lib_path = not main.options.omit_library_dir
--
1.7.2.5
>From 59cf379b9f525f53345ea5d3f3538c46d875cbca Mon Sep 17 00:00:00 2001
From: Gilles Espinasse <g.esp@free.fr>
Date: Sat, 20 Apr 2013 21:41:02 +0200
Subject: [PATCH] mklibs : cosmetic, remove unneeded default path libs ending /
mklibs -v -L /usr/lib/libc_pic -d ... display // on path of
each 'No pic file found for' line and on the line just under
'reducing lib...'
mklibs -v -D -L /lib:/usr/lib:/usr/lib/libc_pic -d ... remove
the duplicated / on each 'No pic file found for' line and on
the line just under 'reducing lib...'
That should prove the ending / is not needed.
Signed-off-by: Gilles Espinasse <g.esp@free.fr>
---
src/mklibs | 2 +-
src/mklibs-copy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mklibs b/src/mklibs
index ef15147..4b2e2ad 100755
--- a/src/mklibs
+++ b/src/mklibs
@@ -340,7 +340,7 @@ lib_path = []
dest_path = "DEST"
ldlib = "LDLIB"
include_default_lib_path = "yes"
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = multiarch(["/lib", "/usr/lib", "/usr/X11R6/lib"])
libc_extras_dir = "/usr/lib/libc_pic"
libc_extras_dir_default = True
libdir = "lib"
diff --git a/src/mklibs-copy b/src/mklibs-copy
index 564bd1b..0702956 100755
--- a/src/mklibs-copy
+++ b/src/mklibs-copy
@@ -146,7 +146,7 @@ lib_rpath = []
lib_path = main.options.library_dir
dest_path = main.options.dest_dir
ldlib = main.options.ldlib
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = multiarch(["/lib", "/usr/lib", "/usr/X11R6/lib"])
target = ""
root = main.options.root
include_default_lib_path = not main.options.omit_library_dir
--
1.7.2.5
Reply to: