rename STAGING_DIR to STAGING_TARGET_DIR, since ADK_NATIVE is gone, there is no difference

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:

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)'; \

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}'; \

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_TARGET_ABI}
 STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}

package/apr-util/Makefile

@@ -20,10 +20,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--without-berkeley-db \
-			--with-apr=${STAGING_DIR}/usr \
+			--with-apr=${STAGING_TARGET_DIR}/usr \
 			--with-expat=${STAGING_TARGET_DIR}/usr
-XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build-1 \
-			apr_builders=${STAGING_DIR}/usr/share/build-1
+XAKE_FLAGS+=		apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \
+			apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1
 
 apr-util-install:
 	${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib

package/apr/Makefile

@@ -42,15 +42,15 @@ endif
 
 pre-build:
 	# we need to patch paths to get apr-util compiling
-	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
 		${WRKBUILD}/apr-1-config
-	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
 		${WRKBUILD}/apr-1-config
 
 apr-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/
-	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1
-	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/
+	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1
+	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bcm2835-vc/Makefile

@@ -31,9 +31,9 @@ bcm2835-vc-install:
 	$(CP) ${WRKINST}/opt/vc/bin/* ${IDIR_BCM2835_VC}/opt/vc/bin
 	# required for xbmc
 	(cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)
-	-rm -rf ${STAGING_DIR}/opt/vc
-	mkdir -p ${STAGING_DIR}/opt/vc
-	${CP} ${WRKINST}/opt/vc/lib ${STAGING_DIR}/opt/vc
-	${CP} ${WRKINST}/opt/vc/include ${STAGING_DIR}/opt/vc
+	-rm -rf ${STAGING_TARGET_DIR}/opt/vc
+	mkdir -p ${STAGING_TARGET_DIR}/opt/vc
+	${CP} ${WRKINST}/opt/vc/lib ${STAGING_TARGET_DIR}/opt/vc
+	${CP} ${WRKINST}/opt/vc/include ${STAGING_TARGET_DIR}/opt/vc
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/boost/Makefile

@@ -57,7 +57,7 @@ CONFIGURE_ARGS += \
 CONFIGURE_ARGS+=--without-locale
 
 ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
-	CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib
+	CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_TARGET_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_TARGET_DIR}/usr/lib
 else
 	CONFIGURE_ARGS += --without-iostreams
 endif

package/classpath/Makefile

@@ -44,9 +44,9 @@ classpath-install:
 	$(CP) $(WRKINST)/usr/lib/classpath/lib*so.* \
 		$(IDIR_CLASSPATH)/usr/lib/classpath
 	# install to staging directory
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/share/classpath
+	$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/classpath
 	$(CP) $(WRKINST)/usr/share/classpath/glibj.zip \
-		$(STAGING_DIR)/usr/share/classpath
+		$(STAGING_TARGET_DIR)/usr/share/classpath
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/conntrack-tools/Makefile

@@ -20,7 +20,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 
 $(eval $(call PKG_template,CONNTRACK_TOOLS,conntrack-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 

package/corosync/Makefile

@@ -23,8 +23,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,COROSYNC,corosync,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/nss \
-			-I$(STAGING_DIR)/usr/include/nspr
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/nss \
+			-I$(STAGING_TARGET_DIR)/usr/include/nspr
 TARGET_LDFLAGS+=	-lssl3 -lsmime3 -lnss3 -lnssutil3
 CONFIGURE_ENV+=		ac_cv_func_fnmatch_works=yes
 

package/dbus/Makefile

@@ -47,9 +47,9 @@ CONFIGURE_ARGS+=	--disable-tests \
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
 pre-install:
-	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
+	${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
-		$(STAGING_DIR)/usr/include/dbus-1.0/dbus
+		$(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
 
 libdbus-install:
 	${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib

package/drbd/Makefile

@@ -18,7 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h
+XAKE_FLAGS+=		GENETLINK_H=$(STAGING_TARGET_DIR)/usr/include/linux/genetlink.h
 CONFIGURE_ARGS+=	--with-distro=generic \
 			--with-pacemaker \
 			--without-heartbeat \

package/e2fsprogs/Makefile

@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath \
 			--disable-defrag
 INSTALL_TARGET+=	install-libs
 TARGET_LDFLAGS+=	-lpthread
-TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include
+TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
 MAKE_FLAGS+=		BUILD_CC="${CC_FOR_BUILD}" \
 			BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \
 			BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}" \

package/font-util/Makefile

@@ -22,9 +22,9 @@ $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${P
 # calling pkg-config (which we don't provide) in order to
 # automatically find the mappings.
 post-build:
-	${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
+	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
 	${CP} ${WRKBUILD}/map-* \
-		${STAGING_DIR}/usr/share/fonts/X11/util
+		${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
 
 font-util-install:
 	${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin

package/gdb/Makefile

@@ -36,13 +36,13 @@ XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
 XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 
 post-extract:
-	-mv $(STAGING_DIR)/usr/lib/libiberty.a $(STAGING_DIR)/usr/lib/libiberty.a.bak
+	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak
 
 gdb-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
 	# shipped libbfd conflicts with system wide one
 	rm -f ${WRKINST}/usr/lib/libbfd*
-	-mv $(STAGING_DIR)/usr/lib/libiberty.a.bak $(STAGING_DIR)/usr/lib/libiberty.a
+	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/hostapd/Makefile

@@ -34,7 +34,7 @@ $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELE
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/libnl3
+TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/libnl3
 
 do-configure:
 	${CP} ./files/hostapd.config ${WRKBUILD}/.config

package/ipvsadm/Makefile

@@ -17,7 +17,7 @@ PKG_NOPARALLEL:=	1
 
 include $(TOPDIR)/mk/package.mk
 
-TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/libnl3 -fPIC -DHAVE_NL=0
+TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/libnl3 -fPIC -DHAVE_NL=0
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		HAVE_NL=0
 

package/libmicrohttpd/Makefile

@@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
+CONFIGURE_ARGS+=	--with-libgcrypt-prefix=$(STAGING_TARGET_DIR)/usr
 
 libmicrohttpd-install:
 	$(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib

package/librpcsecgss/Makefile

@@ -21,7 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 TARGET_LDFLAGS+=	-ltirpc
 
 librpcsecgss-install:

package/lsof/Makefile

@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LSOF,lsof,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 CONFIG_STYLE:=		minimal
 CONFIGURE_PROG:=	Configure
 CONFIGURE_ARGS:=	-n linux
-XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc'
+XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_TARGET_DIR)/usr/include/tirpc'
 XAKE_FLAGS+=		CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
 INSTALL_STYLE:=		manual
 

package/omxplayer/Makefile

@@ -25,13 +25,13 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_55 \
-			-I$(STAGING_DIR)/usr/include/freetype2 \
-			-I$(STAGING_DIR)/usr/include/dbus-1.0 \
-			-I$(STAGING_DIR)/opt/vc/include \
-			-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
-			-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
+			-I$(STAGING_TARGET_DIR)/usr/include/freetype2 \
+			-I$(STAGING_TARGET_DIR)/usr/include/dbus-1.0 \
+			-I$(STAGING_TARGET_DIR)/opt/vc/include \
+			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
+			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib
 
 omxplayer-install:
 	$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin

package/openjdk7/Makefile

@@ -89,9 +89,9 @@ CONFIGURE_ARGS+=	--disable-bootstrap
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
-			ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
-			ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
-			ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
+			ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
+			ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
+			ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
 			OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
 			OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
 			OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \

package/openssh/Makefile

@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 endif
 ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
 endif
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)

package/openssl/Makefile

@@ -57,8 +57,8 @@ CONFIG:=		linux-embedded
 endif
 
 post-extract:
-	-mkdir -p $(STAGING_DIR)/usr/include/crypto
-	cp ./files/cryptodev.h $(STAGING_DIR)/usr/include/crypto/
+	-mkdir -p $(STAGING_TARGET_DIR)/usr/include/crypto
+	cp ./files/cryptodev.h $(STAGING_TARGET_DIR)/usr/include/crypto/
 
 do-configure:
 	(cd $(WRKBUILD); \

package/orbit2/Makefile

@@ -41,8 +41,8 @@ orbit2-install:
 	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
 		$(IDIR_ORBIT2)/usr/lib
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
+	$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
-		$(STAGING_DIR)/usr/bin
+		$(STAGING_TARGET_DIR)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/pacemaker-mgmt/Makefile

@@ -27,9 +27,9 @@ CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
 			--with-ocf-root=/usr/lib/ocf \
 			--without-ais-support \
 			--disable-fatal-warnings
-TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/python2.7 \
-			-I$(STAGING_DIR)/usr/include/pacemaker \
-			-I$(STAGING_DIR)/usr/include/heartbeat
+TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/python2.7 \
+			-I$(STAGING_TARGET_DIR)/usr/include/pacemaker \
+			-I$(STAGING_TARGET_DIR)/usr/include/heartbeat
 
 pacemaker-mgmt-install:
 	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib

package/postfix/Makefile

@@ -25,7 +25,7 @@ ALL_TARGET:=
 INSTALL_STYLE:=		manual
 
 do-configure:
-	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a")
+	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_TARGET_DIR)/usr/include" "AUXLIBS=$(STAGING_TARGET_DIR)/usr/lib/libcdb.a")
 
 postfix-install:
 	$(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix

package/pycurl/Makefile

@@ -25,7 +25,7 @@ INSTALL_STYLE:=		manual
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 TARGET_CFLAGS+=		-fPIC
 MAKE_ENV+=		LDSHARED="$(TARGET_CC) -shared"
-CURL_CONFIG:=		$(STAGING_DIR)/usr/bin/curl-config
+CURL_CONFIG:=		$(STAGING_TARGET_DIR)/usr/bin/curl-config
 
 include $(TOPDIR)/mk/python.mk
 

package/ruby-ldap/Makefile

@@ -26,19 +26,19 @@ CONFIG_STYLE:=		manual
 FAKE_FLAGS+=		DESTDIR="/"
 
 do-configure:
-	(cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \
+	(cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \
 		--with-openldap2 \
 		--without-libnsl \
-		--with-ldap-dir=$(STAGING_DIR)/usr \
-		--with-ldap-lib=$(STAGING_DIR)/usr/lib \
-		--with-ldap-include=$(STAGING_DIR)/usr/include)
+		--with-ldap-dir=$(STAGING_TARGET_DIR)/usr \
+		--with-ldap-lib=$(STAGING_TARGET_DIR)/usr/lib \
+		--with-ldap-include=$(STAGING_TARGET_DIR)/usr/include)
 
 ruby-ldap-install:
 	$(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
 	$(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap
-	$(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \
+	$(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \
 		$(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
-	$(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \
+	$(CP) $(STAGING_TARGET_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \
 		$(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/snort/Makefile

@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 TARGET_LDFLAGS+=	-ltirpc
 CONFIGURE_ARGS+=	--disable-static-daq \
 			--with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \

package/tinyxml/Makefile

@@ -28,6 +28,6 @@ tinyxml-install:
 	$(CP) $(WRKBUILD)/libtinyxml*.so* \
 		$(IDIR_TINYXML)/usr/lib
 	$(INSTALL_DATA) $(WRKBUILD)/tiny{str,xml}.h \
-		$(STAGING_DIR)/usr/include
+		$(STAGING_TARGET_DIR)/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/util-linux/Makefile

@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--enable-libblkid \
 			--enable-libmount \
 			--enable-mount \
-			--with-ncurses=$(STAGING_DIR)/usr/include \
+			--with-ncurses=$(STAGING_TARGET_DIR)/usr/include \
 			--libdir=/usr/lib
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo

package/watchdog/Makefile

@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 TARGET_LDFLAGS+=	-ltirpc
 
 watchdog-install:

package/wget/Makefile

@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--with-ssl=openssl
 endif
 ifeq (${ADK_PACKAGE_WGET_WITH_GNUTLS},y)
 CONFIGURE_ARGS+=	--with-ssl=gnutls \
-			--with-libgnutls-prefix="$(STAGING_DIR)/usr"
+			--with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr"
 endif
 
 AUTOTOOL_STYLE:=	autoreconf

package/wpa_supplicant/Makefile

@@ -33,7 +33,7 @@ $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RE
 
 CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
-TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/libnl3
+TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/libnl3
 
 MAKE_FLAGS+=		CPPFLAGS='${TARGET_CPPFLAGS}' \
 			LDFLAGS='${TARGET_LDFLAGS}' \

package/xbmc/Makefile

@@ -43,14 +43,14 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_55 \
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
 			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/opt/vc/include \
-			-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
-			-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/opt/vc/include \
+			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
+			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib -lkhrn_static
 endif
 
 AUTOTOOL_STYLE:=	autoreconf

package/xcb-proto/Makefile

@@ -27,16 +27,16 @@ include $(TOPDIR)/mk/python.mk
 
 HOST_STYLE:=		auto
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
-CONFIGURE_ARGS+=	--datadir=${STAGING_DIR}/usr/share
+CONFIGURE_ARGS+=	--datadir=${STAGING_TARGET_DIR}/usr/share
 
 post-build:
 	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb
 	${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb
 
 xcb-python-install:
-	$(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
+	$(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
 	${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
-		${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
+		${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
 	${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
 	${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
 		${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen

package/xinetd/Makefile

@@ -19,7 +19,7 @@ $(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 CONFIGURE_ARGS+=	--without-libwrap \
 			--with-loadavg
 ALL_TARGET:=		build
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 TARGET_LDFLAGS+=	-ltirpc
 
 xinetd-install:

toolchain/kernel-headers/Makefile

@@ -10,10 +10,10 @@ $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		headers_check
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
-		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
+		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
 		headers_install
-	@-find $(STAGING_DIR)/usr/include -name .install -delete
-	@-find $(STAGING_DIR)/usr/include -name ..install.cmd -delete
+	@-find $(STAGING_TARGET_DIR)/usr/include -name .install -delete
+	@-find $(STAGING_TARGET_DIR)/usr/include -name ..install.cmd -delete
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk