Change name from raidtools to raidtools2

diff --git a/package/Config.in b/package/Config.in
index 4cda847c2b77151f4b40cdb32c63875c8f7390c1..d730845a522bb440c6a92aacc7b3725e5eb3bec0 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -254,7 +254,7 @@ source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
-source "package/raidtools/Config.in"
+source "package/raidtools2/Config.in"
 source "package/setserial/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 # busybox has fdisk

diff --git a/package/raidtools/Config.in b/package/raidtools/Config.in
deleted file mode 100644 (file)
index 972de71..0000000
--- a/package/raidtools/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_RAIDTOOLS
-       bool "raidtools"
-       help
-         Utilities to support 'old-style' RAID disks.
-
-         http://people.redhat.com/mingo/raidtools/

diff --git a/package/raidtools/raidtools.mk b/package/raidtools/raidtools.mk
deleted file mode 100644 (file)
index 8584ce7..0000000
--- a/package/raidtools/raidtools.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#############################################################
-#
-# raidtools2
-#
-#############################################################
-RAIDTOOLS2_VERSION:=1.00.3
-RAIDTOOLS2_SOURCE:=raidtools2-$(RAIDTOOLS2_VERSION).tar.gz
-RAIDTOOLS2_SITE:=
-RAIDTOOLS2_DIR:=$(BUILD_DIR)/raidtools2-$(RAIDTOOLS2_VERSION)
-RAIDTOOLS2_CAT:=$(ZCAT)
-RAIDTOOLS2_BINARY:=mkraid
-RAIDTOOLS2_TARGET_BINARY:=sbin/mkraid
-
-$(DL_DIR)/$(RAIDTOOLS2_SOURCE):
-       $(WGET) -P $(DL_DIR) $(RAIDTOOLS2_SITE)/$(RAIDTOOLS2_SOURCE)
-
-raidtools2-source: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
-
-$(RAIDTOOLS2_DIR)/.unpacked: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
-       $(RAIDTOOLS2_CAT) $(DL_DIR)/$(RAIDTOOLS2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(RAIDTOOLS2_DIR)/.unpacked
-
-$(RAIDTOOLS2_DIR)/.configured: $(RAIDTOOLS2_DIR)/.unpacked
-       (cd $(RAIDTOOLS2_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 \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --sbindir=/usr/sbin \
-               --libdir=/lib \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share/misc \
-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
-               $(DISABLE_NLS) \
-               --enable-fsect-man5 \
-       )
-       touch $(RAIDTOOLS2_DIR)/.configured
-
-$(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY): $(RAIDTOOLS2_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR)
-
-$(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY): $(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY)
-       $(MAKE) ROOTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) install
-       rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-               $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-
-raidtools2: zlib uclibc $(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY)
-
-raidtools2-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) uninstall
-       -$(MAKE) -C $(RAIDTOOLS2_DIR) clean
-
-raidtools2-dirclean:
-       rm -rf $(RAIDTOOLS2_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_RAIDTOOLS),y)
-TARGETS+=raidtools
-endif

diff --git a/package/raidtools2/Config.in b/package/raidtools2/Config.in
new file mode 100644 (file)
index 0000000..4fc312a
--- /dev/null
+++ b/package/raidtools2/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RAIDTOOLS
+       bool "raidtools2"
+       help
+         Utilities to support 'old-style' RAID disks.
+
+         http://people.redhat.com/mingo/raidtools/

diff --git a/package/raidtools2/raidtools2.mk b/package/raidtools2/raidtools2.mk
new file mode 100644 (file)
index 0000000..d8a1cf9
--- /dev/null
+++ b/package/raidtools2/raidtools2.mk
@@ -0,0 +1,70 @@
+#############################################################
+#
+# raidtools2
+#
+#############################################################
+RAIDTOOLS2_VERSION:=1.00.3
+RAIDTOOLS2_SOURCE:=raidtools2-$(RAIDTOOLS2_VERSION).tar.gz
+RAIDTOOLS2_SITE:=
+RAIDTOOLS2_DIR:=$(BUILD_DIR)/raidtools2-$(RAIDTOOLS2_VERSION)
+RAIDTOOLS2_CAT:=$(ZCAT)
+RAIDTOOLS2_BINARY:=mkraid
+RAIDTOOLS2_TARGET_BINARY:=sbin/mkraid
+
+$(DL_DIR)/$(RAIDTOOLS2_SOURCE):
+       $(WGET) -P $(DL_DIR) $(RAIDTOOLS2_SITE)/$(RAIDTOOLS2_SOURCE)
+
+raidtools2-source: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
+
+$(RAIDTOOLS2_DIR)/.unpacked: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
+       $(RAIDTOOLS2_CAT) $(DL_DIR)/$(RAIDTOOLS2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $(RAIDTOOLS2_DIR)/.unpacked
+
+$(RAIDTOOLS2_DIR)/.configured: $(RAIDTOOLS2_DIR)/.unpacked
+       (cd $(RAIDTOOLS2_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 \
+               --exec-prefix=/usr \
+               --bindir=/usr/bin \
+               --sbindir=/usr/sbin \
+               --libdir=/lib \
+               --libexecdir=/usr/lib \
+               --sysconfdir=/etc \
+               --datadir=/usr/share/misc \
+               --localstatedir=/var \
+               --mandir=/usr/man \
+               --infodir=/usr/info \
+               $(DISABLE_NLS) \
+               --enable-fsect-man5 \
+       )
+       touch $(RAIDTOOLS2_DIR)/.configured
+
+$(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY): $(RAIDTOOLS2_DIR)/.configured
+       $(MAKE) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR)
+
+$(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY): $(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY)
+       $(MAKE) ROOTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) install
+       rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+               $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+raidtools2: zlib uclibc $(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY)
+
+raidtools2-clean:
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) uninstall
+       -$(MAKE) -C $(RAIDTOOLS2_DIR) clean
+
+raidtools2-dirclean:
+       rm -rf $(RAIDTOOLS2_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_RAIDTOOLS),y)
+TARGETS+=raidtools2
+endif