Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2008-07-04 20:35 ulf at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: ulf at uclibc.org @ 2008-07-04 20:35 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2008-07-04 13:35:41 -0700 (Fri, 04 Jul 2008)
New Revision: 22635

Log:
The build of 'file', needs to run 'file' natively, so provide a valid link

Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2008-07-04 11:18:58 UTC (rev 22634)
+++ trunk/buildroot/package/file/file.mk	2008-07-04 20:35:41 UTC (rev 22635)
@@ -85,6 +85,7 @@
 	touch $@
 
 $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file
+	ln -sf $(FILE_DIR1)/install/bin/file $(FILE_DIR2)/magic/file
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="-static" -C $(FILE_DIR2)
 
 $(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2008-09-02 13:54 jacmet at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: jacmet at uclibc.org @ 2008-09-02 13:54 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-09-02 06:54:58 -0700 (Tue, 02 Sep 2008)
New Revision: 23306

Log:
file: select zlib

file depends on zlib, so make it visible in kconfig.

Modified:
   trunk/buildroot/package/file/Config.in


Changeset:
Modified: trunk/buildroot/package/file/Config.in
===================================================================
--- trunk/buildroot/package/file/Config.in	2008-09-02 13:54:55 UTC (rev 23305)
+++ trunk/buildroot/package/file/Config.in	2008-09-02 13:54:58 UTC (rev 23306)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FILE
 	bool "file"
+	select BR2_PACKAGE_ZLIB
 	help
 	  Program to identify a file's format by scanning binary data
 	  for known patterns.

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2008-09-02 13:54 jacmet at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: jacmet at uclibc.org @ 2008-09-02 13:54 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-09-02 06:54:55 -0700 (Tue, 02 Sep 2008)
New Revision: 23305

Log:
file: bump version and use official upstream instead of Debian

Debian is a bit too volatile.

Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2008-09-02 11:14:04 UTC (rev 23304)
+++ trunk/buildroot/package/file/file.mk	2008-09-02 13:54:55 UTC (rev 23305)
@@ -3,9 +3,9 @@
 # file
 #
 #############################################################
-FILE_VERSION:=4.24
-FILE_SOURCE:=file_$(FILE_VERSION).orig.tar.gz
-FILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/file
+FILE_VERSION:=4.26
+FILE_SOURCE:=file-$(FILE_VERSION).tar.gz
+FILE_SITE:=ftp://ftp.astron.com/pub/file/
 FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION)
 FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VERSION)-host
 FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VERSION)-target

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2008-06-16 11:15 jacmet at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:15 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-06-16 04:15:31 -0700 (Mon, 16 Jun 2008)
New Revision: 22368

Log:
file: bump version

Patch by Conrad Parker.


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2008-06-16 09:49:47 UTC (rev 22367)
+++ trunk/buildroot/package/file/file.mk	2008-06-16 11:15:31 UTC (rev 22368)
@@ -3,7 +3,7 @@
 # file
 #
 #############################################################
-FILE_VERSION:=4.23
+FILE_VERSION:=4.24
 FILE_SOURCE:=file_$(FILE_VERSION).orig.tar.gz
 FILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/file
 FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2008-03-06 18:08 ninevoltz at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:08 UTC (permalink / raw)
  To: buildroot

Author: ninevoltz
Date: 2008-03-06 10:08:42 -0800 (Thu, 06 Mar 2008)
New Revision: 21190

Log:
updated file version

Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2008-03-06 18:08:14 UTC (rev 21189)
+++ trunk/buildroot/package/file/file.mk	2008-03-06 18:08:42 UTC (rev 21190)
@@ -3,7 +3,7 @@
 # file
 #
 #############################################################
-FILE_VERSION:=4.21
+FILE_VERSION:=4.23
 FILE_SOURCE:=file_$(FILE_VERSION).orig.tar.gz
 FILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/file
 FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2007-08-05 12:10 aldot at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: aldot at uclibc.org @ 2007-08-05 12:10 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-08-05 05:10:35 -0700 (Sun, 05 Aug 2007)
New Revision: 19404

Log:
- download disappeared, use debian instead


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2007-08-03 14:17:21 UTC (rev 19403)
+++ trunk/buildroot/package/file/file.mk	2007-08-05 12:10:35 UTC (rev 19404)
@@ -4,8 +4,8 @@
 #
 #############################################################
 FILE_VERSION:=4.21
-FILE_SOURCE:=file-$(FILE_VERSION).tar.gz
-FILE_SITE:=ftp://ftp.astron.com/pub/file
+FILE_SOURCE:=file_$(FILE_VERSION).orig.tar.gz
+FILE_SITE:=http://ftp.debian.org/debian/pool/main/f/file
 FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION)
 FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VERSION)-host
 FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VERSION)-target

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2007-07-07 11:06 aldot at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: aldot at uclibc.org @ 2007-07-07 11:06 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-07-07 04:06:08 -0700 (Sat, 07 Jul 2007)
New Revision: 19019

Log:
- using $(STAGING_DIR)/include is inherently wrong. $(STAGING_DIR)/usr/include
  is the proper path for includes (check your host)


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2007-07-07 10:39:13 UTC (rev 19018)
+++ trunk/buildroot/package/file/file.mk	2007-07-07 11:06:08 UTC (rev 19019)
@@ -94,8 +94,7 @@
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
 	rm -f $(TARGET_DIR)/lib/libmagic.la
-	mkdir -p $(STAGING_DIR)/include
-	mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
+	mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include
 
 file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)
 

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2007-06-09  9:58 aldot at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: aldot at uclibc.org @ 2007-06-09  9:58 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-06-09 02:58:14 -0700 (Sat, 09 Jun 2007)
New Revision: 18788

