From d77656116191a166ed0477cf16830480a2406fc5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 8 Jan 2014 12:58:44 +0100 Subject: fix prefix --- mk/pkg-bottom.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 0358c0382..95ee31593 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -151,7 +151,8 @@ endif done @for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \ [[ -e $$a ]] || continue; \ - sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \ + sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \ + -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \ ${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \ done ifeq (,$(filter noremove,${PKG_OPTS})) -- cgit v1.2.3 From ebf9a6961641072a526b027b8dd42831440397ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Jan 2014 19:16:02 +0100 Subject: fix xbmc build --- mk/package.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index 01db36030..24ef42594 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -18,6 +18,7 @@ AUTOTOOL_ENV+= AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \ CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ M4='${STAGING_HOST_DIR}/usr/bin/m4' \ + LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ PATH='${TARGET_PATH}' \ CONFIG_SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ @@ -47,6 +48,7 @@ INSTALL_TARGET?= install MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ + LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ -- cgit v1.2.3 From 4e41871d718048a3ef18dfe10607745cc94b7fc4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 16 Jan 2014 07:27:47 +0100 Subject: good bye cris, hardware is eol, latest toolchain is broken, qemu emulator support is bad, kernel needs patches for serial and network --- mk/build.mk | 6 +++--- mk/modules.mk | 2 -- mk/rootfs.mk | 4 ---- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 986d66cd7..9242cc27a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -579,7 +579,7 @@ release: bulk: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -599,7 +599,7 @@ bulk: bulkall: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -619,7 +619,7 @@ bulkall: bulkallmod: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ diff --git a/mk/modules.mk b/mk/modules.mk index 22afead3b..bb84317de 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1287,11 +1287,9 @@ USBMODULES:= USBMODULES+=drivers/usb/usb-common USBMODULES+=drivers/usb/core/usbcore -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),) $(eval $(call KMOD_template,USB,usb,\ $(foreach mod, $(USBMODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,50)) -endif $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3bbe31f25..f1d0bdf3a 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -32,10 +32,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) ROOTFS:= root=/dev/sda1 rootwait endif -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),y) -ROOTFS:= root=/dev/mtdblock1 -endif - ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) USB:= rootwait else -- cgit v1.2.3