summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-28 02:18:16 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-28 02:18:16 +0000
commit55da36a1f29df8831b834beb8684e374005df241 (patch)
tree86fb2049c2b8714f2ac101dd0f7144d1a63007fc
parentb31d05c970845efc9522d05294efd2da1db3d942 (diff)
[buildsystem] revert r22372 and r22405, dependency on host libtool causes problems
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22406 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk22
-rw-r--r--package/Makefile9
-rw-r--r--package/opkg/Makefile24
-rw-r--r--target/imagebuilder/files/Makefile26
4 files changed, 18 insertions, 63 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 57b06c86d8..87b142aa59 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -1,20 +1,17 @@
#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006,2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# where to build (and put) .ipk packages
-OPKG:= \
+IPKG:= \
IPKG_TMP=$(TMP_DIR)/ipkg \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_DIR)/etc \
IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- $(STAGING_DIR_HOST)/bin/opkg \
- -f $(STAGING_DIR)/etc/opkg.conf \
- --force-depends \
- --force-overwrite
+ $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
# invoke ipkg-build with some default options
IPKG_BUILD:= \
@@ -79,7 +76,7 @@ ifeq ($(DUMP),)
rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
touch $$@
- $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT)
+ $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
@rm -f $(PACKAGE_DIR)/$(1)_*
rm -rf $$(IDIR_$(1))
mkdir -p $$(IDIR_$(1))/CONTROL
@@ -114,8 +111,7 @@ ifeq ($(DUMP),)
@[ -f $$(IPKG_$(1)) ] || false
$$(INFO_$(1)): $$(IPKG_$(1))
- @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
- $(OPKG) install $$(IPKG_$(1))
+ $(IPKG) install $$(IPKG_$(1))
$(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_*
@@ -124,11 +120,9 @@ ifeq ($(DUMP),)
endef
- $(STAGING_DIR)/etc/opkg.conf:
+ $(STAGING_DIR)/etc/ipkg.conf:
mkdir -p $(STAGING_DIR)/etc
- ( echo "dest root /" > $@; \
- echo "arch all 100" >> $@; \
- echo "arch $(PKGARCH) 200" >> $@; \
- echo "option offline_root $(TARGET_DIR)" >> $@ )
+ echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
+ echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
endif
diff --git a/package/Makefile b/package/Makefile
index 3c7b0b49bc..5468bdc718 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,6 @@ $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
ifeq ($(SDK),1)
$(curdir)/builddirs-install:=.
else
- $(curdir)/base-files/compile += $(curdir)/opkg/host/compile
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
$(curdir)/builddirs-install:=. $(sort $(package-y))
@@ -89,9 +88,9 @@ $(curdir)/index: FORCE
$(curdir)/flags-install:= -j1
$(eval $(call stampfile,$(curdir),package,prereq,.config))
-$(eval $(call stampfile,$(curdir),package,cleanup))
-$(eval $(call stampfile,$(curdir),package,compile))
-$(eval $(call stampfile,$(curdir),package,install))
-$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
+$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build))
$(eval $(call subdir,$(curdir)))
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 3a5ba449f1..c18f8e7319 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -18,9 +18,7 @@ PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_FIXUP = libtool
-
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
define Package/opkg
SECTION:=base
@@ -82,25 +80,3 @@ define Build/InstallDev
endef
$(eval $(call BuildPackage,opkg))
-
-
-HOST_CONFIGURE_ARGS += \
- --disable-curl \
- --disable-gpg \
- --with-opkgetcdir=/etc \
- --with-opkglockfile=/tmp/opkg.lock
-
-define Host/Configure
- (cd $(HOST_BUILD_DIR); autoreconf -v --install || exit 1)
- $(call Host/Configure/Default)
-endef
-
-define Host/Compile
- $(MAKE) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
-endef
-
-define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg
-endef
-
-$(eval $(call HostBuild))
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 2e1e82f866..b72e3f1724 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -52,15 +52,12 @@ help: FORCE
# override variables from rules.mk
PACKAGE_DIR:=$(TOPDIR)/packages
-OPKG:= \
+IPKG:= \
IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \
IPKG_INSTROOT="$(TARGET_DIR)" \
IPKG_CONF_DIR="$(TOPDIR)/tmp" \
IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
- $(STAGING_DIR_HOST)/bin/opkg \
- -f $(TOPDIR)/tmp/opkg.conf \
- --force-depends \
- --force-overwrite
+ $(SCRIPT_DIR)/ipkg -force-defaults
define Profile
$(eval $(call Profile/Default))
@@ -82,18 +79,10 @@ _call_info: FORCE
echo 'Available Profiles:'
echo; $(PROFILE_LIST)
-$(TOPDIR)/tmp/opkg.conf: FORCE
+$(TOPDIR)/tmp/ipkg.conf: FORCE
@mkdir -p $(TOPDIR)/tmp
- @mkdir -p $(TARGET_DIR)/tmp
@echo 'dest root /' > $@
@echo 'src packages file:$(PACKAGE_DIR)' >> $@
- @echo 'arch all 100' >> $@
- ifneq ($(CONFIG_TARGET_adm5120),y)
- @echo 'arch $(BOARD) 200' >> $@
- else
- @echo 'arch $(BOARD)_$(ARCH) 200' >> $@
- endif
- @echo 'option offline_root $(TARGET_DIR)' >> $@
BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
# "-pkgname" in the package list means remove "pkgname" from the package list
@@ -113,18 +102,18 @@ endif
$(MAKE) package_postinst
$(MAKE) build_image
-package_index: $(TOPDIR)/tmp/opkg.conf FORCE
+package_index: $(TOPDIR)/tmp/ipkg.conf FORCE
@echo
@echo Building package index...
(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
gzip -9c Packages > Packages.gz \
) >/dev/null 2>/dev/null
- $(OPKG) update
+ $(IPKG) update
package_install: FORCE
@echo
@echo Installing packages...
- $(OPKG) install $(BUILD_PACKAGES)
+ $(IPKG) install $(BUILD_PACKAGES)
copy_files: FORCE
@echo
@@ -133,9 +122,6 @@ copy_files: FORCE
package_postinst: FORCE
@echo
- @echo Cleaning up
- @rm -f $(TARGET_DIR)/tmp/opkg.lock
- @echo
@echo Activating init scripts
@( \
cd $(TARGET_DIR); \