diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-22 14:50:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-23 08:25:53 +0100 |
commit | f4995a0b05de5e92d0d7f01489673d770f371f93 (patch) | |
tree | 2597d027505b78153d7af7fc7949a3916c34002c /meta/recipes-devtools/squashfs-tools/squashfs-tools | |
parent | 01543b2d879de8e4c483fd08d961a0d84080e38b (diff) | |
download | poky-f4995a0b05de5e92d0d7f01489673d770f371f93.tar.gz |
squashfs-tools: upgrade 4.4 -> 4.5
(From OE-Core rev: 142ad53513cae2b9b5bf16524e29b97477bb3dd0)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools/squashfs-tools')
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch new file mode 100644 index 0000000000..b505f05735 --- /dev/null +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From c9e263a7add76df1ed92e879d964264067c0f6e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Patrick McCarty <patrick.mccarty@intel.com> | ||
3 | Date: Mon, 26 Jul 2021 11:38:43 -0700 | ||
4 | Subject: [PATCH] Avoid use of INSTALL_DIR for symlink targets | ||
5 | |||
6 | In case INSTALL_DIR is overridden with a staged install location, using | ||
7 | INSTALL_DIR for the symlink target path prefix will yield an incorrect location | ||
8 | for the final installation. | ||
9 | |||
10 | Because the symlink itself is already installed to INSTALL_DIR, simply removing | ||
11 | the INSTALL_DIR prefix suffices as a fix. | ||
12 | |||
13 | Note that using $DESTDIR/$INSTALL_DIR where appropriate can avoid this type of | ||
14 | issue, but that can be considered a future enhancement. | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com> | ||
18 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
19 | --- | ||
20 | squashfs-tools/Makefile | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile | ||
24 | index 5795d0d..998c5fd 100755 | ||
25 | --- a/Makefile | ||
26 | +++ b/Makefile | ||
27 | @@ -406,5 +406,5 @@ install: mksquashfs unsquashfs | ||
28 | mkdir -p $(INSTALL_DIR) | ||
29 | cp mksquashfs $(INSTALL_DIR) | ||
30 | cp unsquashfs $(INSTALL_DIR) | ||
31 | - ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat | ||
32 | - ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar | ||
33 | + ln -fs unsquashfs $(INSTALL_DIR)/sqfscat | ||
34 | + ln -fs mksquashfs $(INSTALL_DIR)/sqfstar | ||