diff options
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch new file mode 100644 index 0000000000..9dc488b7aa --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 18562ccae6996431d37767653b061d4e9e1b9424 Mon Sep 17 00:00:00 2001 | ||
2 | From: Niko Mauno <niko.mauno@iki.fi> | ||
3 | Date: Sun, 11 Nov 2018 15:50:22 +0200 | ||
4 | Subject: [opkg-utils PATCH] update-alternatives: Fix link relocation support | ||
5 | |||
6 | Commit fcb26339000021eb9bb711aa264247aebcfdd4ae which added Debian-style | ||
7 | support for link relocation tries to relocate symbolic link on host OS, | ||
8 | resulting in following-like error when two alternative packages have | ||
9 | symbolic link source located in different directories (/bin/rev -> | ||
10 | /bin/busybox.nosuid and /usr/bin/rev -> /usr/bin/rev.util-linux): | ||
11 | |||
12 | update-alternatives: renaming rev link from /bin/rev to /usr/bin/rev | ||
13 | mv: cannot stat '/bin/rev': No such file or directory | ||
14 | |||
15 | Fix the issue by prefixing 'olink' and 'link' variable references with | ||
16 | path to targeted root filesystem's root directory. | ||
17 | |||
18 | Upstream-Status: Submitted [opkg-utils] | ||
19 | |||
20 | Signed-off-by: Niko Mauno <niko.mauno@iki.fi> | ||
21 | --- | ||
22 | update-alternatives | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/update-alternatives b/update-alternatives | ||
26 | index 89a440b..d4fa7eb 100644 | ||
27 | --- a/update-alternatives | ||
28 | +++ b/update-alternatives | ||
29 | @@ -58,7 +58,7 @@ register_alt() { | ||
30 | local link_str=`echo $link | protect_slashes` | ||
31 | sed -e "1s/.*/$link_str/" $ad/$name > $ad/$name.new | ||
32 | mv $ad/$name.new $ad/$name | ||
33 | - mv $olink $link | ||
34 | + mv $OPKG_OFFLINE_ROOT$olink $OPKG_OFFLINE_ROOT$link | ||
35 | fi | ||
36 | else | ||
37 | echo "$link" > "$ad/$name" | ||
38 | -- | ||
39 | 2.19.1 | ||
40 | |||