summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk18
-rw-r--r--mk/package.mk10
-rw-r--r--mk/pkg-bottom.mk20
-rw-r--r--mk/vars.mk2
4 files changed, 24 insertions, 26 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}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 11:02:39 +0000