Revision: 6852
http://ipcop.svn.sourceforge.net/ipcop/?rev=6852&view=rev
Author: gespinasse
Date: 2012-11-18 13:33:35 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Upgrade to 3.2.6
- configure for /var/run, not the default /run
- configure to use sendEmail
- use test target as this is required to run some tests
- sleep a bit more for some tests to have a more reliable result
- test suite stay commented for now as that may break some configurations
- use 'bash ./test', not the recommended 'sh ./test' as this script is bash
(and that broke on master)
- cleanup /var/tmp after the tests
Modified Paths:
--------------
ipcop/trunk/lfs/mdadm
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
Modified: ipcop/trunk/lfs/mdadm
===================================================================
--- ipcop/trunk/lfs/mdadm 2012-11-18 10:16:18 UTC (rev 6851)
+++ ipcop/trunk/lfs/mdadm 2012-11-18 13:33:35 UTC (rev 6852)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = mdadm
-VER = 3.2.5
+VER = 3.2.6
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2fd33dedcdb06f0d1461f50ddabb7e4a
+$(DL_FILE)_MD5 = 2afc306135466923fe5020d743bff9a4
install : $(TARGET)
@@ -81,16 +81,27 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_mdadm-fix-segmentation-fault.patch
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_imsm-fix-correct-checking-volume-s-degradation.patch
+ # Fix too many arguments in test log, accepted upstream
+ cd $(DIR_APP) && sed -i 's/\$sum \!= \$sum1/"$sum" != "$sum1"/g'
tests/{01r5integ,01raid6integ}
+ # Waiting a bit more is needed when system is loaded to avoid a timing
issue, happen to me on various 05 -bitmap tests
+ cd $(DIR_APP) && sed -i 's/sleep 4/sleep 8/g' tests/*
+ cd $(DIR_APP) && sed -i 's|sbin\/sendmail|bin/sendEmail|' Makefile
# CXFLAGS="$(CFLAGS)" is required to set the optimization level or -O0
is used and FORTIFY does not apply
- cd $(DIR_APP) && make -j $(PARALLELISM) CXFLAGS="$(CFLAGS)"
+ # Compile mdadm, mdmon and programs needed for the tests
+ cd $(DIR_APP) && make -j $(PARALLELISM) CXFLAGS="$(CFLAGS)"
MAP_DIR='/var/run/mdadm' FAILED_SLOTS_DIR='/var/run/mdadm/failed-slots' test
ifeq "$(RUNNING_TEST)" "yes"
- # not yet ready : TODO we need a way to modprobe md_mod outside of our
chroot (so in make.sh as root)
- # Support failure on tests
- #-cd $(DIR_APP) && sh ./test &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # - still fail even when running the same kernel version we compile,
+ # - break someone using loop for real usage, and probably too if
running a raid array as rootfs
+ # - let md_mod modules loaded after the tests
+ # Too much failures after 06 tests, will not try for now
+ cd $(DIR_APP) && rm -f tests/{07,08,09,10,11,12,13,14,15,16,18}*
+ # - on master branch, syntax add --keep-going to continue even if an
error happen, output should be too better structured
+ # Not yet ready : use it at your own initiative for the reasons above
+ #-cd $(DIR_APP) && bash ./test &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # Cleanup
+ rm -f /var/tmp/*
endif
cd $(DIR_APP) && make install
Deleted:
ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
===================================================================
---
ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
2012-11-18 10:16:18 UTC (rev 6851)
+++
ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
2012-11-18 13:33:35 UTC (rev 6852)
@@ -1,46 +0,0 @@
-From e1993023991a6fa6539cc604b4b3d6718833250d Mon Sep 17 00:00:00 2001
-From: Lukasz Dorau <lukasz.do...@intel.com>
-Date: Fri, 25 May 2012 15:06:41 +0200
-Subject: [PATCH] imsm: fix: correct checking volume's degradation
-
-We do not check the return value of sysfs_get_ll() now. It is wrong.
-If reading of the sysfs "degraded" key does not succeed,
-the "new_degraded" variable will not be initiated
-and accidentally it can have the value of "degraded" variable.
-In that case the change of degradation will not be checked.
-
-It happens if mdadm is compiled with gcc's "-fstack-protector" option
-when one tries to stop a volume under reshape (e.g. OLCE).
-Reshape seems to be finished then (metadata is in normal/clean state)
-but it is not finished, it is broken and data are corrupted.
-
-Now we always check the return value of sysfs_get_ll().
-Even if reading of the sysfs "degraded" key does not succeed
-(rv == -1) the change of degradation will be checked.
-
-Signed-off-by: Lukasz Dorau <lukasz.do...@intel.com>
-Signed-off-by: NeilBrown <ne...@suse.de>
----
- super-intel.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 6c87e20..07ab9ae 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -10370,8 +10370,10 @@ int check_degradation_change(struct mdinfo *info,
- int degraded)
- {
- unsigned long long new_degraded;
-- sysfs_get_ll(info, NULL, "degraded", &new_degraded);
-- if (new_degraded != (unsigned long long)degraded) {
-+ int rv;
-+
-+ rv = sysfs_get_ll(info, NULL, "degraded", &new_degraded);
-+ if ((rv == -1) || (new_degraded != (unsigned long long)degraded)) {
- /* check each device to ensure it is still working */
- struct mdinfo *sd;
- new_degraded = 0;
---
-1.7.10.2
-
Deleted: ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
2012-11-18 10:16:18 UTC (rev 6851)
+++ ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
2012-11-18 13:33:35 UTC (rev 6852)
@@ -1,44 +0,0 @@
-From 4687f160276a8f7815675ca758c598d881f04fd7 Mon Sep 17 00:00:00 2001
-From: majianpeng <majianp...@gmail.com>
-Date: Tue, 29 May 2012 09:21:51 +1000
-Subject: [PATCH] mdadm: Fix Segmentation fault.
-
-In function write_init_super1():
-If "rv = store_super1(st, di->fd)" return error and the di is the last.
-Then the di = NULL && rv > 0, so exec:
-if (rv)
- fprintf(stderr, Name ": Failed to write metadata to%s\n",
- di->devname);
-will be segmentation fault.
-
-Signed-off-by: majianpeng <majianp...@gmail.com>
-Signed-off-by: NeilBrown <ne...@suse.de>
----
- super1.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/super1.c b/super1.c
-index 4f20cc3..fbc2e8f 100644
---- a/super1.c
-+++ b/super1.c
-@@ -1096,7 +1096,7 @@ static int write_init_super1(struct supertype *st)
- unsigned long long dsize, array_size;
- unsigned long long sb_offset, headroom;
-
-- for (di = st->info; di && ! rv ; di = di->next) {
-+ for (di = st->info; di; di = di->next) {
- if (di->disk.state == 1)
- continue;
- if (di->fd < 0)
-@@ -1242,6 +1242,8 @@ static int write_init_super1(struct supertype *st)
- rv = st->ss->write_bitmap(st, di->fd);
- close(di->fd);
- di->fd = -1;
-+ if (rv)
-+ goto error_out;
- }
- error_out:
- if (rv)
---
-1.7.9.5
-
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-18 10:16:18 UTC
(rev 6851)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-18 13:33:35 UTC
(rev 6852)
@@ -452,7 +452,7 @@
## lsof-4.86
/usr/sbin/lsof
##
-## mdadm-3.2.5
+## mdadm-3.2.6
/lib/udev/rules.d/64-md-raid.rules
/sbin/mdadm
/sbin/mdmon
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-11-18 10:16:18 UTC (rev
6851)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-11-18 13:33:35 UTC (rev
6852)
@@ -16,7 +16,7 @@
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, libnet to 1.1.6,
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0,
libpng to 1.5.12,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,
- mdadm to 3.2.5, net-tools to 1.60-p20120127084908, openldap to
2.4.33, openssh to 6.1, openssl to 1.0.1c, openswan to 2.6.38,
+ mdadm to 3.2.6, net-tools to 1.60-p20120127084908, openldap to
2.4.33, openssh to 6.1, openssl to 1.0.1c, openswan to 2.6.38,
parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.4, psmisc to 22.20,
rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13,
tcpdump to 4.3.0, traceroute to 2.0.18,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
