Revision: 6357
http://ipcop.svn.sourceforge.net/ipcop/?rev=6357&view=rev
Author: owes
Date: 2012-02-17 20:03:48 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Patch (from upstream) for libparted to be able to work with linux 3.0.
1 down, (probably) several 1000 to go.....
Modified Paths:
--------------
ipcop/trunk/lfs/parted
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Added Paths:
-----------
ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch
Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted 2012-02-17 13:08:32 UTC (rev 6356)
+++ ipcop/trunk/lfs/parted 2012-02-17 20:03:48 UTC (rev 6357)
@@ -87,6 +87,7 @@
@$(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
# mkpartfs ext2 is not used because it is not similary advanced as
e2fsprogs
# it may even been deprecated in futur versions
Added: ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch
===================================================================
--- ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch
(rev 0)
+++ ipcop/trunk/src/patches/parted-3.0_get-linux-version.patch 2012-02-17
20:03:48 UTC (rev 6357)
@@ -0,0 +1,29 @@
+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);
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-17 13:08:32 UTC
(rev 6356)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-17 20:03:48 UTC
(rev 6357)
@@ -17,6 +17,9 @@
/lib/modules/3.0-1/extra/solos-pci.ko.gz
/lib/modules/3.0-1/kernel
##
+## fixes needed for linux 3.0
+/usr/lib/libparted.so.1.0.0
+##
## shadow-4.1.5
/bin/login
/bin/passwd
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
