clean up the directory layout of the uci shell api

[openwrt.git] / package / ipkg / Makefile

diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile
index a0ec84a..8b3b5c8 100644 (file)
--- a/package/ipkg/Makefile
+++ b/package/ipkg/Makefile
@@ -1,65 +1,76 @@
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipkg
-PKG_VERSION:=0.99.145
+PKG_VERSION:=0.99.163
 PKG_RELEASE:=1
-PKG_MD5SUM:=d98799dbcf911f90a7c3c897713cc37a
 
-PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://ftp.gwdg.de/pub/linux/handhelds/packages/ipkg \
+       http://www.handhelds.org/packages/ipkg \
+       http://www.gtlib.gatech.edu/pub/handhelds.org/packages/ipkg
+PKG_MD5SUM:=0b10ad2924611bccaea8ddf98481a192
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(eval $(call PKG_template,IPKG,ipkg,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/ipkg
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Itsy package management system
+  URL:=http://handhelds.org/moin/moin.cgi/Ipkg
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-               ./configure \
-                 --target=$(GNU_TARGET_NAME) \
-                 --host=$(GNU_TARGET_NAME) \
-                 --build=$(GNU_HOST_NAME) \
-                 --program-prefix="" \
-                 --program-suffix="" \
-                 --prefix=/usr \
-                 --exec-prefix=/usr \
-                 --bindir=/bin \
-                 --datadir=/usr/share \
-                 --includedir=/usr/include \
-                 --infodir=/usr/share/info \
-                 --libdir=/lib \
-                 --libexecdir=/lib \
-                 --localstatedir=/var \
-                 --mandir=/usr/share/man \
-                 --sbindir=/usr/sbin \
-                 --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-       )
-       touch $(PKG_BUILD_DIR)/.configured
+define Package/ipkg/description
+ Lightweight package management system
+ ipkg is the Itsy Package Management System, for handling
+ installation and removal of packages on a system. It can
+ recursively follow dependencies and download all packages
+ necessary to install a particular package.
+ .
+ ipkg knows how to install both .ipk and .deb packages.
+endef
 
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC)
-       mkdir -p $(PKG_INSTALL_DIR)
+CONFIGURE_ARGS += $(DISABLE_LARGEFILE)
+
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC=$(TARGET_CC) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+endef
+
+define Package/ipkg/preinst
+       if [ -L $${IPKG_INSTROOT}/usr/bin/ipkg ] ; then
+               echo -e "Removing busybox ipkg symlink"
+               rm $${IPKG_INSTROOT}/usr/bin/ipkg
+       fi
+endef
+
+define Package/ipkg/postrm
+       if [ "$(busybox ipkg 2>&1)" != "busybox: applet not found" ] ; then
+               echo -e "Reinstalling busybox ipkg symlink"
+               ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/ipkg
+       fi
+endef
+
+define Package/ipkg/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipkg-cl $(1)/usr/bin/ipkg
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libipkg $(1)/usr/include/
+endef
 
-$(IPKG_IPKG):
-       install -d -m0755 $(IDIR_IPKG)/bin
-       cp -fpR $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg
-       install -d -m0755 $(IDIR_IPKG)/lib
-       cp -fpR $(PKG_INSTALL_DIR)/lib/libipkg.so.* $(IDIR_IPKG)/lib/
-       $(RSTRIP) $(IDIR_IPKG)
-       $(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR)
+$(eval $(call BuildPackage,ipkg))