|
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
|
|
|
|
|
|
PKG_NAME:= busybox
|
|
PKG_NAME:= busybox
|
|
PKG_VERSION:= 1.15.2
|
|
PKG_VERSION:= 1.15.2
|
|
-PKG_RELEASE:= 3
|
|
+PKG_RELEASE:= 4
|
|
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
|
|
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
|
|
PKG_DESCR:= Core utilities for embedded Linux systems
|
|
PKG_DESCR:= Core utilities for embedded Linux systems
|
|
PKG_SECTION:= base
|
|
PKG_SECTION:= base
|
|
@@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk
|
|
|
|
|
|
$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
|
|
$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
|
|
|
|
|
|
-CONFIG_STYLE:= manual
|
|
+CONFIG_STYLE:= manual
|
|
-BUILD_STYLE:= manual
|
|
+BUILD_STYLE:= manual
|
|
-INSTALL_STYLE:= manual
|
|
+INSTALL_STYLE:= manual
|
|
|
|
|
|
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
|
|
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
|
|
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
|
|
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
|
|
@@ -32,31 +32,31 @@ do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
|
|
ifeq ($(ADK_NATIVE),y)
|
|
ifeq ($(ADK_NATIVE),y)
|
|
yes '' | \
|
|
yes '' | \
|
|
$(MAKE) V=1 \
|
|
$(MAKE) V=1 \
|
|
- IPKG_ARCH="$(ARCH)" \
|
|
+ IPKG_ARCH="$(CPU_ARCH)" \
|
|
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
|
|
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
|
|
else
|
|
else
|
|
yes '' | \
|
|
yes '' | \
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
|
|
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
|
|
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
|
|
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
|
|
endif
|
|
endif
|
|
|
|
|
|
do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
|
|
do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
|
|
ifeq ($(ADK_NATIVE),y)
|
|
ifeq ($(ADK_NATIVE),y)
|
|
$(MAKE) V=1 \
|
|
$(MAKE) V=1 \
|
|
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
|
|
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
|
|
else
|
|
else
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
|
|
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
|
|
endif
|
|
endif
|
|
|
|
|
|
do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
|
|
do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
|
|
ifeq ($(ADK_NATIVE),y)
|
|
ifeq ($(ADK_NATIVE),y)
|
|
$(MAKE) V=1 \
|
|
$(MAKE) V=1 \
|
|
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
|
|
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
|
|
else
|
|
else
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
|
|
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
|
|
endif
|
|
endif
|
|
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
|
|
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
|
|
ifeq ($(ADK_DEBUG),y)
|
|
ifeq ($(ADK_DEBUG),y)
|