Revision: 2693
http://ipcop.svn.sourceforge.net/ipcop/?rev=2693&view=rev
Author: gespinasse
Date: 2009-04-11 11:58:57 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Add a patch that should enable raid on sparc (not yet tested)
Disable fs support from parted
We are not actually using that (using directly mke2fs)
fs support inside parted lag and is subject for discussion about removal
That's a bit smaller but the difference is very small
As fs creation is disabled inside parted, some tests will fail, so don't run
them
Any failure should be a real issue (tested to work for i486, powerpc and sparc)
--This line, and those below, will be ignored
A src/patches/parted-1.8.8_sparc-fix-raid.patch
M lfs/parted
Modified Paths:
--------------
ipcop/trunk/lfs/parted
Added Paths:
-----------
ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch
Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted 2009-04-11 11:54:15 UTC (rev 2692)
+++ ipcop/trunk/lfs/parted 2009-04-11 11:58:57 UTC (rev 2693)
@@ -42,6 +42,8 @@
DL_FROM = http://ftp.gnu.org/gnu/parted
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+# sources at http://git.debian.org/?p=parted/parted.git
+# git clone git://git.debian.org/git/parted/parted.git
###############################################################################
# Top-level Rules
@@ -80,9 +82,14 @@
$(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
+ # fs support is disabled because it is not similary advanced as
e2fsprogs
+ # it may even been deprecated in futur versions
+ # so we use mke2fs directly for fs creation
cd $(DIR_APP) && ./configure --prefix=/usr \
--without-readline \
+ --disable-fs \
--disable-static \
--disable-nls \
--disable-Werror \
@@ -90,9 +97,10 @@
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- # we may use --disable-fs (because using mke2fs directly),
- # but tests about file system creation will fail
- -cd $(DIR_APP) && make -C tests check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # Using --disable-fs, we skip tests that require fs creation
+ # So a failure reported should be a real issue
+ cd $(DIR_APP) && SKIP_TESTS="t1000.6 t1000.11 t1500 t2000 t3000 t3100" \
+ make -C tests check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
Added: ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch
===================================================================
--- ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch
(rev 0)
+++ ipcop/trunk/src/patches/parted-1.8.8_sparc-fix-raid.patch 2009-04-11
11:58:57 UTC (rev 2693)
@@ -0,0 +1,101 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sparc-fix-raid.dpatch by <[email protected]>
+##
+## 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.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
