From 364cba0fcabc169cef155b42a18d0cc9db4ca71e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 14 Mar 2010 20:49:00 +0100
Subject: fix ipkg, we need to use CPU_ARCH
---
package/busybox/Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'package')
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index ab50a5aec..400be01e6 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.15.2
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
PKG_DESCR:= Core utilities for embedded Linux systems
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}))
-CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
-INSTALL_STYLE:= manual
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
@@ -32,31 +32,31 @@ do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
yes '' | \
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" \
+ IPKG_ARCH="$(CPU_ARCH)" \
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
else
yes '' | \
$(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)
endif
do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(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
$(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
do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(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
$(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
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
ifeq ($(ADK_DEBUG),y)
--
cgit v1.2.3
From cc9768cbc202129d9fa7cc8577b34a35bc1e5035 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 14 Mar 2010 20:49:14 +0100
Subject: fix dependencies
---
package/parted/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'package')
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 03df2e270..b54746dda 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d
PKG_DESCR:= GNU parted
PKG_SECTION:= admin
-PKG_DEPENDS:= libuuid libreadline device-mapper libpthread
+PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread
PKG_BUILDDEP+= e2fsprogs lvm readline
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
PKG_SITES:= ${MASTER_SITE_GNU:=parted/}
--
cgit v1.2.3