diff --git a/packages/libcap/libcap.mk b/packages/libcap/libcap.mk index 500641a..92f6ee1 100644 --- a/packages/libcap/libcap.mk +++ b/packages/libcap/libcap.mk @@ -6,7 +6,7 @@ LIBCAP_TAR = $(CACHE)/libcap-$(LIBCAP_VERSION).tar.gz LIBCAP_URL = http://ftp.debian.org/debian/pool/main/libc/libcap2/libcap2_$(LIBCAP_VERSION).orig.tar.gz LIBCAP_SRCDIR = $(LIBCAP_BUILDDIR)/libcap-$(LIBCAP_VERSION) -LIBCAP_LDOPTS = -L$(CURDIR)/$(LIBCAP_SRCDIR)/libcap +LIBCAP_LDFLAGS = -L$(CURDIR)/$(LIBCAP_SRCDIR)/libcap LIBCAP_CFLAGS = -I$(CURDIR)/$(LIBCAP_SRCDIR)/libcap/include $(LIBCAP_TAR): diff --git a/packages/lxc/lxc.mk b/packages/lxc/lxc.mk index cfdcec1..5d37df2 100644 --- a/packages/lxc/lxc.mk +++ b/packages/lxc/lxc.mk @@ -26,12 +26,13 @@ lxc-source: $(LXC_BUILDDIR)/source $(LXC_BUILDDIR)/source: $(LXC_TAR) mkdir -p $(LXC_BUILDDIR) zcat $(LXC_TAR) | (cd $(LXC_BUILDDIR) && tar xf -) + cp packages/lxc/utmp.c $(LXC_SRCDIR)/src/lxc/ touch $@ lxc-build: $(LXC_BUILDDIR)/built $(LXC_BUILDDIR)/built: $(LXC_BUILDDIR)/source libcap-build cd $(LXC_SRCDIR) && CFLAGS="$(LIBCAP_CFLAGS)" LDFLAGS="$(LIBCAP_LDFLAGS)" ./configure $(CONFIG_XCOMPILE_FLAGS) - $(MAKE) -C $(LXC_SRCDIR) LDFLAGS="-R /opt/lxc/lib" + LD_RUN_PATH=/opt/lxc/lib $(MAKE) -C $(LXC_SRCDIR) touch $@ lxc-install: lxc-build diff --git a/packages/lxc/utmp.c b/packages/lxc/utmp.c new file mode 100644 index 0000000..5b51ba2 --- /dev/null +++ b/packages/lxc/utmp.c @@ -0,0 +1,11 @@ +/* Detecting runlevels from utmp is straight up bullshit, you. + + 1. runit doesn't have run levels + 2. dbtl doesn't write utmp + 3. even if it did, it doesn't have the glibc functions this code + wants +*/ +int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr, + struct lxc_handler *handler) { + return 0; +}