summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES2
-rw-r--r--package/Config.in1
-rw-r--r--package/Makefile.in2
-rw-r--r--package/haserl/Config.in2
-rw-r--r--package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch19
-rw-r--r--package/ntfsprogs/Config.in10
-rw-r--r--package/ntfsprogs/ntfsprogs.mk40
-rw-r--r--package/pciutils/pciutils.mk2
8 files changed, 56 insertions, 22 deletions
diff --git a/CHANGES b/CHANGES
index 527383c9d..4c3d4032d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@
#171: xorg-server / kernel headers 2.6.26 - vm86.c compilation issue
#241: device mapper + lvm2: build together
#243: ctorrent: new package
+ #247: ntfsprogs: new package
#271: Library 'libgcc_s.so.1' not installed in search path
#287: New package libnl
#331: Update MPlayer to version 1.0rc2
@@ -50,6 +51,7 @@
#495: Bump bind package to 9.5.1-P3 (security)
#497: OpenSSL RSA key generation hangs on x86_64
#509: Bump sqlite package to 3.6.16
+ #523: pciutils broken with external toolchain
2009.05, Released June 1st, 2009:
diff --git a/package/Config.in b/package/Config.in
index bd15b62bc..cb5e9e055 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -262,6 +262,7 @@ source "package/mdadm/Config.in"
source "package/memtester/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/Makefile.in b/package/Makefile.in
index 3dcdfe104..0829e8f3b 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -181,7 +181,7 @@ ifeq ($(BR2_STRIP_none),y)
TARGET_STRIP=true -Not_stripping
STRIPCMD=$(TARGET_STRIP)
endif
-INSTALL=/usr/bin/install
+INSTALL=$(shell which install || type -p install)
FLEX:=$(shell which flex || type -p flex)
BISON:=$(shell which bison || type -p bison)
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 0a5847857..21ab63c9c 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -30,4 +30,4 @@ endchoice
config BR2_PACKAGE_HASERL_VERSION
string
default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_X
- default "0.9.25" if BR2_PACKAGE_HASERL_VERSION_0_9_X
+ default "0.9.26" if BR2_PACKAGE_HASERL_VERSION_0_9_X
diff --git a/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch b/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch
deleted file mode 100644
index e6c959a66..000000000
--- a/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-haserl: array vars fix
-
-Fix buffer overflow error. Len is the length of the name= part of the
-name=value string, not the value part.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Index: haserl-0.9.25/src/haserl.c
-===================================================================
---- haserl-0.9.25.orig/src/haserl.c 2009-07-20 15:05:26.000000000 +0200
-+++ haserl-0.9.25/src/haserl.c 2009-07-20 15:06:05.000000000 +0200
-@@ -269,7 +269,7 @@
- /* if an array, create a new string with this
- * value added to the end of the old value(s)
- */
-- temp = xmalloc (strlen (cur->buf) + len + 1);
-+ temp = xmalloc (strlen (cur->buf) + strlen(entry) - len + 1);
- memmove (temp, cur->buf, strlen (cur->buf) + 1);
- strcat (temp, "\n");
- strcat (temp, str + keylen + 3);
diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
new file mode 100644
index 000000000..38b955e56
--- /dev/null
+++ b/package/ntfsprogs/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_NTFSPROGS
+ bool "ntfsprogs"
+ depends on BR2_USE_WCHAR
+ help
+ wide collection of NTFS utilities
+
+ http://www.linux-ntfs.org/
+
+comment "ntfsprogs requires a toolchain with WCHAR support"
+ depends on !BR2_USE_WCHAR
diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk
new file mode 100644
index 000000000..b34fe7a24
--- /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)
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 0d8155f40..976afbf17 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -41,7 +41,7 @@ $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURC
touch $@
$(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
- $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) -C $(PCIUTILS_DIR) \
+ $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) -C $(PCIUTILS_DIR) \
SHAREDIR="/usr/share/misc" \
ZLIB=$(PCIUTILS_HAVE_ZLIB) \
HOST=$(KERNEL_ARCH)-linux \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 17:09:05 +0000