Revision: 6833
http://ipcop.svn.sourceforge.net/ipcop/?rev=6833&view=rev
Author: gespinasse
Date: 2012-11-07 17:18:38 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Upgrade parted to 3.1
Fix the test suite
Remove old comments
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/parted
ipcop/trunk/lfs/parted
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Added Paths:
-----------
ipcop/trunk/src/patches/parted-3.1_tests-t8001-do-not-rely-on-modprobe-loop.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch
Modified: ipcop/trunk/config/rootfiles/common/parted
===================================================================
--- ipcop/trunk/config/rootfiles/common/parted 2012-11-07 15:34:04 UTC (rev
6832)
+++ ipcop/trunk/config/rootfiles/common/parted 2012-11-07 17:18:38 UTC (rev
6833)
@@ -10,11 +10,16 @@
#usr/include/parted/parted.h
#usr/include/parted/timer.h
#usr/include/parted/unit.h
+#usr/lib/libparted-fs-resize.a
+#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.0
+#usr/lib/libparted.a
#usr/lib/libparted.la
#usr/lib/libparted.so
-usr/lib/libparted.so.1
-usr/lib/libparted.so.1.0.0
-#usr/lib/libparted_pic.a
+usr/lib/libparted.so.2
+usr/lib/libparted.so.2.0.0
#usr/lib/pkgconfig/libparted.pc
usr/sbin/parted
usr/sbin/partprobe
Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted 2012-11-07 15:34:04 UTC (rev 6832)
+++ ipcop/trunk/lfs/parted 2012-11-07 17:18:38 UTC (rev 6833)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = parted
-VER = 3.0
+VER = 3.1
HOST_ARCH = all
OTHER_SRC = yes
@@ -46,7 +46,7 @@
# git clone git://git.debian.org/git/parted/parted.git
# Use release date instead of compilation date so everyone that compile has
same md5
-DATESTAMP = "30 May 2011 13:52"
+DATESTAMP = "02 March 2012 18:47"
###############################################################################
# Top-level Rules
@@ -56,7 +56,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c415e5c97f86b5ff65a2d925e5a3feb7
+$(DL_FILE)_MD5 = 5d89d64d94bcfefa9ce8f59f4b81bdcb
install : $(TARGET)
@@ -87,12 +87,9 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e 's/^DATE.*/DATE=$(DATESTAMP)/' -e
's/^HOST.*/HOST=$(SNAME)/' configure
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_get-linux-version.patch
+ # Inside our chroot, rmmod success and modprobe fail, leaving the
machine with no loop, accepted upstream, remove after 3.1
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_tests-t8001-do-not-rely-on-modprobe-loop.patch
- # 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
- # parted does not support properly --disable-fs
# reference to the fs (ext2 there) has to be removed (and hfs for ppc)
# 'parted /dev/hda mkpart primary ext2'
# syntax has to be changed to be able to create part 1 as hfs and part
3 as ext2
@@ -105,12 +102,9 @@
# For verbose compilation, add V=1
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- # make check -C tests skip non standard sector size ss-1024 ss-2048
ss-4096
- # SKIP_TESTS does not work with new test infrastructure (t-lib.sh)
- # t0280 (new t-lib.sh) and t5000 (old test-lib.sh) fail
- # t9021-maxima fail when --disable-pc98 is used
- # So support failure on tests
- -cd $(DIR_APP) && make check -C tests &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # You could run one test using make check -C tests TESTS="name of the
file in tests directory"
+ # Support failure on tests
+ -cd $(DIR_APP) && make --no-print-directory check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
Deleted: ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch
===================================================================
--- ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch 2012-11-07
15:34:04 UTC (rev 6832)
+++ ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch 2012-11-07
17:18:38 UTC (rev 6833)
@@ -1,29 +0,0 @@
-From bb4fbe2130cd85727bbaf6c71b2d27b6769aa4aa Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyer...@redhat.com>
-Date: Sun, 05 Jun 2011 16:15:31 +0000
-Subject: libparted: accommodate two-component linux version number like 3.0
-
-* libparted/arch/linux.c (_get_linux_version): Also accept 2-component
-version numbers.
-* NEWS: (Bug fixes): Mention it.
-Reported by Richard W.M. Jones.
----
-(limited to 'libparted/arch/linux.c')
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index aeaf98f..111816c 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -610,7 +610,11 @@
-
- if (uname (&uts))
- return kver = 0;
-- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3)
-+ if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) == 3)
-+ ; /* ok */
-+ else if (sscanf (uts.release, "%u.%u", &major, &minor) == 2)
-+ teeny = 0;
-+ else
- return kver = 0;
-
- return kver = KERNEL_VERSION (major, minor, teeny);
Added:
ipcop/trunk/src/patches/parted-3.1_tests-t8001-do-not-rely-on-modprobe-loop.patch
===================================================================
---
ipcop/trunk/src/patches/parted-3.1_tests-t8001-do-not-rely-on-modprobe-loop.patch
(rev 0)
+++
ipcop/trunk/src/patches/parted-3.1_tests-t8001-do-not-rely-on-modprobe-loop.patch
2012-11-07 17:18:38 UTC (rev 6833)
@@ -0,0 +1,60 @@
+Accepted upstream
+
+From 485b1be88b8c2d6ec523f68bec998c77a5dc2f5d Mon Sep 17 00:00:00 2001
+From: Gilles Espinasse <g....@free.fr>
+Date: Sun, 7 Oct 2012 15:40:23 +0200
+Subject: [PATCH] tests: t8001: do not rely on "modprobe loop"
+
+Remove 'rmmod loop' and 'modprobe loop max_part=7' commands.
+The latter command may fail after the first command has run,
+leaving the machine with no loop support.
+
+This happen on my chroot as
+- rmmod does not depend on the availability of the loop module,
+- modprobe does not work as the kernel compiled inside the chroot
+ is different from the running kernel.
+
+Instead, rely on t-lvm loop_setup_ to load the loop module, if required.
+---
+ tests/t8001-loop-blkpg.sh | 12 +++---------
+ 1 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/tests/t8001-loop-blkpg.sh b/tests/t8001-loop-blkpg.sh
+index deef18b..9afde4a 100755
+--- a/tests/t8001-loop-blkpg.sh
++++ b/tests/t8001-loop-blkpg.sh
+@@ -20,6 +20,7 @@
+
+ require_root_
+ require_udevadm_settle_
++lvm_init_root_dir_
+
+ cleanup_fn_()
+ {
+@@ -27,21 +28,14 @@ cleanup_fn_()
+ && { udevadm settle --timeout=3; losetup -d "$loopdev"; }
+ }
+
+-# If the loop module is loaded, unload it first
+-if lsmod | grep '^loop[[:space:]]'; then
+- rmmod loop || fail=1
+-fi
+-
+-# Insert loop module with max_part > 1
+-modprobe loop max_part=7 || fail=1
+-
+ # Create backing file
+ dd if=/dev/zero of=backing_file bs=1M count=4 >/dev/null 2>&1 || fail=1
+
+ # Set up loop device on top of backing file
+-loopdev=$(losetup -f --show backing_file)
++loopdev=$(loop_setup_ backing_file)
+ test -z "$loopdev" && fail=1
+
++# Skip this test if loop devices are not partitionable.
+ require_partitionable_loop_device_ $loopdev
+
+ # Expect this to succeed
+--
+1.7.2.5
+
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-11-07 15:34:04 UTC (rev
6832)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-11-07 17:18:38 UTC (rev
6833)
@@ -17,7 +17,7 @@
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,
- pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4, procps to
3.3.3, psmisc to 22.19,
+ parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.3, psmisc to 22.19,
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,
usb-modeswitch to 1.2.4, usb-modeswitch-data to 20120815, usbutils
to 006, util-linux to 2.21.2,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-11-07 15:34:04 UTC (rev 6832)
+++ ipcop/trunk/updates/2.1.0/setup 2012-11-07 17:18:38 UTC (rev 6833)
@@ -137,6 +137,7 @@
/bin/rm -f /usr/lib/libnetfilter_conntrack.so.3.2.0
/bin/rm -f /usr/lib/libnl-3.so.200.5.2
/bin/rm -f /usr/lib/libnl-genl-3.so.200.5.2
+/bin/rm -f /usr/lib/libparted.so.1.0.0
/bin/rm -f /usr/lib/libpcap.so.1.2.1
/bin/rm -f /usr/lib/libpci.so.3.1.9
/bin/rm -f /usr/lib/libpcre.so.0.0.1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
