- 2 patches merged into one

Changed files:
    util-linux-2.10o-rawio.patch -> 1.4
    util-linux-raw.patch -> 1.3

diff --git a/util-linux-2.10o-rawio.patch b/util-linux-2.10o-rawio.patch
deleted file mode 100644 (file)
index 2978f71..0000000
--- a/util-linux-2.10o-rawio.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN util-linux-2.10q.org/configure util-linux-2.10q/configure
---- util-linux-2.10q.org/configure     Tue Nov 21 22:08:46 2000
-+++ util-linux-2.10q/configure Tue Nov 21 22:10:35 2000
-@@ -32,6 +32,7 @@
- # 11. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
- # 12. For hwclock.c: does struct tm have a field tm_gmtoff?
- # 13. For nfsmount: does the output of rpcgen compile?
-+# 14. For raw.c: does <sys/raw.h> exist?
- 
- rm -f make_include defines.h
- 
-@@ -558,3 +559,11 @@
- fi
- rm -f conftest conftestx.c conftestl.c conftest.h conftest.x conferrs
- rm -f conftestx.o conftestl.o
-+
-+#
-+# 14. For raw.c: does <sys/raw.h> exist?
-+#
-+if ./testincl "sys/raw.h"; then
-+       echo "ADD_RAW=yes" >> make_include
-+fi
-+

diff --git a/util-linux-raw.patch b/util-linux-raw.patch
index 2f8b8f3da28448b3c79cc9db1e47d84eb078eb9f..30fc13ddee433d39febab0e62c70e2e285f2eb90 100644 (file)
--- a/util-linux-raw.patch
+++ b/util-linux-raw.patch
@@ -18,3 +18,27 @@
  
  char *        progname;
  int   do_query = 0;
+
+--- util-linux-2.10q.org/configure      Tue Nov 21 22:08:46 2000
++++ util-linux-2.10q/configure  Tue Nov 21 22:10:35 2000
+@@ -32,6 +32,7 @@
+ # 11. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
+ # 12. For hwclock.c: does struct tm have a field tm_gmtoff?
+ # 13. For nfsmount: does the output of rpcgen compile?
++# 14. For raw.c: does <sys/raw.h> exist?
+
+ rm -f make_include defines.h
+
+@@ -558,3 +559,11 @@
+ fi
+ rm -f conftest conftestx.c conftestl.c conftest.h conftest.x conferrs
+ rm -f conftestx.o conftestl.o
++
++#
++# 14. For raw.c: does <sys/raw.h> exist?
++#
++if ./testincl "sys/raw.h"; then
++       echo "ADD_RAW=yes" >> make_include
++fi
++
+