All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] some patches and new packages
@ 2009-03-03 10:58 Olaf Rempel
  2009-03-03 10:58 ` [Buildroot] iproute: fix makefile Olaf Rempel
  0 siblings, 1 reply; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

Here are some patches and new packages that I use.

BR2_PACKAGE_NTFS-3G was renamed to BR2_PACKAGE_NTFS_3G, since
autotargets doesn't like the '-'.

All patches are based on r25499 and tested on x86.

Regards
Olaf

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] iproute: fix makefile
  2009-03-03 10:58 [Buildroot] some patches and new packages Olaf Rempel
@ 2009-03-03 10:58 ` Olaf Rempel
  2009-03-03 10:58   ` [Buildroot] iptables: bump version Olaf Rempel
  2009-03-04 20:17   ` [Buildroot] iproute: fix makefile Peter Korsgaard
  0 siblings, 2 replies; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

- bump version to 2.6.28
- fix download
- change compile ordering (build tc after ip)
- remove both binaries from target when cleaning up
---
 package/iproute2/iproute2.mk |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 3ced612..bfbc0a1 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -3,30 +3,29 @@
 # iproute2
 #
 #############################################################
-IPROUTE2_VERSION:=2.6.18
-IPROUTE2_STAMP:=061002
-IPROUTE2_SOURCE:=iproute2-$(IPROUTE2_VERSION)-$(IPROUTE2_STAMP).tar.gz
+IPROUTE2_VERSION:=2.6.28
+IPROUTE2_SOURCE:=iproute2-$(IPROUTE2_VERSION).tar.bz2
 IPROUTE2_SITE:=http://developer.osdl.org/dev/iproute2/download/
-IPROUTE2_DIR:=$(BUILD_DIR)/iproute2-$(IPROUTE2_VERSION)-$(IPROUTE2_STAMP)
-IPROUTE2_CAT:=$(ZCAT)
+IPROUTE2_DIR:=$(BUILD_DIR)/iproute2-$(IPROUTE2_VERSION)
+IPROUTE2_CAT:=$(BZCAT)
 IPROUTE2_BINARY:=tc/tc
 IPROUTE2_TARGET_BINARY:=sbin/tc
 
 $(DL_DIR)/$(IPROUTE2_SOURCE):
-	$(call DOWNLOAD,$(IPROUTE2_SITE)$(IPROUTE2_SOURCE))
+	$(call DOWNLOAD,$(IPROUTE2_SITE),$(IPROUTE2_SOURCE))
 
 iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE)
 
 $(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE)
 	$(IPROUTE2_CAT) $(DL_DIR)/$(IPROUTE2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(IPROUTE2_DIR)/.unpacked
+	touch $@
 
 $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
 	(cd $(IPROUTE2_DIR); \
 		./configure; \
 		$(SED) '/TC_CONFIG_ATM/s:=.*:=n:' Config; \
 		$(SED) '/^CCOPTS/s:-O2.*:$(TARGET_CFLAGS):' Makefile)
-	touch $(IPROUTE2_DIR)/.configured
+	touch $@
 
 $(IPROUTE2_DIR)/$(IPROUTE2_BINARY): $(IPROUTE2_DIR)/.configured
 	$(MAKE) \
@@ -35,16 +34,16 @@ $(IPROUTE2_DIR)/$(IPROUTE2_BINARY): $(IPROUTE2_DIR)/.configured
 		CC=$(TARGET_CC) \
 		AR=$(TARGET_CROSS)ar \
 		NETEM_DIST="" \
-		SUBDIRS="lib tc ip"
+		SUBDIRS="lib ip tc"
 
 $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY): $(IPROUTE2_DIR)/$(IPROUTE2_BINARY)
-	install -Dc $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
-	install -Dc $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
+	$(INSTALL) -m 0755 -s $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
+	$(INSTALL) -m 0755 -s $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
 
 iproute2: $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
 
 iproute2-clean:
