summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk29
-rw-r--r--mk/image.mk6
-rw-r--r--mk/modules.mk5
-rw-r--r--mk/package.mk2
-rw-r--r--mk/rootfs.mk2
-rw-r--r--mk/vars.mk12
6 files changed, 32 insertions, 24 deletions
diff --git a/mk/build.mk b/mk/build.mk
index d9d33d6c1..5c26ea4c9 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -38,12 +38,18 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
BUSYBOX_FLASH_UNLOCK=n \
BUSYBOX_FLASH_ERASEALL=n \
BUSYBOX_PIE=n \
+ BUSYBOX_TASKSET=n \
BUSYBOX_DEBUG=n \
BUSYBOX_NOMMU=n \
BUSYBOX_WERROR=n \
BUSYBOX_STATIC=n \
+ BUSYBOX_FEATURE_AIX_LABEL=n \
+ BUSYBOX_FEATURE_SUN_LABEL=n \
+ BUSYBOX_FEATURE_OSF_LABEL=n \
+ BUSYBOX_FEATURE_SGI_LABEL=n \
ADK_KERNEL_RT2X00_DEBUG=n \
- ADK_KERNEL_ATH5K_DEBUG=n
+ ADK_KERNEL_ATH5K_DEBUG=n \
+ ADK_KERNEL_DEBUG_WITH_KGDB=n
noconfig_targets:= menuconfig \
_config \
@@ -51,10 +57,7 @@ noconfig_targets:= menuconfig \
distclean \
tags
-MAKECLEANDIR_SYMBOLS= ADK_TARGET_LIB_UCLIBC \
- ADK_TARGET_LIB_GLIBC \
- ADK_TARGET_LIB_ECLIBC \
- ADK_DEBUG
+MAKECLEANDIR_SYMBOLS= ADK_DEBUG
MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \
ADK_TARGET_PACKAGE_RPM \
@@ -83,11 +86,7 @@ POSTCONFIG= -@ \
"$$what' might be required!"; \
break; \
done; \
- fi; \
- if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
- if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \
- rm build_*/w-busybox*/busybox*/.configure_done; \
- fi; \
+ if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \
fi; \
fi
@@ -183,7 +182,7 @@ kernelconfig:
newpackage:
@echo "Creating new package $(PKG)"
$(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG)
- pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \
+ pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \
$(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
@@ -232,14 +231,15 @@ cleandir:
rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \
$(TOOLS_BUILD_DIR)
rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \
- ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+ ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk \
+ .busyboxcfg
cleantarget:
@$(TRACE) cleantarget
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg
rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) all.config .defconfig
- rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
+ rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk .busyboxcfg
distclean:
@$(TRACE) distclean
@@ -248,7 +248,8 @@ distclean:
${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
- .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
+ .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \
+ .busyboxcfg
else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
diff --git a/mk/image.mk b/mk/image.mk
index a2a6bb176..04506f0cd 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -13,7 +13,6 @@ image-prepare-post:
rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
chmod 600 ${TARGET_DIR}/etc/.rnd
- # Sanity checks
@cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \
sed -e "s/*//" | \
while read sum name; do \
@@ -47,6 +46,11 @@ image-prepare-post:
done
chmod 4511 ${TARGET_DIR}/bin/busybox
chmod 1777 ${TARGET_DIR}/tmp
+ @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
+ for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \
+ mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
+ done; \
+ fi
INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
diff --git a/mk/modules.mk b/mk/modules.mk
index c208b80a7..b7074a143 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -858,9 +858,12 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\
$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5 \
,26))
+$(eval $(call KMOD_template,LOCKD,lockd,\
+ $(MODULES_DIR)/kernel/fs/lockd/lockd \
+,27))
+
ifneq ($(ADK_KERNEL_NFS_FS),y)
$(eval $(call KMOD_template,NFS_FS,nfs-fs,\
- $(MODULES_DIR)/kernel/fs/lockd/lockd \
$(MODULES_DIR)/kernel/fs/nfs/nfs \
,30))
endif
diff --git a/mk/package.mk b/mk/package.mk
index f5a48dba8..50f5ecb61 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -233,7 +233,7 @@ endif
@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
'$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \
chmod u+w $$$$fn; \
- $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \
+ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$$$fn; \
done
ifeq (,$(filter noscripts,$(7)))
@cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 4db8b730d..1099a7fac 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -18,7 +18,7 @@ $(eval $(call rootfs_template,archive,ARCHIVE))
$(eval $(call rootfs_template,initramfs,INITRAMFS))
$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
$(eval $(call rootfs_template,squashfs,SQUASHFS))
-$(eval $(call rootfs_template,yaffs,YAFFS))
+$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1))
$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
$(eval $(call rootfs_template,encrypted,ENCRYPTED))
diff --git a/mk/vars.mk b/mk/vars.mk
index cba312e2d..53755266e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,20 +18,20 @@ TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING
BASE_DIR:= $(TOPDIR)
DISTDIR?= ${BASE_DIR}/dl
-BUILD_DIR:= ${BASE_DIR}/build_${CPU_ARCH}
+BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET}_${ADK_LIBC}
BUILD_DIR_PFX:= $(BASE_DIR)/build_*
-STAGING_PARENT:= ${BASE_DIR}/cross_${CPU_ARCH}
+STAGING_PARENT:= ${BASE_DIR}/cross_${ADK_TARGET}_${ADK_LIBC}
STAGING_PARENT_PFX:= ${BASE_DIR}/cross_*
STAGING_TOOLS:= ${STAGING_PARENT}/host
STAGING_DIR:= ${STAGING_PARENT}/target
-TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}
+TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC}
TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build
SCRIPT_DIR:= $(BASE_DIR)/scripts
-BIN_DIR:= $(BASE_DIR)/bin_${ADK_TARGET}
-BIN_DIR_PFX:= $(BASE_DIR)/bin_*
+BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC}
+BIN_DIR_PFX:= $(BASE_DIR)/bin
PACKAGE_DIR:= $(BIN_DIR)/packages
-TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}
+TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 11:26:05 +0000