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-bug-74444-PATCH-parted-fix-do_version-declaration.patch40
-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/autoconf-2.73.patch22
-rw-r--r--meta/recipes-extended/parted/files/fix-doc-mandir.patch20
-rw-r--r--meta/recipes-extended/parted/files/run-ptest7
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb65
6 files changed, 0 insertions, 188 deletions
diff --git a/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
deleted file mode 100644
index a8ea7ec4f7..0000000000
--- a/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Wed, 20 Nov 2024 12:22:22 +0000
4Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration
5
6With gcc 15-20241117 compile fails with the below error, update the
7do_version declaration to match the header in command.h
8
9../../parted/parted.c: In function '_init_commands':
10../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
11 2469 | do_version,
12 | ^~~~~~~~~~
13 | |
14 | int (*)(void)
15In file included from ../../parted/parted.c:28:
16../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
17 35 | int (*method) (PedDevice** dev, PedDisk** diskp),
18 | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19
20Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271]
21Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
22Signed-off-by: Brian C. Lane <bcl@redhat.com>
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24---
25 parted/parted.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/parted/parted.c b/parted/parted.c
29index 3abb52f..fc2aeba 100644
30--- a/parted/parted.c
31+++ b/parted/parted.c
32@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp)
33 }
34
35 static int
36-do_version ()
37+do_version (PedDevice** dev, PedDisk** diskp)
38 {
39 printf ("\n%s\n%s",
40 prog_name,
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
deleted file mode 100644
index 10354f1ed9..0000000000
--- a/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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/autoconf-2.73.patch b/meta/recipes-extended/parted/files/autoconf-2.73.patch
deleted file mode 100644
index 63dea88bfc..0000000000
--- a/meta/recipes-extended/parted/files/autoconf-2.73.patch
+++ /dev/null
@@ -1,22 +0,0 @@
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/fix-doc-mandir.patch b/meta/recipes-extended/parted/files/fix-doc-mandir.patch
deleted file mode 100644
index 0711d4e297..0000000000
--- a/meta/recipes-extended/parted/files/fix-doc-mandir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Submitted [bug-parted@gnu.org]
2
3| for po in `ls -1 ./*.pt_BR.po 2>/dev/null`; do \
4| make $(basename ${po%.pt_BR.po}); \
5| done
6| Makefile:904: *** Recursive variable `mandir' references itself (eventually). Stop.
7
8Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
9
10--- parted-3.1/doc/po4a.mk.orig 2012-03-15 14:09:11.555831872 +0100
11+++ parted-3.1/doc/po4a.mk 2012-03-15 14:10:44.243830985 +0100
12@@ -23,7 +23,7 @@
13 # threshold is 80%), it won't be distributed, and the build won't fail.
14 #
15
16-mandir = $(mandir)/$(lang)
17+mandir := $(mandir)/$(lang)
18
19 # Inform automake that we want to install some man pages in section 1, 5
20 # and 8.
diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest
deleted file mode 100644
index 096078967f..0000000000
--- a/meta/recipes-extended/parted/files/run-ptest
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/bin/sh
2
3mkdir -p /etc/udev/mount.ignorelist.d
4echo /dev/sda1 >> /etc/udev/mount.ignorelist.d/parted-tmp
5rm -f tests/*.log
6make -C tests test-suite.log
7rm /etc/udev/mount.ignorelist.d/parted-tmp
diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb
deleted file mode 100644
index 6fc2cb3b3a..0000000000
--- a/meta/recipes-extended/parted/parted_3.6.bb
+++ /dev/null
@@ -1,65 +0,0 @@
1SUMMARY = "Disk partition editing/resizing utility"
2HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
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"
5LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"
6SECTION = "console/tools"
7DEPENDS = "ncurses util-linux virtual/libiconv"
8
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \
11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \
12 file://autoconf-2.73.patch \
13 file://0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch \
14 file://run-ptest \
15 "
16
17SRC_URI[sha256sum] = "3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612"
18
19inherit autotools pkgconfig gettext texinfo ptest
20
21PACKAGECONFIG ?= "readline"
22PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2"
23PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
24
25BBCLASSEXTEND = "native nativesdk"
26
27do_compile_ptest() {
28 oe_runmake -C tests print-align print-max dup-clobber duplicate fs-resize print-flags
29}
30
31do_install_ptest() {
32 t=${D}${PTEST_PATH}
33 mkdir $t/build-aux
34 cp ${S}/build-aux/test-driver $t/build-aux/
35 cp -r ${S}/tests $t
36 cp ${B}/tests/Makefile $t/tests/
37 mkdir $t/lib
38 cp ${B}/lib/config.h $t/lib
39 sed -e "s|^VERSION.*|VERSION = ${PV}|g" \
40 -e "s|^srcdir =.*|srcdir = \.|g" \
41 -e "s|^abs_srcdir =.*|abs_srcdir = \.|g" \
42 -e "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" \
43 -e "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" \
44 -e "/^SH_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
45 -e "s|^Makefile:.*|Makefile:|g" \
46 -e "/^BUILDINFO.*$/d" \
47 -i $t/tests/Makefile
48 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \
49 do cp ${B}/tests/.libs/$i $t/tests/; \
50 done
51 sed -e 's| ../parted||' -i $t/tests/*.sh
52}
53
54RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools"
55RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat"
56RDEPENDS:${PN}-ptest:append:libc-glibc = "\
57 glibc-utils \
58 locale-base-en-us \
59 "
60
61inherit update-alternatives
62
63ALTERNATIVE_PRIORITY = "100"
64ALTERNATIVE:${PN} = "partprobe"
65ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe"