diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 8 | ||||
| -rw-r--r-- | mk/modules.mk | 5 | ||||
| -rw-r--r-- | mk/package.mk | 3 | ||||
| -rw-r--r-- | mk/rootfs.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5286212ce..400125694 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -22,6 +22,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ @@ -575,7 +577,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; \ ( \ @@ -595,7 +597,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; \ ( \ @@ -615,7 +617,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..62d1abd45 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\ ,24)) $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\ + $(MODULES_DIR)/kernel/lib/oid_registry \ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \ ,25)) @@ -1106,7 +1107,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\ ifneq ($(ADK_KERNEL_NFS_FS),y) $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ $(MODULES_DIR)/kernel/fs/nfs/nfs \ -,30)) +,30, kmod-sunrpc)) endif #$(eval $(call KMOD_template,EXPORTFS,exportfs,\ @@ -1287,11 +1288,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..da04288c1 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,8 @@ INSTALL_TARGET?= install MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ + LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ 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 diff --git a/mk/vars.mk b/mk/vars.mk index fcd22a5e6..e217a9dca 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -84,7 +84,7 @@ TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ - $(ADK_TARGET_ABI_LDFLAGS) + $(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH) ifneq ($(ADK_NATIVE),) TARGET_CPPFLAGS:= |