mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 12:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-block/parted: Sync with Gentoo

Browse Source 
It's from Gentoo commit c5efec2494163085aa796a8c789e8c9e5c658eb2.
This commit is contained in:
Flatcar Buildbot 2024-07-01 07:18:38 +00:00 committed by Mathieu Tortuyaux
parent 8971aed562
commit 4321d0264d
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sdk_container/src/third_party/portage-stable/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch vendored
View File

@ -1,5 +1,6 @@
https://bugs.gentoo.org/910487
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=d22c2d01f62139e0d386d90584cac0705857a571
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=60b3300ed6d3ba2e7af4ddce55bd873b232d12ff
From d22c2d01f62139e0d386d90584cac0705857a571 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
@ -24,3 +25,37 @@ Signed-off-by: Brian C. Lane <bcl@redhat.com>
if test $ENABLE_DEVICE_MAPPER = yes; then
--
cgit v1.1
From 60b3300ed6d3ba2e7af4ddce55bd873b232d12ff Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 12 Jun 2023 10:55:19 -0700
Subject: bug#64034: [PATCH] libparted: link libparted-fs-resize.so to libuuid
uuid_generate() is used in this library
Hence, add UUID_LIBS to libparted_fs_resize_la_LIBADD to avoid
"ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate"
This is uncovered by lld linker linking fatresize package
due to this linker defaulting to --no-allow-shlib-undefined.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Brian C. Lane <bcl@redhat.com>
---
libparted/fs/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 41a60d9..7fa8d14 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \
EXTRA_DIST += fsresize.sym
libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
+libparted_fs_resize_la_LIBADD = $(UUID_LIBS)
libparted_fs_resize_la_SOURCES = \
r/filesys.c \
r/fat/bootsector.c \
--
cgit v1.1

7
sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r1.ebuild → sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r2.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -64,6 +64,11 @@ src_prepare() {
}
src_configure() {
# -fanalyzer substantially slows down the build and isn't useful for
# us. It's useful for upstream as it's static analysis, but it's not
# useful when just getting something built.
export gl_cv_warn_c__fanalyzer=no
local myconf=(
$(use_enable debug)
$(use_enable device-mapper)