diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
| commit | 043601ef5ccc17b3aac714be38889c07b6b5b6f3 (patch) | |
| tree | 3581a07a1a001b919b7515e5baf2d78d0151a6e5 /mk | |
| parent | 6b521744a3b178dc910a46191aed8cf75de1cee7 (diff) | |
| parent | 69d9bac9dad423e4cabf7bfa97a7765e4c442104 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 3 | ||||
| -rw-r--r-- | mk/rootfs.mk | 4 |
5 files changed, 7 insertions, 10 deletions
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/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})' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index dd8e81c41..288616a7c 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})) 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 |