summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-08-09 17:00:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-12 06:26:15 +0100
commit917134a8050f41d76eef82a5967f9c91e266dfb1 (patch)
treebd3b7c9b84df71d6d0e6f43845bd2808f82b30a7
parentc1b7a9cd64f6637ecc42241d0bce39995437200b (diff)
downloadpoky-917134a8050f41d76eef82a5967f9c91e266dfb1.tar.gz
parted: drop unneeded ld-is-gold patch
This patch doesn't appear to be needed anymore, so drop it. (From OE-Core rev: d8c6a87a568ba9b9e84a661989d5b26e07394641) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch34
-rw-r--r--meta/recipes-extended/parted/parted_3.4.bb1
2 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch b/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch
deleted file mode 100644
index bd2b5c55b1..0000000000
--- a/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 5c99d7e4c2b5e7a957dc922aff03debfebbd6154 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 3 Mar 2017 21:49:15 +0100
4Subject: [PATCH] libparted_fs_resize: link against libuuid explicitly to
5 unbreak gold linking on test
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10| ../libparted/fs/.libs/libparted-fs-resize.so: error: undefined reference to 'uuid_generate'
11
12Upstream-Status: Pending
13
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15---
16 libparted/fs/Makefile.am | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
20index d3cc8bc..c301b0b 100644
21--- a/libparted/fs/Makefile.am
22+++ b/libparted/fs/Makefile.am
23@@ -113,6 +113,8 @@ libparted_fs_resize_la_SOURCES = \
24 r/hfs/reloc_plus.c \
25 r/hfs/reloc_plus.h
26
27+libparted_fs_resize_la_LIBADD = $(UUID_LIBS)
28+
29 AM_CPPFLAGS = \
30 -I$(top_srcdir)/libparted/labels \
31 $(partedincludedir) \
32--
332.9.3
34
diff --git a/meta/recipes-extended/parted/parted_3.4.bb b/meta/recipes-extended/parted/parted_3.4.bb
index 8924bdb478..ffab627110 100644
--- a/meta/recipes-extended/parted/parted_3.4.bb
+++ b/meta/recipes-extended/parted/parted_3.4.bb
@@ -8,7 +8,6 @@ DEPENDS = "ncurses util-linux virtual/libiconv"
8 8
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
12 file://run-ptest \ 11 file://run-ptest \
13 file://check-vfat.patch \ 12 file://check-vfat.patch \
14 " 13 "