-	rm -f $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/sbin/ip $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
 	-$(MAKE) -C $(IPROUTE2_DIR) clean
 
 iproute2-dirclean:
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] iptables: bump version
  2009-03-03 10:58 ` [Buildroot] iproute: fix makefile Olaf Rempel
@ 2009-03-03 10:58   ` Olaf Rempel
  2009-03-03 10:58     ` [Buildroot] ncftp: convert to Makefile.autotools.in Olaf Rempel
  2009-03-03 22:28     ` [Buildroot] iptables: bump version Peter Korsgaard
  2009-03-04 20:17   ` [Buildroot] iproute: fix makefile Peter Korsgaard
  1 sibling, 2 replies; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

- bump version to 1.4.2
- add uninstall target
---
 package/iptables/iptables.mk |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index fbb5f18..93f2c32 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -3,7 +3,7 @@
 # iptables
 #
 #############################################################
-IPTABLES_VERSION = 1.4.1
+IPTABLES_VERSION = 1.4.2
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 
@@ -16,3 +16,10 @@ IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR)
 IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
 
 $(eval $(call AUTOTARGETS,package,iptables))
+
+$(IPTABLES_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	rm -f $(TARGET_DIR)/usr/bin/iptables-xml
+	rm -f $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/ip6tables*
+	rm -rf $(TARGET_DIR)/usr/lib/xtables
+	rm -f $(IPTABLES_TARGET_INSTALL_TARGET)
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] ncftp: convert to Makefile.autotools.in
  2009-03-03 10:58   ` [Buildroot] iptables: bump version Olaf Rempel
@ 2009-03-03 10:58     ` Olaf Rempel
  2009-03-03 10:58       ` [Buildroot] ntfs-3g: " Olaf Rempel
  2009-03-03 22:28     ` [Buildroot] iptables: bump version Peter Korsgaard
  1 sibling, 1 reply; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

- ncftpspooler is just a link to ncftpbatch
- only ncftpbookmarks needs ncurses, also change from "depends" to "select"
---
 package/ncftp/Config.in |   11 ++-----
 package/ncftp/ncftp.mk  |   69 +++++++++++-----------------------------------
 2 files changed, 20 insertions(+), 60 deletions(-)

diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index 8025c05..e1e4e56 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -25,18 +25,13 @@ config BR2_PACKAGE_NCFTP_LS
 	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_BATCH
-	bool "NcFTPBatch - background FTP program for individual users"
+	bool "NcFTPBatch & NcFTPSpooler - background FTP program for individual users"
 	default y
 	depends on BR2_PACKAGE_NCFTP
 
-config BR2_PACKAGE_NCFTP_SPOOLER
-	bool "NcFTPSpooler - spooler - not working properly"
-	depends on BR2_PACKAGE_NCFTP
-	depends on BR2_PACKAGE_NCURSES
-
 config BR2_PACKAGE_NCFTP_BOOKMARKS
-	bool "NcFTPBookmarks"
+	bool "NcFTPBookmarks - ncurses based Bookmark Editor"
 	depends on BR2_PACKAGE_NCFTP
-	depends on BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES
 
 endmenu
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 4a4a9a6..5f30f08 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -6,7 +6,6 @@
 NCFTP_VERSION:=3.2.2
 NCFTP_SOURCE:=ncftp-$(NCFTP_VERSION)-src.tar.bz2
 NCFTP_SITE:=ftp://ftp.ncftp.com/ncftp
-NCFTP_DIR:=$(BUILD_DIR)/ncftp-$(NCFTP_VERSION)
 
 NCFTP_TARGET_BINS:=ncftp
 
@@ -26,63 +25,29 @@ ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
 NCFTP_TARGET_BINS+=ncftpbatch
 endif
 
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-ifeq ($(BR2_PACKAGE_NCFTP_SPOOLER),y)
-#Someone needs to figure out what to do...
-NCFTP_TARGET_BINS+=
-endif
-
-# only set if NCURSES is available
 ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y)
 NCFTP_TARGET_BINS+=ncftpbookmarks
+NCFTP_DEPENDENCIES:=ncurses
 endif
 
-NCFTP_DEPS += ncurses
-endif
-
-ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE)
-
-$(DL_DIR)/$(NCFTP_SOURCE):
-	$(call DOWNLOAD,$(NCFTP_SITE),$(NCFTP_SOURCE))
+$(eval $(call AUTOTARGETS,package,ncftp))
 
-$(NCFTP_DIR)/.source: $(DL_DIR)/$(NCFTP_SOURCE)
-	$(BZCAT) $(DL_DIR)/$(NCFTP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+$(NCFTP_TARGET_INSTALL_TARGET):
+	$(call MESSAGE,"Installing to target")
+	$(INSTALL) -m 0755 $(addprefix $(NCFTP_DIR)/bin/, $(NCFTP_TARGET_BINS)) $(TARGET_DIR)/usr/bin
+ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
+	ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler
+endif
 	touch $@
 
-$(NCFTP_DIR)/.configured: $(NCFTP_DIR)/.source
-	(cd $(NCFTP_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-	)
+ifeq ($(BR2_ENABLE_DEBUG),)
+$(NCFTP_HOOK_POST_INSTALL): $(NCFTP_TARGET_INSTALL_TARGET)
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
 	touch $@
-
-$(NCFTP_DIR)/bin/%: $(NCFTP_DIR)/.configured
-	$(MAKE) -C $(NCFTP_DIR)
-
-$(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DIR)/bin/, $(NCFTP_TARGET_BINS))
-	$(INSTALL) -m 0755 $(NCFTP_DIR)/bin/$(notdir $@) $(TARGET_DIR)/usr/bin
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-ncftp: uclibc $(NCFTP_DEPS) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
-
-ncftp-clean:
-	-$(MAKE) -C $(NCFTP_DIR) clean
-	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
-
-ncftp-dirclean:
-	rm -rf $(NCFTP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NCFTP),y)
-TARGETS+=ncftp
 endif
+
+$(NCFTP_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
+	-unlink $(TARGET_DIR)/usr/bin/ncftpspooler
+	rm -f $(NCFTP_TARGET_INSTALL_TARGET) $(NCFTP_HOOK_POST_INSTALL)
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] ntfs-3g: convert to Makefile.autotools.in
  2009-03-03 10:58     ` [Buildroot] ncftp: convert to Makefile.autotools.in Olaf Rempel
