webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

parted: Update to 3.4

Browse Source 
- Update from 3.2 to 3.4
- Updated rootfile
- parted-3.2-device-mapper.patch and parted-3.2-sysmacros.patch are no
   longer needed as changes are now included in the tarball
- Changelog is too large to put in here.
   11 bug fixes included in logs
   Full changelog can be viewed in the tarball

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2021-03-22 08:27:22 +01:00
committed by Michael Tremer
parent 10b0533ce0
commit 79ee597553
4 changed files with 9 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/rootfiles/common/parted
View File

@@ -14,12 +14,13 @@
#usr/lib/libparted-fs-resize.la
#usr/lib/libparted-fs-resize.so
usr/lib/libparted-fs-resize.so.0
usr/lib/libparted-fs-resize.so.0.0.1
usr/lib/libparted-fs-resize.so.0.0.3
#usr/lib/libparted.a
#usr/lib/libparted.la
#usr/lib/libparted.so
usr/lib/libparted.so.2
usr/lib/libparted.so.2.0.1
usr/lib/libparted.so.2.0.3
#usr/lib/pkgconfig/libparted-fs-resize.pc
#usr/lib/pkgconfig/libparted.pc
usr/sbin/parted
usr/sbin/partprobe
@@ -30,10 +31,13 @@ usr/sbin/partprobe
#usr/share/locale/de/LC_MESSAGES/parted.mo
#usr/share/locale/es/LC_MESSAGES/parted.mo
#usr/share/locale/fr/LC_MESSAGES/parted.mo
#usr/share/locale/fur/LC_MESSAGES/parted.mo
#usr/share/locale/gl/LC_MESSAGES/parted.mo
#usr/share/locale/hu/LC_MESSAGES/parted.mo
#usr/share/locale/id/LC_MESSAGES/parted.mo
#usr/share/locale/it/LC_MESSAGES/parted.mo
#usr/share/locale/ja/LC_MESSAGES/parted.mo
#usr/share/locale/ko/LC_MESSAGES/parted.mo
#usr/share/locale/nl/LC_MESSAGES/parted.mo
#usr/share/locale/nn/LC_MESSAGES/parted.mo
#usr/share/locale/pl/LC_MESSAGES/parted.mo

8
lfs/parted
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.2
VER = 3.4
THISAPP = parted-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = parted
PAK_VER = 3
PAK_VER = 4
DEPS =
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0247b6a7b314f8edeb618159fa95f9cb
$(DL_FILE)_MD5 = 357d19387c6e7bc4a8a90fe2d015fe80
install : $(TARGET)
@@ -78,8 +78,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-device-mapper.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-sysmacros.patch
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper
cd $(DIR_APP) && make $(MAKETUNING)

44
src/patches/parted-3.2-device-mapper.patch
View File

@@ -1,44 +0,0 @@
--- parted-3.2/libparted/arch/linux.c.device-mapper 2014-06-15 20:15:54.000000000 +0100
+++ parted-3.2/libparted/arch/linux.c 2014-07-29 22:27:54.487430030 +0100
@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...)
static char *
dm_canonical_path (PedDevice const *dev)
{
+#ifdef ENABLE_DEVICE_MAPPER
LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev);
/* Get map name from devicemapper */
@@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev)
dm_task_destroy (task);
return dev_name;
err:
+#endif
return NULL;
}
@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk)
unsigned long long *start,
unsigned long long *length);
-
+#ifdef ENABLE_DEVICE_MAPPER
if (disk->dev->type == PED_DEVICE_DM) {
add_partition = _dm_add_partition;
remove_partition = _dm_remove_partition;
resize_partition = _dm_resize_partition;
get_partition_start_and_length = _dm_get_partition_start_and_length;
} else {
+#endif
add_partition = _blkpg_add_partition;
remove_partition = _blkpg_remove_partition;
#ifdef BLKPG_RESIZE_PARTITION
@@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk)
resize_partition = NULL;
#endif
get_partition_start_and_length = _kernel_get_partition_start_and_length;
+#ifdef ENABLE_DEVICE_MAPPER
}
+#endif
/* lpn = largest partition number.
* for remove pass, use greater of device or label limit */

28
src/patches/parted-3.2-sysmacros.patch
View File

@@ -1,28 +0,0 @@
https://bugs.gentoo.org/580022
From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 21 Jun 2016 15:01:08 -0400
Subject: [PATCH] include sysmacros.h for major/minor/makedev
Linux C libs are moving away from including this header implicitly via
sys/types.h, so include it explicitly.
---
libparted/arch/linux.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 326b95619d31..e5c168be3c68 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -37,6 +37,7 @@
#include <dirent.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/utsname.h> /* for uname() */
#include <scsi/scsi.h>
--
2.8.2