X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dbf38e7683be6728ee12540c68e59605a7c4f157..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/opkg/Makefile diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 249299fc7..c18f8e731 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -1,13 +1,14 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_REV:=215 +PKG_REV:=528 PKG_VERSION:=$(PKG_REV) PKG_RELEASE:=1 @@ -37,16 +38,17 @@ define Package/opkg/description endef define Package/opkg/conffiles -/etc/opkg/opkg.conf +/etc/opkg.conf endef -TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds) +TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds) EXTRA_CFLAGS += $(TARGET_CPPFLAGS) -EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib CONFIGURE_ARGS += \ --disable-curl \ --disable-gpg \ + --with-opkgetcdir=/etc \ + --with-opkglockfile=/var/lock/opkg.lock define Build/Configure (cd $(PKG_BUILD_DIR); \ @@ -67,12 +69,9 @@ define Package/opkg/install $(INSTALL_DIR) $(1)/usr/lib/opkg $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/etc - $(INSTALL_DIR) $(1)/etc/opkg - $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/opkg/ - $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg/opkg.conf + $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ + $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/ endef define Build/InstallDev