diff options
Diffstat (limited to 'poky/meta/recipes-extended/parted')
3 files changed, 5 insertions, 40 deletions
diff --git a/poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch b/poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch deleted file mode 100644 index bd2b5c55b..000000000 --- a/poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5c99d7e4c2b5e7a957dc922aff03debfebbd6154 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 3 Mar 2017 21:49:15 +0100 -Subject: [PATCH] libparted_fs_resize: link against libuuid explicitly to - unbreak gold linking on test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../libparted/fs/.libs/libparted-fs-resize.so: error: undefined reference to 'uuid_generate' - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - libparted/fs/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index d3cc8bc..c301b0b 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -113,6 +113,8 @@ libparted_fs_resize_la_SOURCES = \ - r/hfs/reloc_plus.c \ - r/hfs/reloc_plus.h - -+libparted_fs_resize_la_LIBADD = $(UUID_LIBS) -+ - AM_CPPFLAGS = \ - -I$(top_srcdir)/libparted/labels \ - $(partedincludedir) \ --- -2.9.3 - diff --git a/poky/meta/recipes-extended/parted/files/check-vfat.patch b/poky/meta/recipes-extended/parted/files/check-vfat.patch index c64130a4e..fad50292d 100644 --- a/poky/meta/recipes-extended/parted/files/check-vfat.patch +++ b/poky/meta/recipes-extended/parted/files/check-vfat.patch @@ -1,7 +1,7 @@ Add checks for both mkfs.vfat and the vfat file system in the kernel before running tests. -Upstream-Status: Pending +Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2021-August/005653.html] Signed-off-by: Ross Burton <ross.burton@arm.com> diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh diff --git a/poky/meta/recipes-extended/parted/parted_3.4.bb b/poky/meta/recipes-extended/parted/parted_3.4.bb index d9b3ffb85..ffab62711 100644 --- a/poky/meta/recipes-extended/parted/parted_3.4.bb +++ b/poky/meta/recipes-extended/parted/parted_3.4.bb @@ -8,7 +8,6 @@ DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-doc-mandir.patch \ - file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ file://run-ptest \ file://check-vfat.patch \ " @@ -49,9 +48,9 @@ do_install_ptest() { sed -e 's| ../parted||' -i $t/tests/*.sh } -RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" -RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" +RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-utils \ locale-base-en-us \ " @@ -59,5 +58,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "partprobe" +ALTERNATIVE:${PN} = "partprobe" ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" |