diff options
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | TODO | 11 | ||||
| -rw-r--r-- | mk/build.mk | 79 | ||||
| -rw-r--r-- | mk/cpu.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 12 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 20 | ||||
| -rw-r--r-- | mk/kernel.mk | 10 | ||||
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | package/asterisk/Makefile | 4 | ||||
| -rw-r--r-- | package/base-files/Makefile | 8 | ||||
| -rw-r--r-- | package/em28xx/Makefile | 5 | ||||
| -rw-r--r-- | package/exmap/Makefile | 2 | ||||
| -rw-r--r-- | package/heimdal/Config.in | 1 | ||||
| -rw-r--r-- | package/heimdal/Makefile | 7 | ||||
| -rw-r--r-- | package/ipset/Makefile | 2 | ||||
| -rw-r--r-- | package/krb5/Config.in | 1 | ||||
| -rw-r--r-- | package/mac80211/Makefile | 6 | ||||
| -rw-r--r-- | package/microperl/Makefile | 2 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 1 | ||||
| -rw-r--r-- | package/ncurses/patches/patch-configure | 16 | ||||
| -rw-r--r-- | rules.mk | 12 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 | ||||
| -rw-r--r-- | target/Config.in | 99 | ||||
| -rw-r--r-- | target/Makefile | 14 | ||||
| -rw-r--r-- | target/alix1c/Makefile | 1 | ||||
| -rw-r--r-- | target/alix1c/target.mk (renamed from target/alix1c/device.mk) | 0 | ||||
| -rw-r--r-- | target/foxboard/target.mk (renamed from target/foxboard/device.mk) | 0 | ||||
| -rw-r--r-- | target/g1/target.mk (renamed from target/g1/device.mk) | 0 | ||||
| -rw-r--r-- | target/lemote/target.mk (renamed from target/lemote/device.mk) | 0 | ||||
| -rw-r--r-- | target/linux/patches/2.6.31.5/aufs2.patch | 454 | ||||
| -rw-r--r-- | target/native/target.mk (renamed from target/native/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-arm/target.mk (renamed from target/qemu-arm/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-cris/target.mk (renamed from target/qemu-cris/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-mips/target.mk (renamed from target/qemu-mips/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-mips64/target.mk (renamed from target/qemu-mips64/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-mips64el/target.mk (renamed from target/qemu-mips64el/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-mipsel/target.mk (renamed from target/qemu-mipsel/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-x86/target.mk (renamed from target/qemu-x86/device.mk) | 0 | ||||
| -rw-r--r-- | target/qemu-x86_64/target.mk (renamed from target/qemu-x86_64/device.mk) | 0 | ||||
| -rw-r--r-- | target/rb411/target.mk (renamed from target/rb411/device.mk) | 0 | ||||
| -rw-r--r-- | target/rb433/target.mk (renamed from target/rb433/device.mk) | 0 | ||||
| -rw-r--r-- | target/rb532/target.mk (renamed from target/rb532/device.mk) | 0 | ||||
| -rw-r--r-- | target/rescue-x86/target.mk (renamed from target/rescue-x86/device.mk) | 0 | ||||
| -rw-r--r-- | target/rescue-x86_64/target.mk (renamed from target/rescue-x86_64/device.mk) | 0 | ||||
| -rw-r--r-- | target/shuttle/target.mk (renamed from target/shuttle/device.mk) | 0 | ||||
| -rw-r--r-- | target/tomtom/target.mk (renamed from target/tomtom/device.mk) | 0 | ||||
| -rw-r--r-- | target/wag54g/target.mk (renamed from target/wag54g/device.mk) | 0 | ||||
| -rw-r--r-- | target/zaurus/target.mk (renamed from target/zaurus/device.mk) | 0 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 8 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 2 |
53 files changed, 442 insertions, 383 deletions
@@ -17,12 +17,14 @@ v: .prereq_done set -x; ${GMAKE_FMK} VERBOSE=1 all) 2>&1 | tee -a make.log help: - @echo ' switch DEV=device - Backup current config and copy old saved device config' + @echo 'Common targets:' + @echo ' switch TARGET=targetname - Backup current config and copy old saved target config' + @echo ' download - fetches all needed distfiles' @echo 'Cleaning targets:' @echo ' clean - Remove bin and build_dir directories' - @echo ' cleandevice - Same as "clean", but also remove toolchain for device' + @echo ' cleantarget - Same as "clean", but also remove toolchain for target' @echo ' cleandir - Same as "clean", but also remove all built toolchains' - @echo ' cleankernel - Remove kernel dir' + @echo ' cleankernel - Remove kernel dir, useful if you changed any kernel patches' @echo ' distclean - Same as "cleandir", but also remove downloaded' @echo ' distfiles and .config' @echo '' @@ -53,13 +55,13 @@ pkg-help: @echo ' patch - Same as "extract", but also patch the source' @echo ' build - Same as "patch", but also build the binaries' @echo ' fake - Same as "build", but also install the binaries' - @echo ' package - Same as "fake", but also create the ipkg package' + @echo ' package - Same as "fake", but also create the package' @echo ' clean - Deinstall and remove the build area' @echo ' distclean - Same as "clean", but also remove the distfiles' @echo '' @echo 'Short package rebuilding guide:' @echo ' run "make package=<pkgname> clean" to remove all generated binaries' - @echo ' run "make package=<pkgname> package" to build everything and create the ipkg' + @echo ' run "make package=<pkgname> package" to build everything and create the package(s)' @echo '' @echo 'This does not automatically resolve package dependencies!' @@ -97,12 +99,12 @@ cleandir dirclean: .prereq_done -@${GMAKE_INV} clean cleandir @-rm -f make.log .prereq_done -cleandevice deviceclean: .prereq_done - -@${GMAKE_INV} clean cleandevice +cleantarget targetclean: .prereq_done + -@${GMAKE_INV} clean cleantarget @-rm -f make.log -distclean cleandist: .prereq_done - -@${GMAKE_INV} clean cleandir distclean +distclean cleandist: + @-${GMAKE_INV} distclean @-rm -f make.log .prereq_done image: .prereq_done @@ -126,6 +128,11 @@ allconfig: .prereq_done allmodconfig: .prereq_done @${GMAKE_INV} _mconfig W=-o RCONFIG=Config.in +allmoddefconfig: .prereq_done + @if [ -z "$(TARGET)" ];then echo "You need to specify a target"; exit 1;fi + cp $(TOPDIR)/target/$(TARGET)/default.config $(TOPDIR)/.defconfig + @${GMAKE_INV} _mconfig W="-m -o -D .defconfig" RCONFIG=Config.in + package_index: .prereq_done @${GMAKE_INV} package_index @@ -2,24 +2,15 @@ - more qemu-targets (ppc/sparc) - rpm package backend - port htop software -- stripping of kernel is not working for all targets -- implement a non-interactive allmodconfig for different targets - (make TARGET=foo defconfig allmodconfig) - needed for ADK buildserver - rescue initramfs image (more archs, generic kernel config ) - usb boot via stick - fix init scripts pidof? vs. killall -- rpath libtool problem fix -- bind isc 9.6.1 -- check ac_cv_func_setpgrp_void=no - freebsd build - win cygwin build - netbsd build - macos x build - openbsd build -- optimize iptables package (libdirs depending on choosen kernel features) -- checksum for toolchain packages - network scripts for wireless client / ap - network scripts for pppoe - customise mconf help texts to better fit for OpenADK -- publish via trac+git +- publish via trac diff --git a/mk/build.mk b/mk/build.mk index c3795b404..3bfd3bce9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -10,6 +10,10 @@ endif CONFIG_CONFIG_IN = Config.in CONFIG = config +DEFCONFIG= ADK_DEVELSYSTEM=n \ + ADK_DEBUG=n \ + ADK_STATIC=n \ + ADK_FORCE_PARALLEL=n noconfig_targets:= menuconfig \ _config \ @@ -20,10 +24,11 @@ MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ ADK_TARGET_LIB_GLIBC \ ADK_TARGET_LIB_ECLIBC \ ADK_IPV6 ADK_CXX ADK_DEBUG + POSTCONFIG= -@\ if [ -f .config.old ];then \ if [ -d .cfg ];then \ - what=cleandevice; \ + what=cleantarget; \ for symbol in ${MAKECLEAN_SYMBOLS}; do \ newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ oldval=$$(cat .cfg/"$$symbol" 2>&-); \ @@ -53,7 +58,7 @@ include ${TOPDIR}/mk/split-cfg.mk all: world .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 ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh @@ -107,14 +112,15 @@ 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 + mv .cfg .cfg.${ADK_TARGET} + if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \ + cp -p .config.old.${TARGET} .config.old; \ + mv .cfg.${TARGET} .cfg; \ + echo "Setting configuration to target: ${TARGET}"; \ + else echo "No old target config found";mv .config .config.bak;fi ############################################################# # @@ -135,9 +141,9 @@ clean: @$(TRACE) clean $(MAKE) -C $(CONFIG) clean for d in ${STAGING_PARENT_PFX}; do \ - #echo "clean: entering $$d" ; \ + echo "clean: entering $$d" ; \ for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do \ - #echo "clean: cleaning for $$f" ; \ + echo "clean: cleaning for $$f" ; \ while read file ; do \ rm $$d/target/$$file 2>/dev/null; \ done < $$f ; \ @@ -158,8 +164,8 @@ cleandir: rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk -cleandevice: - @$(TRACE) cleandevice +cleantarget: + @$(TRACE) cleantarget $(MAKE) -C $(CONFIG) clean rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) @@ -167,8 +173,8 @@ cleandevice: distclean: @$(TRACE) distclean - $(MAKE) -C $(CONFIG) clean - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg + @$(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 @@ -191,7 +197,38 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -menuconfig: $(CONFIG)/mconf +defconfig: + @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 +ifneq (,$(filter %_qemu,${TARGET})) + @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig +endif +ifneq (,$(filter %_rescue,${TARGET})) + @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig +endif + @if [ ! -z "$(TARGET)" ];then \ + $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + fi + +modconfig: + @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 +ifneq (,$(filter %_qemu,${TARGET})) + @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config +endif +ifneq (,$(filter %_rescue,${TARGET})) + @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config +endif + +menuconfig: $(CONFIG)/mconf defconfig @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} @@ -202,13 +239,13 @@ _config: $(CONFIG)/conf .NOTPARALLEL: _mconfig _mconfig: ${CONFIG}/conf _mconfig2 _config -_mconfig2: ${CONFIG}/conf +_mconfig2: ${CONFIG}/conf modconfig @${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 + @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) @@ -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/image.mk b/mk/image.mk index 7c61a137d..50c5d8b95 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -48,10 +48,10 @@ image-prepare-post: chmod 4511 ${TARGET_DIR}/bin/busybox chmod 1777 ${TARGET_DIR}/tmp -INITRAMFS= ${DEVICE}-${ARCH}-${FS} -ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img -ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz -INITRAMFS_PIGGYBACK= ${DEVICE}-${ARCH}-${FS}.cpio +INITRAMFS= ${ADK_TARGET}-${ARCH}-${FS} +ROOTFSSQUASHFS= ${ADK_TARGET}-${ARCH}-${FS}.img +ROOTFSTARBALL= ${ADK_TARGET}-${ARCH}-${FS}.tar.gz +INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ARCH}-${FS}.cpio ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@ @@ -68,11 +68,11 @@ ${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}-${ARCH}-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 b8dccfe84..c32964c10 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -13,19 +13,19 @@ 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 + $(TRACE) target/$(ADK_TARGET)-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) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/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 + $(TRACE) target/$(ADK_TARGET)-kernel-prepare ln -sf $(TOOLCHAIN_BUILD_DIR)/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,30 +33,30 @@ $(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 + $(TRACE) target/$(ADK_TARGET)-create-packages $(MAKE) $(KERNEL_PKG) $(TARGETS) touch -c $(LINUX_DIR)/vmlinux $(KERNEL_PKG): - $(TRACE) target/$(DEVICE)-create-kernel-package + $(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 ${DEVICE}-${KERNEL_VERSION} ${CPU_ARCH} + ../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 + $(TRACE) target/${ADK_TARGET}-modules-install $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) endif diff --git a/mk/kernel.mk b/mk/kernel.mk index 365cc12e6..33fbf5c2a 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -4,12 +4,12 @@ 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_PKG:=$(PACKAGE_DIR)/kernel_$(DEVICE)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) +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).$(PKG_SUFFIX) +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) @@ -52,7 +52,7 @@ $$(PKG_$(1)): 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) diff --git a/mk/modules.mk b/mk/modules.mk index dc98493e1..bdb8fa897 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -54,7 +54,7 @@ $(eval $(call KMOD_template,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 \ + $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ ,20, kmod-led-class)) $(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\ diff --git a/mk/vars.mk b/mk/vars.mk index 45975779f..b68cd6297 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -31,10 +31,10 @@ TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH} 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:= $(BASE_DIR)/bin_${ADK_TARGET} BIN_DIR_PFX:= $(BASE_DIR)/bin_* PACKAGE_DIR:= $(BIN_DIR)/packages -TARGET_DIR:= $(BASE_DIR)/root_${DEVICE} +TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET} 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) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index b048c823c..d234b8a57 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.26.1 +PKG_VERSION:= 1.4.26.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b46f8628f43e1d3c275460ceee26646 +PKG_MD5SUM:= 04017dfdc8caeb8f4663b5dc4a9e1019 PKG_DESCR:= Open Source PBX PKG_SECTION:= net PKG_DEPENDS:= libncurses libpthread libopenssl libcurl diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 52130bf10..f785e303e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base @@ -15,7 +15,7 @@ NO_DISTFILES:= 1 ifeq ($(CPU_ARCH),x86_64) PKG_ID= x86-64-${FS} else -PKG_ID= ${DEVICE}-${FS} +PKG_ID= ${ADK_TARGET}-${FS} endif WRKDIR= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID} @@ -25,8 +25,8 @@ $(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_ do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) - $(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES) - $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile index 2a405660e..bd2ba0315 100644 --- a/package/em28xx/Makefile +++ b/package/em28xx/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= manual BUILD_STYLE:= manual @@ -22,7 +22,6 @@ BUILD_STYLE:= manual EM28XX_MAKEOPTS= -C ${WRKBUILD} \ ARCH="${ARCH}" \ CROSS_COMPILE="${TARGET_CROSS}" \ - TARGET="${HAL_TARGET}" \ TOOLPREFIX="${TARGET_CROSS}" \ TOOLPATH="${TARGET_CROSS}" \ KERNELPATH="${LINUX_DIR}" \ @@ -35,7 +34,7 @@ do-build: post-install: ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/etc/modules.d/ ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/*.ko \ + ${CP} ${WRKBUILD}/*.ko \ ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/exmap/Makefile b/package/exmap/Makefile index be7953f5b..092ba4a34 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in index 449d4c5f3..de86f9d27 100644 --- a/package/heimdal/Config.in +++ b/package/heimdal/Config.in @@ -1,6 +1,7 @@ config ADK_COMPILE_HEIMDAL prompt "heimdal........................... Heimdal kerberos software" bool + depends on !ADK_COMPILE_KRB5 default n config ADK_COMPILE_HEIMDAL_WITH_PKINIT diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 3ae793bc0..d7926542b 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -66,11 +66,11 @@ CONFIGURE_OPTS+= --disable-pk-init endif TCFLAGS+= -pthread -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ${CONFIGURE_OPTS} CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ @@ -93,6 +93,7 @@ pre-configure: ${MAKE} -C ${WRKBUILD} clean post-install: + -rm $(STAGING_DIR)/usr/lib/libcom_err* ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema ${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \ diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 4f5350201..6db433527 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= PREFIX=/usr BUILD_STYLE:= auto diff --git a/package/krb5/Config.in b/package/krb5/Config.in index 5fa68aa6f..d4f8b6436 100644 --- a/package/krb5/Config.in +++ b/package/krb5/Config.in @@ -8,6 +8,7 @@ config ADK_PACKAGE_KRB5_SERVER prompt "krb5-server....................... MIT kerberos server" tristate depends on ADK_COMPILE_KRB5 + depends on !ADK_COMPILE_HEIMDAL select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_KRB5_LIBS default n diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index d03f59486..919b7f120 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -21,9 +21,9 @@ WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) -$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) -$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= manual diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 9e3ab4fff..2d0555f28 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -27,7 +27,7 @@ MAKE_FLAGS+= CC="${TARGET_CC}" OPTIMIZE="${TCFLAGS}" MAKE_FILE:= Makefile.micro pre-configure: - $(CP) ./files/uconfig.h.$(CPU_ARCH) $(WRKBUILD)/uconfig.h + $(CP) ./files/uconfig.h.$(ARCH) $(WRKBUILD)/uconfig.h do-install: ${INSTALL_DIR} ${IDIR_MICROPERL}/usr/bin diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index db71137ce..35da4cb09 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -21,6 +21,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ + --with-build-cc=${HOSTCC} \ --without-progs \ --with-fallbacks \ --without-ada \ diff --git a/package/ncurses/patches/patch-configure b/package/ncurses/patches/patch-configure new file mode 100644 index 000000000..1ef36c733 --- /dev/null +++ b/package/ncurses/patches/patch-configure @@ -0,0 +1,16 @@ +--- ncurses-5.7.orig/configure 2008-10-26 02:04:38.000000000 +0200 ++++ ncurses-5.7/configure 2009-11-15 22:44:41.000000000 +0100 +@@ -3985,13 +3985,6 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 + + : ${BUILD_CC:='${CC}'} + +- if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:3989: error: Cross-build requires two compilers. +-Use --with-build-cc to specify the native compiler." >&5 +-echo "$as_me: error: Cross-build requires two compilers. +-Use --with-build-cc to specify the native compiler." >&2;} +- { (exit 1); exit 1; }; } +- fi + + else + : ${BUILD_CC:='${CC}'} @@ -25,12 +25,12 @@ SET_DASHX:= : endif # Strip off the annoying quoting -DEVICE:= $(strip $(subst ",, $(ADK_DEVICE))) +ADK_TARGET:= $(strip $(subst ",, $(ADK_TARGET))) ADK_TARGET_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_SUFFIX))) ADK_COMPRESSION_TOOL:= $(strip $(subst ",, $(ADK_COMPRESSION_TOOL))) ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y) -include $(TOPDIR)/target/$(DEVICE)/device.mk +include $(TOPDIR)/target/$(ADK_TARGET)/target.mk endif include $(TOPDIR)/mk/vars.mk @@ -43,7 +43,7 @@ TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) -ifneq (${show},) -_show: - @echo '$($(show))' -endif +#ifneq (${show},) +#_show: +# @echo '$($(show))' +#endif diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 50b10e0d6..b9cb279d1 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -39,6 +39,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_COMPILE_HEIMDAL ]]; then + NEED_BISON="$NEED_BISON heimdal-server" +fi + if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then NEED_XMLTO="$NEED_XMLTO alsa-utils" fi @@ -96,6 +100,13 @@ if [[ -n $NEED_SSLDEV ]]; then fi fi +if [[ -n $NEED_BISON ]]; then + if ! which bison >/dev/null 2>&1; then + echo >&2 You need bison to build $NEED_BISON + out=1 + fi +fi + if [[ -n $NEED_GXX ]]; then if ! which g++ >/dev/null 2>&1; then echo >&2 You need GNU c++ compiler to build $NEED_GXX diff --git a/target/Config.in b/target/Config.in index d3b443145..18c57c7b6 100644 --- a/target/Config.in +++ b/target/Config.in @@ -8,7 +8,7 @@ config ADK_BROKEN config ADK_TOOLCHAIN_ONLY bool -config ADK_DEVICE_NO_FPU +config ADK_TARGET_NO_FPU bool config ADK_EABI @@ -23,28 +23,28 @@ config ADK_NATIVE config ADK_alix1c tristate -config ADK_qemu_arm +config ADK_arm_qemu tristate -config ADK_qemu_mips +config ADK_mips_qemu tristate -config ADK_qemu_mipsel +config ADK_mipsel_qemu tristate -config ADK_qemu_mips64 +config ADK_mips64_qemu tristate -config ADK_qemu_mips64el +config ADK_mips64el_qemu tristate -config ADK_qemu_cris +config ADK_cris_qemu tristate -config ADK_qemu_x86 +config ADK_x86_qemu tristate -config ADK_qemu_x86_64 +config ADK_x86_64_qemu tristate config ADK_rb532 @@ -68,16 +68,16 @@ config ADK_foxboard config ADK_lemote tristate -config ADK_rescue_x86 +config ADK_x86_rescue tristate -config ADK_rescue_x86_64 +config ADK_x86_64_rescue tristate -config ADK_rescue_mips +config ADK_mips_rescue tristate -config ADK_rescue_mipsel +config ADK_mipsel_rescue tristate config ADK_wag54g @@ -89,17 +89,17 @@ config ADK_shuttle config ADK_g1 tristate -config ADK_DEVICE +config ADK_TARGET string default "alix1c" if ADK_alix1c - default "qemu-arm" if ADK_qemu_arm - default "qemu-cris" if ADK_qemu_cris - default "qemu-mips" if ADK_qemu_mips - default "qemu-mipsel" if ADK_qemu_mipsel - default "qemu-mips64" if ADK_qemu_mips64 - default "qemu-mips64el" if ADK_qemu_mips64el - default "qemu-x86" if ADK_qemu_x86 - default "qemu-x86_64" if ADK_qemu_x86_64 + default "qemu-arm" if ADK_arm_qemu + default "qemu-cris" if ADK_cris_qemu + default "qemu-mips" if ADK_mips_qemu + default "qemu-mipsel" if ADK_mipsel_qemu + default "qemu-mips64" if ADK_mips64_qemu + default "qemu-mips64el" if ADK_mips64el_qemu + default "qemu-x86" if ADK_x86_qemu + default "qemu-x86_64" if ADK_x86_64_qemu default "foxboard" if ADK_foxboard default "native" if ADK_NATIVE default "rb532" if ADK_rb532 @@ -108,10 +108,10 @@ config ADK_DEVICE default "zaurus" if ADK_arm default "lemote" if ADK_lemote default "wag54g" if ADK_wag54g - default "rescue-x86" if ADK_rescue_x86 - default "rescue-x86_64" if ADK_rescue_x86_64 - default "rescue-mips" if ADK_rescue_mips - default "rescue-mipsel" if ADK_rescue_mipsel + default "rescue-x86" if ADK_x86_rescue + default "rescue-x86_64" if ADK_x86_64_rescue + default "rescue-mips" if ADK_mips_rescue + default "rescue-mipsel" if ADK_mipsel_rescue default "shuttle" if ADK_shuttle default "tomtom" if ADK_tomtom default "g1" if ADK_g1 @@ -119,7 +119,7 @@ config ADK_DEVICE menu "Target system" choice -prompt "Embedded Device" +prompt "Embedded Device or Emulator" default ADK_LINUX_NATIVE config ADK_LINUX_NATIVE @@ -184,7 +184,7 @@ config ADK_LINUX_MIPS_WAG54G config ADK_LINUX_ARM_TOMTOM bool "TomTom Applications" select ADK_tomtom - select ADK_DEVICE_NO_FPU + select ADK_TARGET_NO_FPU select ADK_EABI select ADK_TOOLCHAIN_ONLY help @@ -195,7 +195,7 @@ config ADK_LINUX_ARM_TOMTOM config ADK_LINUX_ARM_G1 bool "Google G1 Applications" select ADK_g1 - select ADK_DEVICE_NO_FPU + select ADK_TARGET_NO_FPU select ADK_EABI select ADK_TOOLCHAIN_ONLY help @@ -205,9 +205,8 @@ config ADK_LINUX_ARM_G1 #config ADK_LINUX_XSCALE_ZAURUS # bool "Zaurus SL-C3200" -# depends on ADK_BROKEN # select ADK_zaurus -# select ADK_DEVICE_NO_FPU +# select ADK_TARGET_NO_FPU # help # Support for Sharp Zaurus SL-C3200 (aka Terrier) @@ -242,7 +241,6 @@ config ADK_LINUX_X86_64_SHUTTLE select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK help Support for a nice and fast shuttle xpc with AMD quad-core CPU. - Known as OpenADK multi operating system buildserver. endchoice @@ -252,25 +250,25 @@ depends on ADK_LINUX_RESCUE config ADK_LINUX_X86_64_RESCUE bool "x86_64" - select ADK_rescue_x86_64 + select ADK_x86_64_rescue help X86 architecture. config ADK_LINUX_X86_RESCUE bool "x86" - select ADK_rescue_x86 + select ADK_x86_rescue help X86 architecture. config ADK_LINUX_MIPSEL_RESCUE bool "mips (little endian)" - select ADK_rescue_mipsel + select ADK_mipsel_rescue help MIPS LE architecture. config ADK_LINUX_MIPS_RESCUE bool "mips (big endian)" - select ADK_rescue_mips + select ADK_mips_rescue help MIPS BE architecture. @@ -282,7 +280,7 @@ depends on ADK_LINUX_QEMU config ADK_LINUX_ARM_QEMU bool "arm" - select ADK_qemu_arm + select ADK_arm_qemu select ADK_EABI help Qemu support for ARM architecture. @@ -290,40 +288,40 @@ config ADK_LINUX_ARM_QEMU config ADK_LINUX_MIPS_QEMU bool "mips (big endian)" - select ADK_qemu_mips + select ADK_mips_qemu help Qemu support for MIPS BE architecture. config ADK_LINUX_MIPSEL_QEMU bool "mipsel (little endian)" - select ADK_qemu_mipsel + select ADK_mipsel_qemu help Qemu support for MIPS LE architecture. config ADK_LINUX_MIPS64_QEMU bool "mips64 (big endian)" - select ADK_qemu_mips64 + select ADK_mips64_qemu select ADK_LINUX_64 help Qemu support for MIPS64 BE architecture. config ADK_LINUX_MIPS64EL_QEMU bool "mips64 (little endian)" - select ADK_qemu_mips64el + select ADK_mips64el_qemu select ADK_LINUX_64 help Qemu support for MIPS64 LE architecture. config ADK_LINUX_CRIS_QEMU bool "cris" - select ADK_qemu_cris + select ADK_cris_qemu # select ADK_BROKEN help Qemu support for CRISv32 architecture. config ADK_LINUX_X86_QEMU bool "x86" - select ADK_qemu_x86 + select ADK_x86_qemu select ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_INPUT_KEYBOARD help @@ -331,7 +329,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" - select ADK_qemu_x86_64 + select ADK_x86_64_qemu select ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_INPUT_KEYBOARD help @@ -416,6 +414,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ @@ -435,6 +434,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_ARM_TOMTOM || \ @@ -456,7 +456,7 @@ config ADK_TARGET_SUFFIX choice prompt "Target Firmware type" depends on !ADK_TOOLCHAIN_ONLY - default ADK_TARGET_ROOTFS_EXT2_CF + default ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" @@ -699,13 +699,13 @@ config ADK_TARGET_PACKAGE_TGZ boolean prompt "gzip compressed tar archive" help - Create simple compressed tar archives. + Create compressed tar archives. config ADK_TARGET_PACKAGE_RPM boolean prompt "rpm package format" help - Create rpm binary packages. + Create rpm packages. endchoice @@ -721,7 +721,7 @@ config ADK_CXX bool "Enable C++ support" default n help - Enable C++ Compiler and Libraries + Enable C++ compiler and libraries. config ADK_IPV6 bool "Enable IPv6 support" @@ -731,7 +731,7 @@ config ADK_IPV6 select BUSYBOX_FEATURE_IFUPDOWN_IPV6 select BUSYBOX_PING6 help - Enable basic IPv6 support (kmod-ipv6) and + Enable basic IPv6 support and make the IPv6 support options in packages visible. config ADK_X11 @@ -742,5 +742,4 @@ config ADK_X11 Try to compile other packages with X11 support. (f.e. mplayer) - endmenu diff --git a/target/Makefile b/target/Makefile index 63c3e58cc..b3f266ee0 100644 --- a/target/Makefile +++ b/target/Makefile @@ -41,9 +41,9 @@ config-prepare: $(TOPDIR)/.config >${BUILD_DIR}/.kernelconfig.nokernel # if native build, first try /proc/config.gz ifeq ($(ADK_NATIVE),y) - @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${DEVICE}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi + @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi else - @cp ${DEVICE}/kernel.config ${BUILD_DIR}/.kernelconfig.board + @cp ${ADK_TARGET}/kernel.config ${BUILD_DIR}/.kernelconfig.board endif @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ while IFS='=' read symbol value; do \ @@ -62,11 +62,11 @@ endif cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp -prepare: $(DEVICE)-prepare -compile: $(DEVICE)-compile -image: $(DEVICE)-imageclean $(DEVICE)-imageinstall -install: $(DEVICE)-imageclean $(DEVICE)-install $(DEVICE)-imageinstall -clean: $(DEVICE)-clean $(DEVICE)-imageclean +prepare: $(ADK_TARGET)-prepare +compile: $(ADK_TARGET)-compile +image: $(ADK_TARGET)-imageclean $(ADK_TARGET)-imageinstall +install: $(ADK_TARGET)-imageclean $(ADK_TARGET)-install $(ADK_TARGET)-imageinstall +clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-clean: $(TRACE) target/$(patsubst %-clean,%,$@)-clean diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 539a1fdba..64f442027 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -20,7 +20,6 @@ endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix1c/device.mk b/target/alix1c/target.mk index 18f3c923e..18f3c923e 100644 --- a/target/alix1c/device.mk +++ b/target/alix1c/target.mk diff --git a/target/foxboard/device.mk b/target/foxboard/target.mk index 0dabf25ab..0dabf25ab 100644 --- a/target/foxboard/device.mk +++ b/target/foxboard/target.mk diff --git a/target/g1/device.mk b/target/g1/target.mk index a19b67034..a19b67034 100644 --- a/target/g1/device.mk +++ b/target/g1/target.mk diff --git a/target/lemote/device.mk b/target/lemote/target.mk index 2702be95b..2702be95b 100644 --- a/target/lemote/device.mk +++ b/target/lemote/target.mk diff --git a/target/linux/patches/2.6.31.5/aufs2.patch b/target/linux/patches/2.6.31.5/aufs2.patch index 7a6d3bac6..6c40cfb81 100644 --- a/target/linux/patches/2.6.31.5/aufs2.patch +++ b/target/linux/patches/2.6.31.5/aufs2.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs ---- linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs +--- linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,40 @@ +What: /debug/aufs/si_<id>/ +Date: March 2009 @@ -42,9 +42,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.3 + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see + Documentation/filesystems/aufs/aufs.5 in detail. -diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs ---- linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs +--- linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,25 @@ +What: /sys/fs/aufs/si_<id>/ +Date: March 2009 @@ -71,9 +71,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31. + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see + Documentation/filesystems/aufs/aufs.5 in detail. -diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h ---- linux-2.6.31.4.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/aufs.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/aufs.h linux-2.6.31.5/fs/aufs/aufs.h +--- linux-2.6.31.5.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/aufs.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -126,9 +126,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c ---- linux-2.6.31.4.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/branch.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.c linux-2.6.31.5/fs/aufs/branch.c +--- linux-2.6.31.5.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/branch.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,974 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -1104,9 +1104,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h ---- linux-2.6.31.4.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/branch.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.h linux-2.6.31.5/fs/aufs/branch.h +--- linux-2.6.31.5.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/branch.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,219 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -1327,9 +1327,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_BRANCH_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c ---- linux-2.6.31.4.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/cpup.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.c linux-2.6.31.5/fs/aufs/cpup.c +--- linux-2.6.31.5.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/cpup.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,1048 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -2379,9 +2379,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c + dput(parent); + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h ---- linux-2.6.31.4.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/cpup.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.h linux-2.6.31.5/fs/aufs/cpup.h +--- linux-2.6.31.5.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/cpup.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -2464,9 +2464,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_CPUP_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c ---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dbgaufs.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.c linux-2.6.31.5/fs/aufs/dbgaufs.c +--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dbgaufs.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,331 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -2799,9 +2799,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c + err = 0; + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h ---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dbgaufs.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.h linux-2.6.31.5/fs/aufs/dbgaufs.h +--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dbgaufs.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -2882,9 +2882,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h + +#endif /* __KERNEL__ */ +#endif /* __DBGAUFS_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c ---- linux-2.6.31.4.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dcsub.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.c linux-2.6.31.5/fs/aufs/dcsub.c +--- linux-2.6.31.5.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dcsub.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,223 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -3109,9 +3109,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c + out: + return trap; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h ---- linux-2.6.31.4.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dcsub.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.h linux-2.6.31.5/fs/aufs/dcsub.h +--- linux-2.6.31.5.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dcsub.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -3167,9 +3167,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DCSUB_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c ---- linux-2.6.31.4.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/debug.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.c linux-2.6.31.5/fs/aufs/debug.c +--- linux-2.6.31.5.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/debug.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,427 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -3598,10 +3598,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c + + return 0; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h ---- linux-2.6.31.4.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/debug.h 2009-10-18 11:26:01.000000000 +0200 -@@ -0,0 +1,260 @@ +diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.h linux-2.6.31.5/fs/aufs/debug.h +--- linux-2.6.31.5.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/debug.h 2009-11-15 22:16:14.000000000 +0100 +@@ -0,0 +1,261 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima + * @@ -3629,9 +3629,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h + +#ifdef __KERNEL__ + ++#include <asm/system.h> +#include <linux/bug.h> +/* #include <linux/err.h> */ -+/* #include <linux/init.h> */ ++#include <linux/init.h> +/* #include <linux/kernel.h> */ +#include <linux/delay.h> +/* #include <linux/kd.h> */ @@ -3862,9 +3863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DEBUG_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c ---- linux-2.6.31.4.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dentry.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.c linux-2.6.31.5/fs/aufs/dentry.c +--- linux-2.6.31.5.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dentry.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,880 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -4746,9 +4747,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c + .d_revalidate = aufs_d_revalidate, + .d_release = aufs_d_release +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h ---- linux-2.6.31.4.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dentry.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.h linux-2.6.31.5/fs/aufs/dentry.h +--- linux-2.6.31.5.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dentry.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,231 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -4981,9 +4982,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DENTRY_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c ---- linux-2.6.31.4.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dinfo.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dinfo.c linux-2.6.31.5/fs/aufs/dinfo.c +--- linux-2.6.31.5.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dinfo.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,367 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -5352,9 +5353,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c + return bindex; + return -1; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c ---- linux-2.6.31.4.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dir.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.c linux-2.6.31.5/fs/aufs/dir.c +--- linux-2.6.31.5.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dir.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,538 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -5894,9 +5895,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c + .flush = aufs_flush, + .fsync = aufs_fsync_dir +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h ---- linux-2.6.31.4.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/dir.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.h linux-2.6.31.5/fs/aufs/dir.h +--- linux-2.6.31.5.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/dir.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -6012,10 +6013,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIR_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c ---- linux-2.6.31.4.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/export.c 2009-10-18 11:26:01.000000000 +0200 -@@ -0,0 +1,745 @@ +diff -Nur linux-2.6.31.5.orig/fs/aufs/export.c linux-2.6.31.5/fs/aufs/export.c +--- linux-2.6.31.5.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/export.c 2009-11-15 22:27:33.000000000 +0100 +@@ -0,0 +1,746 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima + * @@ -6041,6 +6042,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c +#include <linux/exportfs.h> +#include <linux/file.h> +#include <linux/mnt_namespace.h> ++#include <linux/nsproxy.h> +#include <linux/namei.h> +#include <linux/random.h> +#include "aufs.h" @@ -6761,9 +6763,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c + BUILD_BUG_ON(sizeof(u) != sizeof(int)); + atomic_set(&sbinfo->si_xigen_next, u); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c ---- linux-2.6.31.4.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/file.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/file.c linux-2.6.31.5/fs/aufs/file.c +--- linux-2.6.31.5.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/file.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,578 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -7343,9 +7345,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c + .direct_IO = aufs_direct_IO, +#endif /* CONFIG_AUFS_DEBUG */ +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h ---- linux-2.6.31.4.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/file.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/file.h linux-2.6.31.5/fs/aufs/file.h +--- linux-2.6.31.5.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/file.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -7522,9 +7524,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FILE_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c ---- linux-2.6.31.4.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/finfo.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/finfo.c linux-2.6.31.5/fs/aufs/finfo.c +--- linux-2.6.31.5.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/finfo.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -7659,9 +7661,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c + + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c ---- linux-2.6.31.4.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/f_op.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/f_op.c linux-2.6.31.5/fs/aufs/f_op.c +--- linux-2.6.31.5.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/f_op.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,802 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -8465,9 +8467,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c + .aio_splice_read = aufs_aio_splice_read +#endif +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h ---- linux-2.6.31.4.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/fstype.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/fstype.h linux-2.6.31.5/fs/aufs/fstype.h +--- linux-2.6.31.5.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/fstype.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,474 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -8943,9 +8945,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FSTYPE_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify.c ---- linux-2.6.31.4.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/hinotify.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/hinotify.c linux-2.6.31.5/fs/aufs/hinotify.c +--- linux-2.6.31.5.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/hinotify.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,755 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -9702,9 +9704,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify + if (au_cachep[AuCache_HINOTIFY]) + au_hin_destroy_cache(); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c ---- linux-2.6.31.4.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/iinfo.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/iinfo.c linux-2.6.31.5/fs/aufs/iinfo.c +--- linux-2.6.31.5.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/iinfo.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,283 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -9989,9 +9991,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c + kfree(iinfo->ii_hinode); + AuRwDestroy(&iinfo->ii_rwsem); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c ---- linux-2.6.31.4.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/inode.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.c linux-2.6.31.5/fs/aufs/inode.c +--- linux-2.6.31.5.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/inode.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,380 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -10373,9 +10375,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c + mask |= MAY_READ; /* force permission check */ + return au_test_h_perm(h_inode, mask); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h ---- linux-2.6.31.4.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/inode.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.h linux-2.6.31.5/fs/aufs/inode.h +--- linux-2.6.31.5.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/inode.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -10861,9 +10863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_INODE_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c ---- linux-2.6.31.4.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/ioctl.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/ioctl.c linux-2.6.31.5/fs/aufs/ioctl.c +--- linux-2.6.31.5.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/ioctl.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -10932,9 +10934,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add.c ---- linux-2.6.31.4.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/i_op_add.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_add.c linux-2.6.31.5/fs/aufs/i_op_add.c +--- linux-2.6.31.5.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/i_op_add.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,649 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -11585,9 +11587,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c ---- linux-2.6.31.4.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/i_op.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op.c linux-2.6.31.5/fs/aufs/i_op.c +--- linux-2.6.31.5.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/i_op.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,872 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -12461,9 +12463,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c + .getattr = aufs_getattr, + .truncate_range = aufs_truncate_range +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del.c ---- linux-2.6.31.4.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/i_op_del.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_del.c linux-2.6.31.5/fs/aufs/i_op_del.c +--- linux-2.6.31.5.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/i_op_del.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,468 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -12933,9 +12935,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren.c ---- linux-2.6.31.4.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/i_op_ren.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_ren.c linux-2.6.31.5/fs/aufs/i_op_ren.c +--- linux-2.6.31.5.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/i_op_ren.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,948 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -13885,9 +13887,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig ---- linux-2.6.31.4.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/Kconfig 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/Kconfig linux-2.6.31.5/fs/aufs/Kconfig +--- linux-2.6.31.5.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/Kconfig 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,132 @@ +config AUFS_FS + tristate "Aufs (Advanced multi layered unification filesystem) support" @@ -14021,9 +14023,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig + help + Automatic configuration for internal use. +endif -diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c ---- linux-2.6.31.4.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/loop.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.c linux-2.6.31.5/fs/aufs/loop.c +--- linux-2.6.31.5.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/loop.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -14080,9 +14082,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c + && '0' <= c && c <= '9' + && strncmp(current->comm, "loop", 4) == 0; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h ---- linux-2.6.31.4.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/loop.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.h linux-2.6.31.5/fs/aufs/loop.h +--- linux-2.6.31.5.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/loop.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -14135,9 +14137,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LOOP_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk ---- linux-2.6.31.4.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/magic.mk 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/magic.mk linux-2.6.31.5/fs/aufs/magic.mk +--- linux-2.6.31.5.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/magic.mk 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,52 @@ + +# defined in ${srctree}/fs/fuse/inode.c @@ -14191,9 +14193,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk +ifdef CONFIG_UBIFS_FS +ccflags-y += -DUBIFS_SUPER_MAGIC=0x24051905 +endif -diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile ---- linux-2.6.31.4.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/Makefile 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/Makefile linux-2.6.31.5/fs/aufs/Makefile +--- linux-2.6.31.5.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/Makefile 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,23 @@ + +include ${src}/magic.mk @@ -14218,9 +14220,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_POLL) += poll.o +aufs-$(CONFIG_AUFS_DEBUG) += debug.o +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o -diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c ---- linux-2.6.31.4.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/module.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/module.c linux-2.6.31.5/fs/aufs/module.c +--- linux-2.6.31.5.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/module.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -14395,9 +14397,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c + +module_init(aufs_init); +module_exit(aufs_exit); -diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h ---- linux-2.6.31.4.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/module.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/module.h linux-2.6.31.5/fs/aufs/module.h +--- linux-2.6.31.5.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/module.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -14477,9 +14479,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c ---- linux-2.6.31.4.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/opts.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.c linux-2.6.31.5/fs/aufs/opts.c +--- linux-2.6.31.5.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/opts.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,1543 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -16024,9 +16026,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c +{ + return au_mntflags(sb) & AuOptMask_UDBA; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h ---- linux-2.6.31.4.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/opts.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.h linux-2.6.31.5/fs/aufs/opts.h +--- linux-2.6.31.5.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/opts.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,196 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -16224,9 +16226,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c ---- linux-2.6.31.4.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/plink.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/plink.c linux-2.6.31.5/fs/aufs/plink.c +--- linux-2.6.31.5.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/plink.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,354 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -16582,9 +16584,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c + iput(inode); + } +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c ---- linux-2.6.31.4.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/poll.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/poll.c linux-2.6.31.5/fs/aufs/poll.c +--- linux-2.6.31.5.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/poll.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -16642,9 +16644,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c + AuTraceErr((int)mask); + return mask; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h ---- linux-2.6.31.4.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/rwsem.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/rwsem.h linux-2.6.31.5/fs/aufs/rwsem.h +--- linux-2.6.31.5.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/rwsem.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -16832,9 +16834,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_RWSEM_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c ---- linux-2.6.31.4.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/sbinfo.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/sbinfo.c linux-2.6.31.5/fs/aufs/sbinfo.c +--- linux-2.6.31.5.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/sbinfo.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -17044,9 +17046,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c + di_write_unlock2(d1, d2); + si_read_unlock(d1->d_sb); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h ---- linux-2.6.31.4.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/spl.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/spl.h linux-2.6.31.5/fs/aufs/spl.h +--- linux-2.6.31.5.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/spl.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -17105,9 +17107,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_SPL_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c ---- linux-2.6.31.4.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/super.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/super.c linux-2.6.31.5/fs/aufs/super.c +--- linux-2.6.31.5.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/super.c 2009-11-15 22:20:26.000000000 +0100 @@ -0,0 +1,874 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -17494,7 +17496,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c + lockdep_off(); + down_write(&h_sb->s_umount); + shrink_dcache_sb(h_sb); -+ fsync_super(h_sb); ++ sync_filesystem(h_sb); + up_write(&h_sb->s_umount); + lockdep_on(); + } @@ -17983,9 +17985,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c + /* no need to __module_get() and module_put(). */ + .owner = THIS_MODULE, +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h ---- linux-2.6.31.4.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/super.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/super.h linux-2.6.31.5/fs/aufs/super.h +--- linux-2.6.31.5.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/super.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,384 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -18371,9 +18373,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_SUPER_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c ---- linux-2.6.31.4.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/sysaufs.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.c linux-2.6.31.5/fs/aufs/sysaufs.c +--- linux-2.6.31.5.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/sysaufs.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -18479,9 +18481,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h ---- linux-2.6.31.4.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/sysaufs.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.h linux-2.6.31.5/fs/aufs/sysaufs.h +--- linux-2.6.31.5.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/sysaufs.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -18603,9 +18605,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h + +#endif /* __KERNEL__ */ +#endif /* __SYSAUFS_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c ---- linux-2.6.31.4.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/sysfs.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/sysfs.c linux-2.6.31.5/fs/aufs/sysfs.c +--- linux-2.6.31.5.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/sysfs.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -18817,9 +18819,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c + AuWarn("failed %s under sysfs(%d)\n", br->br_name, err); + } +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c ---- linux-2.6.31.4.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/sysrq.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/sysrq.c linux-2.6.31.5/fs/aufs/sysrq.c +--- linux-2.6.31.5.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/sysrq.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -18936,9 +18938,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c + if (unlikely(err)) + AuErr("err %d (ignored)\n", err); +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c ---- linux-2.6.31.4.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/vdir.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/vdir.c linux-2.6.31.5/fs/aufs/vdir.c +--- linux-2.6.31.5.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/vdir.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,882 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -19822,9 +19824,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c + /* smp_mb(); */ + return 0; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c ---- linux-2.6.31.4.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/vfsub.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.c linux-2.6.31.5/fs/aufs/vfsub.c +--- linux-2.6.31.5.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/vfsub.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,740 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -20566,9 +20568,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c + + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h ---- linux-2.6.31.4.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/vfsub.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.h linux-2.6.31.5/fs/aufs/vfsub.h +--- linux-2.6.31.5.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/vfsub.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -20742,9 +20744,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_policy.c ---- linux-2.6.31.4.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/wbr_policy.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/wbr_policy.c linux-2.6.31.5/fs/aufs/wbr_policy.c +--- linux-2.6.31.5.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/wbr_policy.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,641 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -21387,9 +21389,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_po + .fin = au_wbr_create_fin_mfs + } +}; -diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c ---- linux-2.6.31.4.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/whout.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/whout.c linux-2.6.31.5/fs/aufs/whout.c +--- linux-2.6.31.5.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/whout.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,1048 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -22439,9 +22441,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c + au_whtmp_rmdir_free(args); + } +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.h linux-2.6.31.4/fs/aufs/whout.h ---- linux-2.6.31.4.orig/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/whout.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/whout.h linux-2.6.31.5/fs/aufs/whout.h +--- linux-2.6.31.5.orig/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/whout.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -22530,9 +22532,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.h linux-2.6.31.4/fs/aufs/whout.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WHOUT_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.c linux-2.6.31.4/fs/aufs/wkq.c ---- linux-2.6.31.4.orig/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/wkq.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/wkq.c linux-2.6.31.5/fs/aufs/wkq.c +--- linux-2.6.31.5.orig/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/wkq.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,259 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -22793,9 +22795,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.c linux-2.6.31.4/fs/aufs/wkq.c + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.h linux-2.6.31.4/fs/aufs/wkq.h ---- linux-2.6.31.4.orig/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/wkq.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/wkq.h linux-2.6.31.5/fs/aufs/wkq.h +--- linux-2.6.31.5.orig/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/wkq.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -22879,9 +22881,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.h linux-2.6.31.4/fs/aufs/wkq.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WKQ_H__ */ -diff -Nur linux-2.6.31.4.orig/fs/aufs/xino.c linux-2.6.31.4/fs/aufs/xino.c ---- linux-2.6.31.4.orig/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/fs/aufs/xino.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/aufs/xino.c linux-2.6.31.5/fs/aufs/xino.c +--- linux-2.6.31.5.orig/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/fs/aufs/xino.c 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,1200 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -24083,9 +24085,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/xino.c linux-2.6.31.4/fs/aufs/xino.c + out: + return err; +} -diff -Nur linux-2.6.31.4.orig/fs/Kconfig linux-2.6.31.4/fs/Kconfig ---- linux-2.6.31.4.orig/fs/Kconfig 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/Kconfig 2009-10-18 11:26:53.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/Kconfig linux-2.6.31.5/fs/Kconfig +--- linux-2.6.31.5.orig/fs/Kconfig 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/Kconfig 2009-11-15 22:02:37.000000000 +0100 @@ -187,6 +187,7 @@ source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" @@ -24094,9 +24096,9 @@ diff -Nur linux-2.6.31.4.orig/fs/Kconfig linux-2.6.31.4/fs/Kconfig endif # MISC_FILESYSTEMS -diff -Nur linux-2.6.31.4.orig/fs/Makefile linux-2.6.31.4/fs/Makefile ---- linux-2.6.31.4.orig/fs/Makefile 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/Makefile 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/Makefile linux-2.6.31.5/fs/Makefile +--- linux-2.6.31.5.orig/fs/Makefile 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/Makefile 2009-11-15 22:02:37.000000000 +0100 @@ -85,6 +85,7 @@ obj-$(CONFIG_HFS_FS) += hfs/ obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ @@ -24105,9 +24107,9 @@ diff -Nur linux-2.6.31.4.orig/fs/Makefile linux-2.6.31.4/fs/Makefile obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/ obj-$(CONFIG_NFSD) += nfsd/ -diff -Nur linux-2.6.31.4.orig/fs/namei.c linux-2.6.31.4/fs/namei.c ---- linux-2.6.31.4.orig/fs/namei.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/namei.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/namei.c linux-2.6.31.5/fs/namei.c +--- linux-2.6.31.5.orig/fs/namei.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/namei.c 2009-11-15 22:02:37.000000000 +0100 @@ -337,6 +337,7 @@ return 0; @@ -24144,9 +24146,9 @@ diff -Nur linux-2.6.31.4.orig/fs/namei.c linux-2.6.31.4/fs/namei.c /** * lookup_one_len - filesystem helper to lookup single pathname component -diff -Nur linux-2.6.31.4.orig/fs/namespace.c linux-2.6.31.4/fs/namespace.c ---- linux-2.6.31.4.orig/fs/namespace.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/namespace.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/namespace.c linux-2.6.31.5/fs/namespace.c +--- linux-2.6.31.5.orig/fs/namespace.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/namespace.c 2009-11-15 22:02:37.000000000 +0100 @@ -39,6 +39,7 @@ /* spinlock for vfsmount related operations, inplace of dcache_lock */ @@ -24155,9 +24157,9 @@ diff -Nur linux-2.6.31.4.orig/fs/namespace.c linux-2.6.31.4/fs/namespace.c static int event; static DEFINE_IDA(mnt_id_ida); -diff -Nur linux-2.6.31.4.orig/fs/open.c linux-2.6.31.4/fs/open.c ---- linux-2.6.31.4.orig/fs/open.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/open.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/open.c linux-2.6.31.5/fs/open.c +--- linux-2.6.31.5.orig/fs/open.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/open.c 2009-11-15 22:02:37.000000000 +0100 @@ -221,6 +221,7 @@ mutex_unlock(&dentry->d_inode->i_mutex); return err; @@ -24166,9 +24168,9 @@ diff -Nur linux-2.6.31.4.orig/fs/open.c linux-2.6.31.4/fs/open.c static long do_sys_truncate(const char __user *pathname, loff_t length) { -diff -Nur linux-2.6.31.4.orig/fs/splice.c linux-2.6.31.4/fs/splice.c ---- linux-2.6.31.4.orig/fs/splice.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/fs/splice.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/fs/splice.c linux-2.6.31.5/fs/splice.c +--- linux-2.6.31.5.orig/fs/splice.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/fs/splice.c 2009-11-15 22:02:37.000000000 +0100 @@ -1057,8 +1057,8 @@ /* * Attempt to initiate a splice from pipe to file. @@ -24206,9 +24208,9 @@ diff -Nur linux-2.6.31.4.orig/fs/splice.c linux-2.6.31.4/fs/splice.c /** * splice_direct_to_actor - splices data directly between two non-pipes -diff -Nur linux-2.6.31.4.orig/include/linux/aufs_type.h linux-2.6.31.4/include/linux/aufs_type.h ---- linux-2.6.31.4.orig/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.4/include/linux/aufs_type.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/include/linux/aufs_type.h linux-2.6.31.5/include/linux/aufs_type.h +--- linux-2.6.31.5.orig/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.31.5/include/linux/aufs_type.h 2009-11-15 22:02:37.000000000 +0100 @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2005-2009 Junjiro R. Okajima @@ -24319,9 +24321,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/aufs_type.h linux-2.6.31.4/include/l +#define AUFS_CTL_PLINK_CLEAN _IO(AuCtlType, AuCtl_PLINK_CLEAN) + +#endif /* __AUFS_TYPE_H__ */ -diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/Kbuild ---- linux-2.6.31.4.orig/include/linux/Kbuild 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/include/linux/Kbuild 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/include/linux/Kbuild linux-2.6.31.5/include/linux/Kbuild +--- linux-2.6.31.5.orig/include/linux/Kbuild 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/include/linux/Kbuild 2009-11-15 22:02:38.000000000 +0100 @@ -34,6 +34,7 @@ header-y += atmsap.h header-y += atmsvc.h @@ -24330,9 +24332,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/ header-y += auto_fs4.h header-y += ax25.h header-y += b1lli.h -diff -Nur linux-2.6.31.4.orig/include/linux/namei.h linux-2.6.31.4/include/linux/namei.h ---- linux-2.6.31.4.orig/include/linux/namei.h 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/include/linux/namei.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/include/linux/namei.h linux-2.6.31.5/include/linux/namei.h +--- linux-2.6.31.5.orig/include/linux/namei.h 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/include/linux/namei.h 2009-11-15 22:02:38.000000000 +0100 @@ -75,6 +75,9 @@ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); extern void release_open_intent(struct nameidata *); @@ -24343,9 +24345,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/namei.h linux-2.6.31.4/include/linux extern struct dentry *lookup_one_len(const char *, struct dentry *, int); extern struct dentry *lookup_one_noperm(const char *, struct dentry *); -diff -Nur linux-2.6.31.4.orig/include/linux/splice.h linux-2.6.31.4/include/linux/splice.h ---- linux-2.6.31.4.orig/include/linux/splice.h 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/include/linux/splice.h 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/include/linux/splice.h linux-2.6.31.5/include/linux/splice.h +--- linux-2.6.31.5.orig/include/linux/splice.h 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/include/linux/splice.h 2009-11-15 22:02:38.000000000 +0100 @@ -82,4 +82,10 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, splice_direct_actor *); @@ -24357,9 +24359,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/splice.h linux-2.6.31.4/include/linu + unsigned int flags); + #endif -diff -Nur linux-2.6.31.4.orig/security/device_cgroup.c linux-2.6.31.4/security/device_cgroup.c ---- linux-2.6.31.4.orig/security/device_cgroup.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/security/device_cgroup.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/security/device_cgroup.c linux-2.6.31.5/security/device_cgroup.c +--- linux-2.6.31.5.orig/security/device_cgroup.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/security/device_cgroup.c 2009-11-15 22:02:38.000000000 +0100 @@ -513,6 +513,7 @@ return -EPERM; @@ -24368,9 +24370,9 @@ diff -Nur linux-2.6.31.4.orig/security/device_cgroup.c linux-2.6.31.4/security/d int devcgroup_inode_mknod(int mode, dev_t dev) { -diff -Nur linux-2.6.31.4.orig/security/security.c linux-2.6.31.4/security/security.c ---- linux-2.6.31.4.orig/security/security.c 2009-10-12 22:15:40.000000000 +0200 -+++ linux-2.6.31.4/security/security.c 2009-10-18 11:26:01.000000000 +0200 +diff -Nur linux-2.6.31.5.orig/security/security.c linux-2.6.31.5/security/security.c +--- linux-2.6.31.5.orig/security/security.c 2009-10-23 00:57:56.000000000 +0200 ++++ linux-2.6.31.5/security/security.c 2009-11-15 22:02:38.000000000 +0100 @@ -386,6 +386,7 @@ return 0; return security_ops->path_mkdir(path, dentry, mode); diff --git a/target/native/device.mk b/target/native/target.mk index 8b38a16b2..8b38a16b2 100644 --- a/target/native/device.mk +++ b/target/native/target.mk diff --git a/target/qemu-arm/device.mk b/target/qemu-arm/target.mk index f6e2c2e25..f6e2c2e25 100644 --- a/target/qemu-arm/device.mk +++ b/target/qemu-arm/target.mk diff --git a/target/qemu-cris/device.mk b/target/qemu-cris/target.mk index 3c8d8c4f9..3c8d8c4f9 100644 --- a/target/qemu-cris/device.mk +++ b/target/qemu-cris/target.mk diff --git a/target/qemu-mips/device.mk b/target/qemu-mips/target.mk index 8a5abd384..8a5abd384 100644 --- a/target/qemu-mips/device.mk +++ b/target/qemu-mips/target.mk diff --git a/target/qemu-mips64/device.mk b/target/qemu-mips64/target.mk index 19b0fba32..19b0fba32 100644 --- a/target/qemu-mips64/device.mk +++ b/target/qemu-mips64/target.mk diff --git a/target/qemu-mips64el/device.mk b/target/qemu-mips64el/target.mk index 1222cdee6..1222cdee6 100644 --- a/target/qemu-mips64el/device.mk +++ b/target/qemu-mips64el/target.mk diff --git a/target/qemu-mipsel/device.mk b/target/qemu-mipsel/target.mk index bd8f7ca79..bd8f7ca79 100644 --- a/target/qemu-mipsel/device.mk +++ b/target/qemu-mipsel/target.mk diff --git a/target/qemu-x86/device.mk b/target/qemu-x86/target.mk index f825d0259..f825d0259 100644 --- a/target/qemu-x86/device.mk +++ b/target/qemu-x86/target.mk diff --git a/target/qemu-x86_64/device.mk b/target/qemu-x86_64/target.mk index 7652dbff4..7652dbff4 100644 --- a/target/qemu-x86_64/device.mk +++ b/target/qemu-x86_64/target.mk diff --git a/target/rb411/device.mk b/target/rb411/target.mk index 2ab6faed7..2ab6faed7 100644 --- a/target/rb411/device.mk +++ b/target/rb411/target.mk diff --git a/target/rb433/device.mk b/target/rb433/target.mk index 2ab6faed7..2ab6faed7 100644 --- a/target/rb433/device.mk +++ b/target/rb433/target.mk diff --git a/target/rb532/device.mk b/target/rb532/target.mk index c0924be1f..c0924be1f 100644 --- a/target/rb532/device.mk +++ b/target/rb532/target.mk diff --git a/target/rescue-x86/device.mk b/target/rescue-x86/target.mk index 7021d0bb9..7021d0bb9 100644 --- a/target/rescue-x86/device.mk +++ b/target/rescue-x86/target.mk diff --git a/target/rescue-x86_64/device.mk b/target/rescue-x86_64/target.mk index 7ff8b016e..7ff8b016e 100644 --- a/target/rescue-x86_64/device.mk +++ b/target/rescue-x86_64/target.mk diff --git a/target/shuttle/device.mk b/target/shuttle/target.mk index caf9be90a..caf9be90a 100644 --- a/target/shuttle/device.mk +++ b/target/shuttle/target.mk diff --git a/target/tomtom/device.mk b/target/tomtom/target.mk index a35a5b7ba..a35a5b7ba 100644 --- a/target/tomtom/device.mk +++ b/target/tomtom/target.mk diff --git a/target/wag54g/device.mk b/target/wag54g/target.mk index c0924be1f..c0924be1f 100644 --- a/target/wag54g/device.mk +++ b/target/wag54g/target.mk diff --git a/target/zaurus/device.mk b/target/zaurus/target.mk index f6e2c2e25..f6e2c2e25 100644 --- a/target/zaurus/device.mk +++ b/target/zaurus/target.mk diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 7b04ffa23..ec0f4f639 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -33,7 +33,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_gnu99_inline=yes \ libc_cv_slibdir="/lib" -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) EGLIBC_CONFOPTS+= --without-fp endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 210c0f68a..f93691cab 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -28,19 +28,13 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-sjlj-exceptions \ --disable-nls -#ifeq ($(ADK_LINUX_ARM_TOMTOM),y) -#GCC_CONFOPTS+= --enable-sjlj-exceptions -#else -#GCC_CONFOPTS+= --disable-sjlj-exceptions -#endif - ifeq ($(ADK_SSP),y) GCC_CONFOPTS+= --enable-libssp else GCC_CONFOPTS+= --disable-libssp endif -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) GCC_CONFOPTS+= --with-float=soft endif diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 36d6f1214..448d41606 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -39,7 +39,7 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_gnu99_inline=yes \ libc_cv_slibdir="/lib" -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) GLIBC_CONFOPTS+= --without-fp endif diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 3a9310ad1..d3e2c7e70 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -20,7 +20,7 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ - $(TOPDIR)/target/$(DEVICE)/uclibc.config >${WRKBUILD}/.config + $(TOPDIR)/target/$(ADK_TARGET)/uclibc.config >${WRKBUILD}/.config ifeq ($(ADK_IPV6),y) $(SED) 's,# UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,' \ ${WRKBUILD}/.config |