summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk396
-rw-r--r--mk/buildhlp.mk6
-rw-r--r--mk/cpu.mk2
-rw-r--r--mk/fetch.mk2
-rw-r--r--mk/image.mk39
-rw-r--r--mk/kernel-build.mk56
-rw-r--r--mk/kernel-vars.mk8
-rw-r--r--mk/kernel.mk15
-rw-r--r--mk/mirrors.mk5
-rw-r--r--mk/modules.mk516
-rw-r--r--mk/package.mk120
-rw-r--r--mk/pkg-bottom.mk92
-rw-r--r--mk/rootfs.mk11
-rw-r--r--mk/split-cfg.mk8
-rw-r--r--mk/vars.mk71
15 files changed, 881 insertions, 466 deletions
diff --git a/mk/build.mk b/mk/build.mk
index d4cfab8c8..53f0ff5bf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -10,33 +10,62 @@ endif
CONFIG_CONFIG_IN = Config.in
CONFIG = config
+DEFCONFIG= ADK_DEVELSYSTEM=n \
+ ADK_DEBUG=n \
+ ADK_STATIC=n \
+ ADK_MAKE_PARALLEL=n \
+ ADK_FORCE_PARALLEL=n \
+ ADK_PACKAGE_GRUB=n \
+ ADK_PACKAGE_AUFS2_UTIL=n \
+ ADK_PACKAGE_BASE_FILES=y \
+ ADK_PACKAGE_GCC=n \
+ ADK_PACKAGE_MGETTY=n \
+ ADK_COMPILE_HEIMDAL=n \
+ ADK_PACKAGE_HEIMDAL_PKINIT=n \
+ ADK_PACKAGE_HEIMDAL_SERVER=n \
+ ADK_PACKAGE_LIBHEIMDAL=n \
+ ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
+ BUSYBOX_BBCONFIG=n \
+ BUSYBOX_SELINUX=n \
+ BUSYBOX_MODPROBE_SMALL=n \
+ BUSYBOX_EJECT=n \
+ BUSYBOX_BUILD_LIBBUSYBOX=n \
+ BUSYBOX_FEATURE_2_4_MODULES=n \
+ BUSYBOX_LOCALE_SUPPORT=n \
+ BUSYBOX_FEATURE_PREFER_APPLETS=n \
+ BUSYBOX_FEATURE_SUID=n \
+ BUSYBOX_SELINUXENABLED=n \
+ BUSYBOX_FEATURE_INSTALLER=n \
+ BUSYBOX_PAM=n \
+ BUSYBOX_FLASH_LOCK=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_DEBUG_WITH_KGDB=n
noconfig_targets:= menuconfig \
_config \
_mconfig \
+ distclean \
+ defconfig \
tags
-MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC ADK_TARGET_LIB_GLIBC ADK_SSP \
- ADK_IPV6 ADK_CXX ADK_DEBUG
-POSTCONFIG= -@\
+POSTCONFIG= -@ \
if [ -f .config.old ];then \
- if [ -d .cfg ];then \
- what=cleandevice; \
- for symbol in ${MAKECLEAN_SYMBOLS}; do \
- newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \
- oldval=$$(cat .cfg/"$$symbol" 2>&-); \
- [[ $$newval = $$oldval ]] && continue; \
- echo; \
- echo >&2 "WARNING: Toolchain related options have changed, 'make" \
- "$$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; \
+ if [ -f .busyboxcfg ];then \
+ rm .busyboxcfg; \
fi; \
- fi; \
fi
# Pull in the user's configuration file
@@ -50,10 +79,13 @@ include ${TOPDIR}/mk/split-cfg.mk
all: world
+${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
+ mksh ${TOPDIR}/package/depmaker
+
.NOTPARALLEL:
-.PHONY: all world clean cleandevice cleandir distclean image_clean
+.PHONY: all world clean cleantarget cleandir distclean image_clean
-world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
+world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
ifeq ($(ADK_NATIVE),y)
$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
@@ -66,8 +98,10 @@ endif
endif
package_index:
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
-cd ${PACKAGE_DIR} && \
${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages
+endif
$(DISTDIR):
mkdir -p $(DISTDIR)
@@ -82,18 +116,19 @@ $(PACKAGE_DIR):
mkdir -p ${PACKAGE_DIR}/.stamps
${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_TOOLS}:
- mkdir -p ${STAGING_DIR}/{bin,etc,include,lib,usr} \
+ mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/include} \
${STAGING_TOOLS}/{bin,lib}
- cd ${STAGING_DIR}/usr; ln -s ../include include
${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf
echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf
+endif
-package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf
+package/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
$(MAKE) -C package $(patsubst package/%,%,$@)
-target/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
+target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
$(MAKE) -C target $(patsubst target/%,%,$@)
toolchain/%: ${STAGING_DIR}
@@ -103,14 +138,31 @@ image:
$(MAKE) -C target image
switch:
- echo "Saving configuration for device: ${DEVICE}"
- cp .config .config.${DEVICE}
- mv .cfg .cfg.${DEVICE}
- if [ -f .config.${DEV} ];then cp .config.${DEV} .config; \
- cp .config.${DEV} .config.old; \
- mv .cfg.${DEV} .cfg; \
- echo "Setting configuration to device: ${DEV}"; \
- else echo "No old device config found";mv .config .config.bak;fi
+ echo "Saving configuration for target: ${ADK_TARGET}"
+ cp -p .config .config.${ADK_TARGET}
+ if [ -f .config.old ];then cp -p .config.old .config.old.${ADK_TARGET};fi
+ if [ -f .config.split ];then cp -p .config.split .config.split.${ADK_TARGET};fi
+ if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \
+ cp -p .config.old.${TARGET} .config.old; \
+ cp -p .config.split.${TARGET} .config.split; \
+ echo "Setting configuration to target: ${TARGET}"; \
+ else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi
+
+kernelconfig:
+ cp $(TOPDIR)/target/$(ADK_TARGET)/kernel.config $(BUILD_DIR)/linux/.config
+ $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig
+ cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config
+
+# create a new package from package/.template
+newpackage:
+ @echo "Creating new package $(PKG)"
+ $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG)
+ 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
+ @echo "Edit package/$(PKG)/Makefile to complete"
+ @echo "Do not forget to add package to package/Config.in"
#############################################################
#
@@ -120,6 +172,7 @@ switch:
root_clean:
@$(TRACE) root_clean
rm -rf $(TARGET_DIR)
+ mkdir -p $(TARGET_DIR)
# Do a per-package clean here, too. This way stale headers and
# libraries from cross_*/target/ get wiped away, which keeps
@@ -129,47 +182,62 @@ root_clean:
clean:
@$(TRACE) clean
$(MAKE) -C $(CONFIG) clean
- for d in ${STAGING_PARENT_PFX}; do \
- echo "clean: entering $$d" ; \
+ for d in ${STAGING_PARENT}; do \
for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do \
- echo "clean: cleaning for $$f" ; \
while read file ; do \
- rm $$d/target/$$file ; \
+ rm $$d/target/$$file 2>/dev/null; \
done < $$f ; \
rm $$f ; \
done \
done
- rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg
- rm -f ${TOPDIR}/package/*/info.mk
+ rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) \
+ ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC} \
+ ${TOPDIR}/package/pkglist.d
+ rm -f ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
cleankernel:
@$(TRACE) cleankernel
- rm -rf $(TOOLCHAIN_BUILD_DIR)/linux* $(BUILD_DIR)/linux
+ rm -rf $(TOOLCHAIN_BUILD_DIR)/w-linux* $(BUILD_DIR)/linux
cleandir:
@$(TRACE) cleandir
- $(MAKE) -C $(CONFIG) clean
- rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) ${TOPDIR}/.cfg
- rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
- rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
-
-cleandevice:
- @$(TRACE) cleandevice
- $(MAKE) -C $(CONFIG) clean
- rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg
+ @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
+ rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
+ ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d
+ 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 \
+ .busyboxcfg
+
+cleantarget:
+ @$(TRACE) cleantarget
+ @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
+ rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) \
+ ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}
rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT)
- rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
+ rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk \
+ .busyboxcfg all.config .defconfig
distclean:
@$(TRACE) distclean
- $(MAKE) -C $(CONFIG) clean
- rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg
- rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
- rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk
-
-else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
-
+ @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
+ @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d
+ @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 \
+ .busyboxcfg .ADK_HAVE_DOT_CONFIG
+
+else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+
+ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
+include ${TOPDIR}/mk/vars.mk
+else
include $(TOPDIR)/prereq.mk
+export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH
+endif
all: menuconfig
@echo "Start the build with \"make\" or with \"make v\" to be verbose"
@@ -186,24 +254,220 @@ $(CONFIG)/conf:
$(CONFIG)/mconf:
@$(MAKE) -C $(CONFIG)
-menuconfig: $(CONFIG)/mconf
+defconfig: .menu $(CONFIG)/conf
+ifeq (${OStype},Linux)
+ @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
+endif
+ifeq (${OStype},FreeBSD)
+ @echo ADK_HOST_FREEBSD=y > $(TOPDIR)/.defconfig
+endif
+ifeq (${OStype},MirBSD)
+ @echo ADK_HOST_MIRBSD=y > $(TOPDIR)/.defconfig
+endif
+ifeq (${OStype},OpenBSD)
+ @echo ADK_HOST_OPENBSD=y > $(TOPDIR)/.defconfig
+endif
+ifeq (${OStype},NetBSD)
+ @echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter CYGWIN%,${OStype}))
+ @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
+endif
+ @if [ ! -z "$(TARGET)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(TARGET)"\$$ \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/.defconfig; \
+ for symbol in ${DEFCONFIG}; do \
+ echo $$symbol >> $(TOPDIR)/.defconfig; \
+ done; \
+ fi
+ @if [ ! -z "$(FS)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(FS)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/.defconfig; \
+ fi
+ @if [ ! -z "$(PKG)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(PKG)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/.defconfig; \
+ fi
+ @if [ ! -z "$(LIBC)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(LIBC)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/.defconfig; \
+ fi
+ifneq (,$(filter %_qemu,${TARGET}))
+ @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter %_toolchain,${TARGET}))
+ @echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter rescue%,${TARGET}))
+ @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter rb%,${TARGET}))
+ @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter alix%,${TARGET}))
+ @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter wrap%,${TARGET}))
+ @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
+endif
+ @if [ ! -z "$(TARGET)" ];then \
+ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
+ fi
+
+modconfig:
+ifeq (${OStype},Linux)
+ @echo ADK_HOST_LINUX=y > $(TOPDIR)/all.config
+endif
+ifeq (${OStype},FreeBSD)
+ @echo ADK_HOST_FREEBSD=y > $(TOPDIR)/all.config
+endif
+ifeq (${OStype},MirBSD)
+ @echo ADK_HOST_MIRBSD=y > $(TOPDIR)/all.config
+endif
+ifeq (${OStype},OpenBSD)
+ @echo ADK_HOST_OPENBSD=y > $(TOPDIR)/all.config
+endif
+ifeq (${OStype},NetBSD)
+ @echo ADK_HOST_NETBSD=y > $(TOPDIR)/all.config
+endif
+ifneq (,$(filter CYGWIN%,${OStype}))
+ @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
+endif
+ @if [ ! -z "$(TARGET)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(TARGET)"\$$ \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/all.config; \
+ for symbol in ${DEFCONFIG}; do \
+ echo $$symbol >> $(TOPDIR)/all.config; \
+ done; \
+ fi
+ @if [ ! -z "$(FS)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(FS)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/all.config; \
+ fi
+ @if [ ! -z "$(PKG)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(PKG)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/all.config; \
+ fi
+ @if [ ! -z "$(LIBC)" ];then \
+ grep "^config" target/Config.in \
+ |grep -i "$(LIBC)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/all.config; \
+ fi
+ifneq (,$(filter %_qemu,${TARGET}))
+ @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter %_toolchain,${TARGET}))
+ @echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter %_rescue,${TARGET}))
+ @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter rb%,${TARGET}))
+ @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter alix%,${TARGET}))
+ @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter wrap%,${TARGET}))
+ @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
+endif
+
+menuconfig: $(CONFIG)/mconf defconfig .menu
+ @if [ ! -f .config ];then \
+ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
+ fi
@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
${POSTCONFIG}
-_config: $(CONFIG)/conf
+_config: $(CONFIG)/conf .menu
-@touch .config
- @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null
+ @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
${POSTCONFIG}
.NOTPARALLEL: _mconfig
_mconfig: ${CONFIG}/conf _mconfig2 _config
-_mconfig2: ${CONFIG}/conf
+_mconfig2: ${CONFIG}/conf modconfig .menu
@${CONFIG}/conf -m ${RCONFIG} >/dev/null
distclean:
@$(MAKE) -C $(CONFIG) clean
- rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) ${TOPDIR}/.cfg
- rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR)
- rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk
-
-endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+ @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d
+ @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 .ADK_HAVE_DOT_CONFIG
+
+endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+
+# build all targets and combinations
+bulk:
+ while read target libc fs; do \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+ ( \
+ echo === building $$target $$libc $$fs on $$(date); \
+ $(GMAKE) prereq && \
+ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs defconfig; \
+ $(GMAKE) VERBOSE=1 all; \
+ rm .config; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+ done <${TOPDIR}/target/bulk.lst
+
+bulktoolchain:
+ while read target libc; do \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+ ( \
+ echo === building $$target $$libc on $$(date); \
+ $(GMAKE) prereq && \
+ $(GMAKE) TARGET=$$target LIBC=$$libc defconfig; \
+ $(GMAKE) VERBOSE=1 all; \
+ rm .config; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc.log; \
+ done <${TOPDIR}/target/bulktool.lst
+
+bulkall:
+ while read target libc fs; do \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+ ( \
+ echo === building $$target $$libc $$fs on $$(date); \
+ $(GMAKE) prereq && \
+ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allconfig; \
+ $(GMAKE) VERBOSE=1 all; \
+ rm .config; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+ done <${TOPDIR}/target/bulk.lst
+
+bulkallmod:
+ while read target libc fs; do \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+ ( \
+ echo === building $$target $$libc $$fs on $$(date); \
+ $(GMAKE) prereq && \
+ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allmodconfig; \
+ $(GMAKE) VERBOSE=1 all; \
+ rm .config; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+ done <${TOPDIR}/target/bulk.lst
+
+menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
+ mksh $(TOPDIR)/package/pkgmaker
+ @:>.menu
+
+dep:
+ mksh $(TOPDIR)/package/depmaker
+
+.PHONY: menu dep
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index afad521e2..d4c8eeb50 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -19,7 +19,7 @@ WRKBUILD?= ${WRKSRC}
WRKINST?= ${WRKDIR}/fake-${CPU_ARCH}/root
ifeq ($(strip ${NO_CHECKSUM}),)
-_CHECKSUM_COOKIE= ${WRKDIR}/.checksum_done
+_CHECKSUM_COOKIE= ${WRKDIR}/.checksum_done
else
_CHECKSUM_COOKIE=
endif
@@ -58,7 +58,7 @@ post-patch:
${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
[ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
'{patch-!(*.orig),*.patch}' $(MAKE_TRACE)
- [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
+ [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
$(MAKE_TRACE)
@${MAKE} post-patch $(MAKE_TRACE)
touch $@
@@ -88,7 +88,7 @@ endif
${BASH} ${TOPDIR}/scripts/update-patches); \
if [[ -n $$toedit && $$toedit != FAIL ]]; then \
echo -n 'edit patches: '; read i; \
- cd patches && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit; \
+ cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
fi; \
rm -rf ${WRKDIR}.orig; \
[[ $$toedit != FAIL ]]
diff --git a/mk/cpu.mk b/mk/cpu.mk
index 1043ee36c..1678e9311 100644
--- a/mk/cpu.mk
+++ b/mk/cpu.mk
@@ -3,7 +3,7 @@
#
# optimization configure options for CPU features
-ifeq ($(DEVICE),alix1c)
+ifeq ($(ADK_TARGET),alix1c)
CONFIGURE_CPU_OPTS:= --disable-ssse3 \
--disable-sse \
--enable-amd3dnow \
diff --git a/mk/fetch.mk b/mk/fetch.mk
index 5a1ba5d43..2172e9d86 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -31,7 +31,7 @@ _CHECKSUM_COOKIE?= ${WRKDIR}/.checksum_done
checksum: ${_CHECKSUM_COOKIE}
ifeq ($(strip ${NO_CHECKSUM}),)
${_CHECKSUM_COOKIE}: ${FULLDISTFILES}
- rm -rf ${WRKDIR}
+ -rm -rf ${WRKDIR}
@OK=n; \
(md5sum ${FULLDISTFILES}; echo exit) | while read sum name; do \
if [[ $$sum = exit ]]; then \
diff --git a/mk/image.mk b/mk/image.mk
index e60957fc6..04fae43bf 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -1,13 +1,18 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-imageprepare: kernel-install image-prepare-post
+imageprepare: kernel-install image-prepare-post extra-install
+
+# if an extra directory exist in TOPDIR, copy all content over the
+# root directory, do the same if make extra=/dir/to/extra is used
+extra-install:
+ @if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi
+ @if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
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 \
@@ -41,32 +46,40 @@ 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= ${DEVICE}-${ARCH}-${FS}
-ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img
-ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz
-INITRAMFS_PIGGYBACK= ${DEVICE}-${ARCH}-${FS}.cpio
+INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
+ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
+ROOTFSTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}+kernel.tar.gz
+ROOTFSUSERTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
+INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
+${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
+ cd ${TARGET_DIR}; tar --exclude ./boot -cf - --owner=0 --group=0 . \
+ | gzip -n9 >$@
+
${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
- cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc | gzip -n9 >$@
+ cpio -R 0:0 -oC512 -Mdist -Hnewc | ${ADK_COMPRESSION_TOOL} >$@
${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
- cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc >$@
+ cpio -R 0:0 -oC512 -Mdist -Hnewc >$@
${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
PATH='${TARGET_PATH}' \
mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \
-nopad -noappend -root-owned $(MAKE_TRACE)
- cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \
+ cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \
+ ${BUILD_DIR}/root.squashfs > \
${BUILD_DIR}/${ROOTFSSQUASHFS}
- # padding of images is required
- dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
- bs=4063232 conv=sync $(MAKE_TRACE)
imageclean:
- rm -f $(BIN_DIR)/$(DEVICE)-* ${BUILD_DIR}/$(DEVICE)-*
+ rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-*
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index b9b2d9b9b..11b5a4890 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -3,29 +3,25 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/mk/linux.mk
-include ${TOPDIR}/mk/buildhlp.mk
+#include ${TOPDIR}/mk/buildhlp.mk
+include ${TOPDIR}/mk/kernel-vars.mk
-KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
+KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
-KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1
-ifneq ($(ADK_NATIVE),y)
-KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)"
-endif
-
-$(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched:
- $(TRACE) target/$(DEVICE)-kernel-patch
- $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
- $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(DEVICE)/patches *.patch $(MAKE_TRACE)
+$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
+ $(TRACE) target/$(ADK_TARGET)-kernel-patch
+ $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
+ $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE)
touch $@
-$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched
- $(TRACE) target/$(DEVICE)-kernel-prepare
- ln -sf $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) $(LINUX_DIR)
+$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
+ $(TRACE) target/$(ADK_TARGET)-kernel-prepare
+ ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) $(LINUX_DIR)
mkdir -p $(LINUX_BUILD_DIR)/kmod-control
touch $@
$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig
- $(TRACE) target/$(DEVICE)-kernel-configure
+ $(TRACE) target/$(ADK_TARGET)-kernel-configure
for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE)
$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
echo N | $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
@@ -33,31 +29,35 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig
touch -c $(LINUX_DIR)/.config
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
- $(TRACE) target/$(DEVICE)-kernel-compile
+ $(TRACE) target/$(ADK_TARGET)-kernel-compile
$(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(MAKE_TRACE)
- $(TRACE) target/$(DEVICE)-kernel-modules-install
+ $(TRACE) target/$(ADK_TARGET)-kernel-modules-install
rm -rf $(LINUX_BUILD_DIR)/modules
$(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
modules_install $(MAKE_TRACE)
- $(TRACE) target/$(DEVICE)-create-packages
- $(MAKE) $(KERNEL_IPKG) $(TARGETS)
+ $(TRACE) target/$(ADK_TARGET)-create-packages
+ $(MAKE) $(KERNEL_PKG) $(TARGETS)
touch -c $(LINUX_DIR)/vmlinux
-$(KERNEL_IPKG):
- $(TRACE) target/$(DEVICE)-create-kernel-package
- rm -rf $(KERNEL_IDIR)
- @mkdir -p $(KERNEL_IDIR)/etc
- ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_IDIR} \
- ../linux/kernel.control ${DEVICE}-${KERNEL_VERSION} ${CPU_ARCH}
- $(IPKG_BUILD) $(KERNEL_IDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
+$(KERNEL_PKG):
+ $(TRACE) target/$(ADK_TARGET)-create-kernel-package
+ rm -rf $(KERNEL_PKGDIR)
+ @mkdir -p $(KERNEL_PKGDIR)/etc
+ ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
+ ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
+ $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
prepare:
compile: $(LINUX_DIR)/vmlinux
install: compile
ifneq ($(strip $(INSTALL_TARGETS)),)
- $(TRACE) target/${DEVICE}-modules-install
- $(IPKG) install $(INSTALL_TARGETS) $(MAKE_TRACE)
+ $(TRACE) target/${ADK_TARGET}-modules-install
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
+ $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE)
+else
+ $(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg)))
+endif
endif
clean:
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
new file mode 100644
index 000000000..2f238c2c6
--- /dev/null
+++ b/mk/kernel-vars.mk
@@ -0,0 +1,8 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1
+ifneq ($(ADK_NATIVE),y)
+KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" HOSTCC="${HOSTCC}"
+endif
+
diff --git a/mk/kernel.mk b/mk/kernel.mk
index f5b85832e..33fbf5c2a 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -4,13 +4,13 @@
LINUX_KMOD_SUFFIX=ko
MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION)
-LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(DEVICE)
+LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(ADK_TARGET)
KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-KERNEL_IPKG:=$(PACKAGE_DIR)/kernel_$(DEVICE)-$(KERNEL_VERSION)_$(CPU_ARCH).ipk
-INSTALL_TARGETS:= $(KERNEL_IPKG)
+KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
+INSTALL_TARGETS:= $(KERNEL_PKG)
NOINSTALL_TARGETS:=
TARGETS:=
@@ -30,9 +30,9 @@ TARGETS:=
#
define KMOD_template
-IDEPENDK_$(1):=kernel ($(DEVICE)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)")
+IDEPENDK_$(1):=kernel ($(ADK_TARGET)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)")
-PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).ipk
+PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX)
I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m)
@@ -45,13 +45,14 @@ endif
$$(PKG_$(1)):
rm -rf $$(I_$(1))
+ @mkdir -p $$(I_$(1))
echo "Package: kmod-$(2)" > $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control
echo "Priority: optional" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control
echo "Section: sys" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control
echo "Description: kernel module $(2)" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \
$(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control \
- $(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH)
+ $(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH)
echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control
ifneq ($(strip $(3)),)
mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION)
@@ -69,7 +70,7 @@ ifneq ($(4),)
chmod 0755 $$(I_$(1))/CONTROL/postinst
endif
endif
- $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE)
+ $(PKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE)
endef
include $(BUILD_DIR)/.kernelconfig
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index 341ed486a..c7e0ac623 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -17,8 +17,9 @@ MASTER_SITE_KERNEL?= \
http://www.kernel.org/pub/linux/ \
MASTER_SITE_XORG?= \
- http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.4/src/everything/ \
- http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ \
+ http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.5/src/everything/ \
+ http://www.x.org/releases/X11R7.5/src/everything/ \
+ http://xorg.freedesktop.org/releases/X11R7.5/src/everything/ \
http://xorg.freedesktop.org/releases/individual/lib/ \
MASTER_SITE_GNU?= \
diff --git a/mk/modules.mk b/mk/modules.mk
index 409278015..ab33f6863 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -32,6 +32,14 @@ $(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
$(MODULES_DIR)/kernel/drivers/net/ne2k-pci \
,20))
+$(eval $(call KMOD_template,8139CP,8139cp,\
+ $(MODULES_DIR)/kernel/drivers/net/8139cp \
+,20))
+
+$(eval $(call KMOD_template,8139TOO,8139too,\
+ $(MODULES_DIR)/kernel/drivers/net/8139too \
+,20))
+
$(eval $(call KMOD_template,E100,e100,\
$(MODULES_DIR)/kernel/drivers/net/e100 \
,20))
@@ -53,27 +61,35 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\
$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb kmod-crc32))
-$(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\
- $(MODULES_DIR)/kernel/drivers/net/wireless/ath5k/ath5k \
+$(eval $(call KMOD_template,ATH5K,ath5k,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \
,20, kmod-led-class))
-$(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\
- $(MODULES_DIR)/kernel/drivers/input/input-polldev \
+$(eval $(call KMOD_template,P54_COMMON,p54-common,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \
+,68))
+
+$(eval $(call KMOD_template,P54_USB,p54-usb,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \
+,70))
+
+$(eval $(call KMOD_template,RT2X00,rt2x00,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
,17))
-$(eval $(call KMOD_template,RT2400PCI,mac80211-rt2400pci,\
+$(eval $(call KMOD_template,RT2400PCI,rt2400pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \
-,20, kmod-led-class kmod-mac80211-rt2x00))
+,20, kmod-led-class kmod-rt2x00))
-$(eval $(call KMOD_template,RT2500PCI,mac80211-rt2500pci,\
+$(eval $(call KMOD_template,RT2500PCI,rt2500pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \
-,20, kmod-led-class kmod-mac80211-rt2x00))
+,20, kmod-led-class kmod-rt2x00))
-$(eval $(call KMOD_template,RT61PCI,mac80211-rt61pci,\
+$(eval $(call KMOD_template,RT61PCI,rt61pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \
-,20, kmod-led-class kmod-mac80211-rt2x00))
+,20, kmod-led-class kmod-rt2x00))
#
# Networking
@@ -82,21 +98,29 @@ $(eval $(call KMOD_template,ATM,atm,\
$(MODULES_DIR)/kernel/net/atm/atm \
,50))
+$(eval $(call KMOD_template,ATM_BR2684,atm-br2684,\
+ $(MODULES_DIR)/kernel/net/atm/br2684 \
+,51))
+
+$(eval $(call KMOD_template,VLAN_8021Q,vlan-8021q,\
+ $(MODULES_DIR)/kernel/net/8021q/8021q \
+,5))
+
$(eval $(call KMOD_template,BRIDGE,bridge,\
$(MODULES_DIR)/kernel/net/llc/llc \
$(MODULES_DIR)/kernel/net/802/stp \
$(MODULES_DIR)/kernel/net/bridge/bridge \
,10))
-$(eval $(call KMOD_template,NET_IPGRE,gre,\
+$(eval $(call KMOD_template,NET_IPGRE,net-ipgre,\
$(MODULES_DIR)/kernel/net/ipv4/ip_gre \
,50))
-$(eval $(call KMOD_template,INET_TUNNEL,tunnel,\
+$(eval $(call KMOD_template,INET_TUNNEL,inet-tunnel,\
$(MODULES_DIR)/kernel/net/ipv4/tunnel4 \
,20))
-$(eval $(call KMOD_template,NET_IPIP,ipip,\
+$(eval $(call KMOD_template,NET_IPIP,net-ipip,\
$(MODULES_DIR)/kernel/net/ipv4/ipip \
,60))
@@ -123,8 +147,8 @@ $(eval $(call KMOD_template,PPPOATM,pppoatm,\
,60))
$(eval $(call KMOD_template,PPPOE,pppoe,\
- $(MODULES_DIR)/kernel/drivers/net/pppoe \
$(MODULES_DIR)/kernel/drivers/net/pppox \
+ $(MODULES_DIR)/kernel/drivers/net/pppoe \
,60))
$(eval $(call KMOD_template,TUN,tun,\
@@ -138,31 +162,31 @@ $(eval $(call KMOD_template,BONDING,bonding,\
#
# Traffic scheduling
#
-$(eval $(call KMOD_template,NET_SCH_CBQ,net-sched-cbq,\
+$(eval $(call KMOD_template,NET_SCH_CBQ,net-sch-cbq,\
$(MODULES_DIR)/kernel/net/sched/sch_cbq \
,40))
-$(eval $(call KMOD_template,NET_SCH_HTB,net-sched-htb,\
+$(eval $(call KMOD_template,NET_SCH_HTB,net-sch-htb,\
$(MODULES_DIR)/kernel/net/sched/sch_htb \
,40))
-$(eval $(call KMOD_template,NET_SCH_HFSC,net-sched-hfsc,\
+$(eval $(call KMOD_template,NET_SCH_HFSC,net-sch-hfsc,\
$(MODULES_DIR)/kernel/net/sched/sch_hfsc \
,40))
-$(eval $(call KMOD_template,NET_SCH_ATM,net-sched-atm,\
+$(eval $(call KMOD_template,NET_SCH_ATM,net-sch-atm,\
$(MODULES_DIR)/kernel/net/sched/sch_atm \
,40))
-$(eval $(call KMOD_template,NET_SCH_PRIO,net-sched-prio,\
+$(eval $(call KMOD_template,NET_SCH_PRIO,net-sch-prio,\
$(MODULES_DIR)/kernel/net/sched/sch_prio \
,40))
-$(eval $(call KMOD_template,NET_SCH_RED,net-sched-red,\
+$(eval $(call KMOD_template,NET_SCH_RED,net-sch-red,\
$(MODULES_DIR)/kernel/net/sched/sch_red \
,40))
-$(eval $(call KMOD_template,NET_SCH_SFQ,net-sched-sfq,\
+$(eval $(call KMOD_template,NET_SCH_SFQ,net-sch-sfq,\
$(MODULES_DIR)/kernel/net/sched/sch_sfq \
,40))
@@ -171,19 +195,19 @@ $(eval $(call KMOD_template,NET_SCH_SFQ,net-sched-sfq,\
# $(MODULES_DIR)/kernel/net/sched/sch_teql \
#,40))
-$(eval $(call KMOD_template,NET_SCH_TBF,net-sched-tbf,\
+$(eval $(call KMOD_template,NET_SCH_TBF,net-sch-tbf,\
$(MODULES_DIR)/kernel/net/sched/sch_tbf \
,40))
-$(eval $(call KMOD_template,NET_SCH_GRED,net-sched-gred,\
+$(eval $(call KMOD_template,NET_SCH_GRED,net-sch-gred,\
$(MODULES_DIR)/kernel/net/sched/sch_gred \
,40))
-$(eval $(call KMOD_template,NET_SCH_DSMARK,net-sched-dsmark,\
+$(eval $(call KMOD_template,NET_SCH_DSMARK,net-sch-dsmark,\
$(MODULES_DIR)/kernel/net/sched/sch_dsmark \
,40))
-$(eval $(call KMOD_template,NET_SCH_INGRESS,net-sched-ingress,\
+$(eval $(call KMOD_template,NET_SCH_INGRESS,net-sch-ingress,\
$(MODULES_DIR)/kernel/net/sched/sch_ingress \
,40))
@@ -198,7 +222,7 @@ $(eval $(call KMOD_template,NET_CLS_TCINDEX,net-cls-tcindex,\
$(MODULES_DIR)/kernel/net/sched/cls_tcindex \
,40))
-$(eval $(call KMOD_template,NET_CLS_ROUTE4,net-cls-route,\
+$(eval $(call KMOD_template,NET_CLS_ROUTE4,net-cls-route4,\
$(MODULES_DIR)/kernel/net/sched/cls_route \
,40))
@@ -236,32 +260,32 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\
#
# IPsec
#
-$(eval $(call KMOD_template,NET_KEY,net-ipsec-netkey,\
+$(eval $(call KMOD_template,NET_KEY,net-key,\
$(MODULES_DIR)/kernel/net/key/af_key \
,60))
-$(eval $(call KMOD_template,INET_AH,net-ipsec-ah,\
+$(eval $(call KMOD_template,INET_AH,inet-ah,\
$(MODULES_DIR)/kernel/net/ipv4/ah4 \
,65))
-$(eval $(call KMOD_template,INET_ESP,net-ipsec-esp,\
+$(eval $(call KMOD_template,INET_ESP,inet-esp,\
$(MODULES_DIR)/kernel/net/ipv4/esp4 \
,65))
-$(eval $(call KMOD_template,INET_IPCOMP,net-ipsec-comp,\
- $(MODULES_DIR)/kernel/net/ipv4/ipcomp \
+$(eval $(call KMOD_template,INET_IPCOMP,inet-ipcomp,\
$(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \
+ $(MODULES_DIR)/kernel/net/ipv4/ipcomp \
,70))
-$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,net-ipsec-transport,\
+$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,inet-xfrm-mode-transport,\
$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_transport \
,75))
-$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,net-ipsec-tunnel,\
+$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,inet-xfrm-mode-tunnel,\
$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_tunnel \
,75))
-$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\
+$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,inet-xfrm-mode-beet,\
$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_beet \
,75))
@@ -269,25 +293,68 @@ $(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\
## Filtering / Firewalling
##
#
+# Ethernet Bridging firewall
+#
+$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,bridge-nf-ebtables,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtables \
+,55))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_BROUTE,bridge-ebt-broute,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_broute \
+,60))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_T_FILTER,bridge-ebt-t-filter,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_filter \
+,60))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_T_NAT,bridge-ebt-t-nat,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_nat \
+,60))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_802_3,bridge-ebt-802-3,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_802_3 \
+,65))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_AMONG,bridge-ebt-among,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_among \
+,65))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_ARP,bridge-ebt-arp,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_arpreply \
+,65))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_IP,bridge-ebt-ip,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_ip \
+,65))
+
+$(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,bridge-ebt-redirect,\
+ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_redirect \
+,65))
+
+#
# Netfilter Core
#
-$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,nf-classify,\
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-classify,\
$(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \
,50))
-$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,nf-connmark,\
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,netfilter-xt-target-connmark,\
$(MODULES_DIR)/kernel/net/netfilter/xt_CONNMARK \
,50))
-$(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,nf-mark,\
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,netfilter-xt-target-mark,\
$(MODULES_DIR)/kernel/net/netfilter/xt_MARK \
,50))
-$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,nf-queue,\
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,netfilter-xt-target-nfqueue,\
$(MODULES_DIR)/kernel/net/netfilter/xt_NFQUEUE \
,50))
-$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,nf-notrack,\
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_TCPMSS,netfilter-xt-target-tcpmss,\
+ $(MODULES_DIR)/kernel/net/netfilter/xt_TCPMSS \
+,50))
+
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notrack,\
$(MODULES_DIR)/kernel/net/netfilter/xt_NOTRACK \
,50))
@@ -303,106 +370,106 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \
,50))
-$(eval $(call KMOD_template,IP_NF_FTP,nf-ip-conntrack-ftp,\
+$(eval $(call KMOD_template,IP_NF_FTP,ip-nf-ftp,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_ftp \
,55))
-$(eval $(call KMOD_template,IP_NF_IRC,nf-ip-conntrack-irc,\
+$(eval $(call KMOD_template,IP_NF_IRC,ip-nf-irc,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_irc \
,55))
-$(eval $(call KMOD_template,IP_NF_NETBIOS_NS,nf-ip-conntrack-netbios-ns,\
+$(eval $(call KMOD_template,IP_NF_NETBIOS_NS,ip-nf-netbios-ns,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_netbios_ns \
,55))
-$(eval $(call KMOD_template,IP_NF_TFTP,nf-ip-conntrack-tftp,\
+$(eval $(call KMOD_template,IP_NF_TFTP,ip-nf-tftp,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_tftp \
,55))
-$(eval $(call KMOD_template,IP_NF_AMANDA,nf-ip-conntrack-amanda,\
+$(eval $(call KMOD_template,IP_NF_AMANDA,ip-nf-amanda,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_amanda \
,55))
-$(eval $(call KMOD_template,IP_NF_PPTP,nf-ip-conntrack-pptp,\
+$(eval $(call KMOD_template,IP_NF_PPTP,ip-nf-pptp,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_pptp \
,55))
-$(eval $(call KMOD_template,IP_NF_H323,nf-ip-conntrack-h323,\
+$(eval $(call KMOD_template,IP_NF_H323,ip-nf-h323,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_h323 \
,55))
-$(eval $(call KMOD_template,IP_NF_SIP,nf-ip-conntrack-sip,\
+$(eval $(call KMOD_template,IP_NF_SIP,ip-nf-sip,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_sip \
,55))
-$(eval $(call KMOD_template,IP_NF_IPTABLES,nf-ip-iptables,\
+$(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_tables \
,50))
-$(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,nf-ip-match-iprange,\
+$(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,ip-nf-match-iprange,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_iprange \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_TOS,nf-ip-match-tos,\
+$(eval $(call KMOD_template,IP_NF_MATCH_TOS,ip-nf-match-tos,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_tos \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_RECENT,nf-ip-match-recent,\
+$(eval $(call KMOD_template,IP_NF_MATCH_RECENT,ip-nf-match-recent,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_recent \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_ECN,nf-ip-match-ecn,\
+$(eval $(call KMOD_template,IP_NF_MATCH_ECN,ip-nf-match-ecn,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ecn \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_AH,nf-ip-match-ah,\
+$(eval $(call KMOD_template,IP_NF_MATCH_AH,ip-nf-match-ah,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ah \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_TTL,nf-ip-match-ttl,\
+$(eval $(call KMOD_template,IP_NF_MATCH_TTL,ip-nf-match-ttl,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ttl \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_OWNER,nf-ip-match-owner,\
+$(eval $(call KMOD_template,IP_NF_MATCH_OWNER,ip-nf-match-owner,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_owner \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_ADDRTYPE,nf-ip-match-addrtype,\
+$(eval $(call KMOD_template,IP_NF_MATCH_ADDRTYPE,ip-nf-match-addrtype,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_addrtype \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_HASHLIMIT,nf-ip-match-hashlimit,\
+$(eval $(call KMOD_template,IP_NF_MATCH_HASHLIMIT,ip-nf-match-hashlimit,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_hashlimit \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_STATE,nf-ip-match-state,\
+$(eval $(call KMOD_template,IP_NF_MATCH_STATE,ip-nf-match-state,\
$(MODULES_DIR)/kernel/net/netfilter/xt_state \
,55))
-$(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,nf-ip-match-multiport,\
+$(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,ip-nf-match-multiport,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_multiport \
,55))
#
# Filtering
#
-$(eval $(call KMOD_template,IP_NF_FILTER,nf-ip-filter,\
+$(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_filter \
,55))
-$(eval $(call KMOD_template,IP_NF_TARGET_REJECT,nf-ip-target-reject,\
+$(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \
,60))
-$(eval $(call KMOD_template,IP_NF_TARGET_LOG,nf-ip-target-log,\
+$(eval $(call KMOD_template,IP_NF_TARGET_LOG,ip-nf-target-log,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_LOG \
,60))
-$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,nf-ip-target-ulog,\
+$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,ip-nf-target-ulog,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ULOG \
,60))
-$(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,nf-ip-target-tcpmss,\
+$(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TCPMSS \
,60))
@@ -411,66 +478,34 @@ $(eval $(call KMOD_template,NF_NAT,nf-nat,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \
,60))
-$(eval $(call KMOD_template,IP_NF_PPTP,nf-ip-nat-pptp,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_pptp \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_TFTP,nf-ip-nat-tftp,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_tftp \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_FTP,nf-ip-nat-ftp,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_ftp \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_IRC,nf-ip-nat-irc,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_irc \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_AMANDA,nf-ip-nat-amanda,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_amanda \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_SIP,nf-ip-nat-sip,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_sip \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_H323,nf-ip-nat-h323,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_h323 \
-,65))
-
-$(eval $(call KMOD_template,IP_NF_TARGET_MASQUERADE,nf-ip-target-masquerade,\
+$(eval $(call KMOD_template,IP_NF_TARGET_MASQUERADE,ip-nf-target-masquerade,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_MASQUERADE \
,65))
-$(eval $(call KMOD_template,IP_NF_TARGET_REDIRECT,nf-ip-target-redirect,\
+$(eval $(call KMOD_template,IP_NF_TARGET_REDIRECT,ip-nf-target-redirect,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REDIRECT \
,65))
-$(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,nf-ip-target-netmap,\
+$(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,ip-nf-target-netmap,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_NETMAP \
,65))
-$(eval $(call KMOD_template,IP_NF_TARGET_SAME,nf-ip-target-same,\
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_SAME \
-,65))
-
#
# Mangle
#
-$(eval $(call KMOD_template,IP_NF_MANGLE,nf-ip-mangle,\
+$(eval $(call KMOD_template,IP_NF_MANGLE,ip-nf-mangle,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_mangle \
,60))
-$(eval $(call KMOD_template,IP_NF_TARGET_TOS,nf-ip-target-tos,\
+$(eval $(call KMOD_template,IP_NF_TARGET_TOS,ip-nf-target-tos,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TOS \
,65))
-$(eval $(call KMOD_template,IP_NF_TARGET_ECN,nf-ip-target-ecn,\
+$(eval $(call KMOD_template,IP_NF_TARGET_ECN,ip-nf-target-ecn,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ECN \
,65))
-$(eval $(call KMOD_template,IP_NF_TARGET_TTL,nf-ip-target-ttl,\
+$(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TTL \
,65))
@@ -531,23 +566,24 @@ $(eval $(call KMOD_template,IP_VS_FTP,ip-vs-ftp,\
#
# Block devices
#
-$(eval $(call KMOD_template,BLK_DEV_LOOP,loop,\
+$(eval $(call KMOD_template,BLK_DEV_LOOP,blk-dev-loop,\
$(MODULES_DIR)/kernel/drivers/block/loop \
,20))
-$(eval $(call KMOD_template,BLK_DEV_NBD,nbd,\
+$(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\
$(MODULES_DIR)/kernel/drivers/block/nbd \
,20))
$(eval $(call KMOD_template,SCSI,scsi,\
$(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \
+ $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
,20))
-$(eval $(call KMOD_template,BLK_DEV_SD,scsi-disk,\
+$(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\
$(MODULES_DIR)/kernel/drivers/scsi/sd_mod \
,25))
-$(eval $(call KMOD_template,BLK_DEV_SR,scsi-cdrom,\
+$(eval $(call KMOD_template,BLK_DEV_SR,blk-dev-sr,\
$(MODULES_DIR)/kernel/drivers/cdrom/cdrom \
$(MODULES_DIR)/kernel/drivers/scsi/sr_mod \
,25))
@@ -555,7 +591,7 @@ $(eval $(call KMOD_template,BLK_DEV_SR,scsi-cdrom,\
#
# RAID
#
-$(eval $(call KMOD_template,BLK_DEV_MD,md,\
+$(eval $(call KMOD_template,BLK_DEV_MD,blk-dev-md,\
$(MODULES_DIR)/kernel/drivers/md/md-mod \
,30))
@@ -568,16 +604,19 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\
,35))
$(eval $(call KMOD_template,MD_RAID456,md-raid456,\
+ $(MODULES_DIR)/kernel/crypto/xor \
$(MODULES_DIR)/kernel/crypto/async_tx/async_tx \
$(MODULES_DIR)/kernel/crypto/async_tx/async_xor \
$(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \
+ $(MODULES_DIR)/kernel/drivers/md/raid6_pq \
+ $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \
$(MODULES_DIR)/kernel/drivers/md/raid456 \
,35))
#
# Device Mapper
#
-$(eval $(call KMOD_template,BLK_DEV_DM,dm-mod,\
+$(eval $(call KMOD_template,BLK_DEV_DM,blk-dev-dm,\
$(MODULES_DIR)/kernel/drivers/md/dm-mod \
,35))
@@ -600,12 +639,13 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\
# Crypto
#
-$(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-hw-geode,\
+$(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\
$(MODULES_DIR)/kernel/drivers/crypto/geode-aes \
,10))
$(eval $(call KMOD_template,CRYPTO_ALGAPI,crypto-algapi,\
$(MODULES_DIR)/kernel/crypto/crypto_algapi \
+ $(MODULES_DIR)/kernel/crypto/pcompress \
,02))
$(eval $(call KMOD_template,CRYPTO_AEAD,crypto-aead,\
@@ -621,13 +661,12 @@ $(eval $(call KMOD_template,CRYPTO_BLKCIPHER,crypto-blkcipher,\
$(MODULES_DIR)/kernel/crypto/crypto_blkcipher \
,05))
-$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng,\
+$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\
$(MODULES_DIR)/kernel/crypto/rng \
$(MODULES_DIR)/kernel/crypto/krng \
,06))
$(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\
- $(MODULES_DIR)/kernel/crypto/pcompress \
$(MODULES_DIR)/kernel/crypto/cryptomgr \
$(MODULES_DIR)/kernel/crypto/eseqiv \
$(MODULES_DIR)/kernel/crypto/chainiv \
@@ -661,11 +700,11 @@ $(eval $(call KMOD_template,CRYPTO_SHA512,crypto-sha512,\
$(MODULES_DIR)/kernel/crypto/sha512_generic \
,11))
-$(eval $(call KMOD_template,CRYPTO_WP512,crypto-whirlpool,\
+$(eval $(call KMOD_template,CRYPTO_WP512,crypto-wp512,\
$(MODULES_DIR)/kernel/crypto/wp512 \
,11))
-$(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tiger,\
+$(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tgr192,\
$(MODULES_DIR)/kernel/crypto/tgr192 \
,11))
@@ -690,7 +729,7 @@ $(eval $(call KMOD_template,CRYPTO_TWOFISH,crypto-twofish,\
$(MODULES_DIR)/kernel/crypto/twofish \
,11))
-$(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-i586,\
+$(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-586,\
$(MODULES_DIR)/kernel/arch/x86/crypto/twofish-i586 \
,12))
@@ -702,7 +741,7 @@ $(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\
$(MODULES_DIR)/kernel/crypto/aes_generic \
,10))
-$(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-i586,\
+$(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-586,\
$(MODULES_DIR)/kernel/arch/x86/crypto/aes-i586 \
,11))
@@ -744,6 +783,7 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
,10))
$(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\
+ $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \
$(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \
$(MODULES_DIR)/kernel/crypto/lzo \
,10))
@@ -756,153 +796,164 @@ $(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\
$(MODULES_DIR)/kernel/crypto/crc32c \
,11))
-$(eval $(call KMOD_template,OCF_CRYPTOSOFT,cryptodev-cryptosoft,\
+$(eval $(call KMOD_template,OCF_CRYPTOSOFT,ocf-cryptosoft,\
${MODULES_DIR}/kernel/crypto/ocf/cryptosoft \
,12))
-$(eval $(call KMOD_template,OCF_SAFE,cryptodev-safe,\
+$(eval $(call KMOD_template,OCF_SAFE,ocf-safe,\
${MODULES_DIR}/kernel/crypto/ocf/safe/safe \
,12))
-$(eval $(call KMOD_template,OCF_IXP4XX,cryptodev-ixp4xx,\
+$(eval $(call KMOD_template,OCF_IXP4XX,ocf-ixp4xx,\
${MODULES_DIR}/kernel/crypto/ocf/ixp4xx/ixp4xx \
,12))
-$(eval $(call KMOD_template,OCF_HIFN,cryptodev-hifn,\
+$(eval $(call KMOD_template,OCF_HIFN,ocf-hifn,\
${MODULES_DIR}/kernel/crypto/ocf/hifn/hifn7751 \
,12))
-$(eval $(call KMOD_template,OCF_TALITOS,cryptodev-talitos,\
+$(eval $(call KMOD_template,OCF_TALITOS,ocf-talitos,\
${MODULES_DIR}/kernel/crypto/ocf/talitos/talitos \
,12))
#
# Filesystems
#
-$(eval $(call KMOD_template,AUFS_FS,fs-aufs,\
+$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\
$(MODULES_DIR)/kernel/fs/aufs/aufs \
,30))
-$(eval $(call KMOD_template,CIFS,fs-cifs,\
+$(eval $(call KMOD_template,CIFS,cifs,\
$(MODULES_DIR)/kernel/fs/cifs/cifs \
,30))
-$(eval $(call KMOD_template,CODA_FS,fs-coda,\
+$(eval $(call KMOD_template,CODA_FS,coda-fs,\
$(MODULES_DIR)/kernel/fs/coda/coda \
,30))
ifneq ($(ADK_KERNEL_EXT2_FS),y)
-$(eval $(call KMOD_template,EXT2_FS,fs-ext2,\
+$(eval $(call KMOD_template,EXT2_FS,ext2-fs,\
$(MODULES_DIR)/kernel/fs/ext2/ext2 \
,30))
endif
-$(eval $(call KMOD_template,EXT3_FS,fs-ext3,\
+$(eval $(call KMOD_template,EXT3_FS,ext3-fs,\
$(MODULES_DIR)/kernel/fs/jbd/jbd \
$(MODULES_DIR)/kernel/fs/ext3/ext3 \
,30))
-$(eval $(call KMOD_template,EXT4_FS,fs-ext4,\
+$(eval $(call KMOD_template,EXT4_FS,ext4-fs,\
$(MODULES_DIR)/kernel/fs/mbcache \
$(MODULES_DIR)/kernel/fs/jbd2/jbd2 \
$(MODULES_DIR)/kernel/fs/ext4/ext4 \
,30))
-$(eval $(call KMOD_template,FUSE_FS,fs-fuse,\
+$(eval $(call KMOD_template,FUSE_FS,fuse-fs,\
$(MODULES_DIR)/kernel/fs/fuse/fuse \
,30))
-$(eval $(call KMOD_template,HFSPLUS_FS,fs-hfsplus,\
+$(eval $(call KMOD_template,HFSPLUS_FS,hfsplus-fs,\
$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus \
,30))
-$(eval $(call KMOD_template,SUNRPC,fs-rpc,\
+$(eval $(call KMOD_template,SUNRPC,sunrpc,\
$(MODULES_DIR)/kernel/net/sunrpc/sunrpc \
,24))
-$(eval $(call KMOD_template,SUNRPC_GSS,fs-rpcgss,\
+$(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\
$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \
,25))
-$(eval $(call KMOD_template,RPCSEC_GSS_KRB5,fs-rpcsec-krb5,\
+$(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\
$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5 \
,26))
-ifneq ($(ADK_KERNEL_NFS_FS),y)
-$(eval $(call KMOD_template,NFS_FS,fs-nfs,\
+$(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/nfs/nfs \
,30))
endif
-$(eval $(call KMOD_template,EXPORTFS,fs-exportfs,\
+$(eval $(call KMOD_template,EXPORTFS,exportfs,\
$(MODULES_DIR)/kernel/fs/exportfs/exportfs \
,20))
-$(eval $(call KMOD_template,NFSD,fs-nfsd,\
+$(eval $(call KMOD_template,NFSD,nfsd,\
$(MODULES_DIR)/kernel/fs/nfsd/nfsd \
,30))
-$(eval $(call KMOD_template,NTFS_FS,fs-ntfs,\
+$(eval $(call KMOD_template,NTFS_FS,ntfs-fs,\
$(MODULES_DIR)/kernel/fs/ntfs/ntfs \
,30))
-$(eval $(call KMOD_template,VFAT_FS,fs-vfat,\
+$(eval $(call KMOD_template,VFAT_FS,vfat-fs,\
$(MODULES_DIR)/kernel/fs/fat/fat \
$(MODULES_DIR)/kernel/fs/fat/vfat \
,30))
-$(eval $(call KMOD_template,XFS_FS,fs-xfs,\
+$(eval $(call KMOD_template,XFS_FS,xfs-fs,\
$(MODULES_DIR)/kernel/fs/xfs/xfs \
,30))
-$(eval $(call KMOD_template,YAFFS_FS,fs-yaffs,\
+$(eval $(call KMOD_template,YAFFS_FS,yaffs-fs,\
$(MODULES_DIR)/kernel/fs/yaffs2/yaffs \
,30))
-$(eval $(call KMOD_template,REISERFS_FS,fs-reiserfs,\
+$(eval $(call KMOD_template,REISERFS_FS,reiserfs-fs,\
$(MODULES_DIR)/kernel/fs/reiserfs/reiserfs \
,30))
-$(eval $(call KMOD_template,ISO9660_FS,fs-iso9660,\
+$(eval $(call KMOD_template,ISO9660_FS,iso9660-fs,\
$(MODULES_DIR)/kernel/fs/isofs/isofs \
,30))
-$(eval $(call KMOD_template,UDF_FS,fs-udf,\
+$(eval $(call KMOD_template,UDF_FS,udf-fs,\
$(MODULES_DIR)/kernel/fs/udf/udf \
,30))
#
# Multimedia
#
-$(eval $(call KMOD_template,SOUND,soundcore,\
+$(eval $(call KMOD_template,SOUND,sound,\
$(MODULES_DIR)/kernel/sound/soundcore \
,30))
-$(eval $(call KMOD_template,SND,sound-alsa,\
+$(eval $(call KMOD_template,SND,snd,\
$(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
$(MODULES_DIR)/kernel/sound/core/snd \
$(MODULES_DIR)/kernel/sound/core/snd-timer \
$(MODULES_DIR)/kernel/sound/core/snd-pcm \
,40))
-$(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\
+$(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
+ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \
+ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
+,41))
+
+$(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\
$(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \
$(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \
,45))
-$(eval $(call KMOD_template,SND_AC97_CODEC,sound-alsa-ac97-codec,\
+$(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\
$(MODULES_DIR)/kernel/sound/ac97_bus \
$(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \
,50))
-$(eval $(call KMOD_template,SND_VIA82XX,sound-alsa-via82xx,\
- $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
+$(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\
$(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \
$(MODULES_DIR)/kernel/sound/pci/snd-via82xx \
,55))
-$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-alsa-cs5535,\
+$(eval $(call KMOD_template,SND_ENS1370,snd-ens1370,\
+ $(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \
+,55))
+
+$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
@@ -914,11 +965,9 @@ $(eval $(call KMOD_template,PWC,pwc,\
$(MODULES_DIR)/kernel/drivers/usb/pwc \
,70))
-
#
# PCMCIA/CardBus
#
-
$(eval $(call KMOD_template,PCCARD,pccard,\
$(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \
,40))
@@ -932,7 +981,7 @@ $(eval $(call KMOD_template,CARDBUS,cardbus,\
$(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \
,50))
-$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial,\
+$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\
$(MODULES_DIR)/kernel/drivers/serial/serial_cs \
,55))
@@ -940,129 +989,131 @@ $(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial,\
# Input
#
-$(eval $(call KMOD_template,KEYBOARD_ATKBD,input-keyboard,\
+$(eval $(call KMOD_template,KEYBOARD_ATKBD,keyboard-atkbd,\
$(MODULES_DIR)/kernel/drivers/input/keyboard/atkbd \
,45))
-$(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mouse,\
+$(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\
$(MODULES_DIR)/kernel/drivers/input/mousedev \
,45))
+$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
+ $(MODULES_DIR)/kernel/drivers/input/evdev \
+,45))
+
#
# USB
#
-USB_CORE_MODULE = drivers/usb/core/usbcore
-USB_OHCI_MODULE = drivers/usb/host/ohci-hcd
-USB_UHCI_MODULE = drivers/usb/host/uhci-hcd
-USB_OHCI_SYMBOL = USB_OHCI_HCD
-USB_UHCI_SYMBOL = USB_UHCI_HCD
ifeq ($(ADK_LINUX_CRIS_FOXBOARD),)
-$(eval $(call KMOD_template,USB,usb-core,\
- $(MODULES_DIR)/kernel/$(USB_CORE_MODULE) \
+$(eval $(call KMOD_template,USB,usb,\
+ $(MODULES_DIR)/kernel/drivers/usb/core/usbcore \
,50))
endif
-$(eval $(call KMOD_template,$(USB_OHCI_SYMBOL),usb-ohci,\
- $(MODULES_DIR)/kernel/$(USB_OHCI_MODULE) \
+$(eval $(call KMOD_template,USB_OHCI_HCD,usb-ohci-hcd,\
+ $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd \
,60))
-$(eval $(call KMOD_template,$(USB_UHCI_SYMBOL),usb-uhci,\
- $(MODULES_DIR)/kernel/$(USB_UHCI_MODULE) \
+$(eval $(call KMOD_template,USB_UHCI_HCD,usb-uhci-hcd,\
+ $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd \
,60))
-$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci,\
+$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \
,60))
-USB_ACM_MODULES = drivers/usb/class/cdc-acm
-USB_PRINTER_MODULES = drivers/usb/class/usblp
-
$(eval $(call KMOD_template,USB_ACM,usb-acm,\
- $(foreach mod,$(USB_ACM_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
+ $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm \
,70))
$(eval $(call KMOD_template,USB_HID,usb-hid,\
$(MODULES_DIR)/kernel/drivers/hid/usbhid/usbhid \
-,60))
+,70))
$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
- $(foreach mod,$(USB_PRINTER_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
-,60))
+ $(MODULES_DIR)/kernel/drivers/usb/class/usblp \
+,70))
$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial \
-,60))
+,70))
$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa \
-,61))
+,71))
-$(eval $(call KMOD_template,USB_SERIAL_FTDI_SIO,usb-serial-ftdi,\
+$(eval $(call KMOD_template,USB_SERIAL_FTDI_SIO,usb-serial-ftdi-sio,\
$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232 \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303 \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\
$(MODULES_DIR)/kernel/drivers/usb/serial/visor \
-,61))
+,71))
$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
$(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage \
-,65))
+,75))
$(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\
$(MODULES_DIR)/kernel/drivers/net/usb/pegasus \
-,65))
+,75))
+
+$(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
+ $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \
+ $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
+,75))
#
# Bluetooth
#
-BLUETOOTH_PREFIX = BT
-BLUETOOTH = bluetooth
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX),bluetooth,\
- $(MODULES_DIR)/kernel/net/bluetooth/$(BLUETOOTH) \
+$(eval $(call KMOD_template,BT,bt,\
+ $(MODULES_DIR)/kernel/net/bluetooth/bluetooth \
,70))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUSB,bluetooth-hci-usb,\
- $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb \
+$(eval $(call KMOD_template,BT_HCIBCM203X,bt-hcibcm203x,\
+ $(MODULES_DIR)/kernel/drivers/bluetooth/bcm203x \
,75))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUART,bluetooth-hci-uart,\
+$(eval $(call KMOD_template,BT_HCIBTUSB,bt-hcibtusb,\
+ $(MODULES_DIR)/kernel/drivers/bluetooth/btusb \
+,76))
+
+$(eval $(call KMOD_template,BT_HCIUART,bt-hciuart,\
$(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart \
,75))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_L2CAP,bluetooth-l2cap,\
+$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\
$(MODULES_DIR)/kernel/net/bluetooth/l2cap \
,80))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_SCO,bluetooth-sco,\
+$(eval $(call KMOD_template,BT_SCO,bt-sco,\
$(MODULES_DIR)/kernel/net/bluetooth/sco \
,85))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_BNEP,bluetooth-bnep,\
+$(eval $(call KMOD_template,BT_BNEP,bt-bnep,\
$(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep \
,85))
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_RFCOMM,bluetooth-rfcomm,\
+$(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\
$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm \
,85))
#
# Misc devices
#
-SOFTDOG_MODULES = drivers/char/watchdog/softdog
$(eval $(call KMOD_template,SOFTDOG,softdog,\
- $(foreach mod,$(SOFTDOG_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
+ $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \
,95))
$(eval $(call KMOD_template,FW_LOADER,fw-loader,\
@@ -1073,109 +1124,126 @@ $(eval $(call KMOD_template,EEPROM_93CX6,eeprom-93cx6,\
$(MODULES_DIR)/kernel/drivers/misc/eeprom/eeprom_93cx6 \
,05))
-$(eval $(call KMOD_template,LEDS_CLASS,led-class,\
+$(eval $(call KMOD_template,LEDS_CLASS,leds-class,\
$(MODULES_DIR)/kernel/drivers/leds/led-class \
,05))
+$(eval $(call KMOD_template,LEDS_TRIGGER_TIMER,leds-trigger-timer,\
+ $(MODULES_DIR)/kernel/drivers/leds/ledtrig-timer \
+,10))
+
+$(eval $(call KMOD_template,LEDS_TRIGGER_HEARTBEAT,leds-trigger-heartbeat,\
+ $(MODULES_DIR)/kernel/drivers/leds/ledtrig-heartbeat \
+,10))
+
+$(eval $(call KMOD_template,LEDS_TRIGGER_DEFAULT_ON,leds-trigger-default-on,\
+ $(MODULES_DIR)/kernel/drivers/leds/ledtrig-default-on \
+,10))
+
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
+ $(MODULES_DIR)/kernel/net/netfilter/xt_LED \
+,90))
+
+
#
# NLS
#
-$(eval $(call KMOD_template,NLS,nls-base,\
+$(eval $(call KMOD_template,NLS,nls,\
$(MODULES_DIR)/kernel/fs/nls/nls_base \
,10))
-$(eval $(call KMOD_template,NLS_CODEPAGE_437,nls-cp437,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_437,nls-codepage-437,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp437 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_737,nls-cp737,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_737,nls-codepage-737,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp737 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_775,nls-cp775,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_775,nls-codepage-775,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp775 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_850,nls-cp850,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_850,nls-codepage-850,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp850 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_852,nls-cp852,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_852,nls-codepage-852,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp852 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_857,nls-cp857,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_857,nls-codepage-857,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp857 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_860,nls-cp860,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_860,nls-codepage-860,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp860 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_861,nls-cp861,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_861,nls-codepage-861,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp861 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_862,nls-cp862,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_862,nls-codepage-862,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp862 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_863,nls-cp863,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_863,nls-codepage-863,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp863 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_864,nls-cp864,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_864,nls-codepage-864,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp864 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_865,nls-cp865,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_865,nls-codepage-865,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp865 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_866,nls-cp866,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_866,nls-codepage-866,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp866 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_869,nls-cp869,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_869,nls-codepage-869,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp869 \
,20))
NLS_CODEPAGE_874_MODULES := fs/nls/nls_cp874
-$(eval $(call KMOD_template,NLS_CODEPAGE_874,nls-cp874,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_874,nls-codepage-874,\
$(foreach mod,$(NLS_CODEPAGE_874_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,20))
NLS_CODEPAGE_932_MODULES := fs/nls/nls_cp932
NLS_CODEPAGE_932_MODULES += fs/nls/nls_euc-jp
-$(eval $(call KMOD_template,NLS_CODEPAGE_932,nls-cp932,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_932,nls-codepage-932,\
$(foreach mod,$(NLS_CODEPAGE_932_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,20))
NLS_CODEPAGE_936_MODULES := fs/nls/nls_cp936
-$(eval $(call KMOD_template,NLS_CODEPAGE_936,nls-cp936,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_936,nls-codepage-936,\
$(foreach mod,$(NLS_CODEPAGE_936_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,20))
NLS_CODEPAGE_949_MODULES := fs/nls/nls_cp949
-$(eval $(call KMOD_template,NLS_CODEPAGE_949,nls-cp949,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_949,nls-codepage-949,\
$(foreach mod,$(NLS_CODEPAGE_949_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,20))
NLS_CODEPAGE_950_MODULES := fs/nls/nls_cp950
-$(eval $(call KMOD_template,NLS_CODEPAGE_950,nls-cp950,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_950,nls-codepage-950,\
$(foreach mod,$(NLS_CODEPAGE_950_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_1250,nls-cp1250,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_1250,nls-codepage-1250,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp1250 \
,20))
-$(eval $(call KMOD_template,NLS_CODEPAGE_1251,nls-cp1251,\
+$(eval $(call KMOD_template,NLS_CODEPAGE_1251,nls-codepage-1251,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp1251 \
,20))
@@ -1275,23 +1343,23 @@ MISDN_MODULES+=drivers/isdn/hardware/mISDN/mISDN_isac
MISDN_MODULES+=drivers/isdn/hardware/mISDN/mISDN_x25dte
MISDN_MODULES+=drivers/isdn/hardware/mISDN/l3udss1
-$(eval $(call KMOD_template,MISDN_DRV,misdn, \
+$(eval $(call KMOD_template,MISDN_DRV,misdn-drv, \
$(foreach mod, $(MISDN_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
,75))
-$(eval $(call KMOD_template,MISDN_AVM_FRITZ,misdn-avm, \
+$(eval $(call KMOD_template,MISDN_AVM_FRITZ,misdn-avm-fritz, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/avmfritz \
,80))
-$(eval $(call KMOD_template,MISDN_HFCPCI,misdn-hfc-pci, \
+$(eval $(call KMOD_template,MISDN_HFCPCI,misdn-hfcpci, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcpci \
,80))
-$(eval $(call KMOD_template,MISDN_HFCMULTI,misdn-hfc-multi, \
+$(eval $(call KMOD_template,MISDN_HFCMULTI,misdn-hfcmulti, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcmulti \
,80))
-$(eval $(call KMOD_template,MISDN_HFCMINI,misdn-hfc-minipci, \
+$(eval $(call KMOD_template,MISDN_HFCMINI,misdn-hfcmini, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcsmini \
,80))
diff --git a/mk/package.mk b/mk/package.mk
index c28f22a7c..6c58d4d4e 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,50 +1,62 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-all: build-all-ipkgs
+all: build-all-pkgs
-ifeq ($(ADK_STATIC),y)
-TCFLAGS:= ${TARGET_CFLAGS} -static
-TCXXFLAGS:= ${TARGET_CFLAGS} -static
-TCPPFLAGS:= ${TARGET_CPPFLAGS} -static
+ifneq (${PKG_CXX},)
+ifeq (${ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX},y)
+PKG_BUILDDEP+= uclibc++
+PKG_DEPENDS+= uclibc++
else
+PKG_DEPENDS+= libstdcxx
+endif
+endif
+
TCFLAGS:= ${TARGET_CFLAGS}
TCXXFLAGS:= ${TARGET_CFLAGS}
TCPPFLAGS:= ${TARGET_CPPFLAGS}
+TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
+ -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
+ -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
+ifeq ($(ADK_STATIC),y)
+TCFLAGS:= ${TARGET_CFLAGS} -static
+TCXXFLAGS:= ${TARGET_CFLAGS} -static
+TCPPFLAGS:= ${TARGET_CPPFLAGS} -static
+TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
+ -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
+ -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib \
+ -static
endif
+ifeq ($(ADK_NATIVE),y)
+TCFLAGS:=
+TCXXFLAGS:=
+TCPPFLAGS:=
+TLDFLAGS:=
+endif
+
ifeq ($(ADK_DEBUG),)
TCPPFLAGS+= -DNDEBUG
endif
-TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
- -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
- -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
ifneq ($(ADK_DEBUG),)
CONFIGURE_ARGS+= --enable-debug
else
CONFIGURE_ARGS+= --disable-debug
endif
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ARGS+= --enable-ipv6
-else
-CONFIGURE_ARGS+= --disable-ipv6
-endif
-ifeq ($(ADK_NATIVE),y)
- CONFIG_SHELL='$(strip ${SHELL})'
-else
-CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
- ${HOST_CONFIGURE_OPTS} \
- CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
+CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})' \
- PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
- PKG_CONFIG_LIBDIR=/dev/null \
- CONFIG_SHELL='$(strip ${SHELL})' \
+ PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig'
+ifeq ($(ADK_NATIVE),)
+CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
+ ${HOST_CONFIGURE_OPTS} \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes
endif
+
+CONFIGURE_PROG?= configure
MAKE_FILE?= Makefile
# this is environment for 'make all' and 'make install'
MAKE_ENV?=
@@ -56,26 +68,27 @@ MAKE_FLAGS?=
FAKE_FLAGS?=
ALL_TARGET?= all
INSTALL_TARGET?= install
-ifeq ($(ADK_NATIVE),y)
-MAKE_ENV+= \
- WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
- WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
-else
-MAKE_ENV+= PATH='${TARGET_PATH}' \
- ${HOST_CONFIGURE_OPTS} \
- WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
+
+MAKE_ENV+= WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
- PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
- PKG_CONFIG_LIBDIR=/dev/null \
- CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
- AR='${TARGET_CROSS}ar' RANLIB='${TARGET_CROSS}ranlib' \
- NM='${TARGET_CROSS}nm' \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})'
+ifeq ($(ADK_NATIVE),)
+MAKE_ENV+= PATH='${TARGET_PATH}' \
+ ${HOST_CONFIGURE_OPTS} \
+ PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' \
+ CC='${TARGET_CC}' \
+ CXX='${TARGET_CXX}' \
+ AR='${TARGET_CROSS}ar' \
+ RANLIB='${TARGET_CROSS}ranlib' \
+ NM='${TARGET_CROSS}nm' \
+ STRIP='${TARGET_CROSS}strip' \
+ CROSS="$(TARGET_CROSS)"
endif
-MAKE_FLAGS+= ${XAKE_FLAGS}
+
+MAKE_FLAGS+= ${XAKE_FLAGS} V=1
FAKE_FLAGS+= ${XAKE_FLAGS}
ifeq ($(strip ${WRKDIR_BSD}),)
@@ -105,7 +118,7 @@ build: ${_BUILD_COOKIE}
fake: ${_FAKE_COOKIE}
# our recursive build entry point
-build-all-ipkgs: ${_IPKGS_COOKIE}
+build-all-pkgs: ${_IPKGS_COOKIE}
# there are some parameters to the PKG_template function
# 1.) Config.in identifier ADK_PACKAGE_$(1)
@@ -122,13 +135,17 @@ build-all-ipkgs: ${_IPKGS_COOKIE}
# cleaning (needed for toolchain packages like glibc/eglibc)
# should be package format independent and modular in the future
define PKG_template
-IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.ipk
-IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/ipkg-$(2)
+ALL_PKGOPTS+= $(1)
+PKGNAME_$(1)= $(2)
+PKGDEPS_$(1)= $(4)
+PKGDESC_$(1)= $(5)
+IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
+IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
ALL_IPKGS+= $$(IPKG_$(1))
ALL_IDIRS+= $${IDIR_$(1)}
endif
-INFO_$(1)= $(IPKG_STATE_DIR)/info/$(2).list
+INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list
ifeq ($(ADK_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1))
@@ -142,7 +159,6 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
@echo "Package: $(2)" > $(WRKDIR)/.$(2).control
@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
-ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
comma=; \
@@ -162,7 +178,6 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
done
-endif
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
ifeq ($(ADK_DEBUG),)
@@ -190,24 +205,24 @@ ifeq (,$(filter noremove,$(7)))
fi
endif
@rm -f '$${STAGING_PARENT}/pkg/$(1)'
- @cd $${IDIR_$(1)}; \
+ @-cd $${IDIR_$(1)}; \
x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \
echo 'WARNING: $${IPKG_$(1)} installs files into a' \
'ramdisk location:' >&2; \
echo "$$$$x" | sed 's/^/- /' >&2; \
fi; \
- if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
+ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi; \
find usr ! -type d 2>/dev/null | \
- grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
+ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \
tee '$${STAGING_PARENT}/pkg/$(1)' | \
- cpio -apdlmu --quiet '$${STAGING_DIR}'
+ cpio -padlmu '$${STAGING_DIR}'
@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/' \
@@ -220,11 +235,10 @@ ifeq (,$(filter noscripts,$(7)))
>>'$${STAGING_PARENT}/pkg/$(1)'; \
done
endif
-ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
- $${IPKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
+ifeq (,$(filter libmix,$(7)))
+ifeq (,$(filter libonly,$(7)))
+ $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
endif
-ifeq ($(ADK_TARGET_PACKAGE_TGZ),y)
- (cd $${IDIR_$(1)} && tar czf $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.tar.gz .);
endif
clean-targets: clean-dev-$(1)
@@ -241,7 +255,7 @@ endif
@rm -f '$${STAGING_PARENT}/pkg/$(1)'
$$(INFO_$(1)): $$(IPKG_$(1))
- $(IPKG) install $$(IPKG_$(1))
+ $(PKG_INSTALL) $$(IPKG_$(1))
endef
install-targets:
@@ -259,4 +273,4 @@ distclean: clean
rm -f ${FULLDISTFILES}
.PHONY: all refetch extract patch configure \
- build fake package install clean build-all-ipkgs
+ build fake package install clean build-all-pkgs
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 64baf190c..466a4c398 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -5,28 +5,38 @@
# that we can call it (BSD make has .if target(foo) but GNU not)
# and it won't error out.
# * ${_foo_COOKIE} are the actual targets
-# * default is "manual" -> define a do-foo: target in the Makefile
+# * default is "auto"
+# * define "manual" if you need your own method
+# -> define a do-foo: target in the Makefile
# * if you have a style -> define a pre-foo: and post-foo: if they
# are required, but the do-foo: magic is done here
-# * we want to use styles (configure:gnu, build/install:auto), for
-# making the Makefiles of the packages more clear
+
+REORDER_DEPENDENCIES= ${TOPDIR}/scripts/automake.dep
pre-configure:
do-configure:
post-configure:
${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
+ @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
+ tsort | while read f; do \
+ cd ${WRKSRC}; \
+ case $$f in \
+ /*) \
+ find . -name "$${f#/}" -print | while read i; do \
+ touch "$$i"; \
+ done;; \
+ *) \
+ if test -e "$$f" ; then \
+ touch "$$f"; \
+ fi;; \
+ esac; \
+ done
mkdir -p ${WRKBUILD}
@${MAKE} pre-configure $(MAKE_TRACE)
-ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
- cd ${WRKBUILD}; \
- autoreconf -vif $(MAKE_TRACE)
-endif
-ifneq ($(filter autoconf,${CONFIGURE_STYLE}),)
- cd ${WRKBUILD}; \
- autoconf $(MAKE_TRACE)
-endif
-ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
+ifneq ($(filter manual,${CONFIG_STYLE}),)
+ env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
+else ifneq ($(filter minimal,${CONFIG_STYLE}),)
@$(CMD_TRACE) "configuring... "
@cd ${WRKBUILD}; \
for i in $$(find . -name config.sub);do \
@@ -43,7 +53,26 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
done;
cd ${WRKBUILD}; rm -f config.{cache,status}; \
env ${CONFIGURE_ENV} \
- ${BASH} ${WRKSRC}/configure \
+ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
+ ${CONFIGURE_ARGS} $(MAKE_TRACE)
+else ifeq ($(strip ${CONFIG_STYLE}),)
+ @$(CMD_TRACE) "configuring... "
+ @cd ${WRKBUILD}; \
+ for i in $$(find . -name config.sub);do \
+ if [ -f $$i ]; then \
+ ${CP} $$i $$i.bak; \
+ ${CP} ${SCRIPT_DIR}/config.sub $$i; \
+ fi; \
+ done; \
+ for i in $$(find . -name config.guess);do \
+ if [ -f $$i ]; then \
+ ${CP} $$i $$i.bak; \
+ ${CP} ${SCRIPT_DIR}/config.guess $$i; \
+ fi; \
+ done;
+ cd ${WRKBUILD}; rm -f config.{cache,status}; \
+ env ${CONFIGURE_ENV} \
+ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
--build=${GNU_HOST_NAME} \
--host=${GNU_TARGET_NAME} \
--target=${GNU_TARGET_NAME} \
@@ -52,7 +81,7 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
--prefix=/usr \
--datadir=/usr/share \
--mandir=/usr/share/man \
- --libexecdir=/usr/sbin \
+ --libexecdir=/usr/libexec \
--localstatedir=/var \
--sysconfdir=/etc \
--disable-nls \
@@ -61,17 +90,15 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
--disable-dependency-tracking \
--disable-libtool-lock \
${CONFIGURE_ARGS} $(MAKE_TRACE)
-else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
- env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
else
- @echo "Invalid CONFIGURE_STYLE '${CONFIGURE_STYLE}'" >&2
+ @echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2
@exit 1
endif
@${MAKE} post-configure $(MAKE_TRACE)
touch $@
# do a parallel build if requested && package doesn't force disable it
-ifeq (${PKG_BUILD_PARALLEL},y)
+ifeq (${ADK_MAKE_PARALLEL},y)
ifeq ($(strip ${PKG_NOPARALLEL}),)
MAKE_FLAGS+= -j${ADK_MAKE_JOBS}
endif
@@ -83,13 +110,12 @@ post-build:
${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
@env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE)
@$(CMD_TRACE) "compiling... "
-ifneq ($(filter auto,${BUILD_STYLE}),)
- cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
- ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${BUILD_STYLE}),)
+
+ifneq ($(filter manual,${BUILD_STYLE}),)
env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE)
else ifeq ($(strip ${BUILD_STYLE}),)
- env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE)
+ cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
else
@echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2
@exit 1
@@ -103,15 +129,18 @@ post-install:
${_FAKE_COOKIE}: ${_BUILD_COOKIE}
-rm -f ${_ALL_CONTROLS}
@mkdir -p '${STAGING_PARENT}/pkg' ${WRKINST} '${STAGING_DIR}/scripts'
+ @mkdir -p ${WRKINST}/{sbin,bin,etc,lib}
+ @mkdir -p ${WRKINST}/usr/{sbin,bin,etc,lib}
@${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE)
@env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE)
-ifneq ($(filter auto,${INSTALL_STYLE}),)
- cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
- DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${INSTALL_STYLE}),)
+ifneq ($(filter manual,${INSTALL_STYLE}),)
env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE)
else ifeq ($(strip ${INSTALL_STYLE}),)
- env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE)
+ cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
+ifeq (,$(filter libonly,${PKG_OPTS}))
+ env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
+endif
else
@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
@exit 1
@@ -120,7 +149,6 @@ endif
[[ -e $$a ]] || continue; \
$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
done
- @env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
ifeq (,$(filter noremove,${PKG_OPTS}))
@if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \
cd '${STAGING_DIR}'; \
@@ -130,15 +158,15 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
fi
endif
@rm -f '${STAGING_PARENT}/pkg/${PKG_NAME}'
- @cd ${WRKINST}; \
+ @-cd ${WRKINST}; \
if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi;\
find usr ! -type d 2>/dev/null | \
- grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
+ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \
tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \
- cpio -apdlmu --quiet '${STAGING_DIR}'
+ cpio -padlmu '${STAGING_DIR}'
@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
'${STAGING_PARENT}/pkg/${PKG_NAME}' | while read fn; do \
chmod u+w $$fn; \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 33bc9c536..ef6fb031b 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -12,14 +12,17 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y)
ROOTFS:= root=/dev/sda2
endif
-$(eval $(call rootfs_template,ext2-cf,EXT2_CF,$(ROOTFS)))
-$(eval $(call rootfs_template,ext2-mmc,EXT2_MMC))
+ifeq ($(ADK_LINUX_ARM_FOXBOARD),y)
+ROOTFS:= root=/dev/mmcblk0p2 rootwait
+endif
+
+$(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS)))
$(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,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp))
+$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1 panic=3))
+$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
$(eval $(call rootfs_template,encrypted,ENCRYPTED))
export FS
diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk
index 6b1091e89..e9521c259 100644
--- a/mk/split-cfg.mk
+++ b/mk/split-cfg.mk
@@ -2,6 +2,8 @@
# material, please see the LICENCE file in the top-level directory.
# must work with both BSD and GNU make
-${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \
- ${TOPDIR}/mk/split-cfg.mk ${TOPDIR}/scripts/split-cfg.sh
- ${BASH} ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}'
+${TOPDIR}/.ADK_HAVE_DOT_CONFIG: \
+ ${TOPDIR}/.config ${TOPDIR}/mk/split-cfg.mk \
+ ${TOPDIR}/scripts/split-cfg.sh
+ mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' '${ADK_TARGET}' '${ADK_LIBC}'
+ touch ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
diff --git a/mk/vars.mk b/mk/vars.mk
index 63130507f..42c534071 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -12,74 +12,85 @@ BUILD_GROUP= $(shell id -gn)
ifneq ($(ADK_DEBUG),)
TARGET_DEBUGGING:= -g3 -fno-omit-frame-pointer
else
-TARGET_DEBUGGING:= -fomit-frame-pointer
+TARGET_DEBUGGING:= -fomit-frame-pointer $(TARGET_OPTIMIZATION)
endif
-ifeq ($(ADK_SSP),y)
-TARGET_SSP:= -fstack-protector-all
+TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING)
+ifneq ($(ADK_TARGET_ARCH_OPTIMIZATION),)
+TARGET_CFLAGS+= -march=$(ADK_TARGET_ARCH_OPTIMIZATION)
endif
-TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) $(TARGET_SSP)
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_${DEVICE}
-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_${DEVICE}
+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)
-GNU_TARGET_NAME= $(CPU_ARCH)-linux
+REAL_GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
ifeq ($(ADK_NATIVE),y)
-TARGET_COMPILER_PREFIX?=
TARGET_CROSS:=
+TARGET_COMPILER_PREFIX?=
else
+TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(REAL_GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
-TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
endif
TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc
TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++
+TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld
TARGET_CPPFLAGS+= -I${STAGING_DIR}/usr/include
TARGET_LDFLAGS+= -Wl,-O2
PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh
SED:= sed -i -e
LINUX_DIR:= $(BUILD_DIR)/linux
+LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header
TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \
AR=$(TARGET_CROSS)ar \
AS=$(TARGET_CROSS)as \
LD=$(TARGET_CROSS)ld \
NM=$(TARGET_CROSS)nm \
- CC="$(TARGET_CC)" \
- GCC="$(TARGET_CC)" \
- CXX="$(TARGET_CXX)" \
- RANLIB=$(TARGET_CROSS)ranlib
+ RANLIB=$(TARGET_CROSS)ranlib \
+ CC='$(TARGET_CC)' \
+ GCC='$(TARGET_CC)' \
+ CXX='$(TARGET_CXX)' \
+ CROSS='$(TARGET_CROSS)'
HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${HOSTCC}' \
+ BUILD_CC='${HOSTCC}' \
CFLAGS_FOR_BUILD='${HOSTCFLAGS}' \
CPPFLAGS_FOR_BUILD='${HOSTCPPFLAGS}' \
LDFLAGS_FOR_BUILD='${HOSTLDFLAGS}'
-# invoke ipkg-build with some default options
-IPKG_BUILD:= PATH='${TARGET_PATH}' ${BASH} \
- ${TOPDIR}/scripts/ipkg-build -c -o 0 -g 0
-# where to build (and put) .ipk packages
-IPKG_TARGET_DIR:= $(PACKAGE_DIR)
-IPKG:= IPKG_TMP=$(BUILD_DIR)/tmp \
+PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
+
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
+PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build -c -o 0 -g 0
+
+PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_DIR)/etc \
IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- ${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends
-IPKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg
+ ${BASH} ${SCRIPT_DIR}/ipkg \
+ -force-defaults -force-depends install
+PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg
+else
+PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/tarpkg build
+PKG_INSTALL:= PKG_INSTROOT=$(TARGET_DIR) \
+ ${BASH} ${SCRIPT_DIR}/tarpkg install
+PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/pkg
+endif
ifeq ($(ADK_NATIVE),y)
RSTRIP:= prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh
@@ -91,19 +102,21 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \
cd ${WRKDIR} && \
for file in ${FULLDISTFILES}; do case $$file in \
*.cpio) \
- cat $$file | cpio -i -d --quiet ;; \
+ cat $$file | cpio -i -d ;; \
*.tar) \
tar -xf $$file ;; \
*.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
- gzip -dc $$file | cpio -i -d --quiet ;; \
+ gzip -dc $$file | cpio -i -d ;; \
*.tar.Z | *.tar.gz | *.taz | *.tgz) \
gzip -dc $$file | tar -xf - ;; \
*.cpio.bz2 | *.cbz) \
- bzip2 -dc $$file | cpio -i -d --quiet ;; \
+ bzip2 -dc $$file | cpio -i -d ;; \
*.tar.bz2 | *.tbz | *.tbz2) \
bzip2 -dc $$file | tar -xf - ;; \
*.zip) \
unzip -qd ${WRKDIR} $$file ;; \
+ *.arm) \
+ cp $$file ${WRKDIR} ;; \
*) \
echo "Cannot extract '$$file'" >&2; \
false ;; \
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-24 23:01:22 +0000