summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in8
-rw-r--r--LICENCE9
-rw-r--r--mk/build.mk18
-rw-r--r--mk/kernel-ver.mk8
-rw-r--r--mk/modules.mk21
-rw-r--r--mk/package.mk10
-rw-r--r--mk/pkg-bottom.mk20
-rw-r--r--mk/vars.mk2
-rw-r--r--package/apr-util/Makefile6
-rw-r--r--package/apr/Makefile8
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/etc/init.d/boot4
-rw-r--r--package/bcm2835-vc/Makefile8
-rw-r--r--package/boost/Makefile2
-rw-r--r--package/classpath/Makefile4
-rw-r--r--package/conntrack-tools/Makefile2
-rw-r--r--package/corosync/Makefile4
-rw-r--r--package/dbus/Makefile4
-rw-r--r--package/drbd/Makefile2
-rw-r--r--package/e2fsprogs/Makefile2
-rw-r--r--package/font-util/Makefile4
-rw-r--r--package/gdb/Makefile4
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/ipvsadm/Makefile2
-rw-r--r--package/libmicrohttpd/Makefile2
-rw-r--r--package/librpcsecgss/Makefile2
-rw-r--r--package/lsof/Makefile2
-rw-r--r--package/omxplayer/Makefile14
-rw-r--r--package/openjdk7/Makefile6
-rw-r--r--package/openssh/Makefile2
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/orbit2/Makefile4
-rw-r--r--package/pacemaker-mgmt/Makefile6
-rw-r--r--package/postfix/Makefile2
-rw-r--r--package/pycurl/Makefile2
-rw-r--r--package/ruby-ldap/Makefile12
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/tinyxml/Makefile2
-rw-r--r--package/util-linux/Makefile2
-rw-r--r--package/watchdog/Makefile2
-rw-r--r--package/wget/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile2
-rw-r--r--package/xbmc/Makefile10
-rw-r--r--package/xcb-proto/Makefile6
-rw-r--r--package/xinetd/Makefile2
-rw-r--r--target/linux/config/Config.in.audio33
-rw-r--r--target/linux/config/Config.in.debug28
-rw-r--r--target/linux/config/Config.in.netfilter.ip411
-rw-r--r--target/linux/kernel.config5
-rw-r--r--target/linux/patches/3.13.6/bsd-compatibility.patch (renamed from target/linux/patches/3.13.5/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.13.6/defaults.patch (renamed from target/linux/patches/3.13.5/defaults.patch)0
-rw-r--r--target/linux/patches/3.13.6/disable-netfilter.patch (renamed from target/linux/patches/3.13.5/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.13.6/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.13.5/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.13.6/gemalto.patch (renamed from target/linux/patches/3.13.5/gemalto.patch)0
-rw-r--r--target/linux/patches/3.13.6/lemote-rfkill.patch (renamed from target/linux/patches/3.13.5/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-axi.patch (renamed from target/linux/patches/3.13.5/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-ethernet.patch (renamed from target/linux/patches/3.13.5/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-setup.patch (renamed from target/linux/patches/3.13.5/microblaze-setup.patch)0
-rw-r--r--target/linux/patches/3.13.6/mtd-rootfs.patch (renamed from target/linux/patches/3.13.5/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.13.6/non-static.patch (renamed from target/linux/patches/3.13.5/non-static.patch)0
-rw-r--r--target/linux/patches/3.13.6/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.13.5/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.13.6/ppc64-missing_arch_random.patch (renamed from target/linux/patches/3.13.5/ppc64-missing_arch_random.patch)0
-rw-r--r--target/linux/patches/3.13.6/raspberry.patch (renamed from target/linux/patches/3.13.5/raspberry.patch)7216
-rw-r--r--target/linux/patches/3.13.6/startup.patch (renamed from target/linux/patches/3.13.5/startup.patch)0
-rw-r--r--target/linux/patches/3.13.6/uuid.patch (renamed from target/linux/patches/3.13.5/uuid.patch)0
-rw-r--r--target/linux/patches/3.13.6/vga-cons-default-off.patch (renamed from target/linux/patches/3.13.5/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.13.6/wlan-cf.patch (renamed from target/linux/patches/3.13.5/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.13.6/xargs.patch (renamed from target/linux/patches/3.13.5/xargs.patch)0
-rw-r--r--target/linux/patches/3.13.6/zlib-inflate.patch (renamed from target/linux/patches/3.13.5/zlib-inflate.patch)0
-rw-r--r--target/packages/pkg-available/console5
-rw-r--r--target/packages/pkg-available/mpdbox15
-rw-r--r--target/packages/pkg-available/test1
-rw-r--r--target/packages/pkg-available/xorg3
-rw-r--r--toolchain/kernel-headers/Makefile6
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.13.5/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/microperl.patch (renamed from toolchain/kernel-headers/patches/3.13.5/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.13.5/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/relocs.patch (renamed from toolchain/kernel-headers/patches/3.13.5/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.13.5/sgidefs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.13.6/sortext.patch (renamed from toolchain/kernel-headers/patches/3.13.5/sortext.patch)0
80 files changed, 6655 insertions, 912 deletions
diff --git a/Config.in b/Config.in
index 855d79095..ab2a45f7f 100644
--- a/Config.in
+++ b/Config.in
@@ -97,7 +97,7 @@ prompt "Kernel Version"
depends on ADK_TOOLCHAIN_ONLY
config ADK_KERNEL_VERSION_TOOLCHAIN
- prompt "3.12.13"
+ prompt "3.13.6"
boolean
depends on ADK_TOOLCHAIN_ONLY
@@ -109,8 +109,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
choice
prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_13_5
- prompt "3.13.5"
+config ADK_KERNEL_VERSION_3_13_6
+ prompt "3.13.6"
boolean
config ADK_KERNEL_VERSION_3_12_13
@@ -133,7 +133,7 @@ endchoice
config ADK_KERNEL_VERSION
string
- default "3.13.5" if ADK_KERNEL_VERSION_3_13_5
+ default "3.13.6" if ADK_KERNEL_VERSION_3_13_6
default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
default "3.10.30" if ADK_KERNEL_VERSION_3_10_30
diff --git a/LICENCE b/LICENCE
index 89ce093f4..cc23dbf16 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org>
+OpenADK is Copyright © 2008-2014 Waldemar Brodkorb <wbx@openadk.org>
All rights reserved.
This licence file covers all of the OpenADK meta distribution
@@ -20,11 +20,12 @@ contains tools that are possibly covered by non-GPL-compatible,
but OSD/DFSG-compliant, licences.
OpenADK is based upon several other projects which are listed
-below, in no particular order. If you think you should be li-
-sted here but I have forgotten you, please forgive and drop
+below, in no particular order. If you think you should be listed
+here but I have forgotten you, please forgive and drop
me an email.
• The FreeWRT Project
• The OpenWrt Project
-• uClibc Buildroot
+• The Buildroot Project
+• The Aboriginal Linux Project
• The MirOS Project and contributors
diff --git a/mk/build.mk b/mk/build.mk
index f677a049c..8638e8747 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -165,23 +165,23 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages
endif
-${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_HOST_DIR}:
- mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
+${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
+ mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
-${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc
+${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
- echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf
- echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf
+ echo "dest root /" >${STAGING_TARGET_DIR}/etc/ipkg.conf
+ echo "option offline_root ${TARGET_DIR}" >>$(STAGING_TARGET_DIR)/etc/ipkg.conf
endif
-package/%: ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
+package/%: ${STAGING_TARGET_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
$(MAKE) -C package $(patsubst package/%,%,$@)
target/%:
$(MAKE) -C target $(patsubst target/%,%,$@)
-toolchain/%: ${STAGING_DIR}
+toolchain/%: ${STAGING_TARGET_DIR}
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
tools/%:
@@ -247,7 +247,7 @@ clean:
$(MAKE) -C $(CONFIG) clean
for f in $$(ls ${STAGING_PKG_DIR}/ 2>/dev/null |grep -v [A-Z]|grep -v stamps 2>/dev/null); do \
while read file ; do \
- rm ${STAGING_DIR}/$$file 2>/dev/null;\
+ rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\
done < ${STAGING_PKG_DIR}/$$f ; \
rm ${STAGING_PKG_DIR}/$$f ; \
done
@@ -281,7 +281,7 @@ cleantarget:
@$(TRACE) cleantarget
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR)
- rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_DIR) $(STAGING_PKG_DIR)
+ rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_TARGET_DIR) $(STAGING_PKG_DIR)
rm -f .tmpconfig.h all.config .defconfig
distclean:
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index ef9fee277..96fad87b8 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,14 +1,14 @@
ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:= 3.12.13
+KERNEL_VERSION:= 3.13.6
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d
endif
-ifeq ($(ADK_KERNEL_VERSION_3_13_5),y)
-KERNEL_VERSION:= 3.13.5
+ifeq ($(ADK_KERNEL_VERSION_3_13_6),y)
+KERNEL_VERSION:= 3.13.6
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= b9fa20262a7ecbbc3277aa2ee10412da
+KERNEL_MD5SUM:= 445aa27da818617409982f42902a6e41
endif
ifeq ($(ADK_KERNEL_VERSION_3_12_13),y)
KERNEL_VERSION:= 3.12.13
diff --git a/mk/modules.mk b/mk/modules.mk
index 00667de3e..32c9fe05c 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1198,8 +1198,11 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
-$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
+$(eval $(call KMOD_template,SND_SOC,snd-soc,\
$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
+,54))
+
+$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
@@ -1207,12 +1210,26 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
-,55))
+,55, kmod-snd-soc))
$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
,55))
+$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
+,55, kmod-snd-soc))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
+,56, kmod-snd-bcm2709-soc-i2s))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
+,56, kmod-snd-bcm2709-soc-i2s))
+
#ifeq ($(ADK_LINUX_64),y)
#V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
#endif
diff --git a/mk/package.mk b/mk/package.mk
index 8439d88eb..a70de9377 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -221,10 +221,10 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y)
endif
endif
@mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \
- '$${STAGING_DIR}/scripts'
+ '$${STAGING_TARGET_DIR}/scripts'
ifeq (,$(filter noremove,$(7)))
@if test -s '$${STAGING_PKG_DIR}/$(1)'; then \
- cd '$${STAGING_DIR}'; \
+ cd '$${STAGING_TARGET_DIR}'; \
while read fn; do \
rm -f "$$$$fn"; \
done <'$${STAGING_PKG_DIR}/$(1)'; \
@@ -244,8 +244,8 @@ endif
find usr ! -type d 2>/dev/null | \
grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \
tee '$${STAGING_PKG_DIR}/$(1)' | \
- $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_DIR}'
- @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
+ $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_TARGET_DIR}'
+ @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \
'$${STAGING_PKG_DIR}/$(1)' | while read fn; do \
chmod u+w $$$$fn; \
$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$$$fn; \
@@ -280,7 +280,7 @@ clean-targets: clean-dev-$(1)
clean-dev-$(1):
ifeq (,$(filter noremove,$(7)))
@if test -s '$${STAGING_PKG_DIR}/$(1)'; then \
- cd '$${STAGING_DIR}'; \
+ cd '$${STAGING_TARGET_DIR}'; \
while read fn; do \
rm -f "$$$$fn"; \
done <'$${STAGING_PKG_DIR}/$(1)'; \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 3d70120d1..941970cbc 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -126,7 +126,7 @@ post-install:
spkg-install: ${ALL_POSTINST}
${_FAKE_COOKIE}: ${_BUILD_COOKIE}
@-rm -f ${_ALL_CONTROLS}
- @mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_DIR}/scripts'
+ @mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_TARGET_DIR}/scripts'
@${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE)
@env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE)
ifneq ($(filter manual,${INSTALL_STYLE}),)
@@ -146,9 +146,9 @@ endif
@for a in ${WRKINST}/usr/bin/*-config*; do \
[[ -e $$a ]] || continue; \
sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
- ${STAGING_DIR}/usr/bin/$$(basename $$a); \
- chmod u+x ${STAGING_DIR}/usr/bin/$$(basename $$a); \
- [[ "$$(basename $$a)" != "pkg-config" ]] && cp ${STAGING_DIR}/usr/bin/$$(basename $$a) ${STAGING_DIR}/scripts; \
+ ${STAGING_TARGET_DIR}/usr/bin/$$(basename $$a); \
+ chmod u+x ${STAGING_TARGET_DIR}/usr/bin/$$(basename $$a); \
+ [[ "$$(basename $$a)" != "pkg-config" ]] && cp ${STAGING_TARGET_DIR}/usr/bin/$$(basename $$a) ${STAGING_TARGET_DIR}/scripts; \
echo "scripts/$$(basename $$a)" \
>>'${STAGING_PKG_DIR}/${PKG_NAME}.scripts'; \
done
@@ -156,11 +156,11 @@ endif
[[ -e $$a ]] || continue; \
sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \
-e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \
- ${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
+ ${STAGING_TARGET_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
done
ifeq (,$(filter noremove,${PKG_OPTS}))
@if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \
- cd '${STAGING_DIR}'; \
+ cd '${STAGING_TARGET_DIR}'; \
while read fn; do \
rm -f "$$fn"; \
done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \
@@ -191,14 +191,14 @@ endif
find usr ! -type d 2>/dev/null | \
grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
- $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '${STAGING_DIR}'
- @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
+ $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '${STAGING_TARGET_DIR}'
+ @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \
'${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \
chmod u+w $$fn; \
$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$fn; \
done
ifeq (,$(filter noscripts,${PKG_OPTS}))
- @cd '${STAGING_DIR}'; grep 'usr/s*bin/' \
+ @cd '${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \
'${STAGING_PKG_DIR}/${PKG_NAME}' | \
while read fn; do \
b="$$(dd if="$$fn" bs=2 count=1 2>/dev/null)"; \
@@ -265,7 +265,7 @@ clean-targets: clean-dev-generic
clean-dev-generic:
ifeq (,$(filter noremove,${PKG_OPTS}))
@if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \
- cd '${STAGING_DIR}'; \
+ cd '${STAGING_TARGET_DIR}'; \
while read fn; do \
rm -f "$$fn"; \
done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 01120b005..5fd4a51aa 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -35,7 +35,6 @@ TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
-STAGING_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -44,7 +43,6 @@ TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
-STAGING_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_T