@ 2009-03-03 10:58       ` Olaf Rempel
  2009-03-03 10:58         ` [Buildroot] dmraid: fix build & " Olaf Rempel
  0 siblings, 1 reply; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

- bump version to 2009.02.1
- internal fuse support, no longer depends on libfuse/pkgconfig
---
 package/ntfs-3g/Config.in  |    3 +-
 package/ntfs-3g/ntfs-3g.mk |  101 ++++++++++---------------------------------
 2 files changed, 25 insertions(+), 79 deletions(-)

diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index da2c86a..32beb74 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -1,9 +1,8 @@
 comment "ntfs-3g has no inherent support for AVR32" 
 	depends on BR2_avr32 && BR2_PACKAGE_NTFS_3G
 
-config BR2_PACKAGE_NTFS-3G
+config BR2_PACKAGE_NTFS_3G
         bool "ntfs-3g"
-	select BR2_PACKAGE_PKGCONFIG
         help
 	  The NTFS-3G driver is an open source, freely available
           read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD,
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 1e78fee..44f938c 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -3,85 +3,32 @@
 # ntfs-3g
 #
 #############################################################
-#NTFS-3G_VERSION:=1.2506
-NTFS-3G_VERSION:=1.5130
-NTFS-3G_SOURCE:=ntfs-3g-$(NTFS-3G_VERSION).tgz
-NTFS-3G_SITE:=www.ntfs-3g.org
-NTFS-3G_DIR:=$(BUILD_DIR)/ntfs-3g-$(NTFS-3G_VERSION)
-NTFS-3G_BINARY:=ntfs-3g
-
-http://www.ntfs-3g.org/ntfs-3g-1.5130.tgz
-$(DL_DIR)/$(NTFS-3G_SOURCE):
-	$(call DOWNLOAD,$(NTFS-3G_SITE),$(NTFS-3G_SOURCE))
-
-$(NTFS-3G_DIR)/.source: $(DL_DIR)/$(NTFS-3G_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(NTFS-3G_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+NTFS_3G_VERSION:=2009.2.1
+NTFS_3G_SOURCE:=ntfs-3g-$(NTFS_3G_VERSION).tgz
+NTFS_3G_SITE:=http://www.ntfs-3g.org/
+NTFS_3G_CONF_OPT:=--disable-ldconfig --program-prefix=""
+NTFS_3G_INSTALL_STAGING:=yes
+
+$(eval $(call AUTOTARGETS,package,ntfs-3g))
+
+$(NTFS_3G_TARGET_INSTALL_TARGET): $(NTFS_3G_TARGET_INSTALL_STAGING)
+	$(call MESSAGE,"Installing to target")
+	cp -dpf $(STAGING_DIR)/usr/lib/libntfs-3g.so* $(TARGET_DIR)/lib/
+	$(INSTALL) -m 0755 $(STAGING_DIR)/usr/bin/ntfs-3g $(TARGET_DIR)/bin/
+	$(INSTALL) -m 0755 $(STAGING_DIR)/usr/bin/ntfs-3g.probe $(TARGET_DIR)/bin/
 	touch $@
 
-$(NTFS-3G_DIR)/.configured: $(NTFS-3G_DIR)/.source
-	(cd $(NTFS-3G_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 \
-		--libdir=/usr/lib \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--program-prefix="" \
-		--with-gnu-ld \
-		--enable-shared \
-		--enable-static \
-		, \
-		ac_cv_path_LDCONFIG=""\
-	);
+ifeq ($(BR2_ENABLE_DEBUG),)
+$(NTFS_3G_HOOK_POST_INSTALL): $(NTFS_3G_TARGET_INSTALL_TARGET)
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g.probe
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/lib/libntfs-3g.so*
 	touch $@
+endif
 
-$(NTFS-3G_DIR)/.compiled: $(NTFS-3G_DIR)/.configured
-	$(MAKE) prefix=$/usr CC=$(TARGET_CC)-C $(NTFS-3G_DIR)
-	touch $@
-#		CROSS_COMPILE="$(TARGET_CROSS)"
-
-
-
-$(STAGING_DIR)/usr/bin/ntfs-3g: $(NTFS-3G_DIR)/.compiled
-	$(MAKE) prefix=$/usr -C $(NTFS-3G_DIR) DESTDIR=$(STAGING_DIR)/ install
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/ntfs-3g: $(STAGING_DIR)/usr/bin/ntfs-3g
-	rm -f $(TARGET_DIR)/lib/libntfs-3g.so.*
-	cp -dpf $(STAGING_DIR)/lib/libntfs-3g.so.* $(TARGET_DIR)/lib/
-	-unlink $(TARGET_DIR)/usr/lib/libntfs-3g*
-	ln -s /lib/libntfs-3g.so  $(TARGET_DIR)/usr/lib/libntfs-3g.so
-	cp -dpf $(STAGING_DIR)/bin/ntfs-3g $(TARGET_DIR)/bin/
-	touch -c $@
-
-ntfs-3g: uclibc pkgconfig libfuse $(TARGET_DIR)/usr/bin/ntfs-3g
-
-ntfs-3g-source: $(DL_DIR)/$(NTFS-3G_SOURCE)
-
-ntfs-3g-clean:
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(NTFS-3G_DIR) uninstall
-	unlink $(TARGET_DIR)/usr/lib/libntfs-3g*
+$(NTFS_3G_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(NTFS_3G_DIR) uninstall
 	rm -f $(TARGET_DIR)/lib/libntfs-3g*
-	rm -f $(TARGET_DIR)/bin/ntfs-3g
-	-$(MAKE) -C $(NTFS-3G_DIR) clean
-
-ntfs-3g-dirclean:
-	rm -rf $(NTFS-3G_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NTFS-3G),y)
-TARGETS+=ntfs-3g
-endif
+	rm -f $(TARGET_DIR)/bin/ntfs-3g $(TARGET_DIR)/bin/ntfs-3g.probe
+	rm -f $(NTFS_3G_TARGET_INSTALL_STAGING) $(NTFS_3G_TARGET_INSTALL_TARGET) $(NTFS_3G_HOOK_POST_INSTALL)
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] dmraid: fix build & convert to Makefile.autotools.in
  2009-03-03 10:58       ` [Buildroot] ntfs-3g: " Olaf Rempel
@ 2009-03-03 10:58         ` Olaf Rempel
  2009-03-03 10:58           ` [Buildroot] ctorrent: new package Olaf Rempel
  2009-03-04 13:23           ` [Buildroot] dmraid: fix build & convert to Makefile.autotools.in Peter Korsgaard
  0 siblings, 2 replies; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

- was not building at all (x86 uclibc)
- adding devicemapper dependency
---
 package/dmraid/Config.in    |    6 +++-
 package/dmraid/dmraid.init  |    6 ++--
 package/dmraid/dmraid.mk    |   75 +++++++++++-------------------------------
 package/dmraid/dmraid.patch |    4 +-
 4 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index 48496b7..a06b381 100644
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -5,4 +5,8 @@ config BR2_PACKAGE_DMRAID
 	bool "dmraid"
 	select BR2_PACKAGE_DM
 	help
-	  Device-Mapper Software RAID support tool/
+	  dmraid discovers, activates, deactivates and displays properties
+	  of software RAID sets (eg, ATARAID) and contained DOS partitions.
+
+	  dmraid uses the Linux device-mapper to create devices with
+	  respective mappings for the ATARAID sets discovered.
diff --git a/package/dmraid/dmraid.init b/package/dmraid/dmraid.init
index 43240e2..970d47d 100644
--- a/package/dmraid/dmraid.init
+++ b/package/dmraid/dmraid.init
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-# try to load module in case that hasn't been done yet
-modprobe dm-mod >/dev/null 2>&1
-
 set -e
 
 [ -x /sbin/dmraid ] || exit 0
 
+# try to load module in case that hasn't been done yet
+modprobe dm-mod >/dev/null 2>&1
+
 case "$1" in
 	start|"")
 		echo "Setting up DMRAID devices..."
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 7db7d84..b5f96b5 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -3,65 +3,30 @@
 # dmraid
 #
 #############################################################
-
-DMRAID_VERSION=1.0.0.rc15
+DMRAID_VERSION:=1.0.0.rc15
 DMRAID_SOURCE:=dmraid-$(DMRAID_VERSION).tar.bz2
 DMRAID_SITE:=http://people.redhat.com/~heinzm/sw/dmraid/src
-DMRAID_DIR:=$(BUILD_DIR)/dmraid/$(DMRAID_VERSION)
-DMRAID_CAT:=$(BZCAT)
-DMRAID_BINARY:=dmraid
-DMRAID_STAGING_BINARY:=$(DMRAID_DIR)/STAGING_DIR)/tools/$(DMRAID_BINARY)
-DMRAID_TARGET_BINARY:=$(TARGET_DIR)/sbin/$(DMRAID_BINARY)
-
-$(DL_DIR)/$(DMRAID_SOURCE):
-	 $(call DOWNLOAD,$(DMRAID_SITE),$(DMRAID_SOURCE))
-
-dmraid-source: $(DL_DIR)/$(DMRAID_SOURCE)
-
-$(DMRAID_DIR)/.unpacked: $(DL_DIR)/$(DMRAID_SOURCE)
-	$(DMRAID_CAT) $(DL_DIR)/$(DMRAID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(DMRAID_DIR) package/dmraid \*.patch
-	touch $(DMRAID_DIR)/.unpacked
+DMRAID_SUBDIR:=$(DMRAID_VERSION)
+DMRAID_DEPENDENCIES:=dm
+DMRAID_INSTALL_STAGING:=yes
 
-$(DMRAID_DIR)/.configured: $(DMRAID_DIR)/.unpacked
-	(cd $(DMRAID_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		--with-user=$(shell id -un) --with-group=$(shell id -gn) \
-	)
-	touch $(DMRAID_DIR)/.configured
+$(eval $(call AUTOTARGETS,package,dmraid))
 
-$(DMRAID_DIR)/tools/$(DMRAID_BINARY): $(DMRAID_DIR)/.configured
-	$(MAKE1) -C $(DMRAID_DIR)
-	-$(STRIPCMD) $(DMRAID_DIR)/tools/$(DMRAID_BINARY)
-	-$(UPX) --best $(DMRAID_DIR)/tools/$(DMRAID_BINARY)
-	touch -c $(DMRAID_DIR)/tools/$(DMRAID_BINARY)
-
-$(DMRAID_TARGET_BINARY): $(DMRAID_DIR)/tools/$(DMRAID_BINARY)
-	$(INSTALL) -m 0755 $? $@
+$(DMRAID_TARGET_INSTALL_TARGET): $(DMRAID_TARGET_INSTALL_STAGING)
+	$(call MESSAGE,"Installing to target")
+	$(INSTALL) -m 0755 $(STAGING_DIR)/usr/sbin/dmraid $(TARGET_DIR)/usr/sbin
 	$(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/dmraid
+	touch $@
 
-dmraid: uclibc dm zlib $(DMRAID_TARGET_BINARY)
-
-dmraid-clean:
-	rm -f $(DMRAID_TARGET_BINARY) $(TARGET_DIR)/etc/init.d/dmraid
-	-$(MAKE) -C $(DMRAID_DIR) clean
-
-dmraid-dirclean:
-	rm -rf $(DMRAID_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DMRAID),y)
-TARGETS+=dmraid
+ifeq ($(BR2_ENABLE_DEBUG),)
+$(DMRAID_HOOK_POST_INSTALL): $(DMRAID_TARGET_INSTALL_TARGET)
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/dmraid
+	touch $@
 endif
+
+$(DMRAID_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+#	makefile has no uninstall target..
+#	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DMRAID_DIR) uninstall
+	rm -f $(TARGET_DIR)/usr/sbin/dmraid $(TARGET_DIR)/etc/init.d/dmraid
+	rm -f $(DMRAID_TARGET_INSTALL_TARGET) $(DMRAID_HOOK_POST_INSTALL)
diff --git a/package/dmraid/dmraid.patch b/package/dmraid/dmraid.patch
index 55bfcd5..fbe2894 100644
--- a/package/dmraid/dmraid.patch
+++ b/package/dmraid/dmraid.patch
@@ -1,5 +1,5 @@
---- 1.0.0.rc15/lib/device/scan.c.orig	2008-06-20 09:32:05.000000000 -0500
-+++ 1.0.0.rc15/lib/device/scan.c	2008-12-01 17:15:25.000000000 -0600
+--- a/1.0.0.rc15/lib/device/scan.c.orig	2008-06-20 09:32:05.000000000 -0500
++++ b/1.0.0.rc15/lib/device/scan.c	2008-12-01 17:15:25.000000000 -0600
 @@ -69,7 +69,7 @@
  	static char *ret = NULL, *sysfs_mp;
  
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] ctorrent: new package
  2009-03-03 10:58         ` [Buildroot] dmraid: fix build & " Olaf Rempel
@ 2009-03-03 10:58           ` Olaf Rempel
  2009-03-03 10:58             ` [Buildroot] lzop: " Olaf Rempel
  2009-03-04 13:23           ` [Buildroot] dmraid: fix build & convert to Makefile.autotools.in Peter Korsgaard
  1 sibling, 1 reply; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

CTorrent is a BitTorrent client implemented in C++
to be lightweight and quick.
This is the enhanced version from
http://www.rahul.net/dholmes/ctorrent/
---
 package/Config.in            |    1 +
 package/ctorrent/Config.in   |   14 ++++++++++++++
 package/ctorrent/ctorrent.mk |   11 +++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 package/ctorrent/Config.in
 create mode 100644 package/ctorrent/ctorrent.mk

diff --git a/package/Config.in b/package/Config.in
index 59d2a43..6f566f4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -132,6 +132,7 @@ source "package/boa/Config.in"
 endif
 source "package/bind/Config.in"
 source "package/bridge-utils/Config.in"
+source "package/ctorrent/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/dhcp/Config.in"
 endif
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
new file mode 100644
index 0000000..9a99c5a
--- /dev/null
+++ b/package/ctorrent/Config.in
@@ -0,0 +1,14 @@
+comment "ctorrent requires a toolchain with C++ support enabled"
+	depends on !BR2_GCC_CROSS_CXX
+
+config BR2_PACKAGE_CTORRENT
+	bool "ctorrent"
+	depends on BR2_GCC_CROSS_CXX
+	default n
+	help
+	  CTorrent is a BitTorrent client implemented in C++
+	  to be lightweight and quick.
+	  http://ctorrent.sourceforge.net/
+
+	  This is the enhanced version from
+	  http://www.rahul.net/dholmes/ctorrent/
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
new file mode 100644
index 0000000..2560881
--- /dev/null
+++ b/package/ctorrent/ctorrent.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# enhanced ctorrent
+#
+#############################################################
+CTORRENT_VERSION:=dnh3.3.2
+CTORRENT_SOURCE:=ctorrent-$(CTORRENT_VERSION).tar.gz
+CTORRENT_SITE:=http://www.rahul.net/dholmes/ctorrent/
+CTORRENT_CONF_OPT:=--with-ssl=no
+
+$(eval $(call AUTOTARGETS,package,ctorrent))
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] lzop: new package
  2009-03-03 10:58           ` [Buildroot] ctorrent: new package Olaf Rempel
@ 2009-03-03 10:58             ` Olaf Rempel
  2009-03-03 10:58               ` [Buildroot] ntfsprogs: " Olaf Rempel
  0 siblings, 1 reply; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

lzop is a file compressor which is very similar to gzip.
lzop uses the LZO data compression library for compression services.
http://www.lzop.org/
---
 package/Config.in      |    1 +
 package/lzop/Config.in |    9 +++++++++
 package/lzop/lzop.mk   |   12 ++++++++++++
 3 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 package/lzop/Config.in
 create mode 100644 package/lzop/lzop.mk

diff --git a/package/Config.in b/package/Config.in
index 6f566f4..e0b906b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -403,6 +403,7 @@ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/gzip/Config.in"
 endif
 source "package/lzo/Config.in"
+source "package/lzop/Config.in"
 source "package/lzma/Config.in"
 source "package/zlib/Config.in"
 endmenu
diff --git a/package/lzop/Config.in b/package/lzop/Config.in
new file mode 100644
index 0000000..c529207
--- /dev/null
+++ b/package/lzop/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LZOP
+	bool "lzop"
+	default n
+	select BR2_PACKAGE_LZO
+	help
+	  lzop is a file compressor which is very similar to gzip.
+	  lzop uses the LZO data compression library for compression services.
+
+	  http://www.lzop.org/
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
new file mode 100644
index 0000000..796686a
--- /dev/null
+++ b/package/lzop/lzop.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# lzop
+#
+#############################################################
+LZOP_VERSION:=1.02rc1
+LZOP_SOURCE:=lzop-$(LZOP_VERSION).tar.gz
+LZOP_SITE:=http://www.lzop.org/download/
+LZOP_CONF_OPT:=--program-prefix=""
+LZOP_DEPENDENCIES:=lzo
+
+$(eval $(call AUTOTARGETS,package,lzop))
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] ntfsprogs: new package
  2009-03-03 10:58             ` [Buildroot] lzop: " Olaf Rempel
@ 2009-03-03 10:58               ` Olaf Rempel
  0 siblings, 0 replies; 12+ messages in thread
From: Olaf Rempel @ 2009-03-03 10:58 UTC (permalink / raw)
  To: buildroot

wide collection of NTFS utilities from http://www.linux-ntfs.org/
---
 package/Config.in              |    1 +
 package/ntfsprogs/Config.in    |    5 +++++
 package/ntfsprogs/ntfsprogs.mk |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 package/ntfsprogs/Config.in
 create mode 100644 package/ntfsprogs/ntfsprogs.mk

diff --git a/package/Config.in b/package/Config.in
index e0b906b..69aefcd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -254,6 +254,7 @@ source "package/memtester/Config.in"
 source "package/mkdosfs/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
+source "package/ntfsprogs/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
 source "package/setserial/Config.in"
diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
new file mode 100644
index 0000000..165bb78
--- /dev/null
+++ b/package/ntfsprogs/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_NTFSPROGS
+    bool "ntfsprogs"
+    default n
+    help
+        wide collection of NTFS utilities from http://www.linux-ntfs.org/
diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk
new file mode 100644
index 0000000..b34fe7a
--- /dev/null
+++ b/package/ntfsprogs/ntfsprogs.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# ntfsprogs
+#
+#############################################################
+NTFSPROGS_VERSION:=2.0.0
+NTFSPROGS_SOURCE:=ntfsprogs-$(NTFSPROGS_VERSION).tar.gz
+NTFSPROGS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-ntfs/
+NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --program-prefix=""
+NTFSPROGS_INSTALL_STAGING:=yes
+
+NTFSPROGS_BIN:=ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls
+NTFSPROGS_SBIN:=ntfsclone ntfscp ntfslabel ntfsresize ntfsundelete mkntfs
+
+$(eval $(call AUTOTARGETS,package,ntfsprogs))
+
+$(NTFSPROGS_TARGET_INSTALL_TARGET): $(NTFSPROGS_TARGET_INSTALL_STAGING)
+	$(call MESSAGE,"Installing to target")
+	cp -dpf $(STAGING_DIR)/usr/lib/libntfs.so* $(TARGET_DIR)/usr/lib/
+	$(INSTALL) -m 0755 $(addprefix $(STAGING_DIR)/usr/bin/,$(NTFSPROGS_BIN)) $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 $(addprefix $(STAGING_DIR)/usr/sbin/,$(NTFSPROGS_SBIN)) $(TARGET_DIR)/usr/sbin
+	ln -s /usr/sbin/mkntfs $(TARGET_DIR)/sbin/mkfs.ntfs
+	touch $@
+
+ifeq ($(BR2_ENABLE_DEBUG),)
+$(NTFSPROGS_HOOK_POST_INSTALL): $(NTFSPROGS_TARGET_INSTALL_TARGET)
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libntfs.so*
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN))
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN))
+	touch $@
+endif
+
+$(NTFSPROGS_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(NTFSPROGS_DIR) uninstall
+	rm -f $(TARGET_DIR)/usr/lib/libntfs.so*
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN))
+	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN))
+	-unlink $(TARGET_DIR)/sbin/mkfs.ntfs
+	rm -f $(NTFSPROGS_TARGET_INSTALL_STAGING) $(NTFSPROGS_TARGET_INSTALL_TARGET) $(NTFSPROGS_HOOK_POST_INSTALL)
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] iptables: bump version
  2009-03-03 10:58   ` [Buildroot] iptables: bump version Olaf Rempel
  2009-03-03 10:58     ` [Buildroot] ncftp: convert to Makefile.autotools.in Olaf Rempel
@ 2009-03-03 22:28     ` Peter Korsgaard
  1 sibling, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2009-03-03 22:28 UTC (permalink / raw)
  To: buildroot

>>>>> "Olaf" == Olaf Rempel <razzor@kopf-tisch.de> writes:

 Olaf> - bump version to 1.4.2
 Olaf> - add uninstall target

Thanks, committed as r25516.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] dmraid: fix build & convert to Makefile.autotools.in
  2009-03-03 10:58         ` [Buildroot] dmraid: fix build & " Olaf Rempel
  2009-03-03 10:58           ` [Buildroot] ctorrent: new package Olaf Rempel
