diff options
| author | Matt Wilson <msw@redhat.com> | 2001-12-11 20:04:46 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-12-11 20:04:46 +0000 |
| commit | 9fc68ae4237eeab93c0c58e4ee6cbc753cc701b0 (patch) | |
| tree | 070173a44e9190ab9754a6a26fc4a41a42750b87 /loader | |
| parent | 39dcaa35e13f2efc08d905aada02f68905b23369 (diff) | |
| download | anaconda-9fc68ae4237eeab93c0c58e4ee6cbc753cc701b0.tar.gz anaconda-9fc68ae4237eeab93c0c58e4ee6cbc753cc701b0.tar.xz anaconda-9fc68ae4237eeab93c0c58e4ee6cbc753cc701b0.zip | |
anaconda.spec.in: require modutils-devel
isys/Makefile: don't build any of the stuff in modutils/
loader/Makefile: link against the system modutils
loader/dietstubs.c: implement __rawmemchr
loader/minilibc.h: add declaration to make things build with
current kernel headers
po/Makefile: no more gnome-map
po/anaconda.pot: regenerate
utils/Makefile link against the system modutils
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/Makefile | 4 | ||||
| -rw-r--r-- | loader/dietstubs.c | 6 | ||||
| -rw-r--r-- | loader/minilibc.h | 12 |
3 files changed, 19 insertions, 3 deletions
diff --git a/loader/Makefile b/loader/Makefile index 4315a1d02..69b56d370 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -24,9 +24,7 @@ PCMCIAOBJS = pcmcia.o $(NETOBJS) OPTS = -Os DEBUG = -g -MODULELINKAGE :=../isys/modutils/insmod/libmodutils.a \ - ../isys/modutils/util/libutil.a \ - ../isys/modutils/obj/libobj.a +MODULELINKAGE :=-lmodutils -lmodutilutil -lmodutilobj COPTS = $(DEBUG) -Wall -DVERSION='"$(VERSION)"' diff --git a/loader/dietstubs.c b/loader/dietstubs.c index 385afecf2..0c2f8cacc 100644 --- a/loader/dietstubs.c +++ b/loader/dietstubs.c @@ -160,3 +160,9 @@ void warn(char * format, ...) { int pwrite(int fd, const void *buf, size_t count, off_t offset) { return __pwrite(fd, buf, count, offset); } + +void * __rawmemchr (void* s, int c) { + while (*(char *)s != c) + s++; + return s; +} diff --git a/loader/minilibc.h b/loader/minilibc.h index c774e92b2..32bf3307a 100644 --- a/loader/minilibc.h +++ b/loader/minilibc.h @@ -20,6 +20,18 @@ extern char ** _environ; extern int errno; +/* from /usr/include/bits/sigset.h */ +/* A `sigset_t' has a bit for each signal. */ + +#define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) +typedef struct + { + unsigned long int __val[_SIGSET_NWORDS]; + } __sigset_t; + +/* from /usr/include/signal.h */ +typedef __sigset_t sigset_t; + /* Aieee, gcc 2.95+ creates a stub for posix_types.h on i386 which brings glibc headers in and thus makes __FD_SET etc. not defined with 2.3+ kernels. */ #define _FEATURES_H 1 |