summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-03-07 17:17:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-15 13:20:40 +0000
commit2fd70227b2835d441e0e086c6bb733a86b395d5c (patch)
treed3e74b01fcbab1321483ec058f4f375aadd0f005 /meta/recipes-core
parent9d9c68e3536387150e3ce7261f4770576e724dd9 (diff)
downloadpoky-2fd70227b2835d441e0e086c6bb733a86b395d5c.tar.gz
util-linux: remove unused files from files directory
(From OE-Core rev: 05d9c6646d4d5bb174e42c3a6e36bcdad1657da3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/files/debian-bug392236.patch203
-rw-r--r--meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff12
-rw-r--r--meta/recipes-core/util-linux/files/fix-make-c.patch41
-rw-r--r--meta/recipes-core/util-linux/files/gcc34.patch23
-rw-r--r--meta/recipes-core/util-linux/files/glibc-fix.patch22
-rw-r--r--meta/recipes-core/util-linux/files/optional-uuid.patch55
-rw-r--r--meta/recipes-core/util-linux/files/umount.diff19
-rw-r--r--meta/recipes-core/util-linux/files/uuid.patch22
8 files changed, 0 insertions, 397 deletions
diff --git a/meta/recipes-core/util-linux/files/debian-bug392236.patch b/meta/recipes-core/util-linux/files/debian-bug392236.patch
deleted file mode 100644
index fcd2046e34..0000000000
--- a/meta/recipes-core/util-linux/files/debian-bug392236.patch
+++ /dev/null
@@ -1,203 +0,0 @@
1Index: util-linux-2.12r/fdisk/llseek.c
2===================================================================
3--- util-linux-2.12r.orig/fdisk/llseek.c 2003-07-13 23:13:33.000000000 +0200
4+++ util-linux-2.12r/fdisk/llseek.c 2007-04-04 19:01:14.000000000 +0200
5@@ -14,30 +14,23 @@
6
7 #ifdef __linux__
8
9-#ifdef HAVE_LLSEEK
10-#include <syscall.h>
11-
12-#else /* HAVE_LLSEEK */
13+#include <sys/syscall.h>
14+#ifndef HAVE_LLSEEK
15
16 #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
17
18 #define my_llseek lseek
19
20 #else
21-#include <linux/unistd.h> /* for __NR__llseek */
22-
23-static int _llseek (unsigned int, unsigned long,
24- unsigned long, long long *, unsigned int);
25
26-#ifdef __NR__llseek
27+#ifdef SYS__llseek
28
29-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
30- unsigned long, offset_low,long long *,result,
31- unsigned int, origin)
32+#define _llseek(fd, offset_high, offset_low, result, origin) \
33+ syscall(SYS__llseek, fd, offset_high, offset_low, result, origin)
34
35 #else
36
37-/* no __NR__llseek on compilation machine - might give it explicitly */
38+/* no SYS__llseek on compilation machine - might give it explicitly */
39 static int _llseek (unsigned int fd, unsigned long oh,
40 unsigned long ol, long long *result,
41 unsigned int origin) {
42Index: util-linux-2.12r/fdisk/sfdisk.c
43===================================================================
44--- util-linux-2.12r.orig/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100
45+++ util-linux-2.12r/fdisk/sfdisk.c 2007-04-04 19:01:14.000000000 +0200
46@@ -48,7 +48,7 @@
47 #include <sys/ioctl.h>
48 #include <sys/stat.h>
49 #include <sys/utsname.h>
50-#include <linux/unistd.h> /* _syscall */
51+#include <sys/syscall.h>
52 #include "nls.h"
53 #include "common.h"
54
55@@ -177,9 +177,8 @@
56 #endif
57
58 #ifndef use_lseek
59-static __attribute__used
60-_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
61- loff_t *, res, unsigned int, wh);
62+#define _llseek(fd, hi, lo, res, wh) \
63+ syscall(SYS__llseek, fd, hi, lo, res, wh)
64 #endif
65
66 static int
67Index: util-linux-2.12r/lib/my_reboot.c
68===================================================================
69--- util-linux-2.12r.orig/lib/my_reboot.c 1999-07-09 04:56:36.000000000 +0200
70+++ util-linux-2.12r/lib/my_reboot.c 2007-04-04 19:01:14.000000000 +0200
71@@ -23,10 +23,11 @@
72 #else /* no USE_LIBC */
73
74 /* direct syscall version */
75-#include <linux/unistd.h>
76+#include <sys/syscall.h>
77
78-#ifdef _syscall3
79-_syscall3(int, reboot, int, magic, int, magic_too, int, cmd);
80+#ifdef SYS_reboot
81+#define reboot(magic, magic2, cmd) \
82+ syscall(SYS_reboot, magic, magic2, cmd)
83 #else
84 /* Let us hope we have a 3-argument reboot here */
85 extern int reboot(int, int, int);
86Index: util-linux-2.12r/misc-utils/setterm.c
87===================================================================
88--- util-linux-2.12r.orig/misc-utils/setterm.c 2003-10-17 18:17:51.000000000 +0200
89+++ util-linux-2.12r/misc-utils/setterm.c 2007-04-04 19:01:14.000000000 +0200
90@@ -119,14 +119,13 @@
91
92 #if __GNU_LIBRARY__ < 5
93 #ifndef __alpha__
94-# include <linux/unistd.h>
95-#define __NR_klogctl __NR_syslog
96-_syscall3(int, klogctl, int, type, char*, buf, int, len);
97+# include <sys/syscall.h>
98+#define klogctl(type, buf, len) \
99+ syscall(SYS_syslog, type, buf, len)
100 #else /* __alpha__ */
101 #define klogctl syslog
102 #endif
103 #endif
104-extern int klogctl(int type, char *buf, int len);
105
106 /* Constants. */
107
108Index: util-linux-2.12r/mount/swapon.c
109===================================================================
110--- util-linux-2.12r.orig/mount/swapon.c 2004-12-22 10:50:19.000000000 +0100
111+++ util-linux-2.12r/mount/swapon.c 2007-04-04 19:01:14.000000000 +0200
112@@ -82,11 +82,11 @@
113 #else
114 /* We want a swapon with two args, but have an old libc.
115 Build the kernel call by hand. */
116-#include <linux/unistd.h>
117-static
118-_syscall2(int, swapon, const char *, path, int, flags);
119-static
120-_syscall1(int, swapoff, const char *, path);
121+#include <sys/syscall.h>
122+#define swapon(path, flags) \
123+ syscall(SYS_swapon, path, flags)
124+#define swapoff(path) \
125+ syscall(SYS_swapoff, path)
126 #endif
127 #else
128 /* just do as libc says */
129Index: util-linux-2.12r/mount/umount.c
130===================================================================
131--- util-linux-2.12r.orig/mount/umount.c 2007-04-04 19:01:14.000000000 +0200
132+++ util-linux-2.12r/mount/umount.c 2007-04-04 19:02:22.000000000 +0200
133@@ -37,14 +37,13 @@
134 #else /* MNT_FORCE */
135
136 /* Does the present kernel source know about umount2? */
137-#include <linux/unistd.h>
138-#ifdef __NR_umount2
139+#include <sys/syscall.h>
140+#ifdef SYS_umount2
141
142-int umount2(const char *path, int flags);
143+#define umount2(path, flags) \
144+ syscall(SYS_umount2, path, flags)
145
146-_syscall2(int, umount2, const char *, path, int, flags);
147-
148-#else /* __NR_umount2 */
149+#else /* SYS_umount2 */
150
151 static int
152 umount2(const char *path, int flags) {
153@@ -52,7 +51,7 @@
154 errno = ENOSYS;
155 return -1;
156 }
157-#endif /* __NR_umount2 */
158+#endif /* SYS_umount2 */
159
160 #if !defined(MNT_FORCE)
161 /* dare not try to include <linux/mount.h> -- lots of errors */
162Index: util-linux-2.12r/partx/partx.c
163===================================================================
164--- util-linux-2.12r.orig/partx/partx.c 2004-08-23 22:13:27.000000000 +0200
165+++ util-linux-2.12r/partx/partx.c 2007-04-04 19:01:14.000000000 +0200
166@@ -338,10 +338,9 @@
167 #endif
168
169 #ifdef NEED__llseek
170-#include <linux/unistd.h> /* _syscall */
171-static
172-_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
173- long long *, res, uint, wh);
174+#include <sys/syscall.h>
175+#define _llseek(fd, hi, lo, res, wh) \
176+ syscall(SYS__llseek, fd, hi, lo, res, wh)
177 #endif
178
179 static int
180Index: util-linux-2.12r/sys-utils/dmesg.c
181===================================================================
182--- util-linux-2.12r.orig/sys-utils/dmesg.c 2004-05-04 18:38:12.000000000 +0200
183+++ util-linux-2.12r/sys-utils/dmesg.c 2007-04-04 19:01:14.000000000 +0200
184@@ -29,7 +29,7 @@
185 * Only function 3 is allowed to non-root processes.
186 */
187
188-#include <linux/unistd.h>
189+#include <sys/syscall.h>
190 #include <stdio.h>
191 #include <getopt.h>
192 #include <stdlib.h>
193@@ -38,8 +38,8 @@
194 #if __GNU_LIBRARY__ < 5
195
196 #ifndef __alpha__
197-# define __NR_klogctl __NR_syslog
198- static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
199+# define klogctl(type, b, len) \
200+ syscall(SYS_syslog, type, b, len)
201 #else /* __alpha__ */
202 #define klogctl syslog
203 #endif
diff --git a/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff b/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
deleted file mode 100644
index e6f82b5b46..0000000000
--- a/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
+++ /dev/null
@@ -1,12 +0,0 @@
1--- util-linux-2.12r/fdisk/fdiskbsdlabel.h.orig 2006-01-21 23:53:51.000000000 +0100
2+++ util-linux-2.12r/fdisk/fdiskbsdlabel.h 2006-01-21 23:54:35.000000000 +0100
3@@ -52,6 +52,9 @@
4 #elif defined (__s390__) || defined (__s390x__)
5 #define BSD_LABELSECTOR 1
6 #define BSD_LABELOFFSET 0
7+#elif defined (__thumb__)
8+#define BSD_LABELSECTOR 1
9+#define BSD_LABELOFFSET 0
10 #else
11 #error unknown architecture
12 #endif
diff --git a/meta/recipes-core/util-linux/files/fix-make-c.patch b/meta/recipes-core/util-linux/files/fix-make-c.patch
deleted file mode 100644
index bf1082e85c..0000000000
--- a/meta/recipes-core/util-linux/files/fix-make-c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From: Karel Zak <kzak@redhat.com>
2Date: Mon, 11 May 2009 09:49:00 +0000 (+0200)
3Subject: build-sys: fix "make -C" bug
4X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d
5
6build-sys: fix "make -C" bug
7
8Running:
9
10./configure --with-fsprobe=builtin
11make -C mount mount
12
13causes the following error:
14
15gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -include ../config.h
16-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\"
17-fsigned-char -I../libs/blkid/src -g -O2 -MT mount-setproctitle.o
18-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o
19`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv
20-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po
21make -C
22make: option requires an argument -- 'C'
23Usage: make [options] [target] ...
24...
25
26Reported-by: Matthew Burgess <matthew@linuxfromscratch.org>
27Signed-off-by: Karel Zak <kzak@redhat.com>
28---
29
30diff --git a/config/include-Makefile.am b/config/include-Makefile.am
31index b42a0c3..d5da619 100644
32--- a/config/include-Makefile.am
33+++ b/config/include-Makefile.am
34@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS)
35 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
36 #
37 ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
38+ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
39 ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
40
41 $(ul_libblkid_la):
diff --git a/meta/recipes-core/util-linux/files/gcc34.patch b/meta/recipes-core/util-linux/files/gcc34.patch
deleted file mode 100644
index 8c4a20cdca..0000000000
--- a/meta/recipes-core/util-linux/files/gcc34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- util-linux-2.12o/disk-utils/fsck.cramfs.c~gcc34
7+++ util-linux-2.12o/disk-utils/fsck.cramfs.c
8@@ -77,15 +77,7 @@
9 #define PAD_SIZE 512
10
11 #include <asm/page.h>
12-#ifdef PAGE_SIZE
13-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
14-#elif defined __ia64__
15-#define PAGE_CACHE_SIZE (16384)
16-#elif defined __alpha__
17-#define PAGE_CACHE_SIZE (8192)
18-#else
19 #define PAGE_CACHE_SIZE (4096)
20-#endif
21
22 /* Guarantee access to at least 8kB at a time */
23 #define ROMBUFFER_BITS 13
diff --git a/meta/recipes-core/util-linux/files/glibc-fix.patch b/meta/recipes-core/util-linux/files/glibc-fix.patch
deleted file mode 100644
index 6d0c2fcefa..0000000000
--- a/meta/recipes-core/util-linux/files/glibc-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1--- /tmp/cmos.c 2006-11-21 11:38:55.000000000 +0100
2+++ util-linux-2.12r/hwclock/cmos.c 2006-11-21 11:41:45.458554000 +0100
3@@ -46,15 +46,16 @@
4
5 #include <unistd.h> /* for geteuid() */
6 #include <fcntl.h> /* for O_RDWR */
7+#include <linux/version.h>
8 #include <errno.h>
9 #include "../defines.h" /* for HAVE_sys_io_h */
10 #include "nls.h"
11
12 #if defined(__i386__)
13-#ifdef HAVE_sys_io_h
14-#include <sys/io.h>
15+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
16+#include <asm/io.h>
17 #else
18-#include <asm/io.h> /* for inb, outb */
19+#include <sys/io.h> /* for inb, outb */
20 #endif
21 #elif defined(__alpha__)
22 /* <asm/io.h> fails to compile, probably because of u8 etc */
diff --git a/meta/recipes-core/util-linux/files/optional-uuid.patch b/meta/recipes-core/util-linux/files/optional-uuid.patch
deleted file mode 100644
index 2d0ea43cd2..0000000000
--- a/meta/recipes-core/util-linux/files/optional-uuid.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From: Karel Zak <kzak@redhat.com>
2Date: Tue, 12 May 2009 19:22:19 +0000 (+0200)
3Subject: blkid: make libuuid optional
4X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed
5
6blkid: make libuuid optional
7
8read.c:28:23: error: uuid/uuid.h: No such file or directory
9make[3]: *** [read.lo] Error 1
10make[3]: *** Waiting for unfinished jobs....
11
12Reported-by: Olaf <mailinglists@ban-solms.de>
13Signed-off-by: Karel Zak <kzak@redhat.com>
14---
15
16diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
17index 2e59218..9091736 100644
18--- a/libs/blkid/src/config.c
19+++ b/libs/blkid/src/config.c
20@@ -24,9 +24,6 @@
21 #include <errno.h>
22 #endif
23 #include <stdint.h>
24-#ifdef HAVE_LIBUUID
25-#include <uuid/uuid.h>
26-#endif
27 #include <stdarg.h>
28
29 #include "blkdev.h"
30diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
31index a9c9fba..f0ae126 100644
32--- a/libs/blkid/src/evaluate.c
33+++ b/libs/blkid/src/evaluate.c
34@@ -27,9 +27,6 @@
35 #include <errno.h>
36 #endif
37 #include <stdint.h>
38-#ifdef HAVE_LIBUUID
39-#include <uuid/uuid.h>
40-#endif
41 #include <stdarg.h>
42
43 #include "pathnames.h"
44diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
45index 4163874..b5e9cd0 100644
46--- a/libs/blkid/src/read.c
47+++ b/libs/blkid/src/read.c
48@@ -25,7 +25,6 @@
49 #endif
50
51 #include "blkidP.h"
52-#include "uuid/uuid.h"
53
54 #ifdef HAVE_STRTOULL
55 #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */
diff --git a/meta/recipes-core/util-linux/files/umount.diff b/meta/recipes-core/util-linux/files/umount.diff
deleted file mode 100644
index 78330789ef..0000000000
--- a/meta/recipes-core/util-linux/files/umount.diff
+++ /dev/null
@@ -1,19 +0,0 @@
1*** util-linux-2.12r/mount/umount.c.orig 2005-09-10 20:07:38.000000000 +0200
2--- util-linux-2.12r/mount/umount.c 2006-06-07 21:14:04.000000000 +0200
3***************
4*** 40,46 ****
5 #include <linux/unistd.h>
6 #ifdef __NR_umount2
7
8! static int umount2(const char *path, int flags);
9
10 _syscall2(int, umount2, const char *, path, int, flags);
11
12--- 40,46 ----
13 #include <linux/unistd.h>
14 #ifdef __NR_umount2
15
16! int umount2(const char *path, int flags);
17
18 _syscall2(int, umount2, const char *, path, int, flags);
19
diff --git a/meta/recipes-core/util-linux/files/uuid.patch b/meta/recipes-core/util-linux/files/uuid.patch
deleted file mode 100644
index 3208e0a865..0000000000
--- a/meta/recipes-core/util-linux/files/uuid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: util-linux-ng-2.15/libs/blkid/src/Makefile.am
2===================================================================
3--- util-linux-ng-2.15.orig/libs/blkid/src/Makefile.am 2009-05-19 17:01:15.000000000 +0100
4+++ util-linux-ng-2.15/libs/blkid/src/Makefile.am 2009-05-19 17:08:11.000000000 +0100
5@@ -7,7 +7,7 @@
6 common_ldadd =
7
8 if HAVE_UUID
9-common_ldadd += -luuid #TODO $(UUID_LIBS)
10+common_ldadd += -luuid
11 endif
12
13 # includes
14@@ -26,7 +26,7 @@
15 $(top_srcdir)/lib/md5.c
16
17 libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
18-libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
19+libblkid_la_DEPENDENCIES = probers/libblkid_probers.la blkid.sym
20
21 # TODO: for unknown reason "make distcheck" requires
22 # full path to the version script
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-03 11:19:09 +0000