Menu
▾
▴
[Ipcop-svn] SF.net SVN: ipcop:[3511] ipcop/trunk
|
From: <ges...@us...> - 2009-08-29 14:21:35
|
Revision: 3511
http://ipcop.svn.sourceforge.net/ipcop/?rev=3511&view=rev
Author: gespinasse
Date: 2009-08-29 14:21:26 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Upgrade parted to 1.9.0 and use xz package flavor.
I know better understand how parted work.
If we disable fs support, we should not try to use fs reference to partition the device in disk-partition.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/parted
ipcop/trunk/lfs/parted
Removed Paths:
-------------
ipcop/trunk/src/patches/parted-1.8.8_no-md-partition.patch
ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch
Modified: ipcop/trunk/config/rootfiles/common/parted
===================================================================
--- ipcop/trunk/config/rootfiles/common/parted 2009-08-29 07:06:20 UTC (rev 3510)
+++ ipcop/trunk/config/rootfiles/common/parted 2009-08-29 14:21:26 UTC (rev 3511)
@@ -6,14 +6,12 @@
#usr/include/parted/exception.h
#usr/include/parted/filesys.h
#usr/include/parted/geom.h
-#usr/include/parted/gnu.h
-#usr/include/parted/linux.h
#usr/include/parted/natmath.h
#usr/include/parted/parted.h
#usr/include/parted/timer.h
#usr/include/parted/unit.h
-usr/lib/libparted-1.8.so.8
-usr/lib/libparted-1.8.so.8.0.0
+usr/lib/libparted-1.9.so.0
+usr/lib/libparted-1.9.so.0.0.0
#usr/lib/libparted.la
usr/lib/libparted.so
#usr/lib/pkgconfig/libparted.pc
Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted 2009-08-29 07:06:20 UTC (rev 3510)
+++ ipcop/trunk/lfs/parted 2009-08-29 14:21:26 UTC (rev 3511)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = parted
-VER = 1.8.8
+VER = 1.9.0
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = parted-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = http://ftp.gnu.org/gnu/parted
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 607ab4c3cfd8455af6588b97d99ad0ba
+$(DL_FILE)_MD5 = a9ffa9b69f0b6099b75c32a03bb12f7f
install : $(TARGET)
@@ -81,28 +81,27 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_sparc-fix-raid.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_no-md-partition.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # fs support is not used because it is not similary advanced as e2fsprogs
+ # mkpartfs ext2 is not used because it is not similary advanced as e2fsprogs
# it may even been deprecated in futur versions
# so we use mke2fs directly for fs creation
- # but parted is broken when using --disable-fs
- # this command fail 'parted /dev/hda mkpart primary ext2'
+ # parted configured with --disable-fs does not support 'parted /dev/hda mkpart primary ext2'
+ # reference to the fs (ext2 there) has to be removed (and hfs for ppc)
+ # let fs compiled in for now until we prove we can disable that
cd $(DIR_APP) && ./configure --prefix=/usr \
+ --disable-device-mapper \
--without-readline \
--disable-static \
--disable-nls \
- --disable-Werror \
--disable-debug
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- # Disable only 2 resize tests that fail on debian lenny 2.6.26 but not on 2.6.27
+ # Disable 3 tests that fail on on 2.6.27.x kernel (from the building machine)
# So any other failure reported should be a real issue
- cd $(DIR_APP) && SKIP_TESTS="t3100.6 t3100.7" \
- make -C tests check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ cd $(DIR_APP) && SKIP_TESTS="t4100 t5000 t7000" \
+ make -C tests check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
Deleted: ipcop/trunk/src/patches/parted-1.8.8_no-md-partition.patch
===================================================================
--- ipcop/trunk/src/patches/parted-1.8.8_no-md-partition.patch 2009-08-29 07:06:20 UTC (rev 3510)
+++ ipcop/trunk/src/patches/parted-1.8.8_no-md-partition.patch 2009-08-29 14:21:26 UTC (rev 3511)
@@ -1,23 +0,0 @@
-following this advice
-http://parted.alioth.debian.org/cgi-bin/trac.cgi/ticket/195
-exclude md devices from the block list wich have a partition
-
-they are no more reported like they were before
-parted /dev/hda print devices
-/dev/hda (2625MB)
-/dev/hdc (6488MB)
-/dev/md0 (805MB)
-/dev/md1 (1818MB)
-
-parted /dev/md0 print
-Error: Can't have a partition outside the disk!
---- parted-1.8.8/libparted/arch/linux.c.old 2007-08-09 20:47:57.000000000 +0200
-+++ parted-1.8.8/libparted/arch/linux.c 2009-04-11 18:25:32.000000000 +0200
-@@ -1865,6 +1865,7 @@
- { "..", sizeof ("..") - 1 },
- { "dm-", sizeof ("dm-") - 1 },
- { "loop", sizeof ("loop") - 1 },
-+ { "md", sizeof ("md") - 1 },
- { "ram", sizeof ("ram") - 1 },
- { 0, 0 },
- };
Deleted: ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch
===================================================================
--- ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch 2009-08-29 07:06:20 UTC (rev 3510)
+++ ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch 2009-08-29 14:21:26 UTC (rev 3511)
@@ -1,101 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sparc-fix-raid.dpatch by <fab...@su...>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad parted-1.6.25.1~/libparted/disk_sun.c parted-1.6.25.1/libparted/disk_sun.c
---- parted-1.6.25.1~/libparted/labels/sun.c 2006-04-16 07:18:49.000000000 +0200
-+++ parted-1.6.25.1/libparted/labels/sun.c 2006-04-16 07:19:22.000000000 +0200
-@@ -82,6 +82,7 @@
- int is_boot;
- int is_root;
- int is_lvm;
-+ int is_raid;
- };
-
- typedef struct {
-@@ -342,6 +343,7 @@
- sun_data->is_boot = sun_data->type == 0x1;
- sun_data->is_root = sun_data->type == 0x2;
- sun_data->is_lvm = sun_data->type == 0x8e;
-+ sun_data->is_raid = sun_data->type == 0xfd;
-
- part->num = i + 1;
- part->fs_type = ped_file_system_probe (&part->geom);
-@@ -477,6 +479,7 @@
- sun_data->is_boot = 0;
- sun_data->is_root = 0;
- sun_data->is_lvm = 0;
-+ sun_data->is_raid = 0;
- } else {
- part->disk_specific = NULL;
- }
-@@ -511,6 +514,7 @@
- new_sun_data->is_boot = old_sun_data->is_boot;
- new_sun_data->is_root = old_sun_data->is_root;
- new_sun_data->is_lvm = old_sun_data->is_lvm;
-+ new_sun_data->is_raid = old_sun_data->is_raid;
- return new_part;
- }
-
-@@ -543,6 +547,10 @@
- sun_data->type = 0x8e;
- return 1;
- }
-+ if (sun_data->is_raid) {
-+ sun_data->type = 0xfd;
-+ return 1;
-+ }
-
- sun_data->type = 0x83;
- if (fs_type) {
-@@ -570,19 +578,25 @@
- case PED_PARTITION_BOOT:
- sun_data->is_boot = state;
- if (state)
-- sun_data->is_root = sun_data->is_lvm = 0;
-+ sun_data->is_root = sun_data->is_lvm = sun_data->is_raid = 0;
- return ped_partition_set_system (part, part->fs_type);
-
- case PED_PARTITION_ROOT:
- sun_data->is_root = state;
- if (state)
-- sun_data->is_boot = sun_data->is_lvm = 0;
-+ sun_data->is_boot = sun_data->is_lvm = sun_data->is_raid = 0;
- return ped_partition_set_system (part, part->fs_type);
-
- case PED_PARTITION_LVM:
- sun_data->is_lvm = state;
- if (state)
-- sun_data->is_root = sun_data->is_boot = 0;
-+ sun_data->is_root = sun_data->is_boot = sun_data->is_raid = 0;
-+ return ped_partition_set_system (part, part->fs_type);
-+
-+ case PED_PARTITION_RAID:
-+ sun_data->is_raid = state;
-+ if (state)
-+ sun_data->is_root = sun_data->is_boot = sun_data->is_lvm = 0;
- return ped_partition_set_system (part, part->fs_type);
-
- default:
-@@ -608,6 +622,8 @@
- return sun_data->is_root;
- case PED_PARTITION_LVM:
- return sun_data->is_lvm;
-+ case PED_PARTITION_RAID:
-+ return sun_data->is_raid;
-
- default:
- return 0;
-@@ -623,6 +639,7 @@
- case PED_PARTITION_BOOT:
- case PED_PARTITION_ROOT:
- case PED_PARTITION_LVM:
-+ case PED_PARTITION_RAID:
- return 1;
-
- default:
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|