@ 2009-03-04 13:23           ` Peter Korsgaard
  1 sibling, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2009-03-04 13:23 UTC (permalink / raw)
  To: buildroot

>>>>> "Olaf" == Olaf Rempel <razzor@kopf-tisch.de> writes:

 Olaf> - was not building at all (x86 uclibc)
 Olaf> - adding devicemapper dependency

Thanks, committed as r25522.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] iproute: fix makefile
  2009-03-03 10:58 ` [Buildroot] iproute: fix makefile Olaf Rempel
  2009-03-03 10:58   ` [Buildroot] iptables: bump version Olaf Rempel
@ 2009-03-04 20:17   ` Peter Korsgaard
  1 sibling, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2009-03-04 20:17 UTC (permalink / raw)
  To: buildroot

>>>>> "Olaf" == Olaf Rempel <razzor@kopf-tisch.de> writes:

 Olaf> - bump version to 2.6.28
 Olaf> - fix download
 Olaf> - change compile ordering (build tc after ip)
 Olaf> - remove both binaries from target when cleaning up

Thanks, committed as r25529 except for:

 Olaf>  $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY): $(IPROUTE2_DIR)/$(IPROUTE2_BINARY)
 Olaf> -	install -Dc $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
 Olaf> -	install -Dc $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
 Olaf> +	$(INSTALL) -m 0755 -s $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
 Olaf> +	$(INSTALL) -m 0755 -s $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)

install -s doesn't work when cross compiling. Fixed to use a seperate
$(STRIPCMD) invocation.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2009-03-04 20:17 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-03 10:58 [Buildroot] some patches and new packages Olaf Rempel
2009-03-03 10:58 ` [Buildroot] iproute: fix makefile Olaf Rempel
2009-03-03 10:58   ` [Buildroot] iptables: bump version Olaf Rempel
2009-03-03 10:58     ` [Buildroot] ncftp: convert to Makefile.autotools.in Olaf Rempel
2009-03-03 10:58       ` [Buildroot] ntfs-3g: " Olaf Rempel
2009-03-03 10:58         ` [Buildroot] dmraid: fix build & " Olaf Rempel
2009-03-03 10:58           ` [Buildroot] ctorrent: new package Olaf Rempel
2009-03-03 10:58             ` [Buildroot] lzop: " Olaf Rempel
2009-03-03 10:58               ` [Buildroot] ntfsprogs: " Olaf Rempel
2009-03-04 13:23           ` [Buildroot] dmraid: fix build & convert to Makefile.autotools.in Peter Korsgaard
2009-03-03 22:28     ` [Buildroot] iptables: bump version Peter Korsgaard
2009-03-04 20:17   ` [Buildroot] iproute: fix makefile Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.