diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/busybox/Makefile | 13 |
3 files changed, 6 insertions, 11 deletions
diff --git a/package/Makefile b/package/Makefile index e271216dd..12058a8dd 100644 --- a/package/Makefile +++ b/package/Makefile @@ -39,7 +39,7 @@ ifeq ($(ADK_TOOLCHAIN_ONLY),y) compile: $(REBUILD_PACKAGES) $(COMPILE_PACKAGES) install: $(INSTALL_PACKAGES) else -compile: base-files-compile $(REBUILD_PACKAGES) $(COMPILE_PACKAGES) +compile: $(REBUILD_PACKAGES) base-files-compile $(COMPILE_PACKAGES) install: base-files-install $(INSTALL_PACKAGES) endif diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0bc6bb079..c0d7a0724 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -66,7 +66,7 @@ endif echo $(ADK_RUNTIME_HOSTNAME) > \ $(IDIR_BASE_FILES)/etc/hostname test -z $(ADK_RUNTIME_PASSWORD) || \ - $(SED) 's,\*NP\*,'"$$(${STAGING_TOOLS}/bin/mkcrypt \ + $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \ ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1f56f057b..efae99f2a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -31,15 +31,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config +do-configure: grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \ - ${TOPDIR}/.busyboxcfg - -${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg - cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config + ${WRKBUILD}/.config $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config - -do-configure: ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) yes '' | \ $(MAKE) V=1 \ @@ -52,7 +47,7 @@ else ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) endif -do-build: do-configure +do-build: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox @@ -61,7 +56,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${WRKBUILD}/.config ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) |