From 0f64c10d29d21b8e39050df345435c76dd700043 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 11:31:17 +0100 Subject: rename STAGING_DIR to STAGING_TARGET_DIR, since ADK_NATIVE is gone, there is no difference --- mk/build.mk | 18 +++++++++--------- mk/package.mk | 10 +++++----- mk/pkg-bottom.mk | 20 ++++++++++---------- mk/vars.mk | 2 -- package/apr-util/Makefile | 6 +++--- package/apr/Makefile | 8 ++++---- package/bcm2835-vc/Makefile | 8 ++++---- package/boost/Makefile | 2 +- package/classpath/Makefile | 4 ++-- package/conntrack-tools/Makefile | 2 +- package/corosync/Makefile | 4 ++-- package/dbus/Makefile | 4 ++-- package/drbd/Makefile | 2 +- package/e2fsprogs/Makefile | 2 +- package/font-util/Makefile | 4 ++-- package/gdb/Makefile | 4 ++-- package/hostapd/Makefile | 2 +- package/ipvsadm/Makefile | 2 +- package/libmicrohttpd/Makefile | 2 +- package/librpcsecgss/Makefile | 2 +- package/lsof/Makefile | 2 +- package/omxplayer/Makefile | 14 +++++++------- package/openjdk7/Makefile | 6 +++--- package/openssh/Makefile | 2 +- package/openssl/Makefile | 4 ++-- package/orbit2/Makefile | 4 ++-- package/pacemaker-mgmt/Makefile | 6 +++--- package/postfix/Makefile | 2 +- package/pycurl/Makefile | 2 +- package/ruby-ldap/Makefile | 12 ++++++------ package/snort/Makefile | 2 +- package/tinyxml/Makefile | 2 +- package/util-linux/Makefile | 2 +- package/watchdog/Makefile | 2 +- package/wget/Makefile | 2 +- package/wpa_supplicant/Makefile | 2 +- package/xbmc/Makefile | 10 +++++----- package/xcb-proto/Makefile | 6 +++--- package/xinetd/Makefile | 2 +- toolchain/kernel-headers/Makefile | 6 +++--- 40 files changed, 98 insertions(+), 100 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index 0d36923d2..f4e2ae6e4 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/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_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} diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 3df9a52bf..8cb3f1f37 100644 --- a/package/apr-util/Makefile +++ b/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 diff --git a/package/apr/Makefile b/package/apr/Makefile index ba53c9c92..3a6524c58 100644 --- a/package/apr/Makefile +++ b/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 diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index e19ddcc9c..e6405bf38 100644 --- a/package/bcm2835-vc/Makefile +++ b/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 diff --git a/package/boost/Makefile b/package/boost/Makefile index 2951c1e8c..a2a92df00 100644 --- a/package/boost/Makefile +++ b/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 diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 3d2166c60..dd983288e 100644 --- a/package/classpath/Makefile +++ b/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 diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 89bb7b895..1341e8c5b 100644 --- a/package/conntrack-tools/Makefile +++ b/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})) diff --git a/package/corosync/Makefile b/package/corosync/Makefile index 633d32884..efb99a11a 100644 --- a/package/corosync/Makefile +++ b/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 diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 31596f56d..6a84890dd 100644 --- a/package/dbus/Makefile +++ b/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 diff --git a/package/drbd/Makefile b/package/drbd/Makefile index f7de4f0a0..1e1308b3b 100644 --- a/package/drbd/Makefile +++ b/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 \ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 4b7342197..391d3475b 100644 --- a/package/e2fsprogs/Makefile +++ b/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}" \ diff --git a/package/font-util/Makefile b/package/font-util/Makefile index fb1d6070c..e61808321 100644 --- a/package/font-util/Makefile +++ b/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 diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 8128e8bd5..d8b9a26bd 100644 --- a/package/gdb/Makefile +++ b/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 diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index d6373de34..0b8d3aa7a 100644 --- a/package/hostapd/Makefile +++ b/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 diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index 1f992de47..2e5d63745 100644 --- a/package/ipvsadm/Makefile +++ b/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 diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index 558264ce6..58a47af58 100644 --- a/package/libmicrohttpd/Makefile +++ b/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 diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 511f62b69..5cd8ea8bc 100644 --- a/package/librpcsecgss/Makefile +++ b/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: diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 6415703fc..478d63a17 100644 --- a/package/lsof/Makefile +++ b/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 diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 98d09ea39..696f8901b 100644 --- a/package/omxplayer/Makefile +++ b/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 diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index b86680a7b..8376e715a 100644 --- a/package/openjdk7/Makefile +++ b/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)' \ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index a56ee80de..409e63c0a 100644 --- a/package/openssh/Makefile +++ b/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) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 027a74611..17ec4771e 100644 --- a/package/openssl/Makefile +++ b/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); \ diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 46da045d1..4f656ea59 100644 --- a/package/orbit2/Makefile +++ b/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 diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile index 4fae950ca..a4959fe06 100644 --- a/package/pacemaker-mgmt/Makefile +++ b/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 diff --git a/package/postfix/Makefile b/package/postfix/Makefile index 7e27207c4..e95cc4c9c 100644 --- a/package/postfix/Makefile +++ b/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 diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile index 899bb3ddb..827693423 100644 --- a/package/pycurl/Makefile +++ b/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 diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index 4a332b32e..bb6fc15a6 100644 --- a/package/ruby-ldap/Makefile +++ b/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 diff --git a/package/snort/Makefile b/package/snort/Makefile index 4427a1297..7fdd18c51 100644 --- a/package/snort/Makefile +++ b/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" \ diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile index 0af10f763..568cc1071 100644 --- a/package/tinyxml/Makefile +++ b/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 diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index b449a985e..e2a04670d 100644 --- a/package/util-linux/Makefile +++ b/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 diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index df586c8c0..a4c6d44a5 100644 --- a/package/watchdog/Makefile +++ b/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: diff --git a/package/wget/Makefile b/package/wget/Makefile index 7abbe7241..9c412c3ea 100644 --- a/package/wget/Makefile +++ b/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 diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 8f6e0efee..e1545e64c 100644 --- a/package/wpa_supplicant/Makefile +++ b/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}' \ diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 282cf88fb..fed181d92 100644 --- a/package/xbmc/Makefile +++ b/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 diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index eca8ab4f5..9e5d2b3b1 100644 --- a/package/xcb-proto/Makefile +++ b/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 diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index af603f7bb..42e3f7b83 100644 --- a/package/xinetd/Makefile +++ b/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: diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index e62b33e2d..4303accdc 100644 --- a/toolchain/kernel-headers/Makefile +++ b/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 -- cgit v1.2.3 From 5c8e7688ee2b75354ca820778a9b5cc74f1ce934 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 11:45:41 +0100 Subject: use SLOB allocator for embedded systems --- target/linux/kernel.config | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 26205a842..240ec9bf1 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -7,6 +7,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_SLOB=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y -- cgit v1.2.3 From b5fb550ce2d55156609a7549d062e10a6e9c8166 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 12:36:04 +0100 Subject: make printk option configurable via menuconfig --- package/base-files/Makefile | 2 +- package/base-files/src/etc/init.d/boot | 4 +++- target/linux/config/Config.in.debug | 28 ++++++++++++++++++++++++++++ target/linux/kernel.config | 4 ---- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a298d108b..f320d6b82 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:= 67 +PKG_RELEASE:= 68 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index b859d1d89..8daf52b89 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -5,7 +5,9 @@ . /etc/functions.sh # disable kernel messages -echo 0 > /proc/sys/kernel/printk +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 6236b329b..46942160f 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -25,6 +25,34 @@ config ADK_QUIET_KERNEL help Make bootup quiet without messages from the kernel. +config ADK_KERNEL_EARLY_PRINTK + boolean + default n + +config ADK_KERNEL_PRINTK + prompt "Enable printk to save space and quieten bootup" + boolean + select ADK_KERNEL_EARLY_PRINTK + default y + help + Disable printk to save space and quieten bootup. + +config ADK_KERNEL_PRINTK_TIME + prompt "Enable timing information for printk" + boolean + depends on ADK_KERNEL_PRINTK + default n + help + Enable timing information for printk, to analyze kernel + bootup performance. + +config ADK_KERNEL_BUG + prompt "Enable BUGS() in the kernel" + boolean + default n + help + Enable if you need BUGS() in the kernel. + config ADK_KERNEL_NETCONSOLE prompt "Netconsole" boolean diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 240ec9bf1..a28c2088b 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -28,8 +28,6 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y -CONFIG_PRINTK=y -CONFIG_BUG=n CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y @@ -40,5 +38,3 @@ CONFIG_AIO=y CONFIG_PCI_QUIRKS=y CONFIG_TTY=y CONFIG_UNIX98_PTYS=y -CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y -- cgit v1.2.3 From 7a22456611f068b55d84fb8d36b16f8d8a408849 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 13:59:44 +0100 Subject: update year, add Aboriginal Linux, which is helpful for exotic qemu emulators and I used the miniconfig concept from there --- LICENCE | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 +OpenADK is Copyright © 2008-2014 Waldemar Brodkorb 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 -- cgit v1.2.3