mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
[PATCH] merge tdb into the build process.
This commit is contained in:
parent
8e41d35d76
commit
a2822451e2
15
Makefile
15
Makefile
@ -113,17 +113,23 @@ all: $(LIBC) $(ROOT)
|
|||||||
$(ARCH_LIB_OBJS) :
|
$(ARCH_LIB_OBJS) :
|
||||||
$(MAKE) -C klibc
|
$(MAKE) -C klibc
|
||||||
|
|
||||||
|
LIBSYSFS = libsysfs/libsysfs.a
|
||||||
|
TDB = tdb/tdb.o tdb/spinlock.o
|
||||||
|
|
||||||
OBJS = udev.o \
|
OBJS = udev.o \
|
||||||
udev-add.o \
|
udev-add.o \
|
||||||
udev-remove.o \
|
udev-remove.o \
|
||||||
|
udevdb.o \
|
||||||
logging.o \
|
logging.o \
|
||||||
namedev.o
|
namedev.o \
|
||||||
|
$(TDB)
|
||||||
LIBSYSFS = libsysfs/libsysfs.a
|
|
||||||
|
|
||||||
libsysfs/libsysfs.a:
|
libsysfs/libsysfs.a:
|
||||||
$(MAKE) -C libsysfs
|
$(MAKE) -C libsysfs
|
||||||
|
|
||||||
|
tdb/tdb.o:
|
||||||
|
$(MAKE) -C tdb
|
||||||
|
|
||||||
# header files automatically generated
|
# header files automatically generated
|
||||||
GEN_HEADERS = udev_version.h
|
GEN_HEADERS = udev_version.h
|
||||||
|
|
||||||
@ -132,7 +138,7 @@ udev_version.h:
|
|||||||
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
|
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
|
||||||
|
|
||||||
|
|
||||||
$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS)
|
$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
|
||||||
$(MAKE) -C libsysfs
|
$(MAKE) -C libsysfs
|
||||||
$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
|
$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
|
||||||
$(STRIPCMD) $(ROOT)
|
$(STRIPCMD) $(ROOT)
|
||||||
@ -143,6 +149,7 @@ clean:
|
|||||||
-rm -f core $(ROOT) $(GEN_HEADERS)
|
-rm -f core $(ROOT) $(GEN_HEADERS)
|
||||||
$(MAKE) -C klibc clean
|
$(MAKE) -C klibc clean
|
||||||
$(MAKE) -C libsysfs clean
|
$(MAKE) -C libsysfs clean
|
||||||
|
$(MAKE) -C tdb clean
|
||||||
|
|
||||||
DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS )
|
DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS )
|
||||||
DISTDIR := $(RELEASE_NAME)
|
DISTDIR := $(RELEASE_NAME)
|
||||||
|
@ -136,6 +136,7 @@ int udev_add_device(char *device, char *subsystem)
|
|||||||
{
|
{
|
||||||
struct sysfs_class_device *class_dev;
|
struct sysfs_class_device *class_dev;
|
||||||
struct device_attr attr;
|
struct device_attr attr;
|
||||||
|
struct udevice dbdev;
|
||||||
int major;
|
int major;
|
||||||
int minor;
|
int minor;
|
||||||
char type;
|
char type;
|
||||||
|
3
udevdb.c
3
udevdb.c
@ -7,9 +7,10 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
#include "udevdb.h"
|
#include "udevdb.h"
|
||||||
#include "tdb.h"
|
#include "tdb/tdb.h"
|
||||||
|
|
||||||
static TDB_CONTEXT *busdb;
|
static TDB_CONTEXT *busdb;
|
||||||
static TDB_CONTEXT *classdb;
|
static TDB_CONTEXT *classdb;
|
||||||
|
6
udevdb.h
6
udevdb.h
@ -7,9 +7,9 @@
|
|||||||
#include "namedev.h"
|
#include "namedev.h"
|
||||||
#include "udev.h"
|
#include "udev.h"
|
||||||
|
|
||||||
#define BUS_DB "/home/stekloff/src/udev-0.2/busdb.tdb"
|
#define BUS_DB "/home/greg/src/udev/busdb.tdb"
|
||||||
#define CLASS_DB "/home/stekloff/src/udev-0.2/classdb.tdb"
|
#define CLASS_DB "/home/greg/src/udev/classdb.tdb"
|
||||||
#define NAME_DB "/home/stekloff/src/udev-0.2/namedb.tdb"
|
#define NAME_DB "/home/greg/src/udev/namedb.tdb"
|
||||||
|
|
||||||
#define PATH_SIZE 256
|
#define PATH_SIZE 256
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user