From d2559721eeb659e51c581ed1275ffb44576fc3d1 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 19 May 2005 03:06:03 +0000 Subject: [PATCH] Convert lcd4linux to new packaging style SVN-Revision: 944 --- openwrt/package/lcd4linux/Config.in | 11 ++- openwrt/package/lcd4linux/Makefile | 89 +++++++++---------- .../lcd4linux/{ => ipkg}/lcd4linux.control | 0 3 files changed, 51 insertions(+), 49 deletions(-) rename openwrt/package/lcd4linux/{ => ipkg}/lcd4linux.control (100%) diff --git a/openwrt/package/lcd4linux/Config.in b/openwrt/package/lcd4linux/Config.in index b770101070..e04e2f95b7 100644 --- a/openwrt/package/lcd4linux/Config.in +++ b/openwrt/package/lcd4linux/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_LCD4LINUX - tristate "lcd4linux" - select BR2_PACKAGE_NCURSES + tristate "lcd4linux - Program to access an external LCD" default m if CONFIG_DEVEL + select BR2_PACKAGE_NCURSES help - LCD4Linux - https://ssl.bulix.org/projects/lcd4linux/wiki/Howto + LCD4Linux + + https://ssl.bulix.org/projects/lcd4linux/wiki/Howto + + diff --git a/openwrt/package/lcd4linux/Makefile b/openwrt/package/lcd4linux/Makefile index 51334d0265..5586e65f00 100644 --- a/openwrt/package/lcd4linux/Makefile +++ b/openwrt/package/lcd4linux/Makefile @@ -9,57 +9,56 @@ PKG_MD5SUM:=bab64ac01ebdce7e46ab367351af839f PKG_SOURCE_URL:=@SF/lcd4linux/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.patched +$(eval $(call PKG_template,LCD4LINUX,lcd4linux,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --sysconfdir=/etc \ - --without-x \ - --with-drivers='all,!RouterBoard,!X11' \ - --with-plugins=wireless ) - touch $(PKG_BUILD_DIR)/.configured +$(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" \ + LIBS="-lpng12 -lz" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --without-x \ + --with-drivers='all,!RouterBoard,!X11' \ + --with-plugins=wireless \ + ) + touch $@ -$(PKG_BUILD_DIR)/lcd4linux: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ - CFLAGS="$(TARGET_CFLAGS) -O2 -Wall -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include" + CFLAGS="$(TARGET_CFLAGS) -Wall" + touch $@ -$(PKG_IPK): $(PKG_BUILD_DIR)/lcd4linux - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/bin - cp $(PKG_BUILD_DIR)/lcd4linux $(PKG_IPK_DIR)/usr/bin/ - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/lcd4linux.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/lcd4linux.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) +$(IPKG_LCD4LINUX): + install -d -m0755 $(IDIR_LCD4LINUX)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/lcd4linux $(IDIR_LCD4LINUX)/usr/bin/ + $(RSTRIP) $(IDIR_LCD4LINUX) + $(IPKG_BUILD) $(IDIR_LCD4LINUX) $(PACKAGE_DIR) diff --git a/openwrt/package/lcd4linux/lcd4linux.control b/openwrt/package/lcd4linux/ipkg/lcd4linux.control similarity index 100% rename from openwrt/package/lcd4linux/lcd4linux.control rename to openwrt/package/lcd4linux/ipkg/lcd4linux.control