Author: ken
Date: 2006-12-30 11:23:11 -0700 (Sat, 30 Dec 2006)
New Revision: 1736
Added:
trunk/nfs-utils/nfs-utils-1.0.10_kernel_headers_2.6.18-1.patch
trunk/strace/strace-4.5.14_kernel_headers_2.6.18-1.patch
Removed:
trunk/nfs-utils/nfs-utils-1.0.10_kernel_2.6.18-1.patch
trunk/strace/strace-4.5.14_kernel_2.6.18-1.patch
Log:
another attempt to correct the names.
Deleted: trunk/nfs-utils/nfs-utils-1.0.10_kernel_2.6.18-1.patch
===================================================================
--- trunk/nfs-utils/nfs-utils-1.0.10_kernel_2.6.18-1.patch 2006-12-30
15:26:44 UTC (rev 1735)
+++ trunk/nfs-utils/nfs-utils-1.0.10_kernel_2.6.18-1.patch 2006-12-30
18:23:11 UTC (rev 1736)
@@ -1,18 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-12-29
-Initial Package Version: 1.0.10
-Upstream Status: unknown
-Origin: From gentoo
-Description: Allows nfs-utils to compile with the sanitised headers from
linux-2.6.18 which omit UTS_RELEASE
-
---- nfs-utils-1.0.10/tools/getkversion/getkversion.c.orig 2006-12-29
23:34:16.000000000 +0000
-+++ nfs-utils-1.0.10/tools/getkversion/getkversion.c 2006-12-29
23:34:38.000000000 +0000
-@@ -14,6 +14,8 @@
- int
- main(void) /* This is for Dan Popp ;) */
- {
-+#ifdef UTS_RELEASE
- printf("%s\n", UTS_RELEASE);
-+#endif
- return 0;
- }
Copied: trunk/nfs-utils/nfs-utils-1.0.10_kernel_headers_2.6.18-1.patch (from
rev 1735, trunk/nfs-utils/nfs-utils-1.0.10_kernel_2.6.18-1.patch)
===================================================================
--- trunk/nfs-utils/nfs-utils-1.0.10_kernel_headers_2.6.18-1.patch
(rev 0)
+++ trunk/nfs-utils/nfs-utils-1.0.10_kernel_headers_2.6.18-1.patch
2006-12-30 18:23:11 UTC (rev 1736)
@@ -0,0 +1,18 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2006-12-29
+Initial Package Version: 1.0.10
+Upstream Status: unknown
+Origin: From gentoo
+Description: Allows nfs-utils to compile with the sanitised headers from
linux-2.6.18 which omit UTS_RELEASE
+
+--- nfs-utils-1.0.10/tools/getkversion/getkversion.c.orig 2006-12-29
23:34:16.000000000 +0000
++++ nfs-utils-1.0.10/tools/getkversion/getkversion.c 2006-12-29
23:34:38.000000000 +0000
+@@ -14,6 +14,8 @@
+ int
+ main(void) /* This is for Dan Popp ;) */
+ {
++#ifdef UTS_RELEASE
+ printf("%s\n", UTS_RELEASE);
++#endif
+ return 0;
+ }
Deleted: trunk/strace/strace-4.5.14_kernel_2.6.18-1.patch
===================================================================
--- trunk/strace/strace-4.5.14_kernel_2.6.18-1.patch 2006-12-30 15:26:44 UTC
(rev 1735)
+++ trunk/strace/strace-4.5.14_kernel_2.6.18-1.patch 2006-12-30 18:23:11 UTC
(rev 1736)
@@ -1,37 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-12-29
-Initial Package Version: 4.5.14
-Upstream Status: applied
-Origin: Jakub Jelinek
-Description: Allows strace to compile against 2.6.18 kernel headers
-
---- strace-4.5.14/system.c.orig 2006-12-29 22:52:43.000000000 +0000
-+++ strace-4.5.14/system.c 2006-12-29 22:53:16.000000000 +0000
-@@ -27,7 +27,7 @@
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-- * $Id: system.c,v 1.39 2006/01/12 21:21:06 roland Exp $
-+ * $Id: system.c,v 1.40 2006/12/04 13:48:10 ldv Exp $
- */
-
- #include "defs.h"
-@@ -1574,6 +1574,8 @@
- #endif
-
- #ifdef LINUX
-+/* Linux 2.6.18+ headers removed CTL_PROC enum. */
-+# define CTL_PROC 4
- static const struct xlat sysctl_root[] = {
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
-@@ -1582,6 +1584,9 @@
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
-+ { CTL_BUS, "CTL_BUS" },
-+ { CTL_ABI, "CTL_ABI" },
-+ { CTL_CPU, "CTL_CPU" },
- { 0, NULL }
- };
-
Copied: trunk/strace/strace-4.5.14_kernel_headers_2.6.18-1.patch (from rev
1735, trunk/strace/strace-4.5.14_kernel_2.6.18-1.patch)
===================================================================
--- trunk/strace/strace-4.5.14_kernel_headers_2.6.18-1.patch
(rev 0)
+++ trunk/strace/strace-4.5.14_kernel_headers_2.6.18-1.patch 2006-12-30
18:23:11 UTC (rev 1736)
@@ -0,0 +1,37 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2006-12-29
+Initial Package Version: 4.5.14
+Upstream Status: applied
+Origin: Jakub Jelinek
+Description: Allows strace to compile against 2.6.18 kernel headers
+
+--- strace-4.5.14/system.c.orig 2006-12-29 22:52:43.000000000 +0000
++++ strace-4.5.14/system.c 2006-12-29 22:53:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+- * $Id: system.c,v 1.39 2006/01/12 21:21:06 roland Exp $
++ * $Id: system.c,v 1.40 2006/12/04 13:48:10 ldv Exp $
+ */
+
+ #include "defs.h"
+@@ -1574,6 +1574,8 @@
+ #endif
+
+ #ifdef LINUX
++/* Linux 2.6.18+ headers removed CTL_PROC enum. */
++# define CTL_PROC 4
+ static const struct xlat sysctl_root[] = {
+ { CTL_KERN, "CTL_KERN" },
+ { CTL_VM, "CTL_VM" },
+@@ -1582,6 +1584,9 @@
+ { CTL_FS, "CTL_FS" },
+ { CTL_DEBUG, "CTL_DEBUG" },
+ { CTL_DEV, "CTL_DEV" },
++ { CTL_BUS, "CTL_BUS" },
++ { CTL_ABI, "CTL_ABI" },
++ { CTL_CPU, "CTL_CPU" },
+ { 0, NULL }
+ };
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