Log:
- bump version


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2007-06-09 09:12:45 UTC (rev 18787)
+++ trunk/buildroot/package/file/file.mk	2007-06-09 09:58:14 UTC (rev 18788)
@@ -3,7 +3,7 @@
 # file
 #
 #############################################################
-FILE_VER:=4.19
+FILE_VER:=4.21
 FILE_SOURCE:=file-$(FILE_VER).tar.gz
 FILE_SITE:=ftp://ftp.astron.com/pub/file
 FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VER)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2007-04-13  2:43 sjhill at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: sjhill at uclibc.org @ 2007-04-13  2:43 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-04-12 19:43:28 -0700 (Thu, 12 Apr 2007)
New Revision: 18423

Log:
Need the target LDFLAGS for this to link using external toolchain.


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2007-04-13 02:04:32 UTC (rev 18422)
+++ trunk/buildroot/package/file/file.mk	2007-04-13 02:43:28 UTC (rev 18423)
@@ -86,10 +86,10 @@
 	touch $(FILE_DIR2)/.configured
 
 $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="-static" -C $(FILE_DIR2)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -static" -C $(FILE_DIR2)
 
 $(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
 	-($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2007-01-16  0:33 sjhill at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: sjhill at uclibc.org @ 2007-01-16  0:33 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-01-15 16:33:24 -0800 (Mon, 15 Jan 2007)
New Revision: 17321

Log:
Fix failed build due to addition of '--libdir=/lib' which changed the location of where libmagic.a and libmagic.la were located.


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2007-01-15 22:37:08 UTC (rev 17320)
+++ trunk/buildroot/package/file/file.mk	2007-01-16 00:33:24 UTC (rev 17321)
@@ -91,8 +91,8 @@
 	-($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-	mv $(TARGET_DIR)/usr/lib/libmagic.a $(STAGING_DIR)/lib
-	rm -f $(TARGET_DIR)/usr/lib/libmagic.la
+	mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
+	rm -f $(TARGET_DIR)/lib/libmagic.la
 	mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
 
 file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/file
@ 2006-12-15 15:19 aldot at uclibc.org
  0 siblings, 0 replies; 11+ messages in thread
From: aldot at uclibc.org @ 2006-12-15 15:19 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-12-15 07:19:46 -0800 (Fri, 15 Dec 2006)
New Revision: 16948

Log:
- bump version, mv the libmagic.a to the staging dir and peruse one sourcedir
  for both host and target build. Thanks to Ulrich Hecht.


Modified:
   trunk/buildroot/package/file/file.mk


Changeset:
Modified: trunk/buildroot/package/file/file.mk
===================================================================
--- trunk/buildroot/package/file/file.mk	2006-12-15 15:15:35 UTC (rev 16947)
+++ trunk/buildroot/package/file/file.mk	2006-12-15 15:19:46 UTC (rev 16948)
@@ -3,11 +3,12 @@
 # file
 #
 #############################################################
-FILE_VER:=4.17
+FILE_VER:=4.19
 FILE_SOURCE:=file-$(FILE_VER).tar.gz
 FILE_SITE:=ftp://ftp.astron.com/pub/file
-FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)
-FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)-host
+FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)-target
 FILE_CAT:=$(ZCAT)
 FILE_BINARY:=src/file
 FILE_TARGET_BINARY:=usr/bin/file
@@ -23,13 +24,11 @@
 # build file for use on the host system
 #
 #############################################################
-$(FILE_DIR1)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
-	$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(FILE_DIR1)/.unpacked
-
-$(FILE_DIR1)/.configured: $(FILE_DIR1)/.unpacked
+$(FILE_DIR1)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+	mkdir -p $(FILE_DIR1)
 	(cd $(FILE_DIR1); rm -rf config.cache; \
-		./configure \
+		CC="$(HOSTCC)" \
+		$(FILE_SOURCE_DIR)/configure \
 		--prefix=$(FILE_DIR1)/install \
 	);
 	touch $(FILE_DIR1)/.configured
@@ -51,17 +50,18 @@
 # build file for use on the target system
 #
 #############################################################
-file-unpacked: $(FILE_DIR2)/.unpacked
-$(FILE_DIR2)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
+file-unpacked: $(FILE_SOURCE_DIR)/.unpacked
+$(FILE_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
 	$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(FILE_DIR2) package/file/ file\*.patch
-	touch $(FILE_DIR2)/.unpacked
+	toolchain/patch-kernel.sh $(FILE_SOURCE_DIR) package/file/ file\*.patch
+	touch $(FILE_SOURCE_DIR)/.unpacked
 
-$(FILE_DIR2)/.configured: $(FILE_DIR2)/.unpacked
+$(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+	mkdir -p $(FILE_DIR2)
 	(cd $(FILE_DIR2); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
+		$(FILE_SOURCE_DIR)/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -90,6 +90,9 @@
 	-($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+	mv $(TARGET_DIR)/usr/lib/libmagic.a $(STAGING_DIR)/lib
+	rm -f $(TARGET_DIR)/usr/lib/libmagic.la
+	mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
 
 file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)
 

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-09-02 13:54 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-04 20:35 [Buildroot] svn commit: trunk/buildroot/package/file ulf at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2008-09-02 13:54 jacmet at uclibc.org
2008-09-02 13:54 jacmet at uclibc.org
2008-06-16 11:15 jacmet at uclibc.org
2008-03-06 18:08 ninevoltz at uclibc.org
2007-08-05 12:10 aldot at uclibc.org
2007-07-07 11:06 aldot at uclibc.org
2007-06-09  9:58 aldot at uclibc.org
2007-04-13  2:43 sjhill at uclibc.org
2007-01-16  0:33 sjhill at uclibc.org
2006-12-15 15:19 aldot at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox