summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/parted
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/parted')
-rw-r--r--meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch34
-rw-r--r--meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch34
-rw-r--r--meta/recipes-extended/parted/files/autoconf-2.73.patch22
-rw-r--r--meta/recipes-extended/parted/files/no_check.patch20
-rw-r--r--meta/recipes-extended/parted/files/run-ptest8
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb (renamed from meta/recipes-extended/parted/parted_3.4.bb)26
6 files changed, 74 insertions, 70 deletions
diff --git a/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch b/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
new file mode 100644
index 0000000000..10354f1ed9
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
@@ -0,0 +1,34 @@
1From 1fc88332f7e906294fd889287b9e84cefc7f1586 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 12 Jun 2023 10:40:07 -0700
4Subject: [PATCH] fs: Add libuuid to linker flags for libparted-fs-resize
5 library
6
7This library uses uuid_generate function which comes from libuuid and
8hence it should be mentioned on linker cmdline
9
10fixes
11| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate
12| >>> referenced by /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/fatresize/1.1.0-r0/recipe-sysroot/usr/lib/libparted-fs-resize.so
13
14Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2023-June/005873.html]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 libparted/fs/Makefile.am | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
21index 2f345f3..a8970eb 100644
22--- a/libparted/fs/Makefile.am
23+++ b/libparted/fs/Makefile.am
24@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \
25 EXTRA_DIST += fsresize.sym
26 libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
27
28+libparted_fs_resize_la_LIBADD = $(UUID_LIBS)
29 libparted_fs_resize_la_SOURCES = \
30 r/filesys.c \
31 r/fat/bootsector.c \
32--
332.41.0
34
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/files/autoconf-2.73.patch b/meta/recipes-extended/parted/files/autoconf-2.73.patch
new file mode 100644
index 0000000000..63dea88bfc
--- /dev/null
+++ b/meta/recipes-extended/parted/files/autoconf-2.73.patch
@@ -0,0 +1,22 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next parted upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12--- a/m4/largefile.m4
13+++ b/m4/largefile.m4
14@@ -27,7 +27,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
15 # Work around a problem in autoconf <= 2.69:
16 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
17 # or configures them incorrectly in some cases.
18-m4_version_prereq([2.70], [], [
19+m4_version_prereq([2.73], [], [
20
21 # _AC_SYS_LARGEFILE_TEST_INCLUDES
22 # -------------------------------
diff --git a/meta/recipes-extended/parted/files/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch
deleted file mode 100644
index e6a26d11a5..0000000000
--- a/meta/recipes-extended/parted/files/no_check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3If check is detected, it makes the builds non-determinstic so just force
4it to be disabled.
5
6RP - 4/11/08
7
8Index: parted-3.2/configure.ac
9===================================================================
10--- parted-3.2.orig/configure.ac
11+++ parted-3.2/configure.ac
12@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [
13 AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x])
14
15 dnl check for "check", unit testing library/header
16-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
17+have_check=no
18 if test "$have_check" != "yes"; then
19 AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
20 fi
diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest
index 374f1bfbc9..096078967f 100644
--- a/meta/recipes-extended/parted/files/run-ptest
+++ b/meta/recipes-extended/parted/files/run-ptest
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3mkdir -p /etc/udev/mount.blacklist.d 3mkdir -p /etc/udev/mount.ignorelist.d
4echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp 4echo /dev/sda1 >> /etc/udev/mount.ignorelist.d/parted-tmp
5rm -f *.log 5rm -f tests/*.log
6make -C tests test-suite.log 6make -C tests test-suite.log
7rm /etc/udev/mount.blacklist.d/parted-tmp 7rm /etc/udev/mount.ignorelist.d/parted-tmp
diff --git a/meta/recipes-extended/parted/parted_3.4.bb b/meta/recipes-extended/parted/parted_3.6.bb
index 79dad54687..a537ef74db 100644
--- a/meta/recipes-extended/parted/parted_3.4.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -1,25 +1,24 @@
1SUMMARY = "Disk partition editing/resizing utility" 1SUMMARY = "Disk partition editing/resizing utility"
2HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" 2HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
3LICENSE = "GPLv3+" 3DESCRIPTION = "GNU Parted manipulates partition tables. This is useful for creating space for new operating systems, reorganizing disk usage, copying data on hard disks and disk imaging."
4LICENSE = "GPL-3.0-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" 5LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"
5SECTION = "console/tools" 6SECTION = "console/tools"
6DEPENDS = "ncurses util-linux virtual/libiconv" 7DEPENDS = "ncurses util-linux virtual/libiconv"
7 8
8SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
9 file://no_check.patch \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ 11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \
12 file://autoconf-2.73.patch \
12 file://run-ptest \ 13 file://run-ptest \
13 " 14 "
14 15
15SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80" 16SRC_URI[sha256sum] = "3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612"
16SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342"
17
18EXTRA_OECONF = "--disable-device-mapper"
19 17
20inherit autotools pkgconfig gettext texinfo ptest 18inherit autotools pkgconfig gettext texinfo ptest
21 19
22PACKAGECONFIG ?= "readline" 20PACKAGECONFIG ?= "readline"
21PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2"
23PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" 22PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
24 23
25BBCLASSEXTEND = "native nativesdk" 24BBCLASSEXTEND = "native nativesdk"
@@ -34,10 +33,13 @@ do_install_ptest() {
34 cp ${S}/build-aux/test-driver $t/build-aux/ 33 cp ${S}/build-aux/test-driver $t/build-aux/
35 cp -r ${S}/tests $t 34 cp -r ${S}/tests $t
36 cp ${B}/tests/Makefile $t/tests/ 35 cp ${B}/tests/Makefile $t/tests/
36 mkdir $t/lib
37 cp ${B}/lib/config.h $t/lib
37 sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile 38 sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile
38 sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile 39 sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile
39 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile 40 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile
40 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile 41 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile
42 sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile
41 sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile 43 sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile
42 sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile 44 sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile
43 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ 45 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \
@@ -46,9 +48,9 @@ do_install_ptest() {
46 sed -e 's| ../parted||' -i $t/tests/*.sh 48 sed -e 's| ../parted||' -i $t/tests/*.sh
47} 49}
48 50
49RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core" 51RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools"
50RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug" 52RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat"
51RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 53RDEPENDS:${PN}-ptest:append:libc-glibc = "\
52 glibc-utils \ 54 glibc-utils \
53 locale-base-en-us \ 55 locale-base-en-us \
54 " 56 "
@@ -56,5 +58,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
56inherit update-alternatives 58inherit update-alternatives
57 59
58ALTERNATIVE_PRIORITY = "100" 60ALTERNATIVE_PRIORITY = "100"
59ALTERNATIVE_${PN} = "partprobe" 61ALTERNATIVE:${PN} = "partprobe"
60ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" 62ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 16:28:24 +0000