util-linux: use := instead of = to stop recursion

Unbreaks util-linux together with busybox Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
docs/news: announce 2009.08
2009-08-31 22:11:36 +02:00 · 2009-08-31 17:47:14 +02:00 · 2009-08-31 10:23:48 +02:00 · 2009-08-31 07:23:59 +02:00 · 2009-08-30 22:08:21 +02:00 · 2009-08-30 21:59:55 +02:00
12 changed files with 53 additions and 26 deletions
--- a/12
+++ b/12
@@ -1,3 +1,15 @@
+2009.08, Released August 31th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: ctorrent, saveconfig/getconfig,
+	sdl_net, util-linux.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#529: util-linux doesn't find headers and include libs correctly
+	#557: Build ctorrent with SSL support if available
+
 2009.08-rc3, Released August 26th, 2009:

 	Additional fixes and cleanups.
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG

 config BR2_VERSION
 	string
-	default "2009.08-rc3"
+	default "2009.08"

 source "target/Config.in.arch"
 source "target/device/Config.in"
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@

 <p>

-The latest stable release is <b>2009.05</b>, which can be downloaded
+The latest stable release is <b>2009.08</b>, which can be downloaded
 here:<p>

-<a href="/downloads/buildroot-2009.05.tar.gz">buildroot-2009.05.tar.gz</a>
+<a href="/downloads/buildroot-2009.08.tar.gz">buildroot-2009.08.tar.gz</a>
 or
-<a href="/downloads/buildroot-2009.05.tar.bz2">buildroot-2009.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2009.08.tar.bz2">buildroot-2009.08.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2009.08-rc3</b>, which can be
 downloaded here:<p>

@@ -21,8 +21,8 @@ downloaded here:<p>
 or
 <a href="/downloads/buildroot-2009.08-rc3.tar.bz2">buildroot-2009.08-rc3.tar.bz2</a>.
 <p>
-
-This and earlier releases can always be dowloaded from
+-->
+This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.

 <p>
@@ -43,4 +43,3 @@ follow development, but cannot or do not wish to use Git.
 </ul>

 <!--#include file="footer.html" -->
-
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,16 @@
 <p>

 <ul>
+  <li><b>31 August 2009 -- 2009.08 released</b>
+
+    <p>The stable 2009.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-August/029018.html">announcement</a>
+    or <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.08.tar.bz2">2009.08
+    release</a>.</p>
+
  <li><b>26 August 2009 -- 2009.08-rc3 released</b>
    <p>A number of bugfixes have been added to the tree since RC2
    (especially thanks to Thomas Petazzoni) - See the <a
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -6,6 +6,12 @@
 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
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+CTORRENT_CONF_OPT+=--with-ssl=yes
+CTORRENT_DEPENDENCIES+=openssl
+else
+CTORRENT_CONF_OPT+=--with-ssl=no
+endif

 $(eval $(call AUTOTARGETS,package,ctorrent))
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -5,7 +5,7 @@
 #############################################################
 PRBOOM_VERSION:=2.4.7

-PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer
+PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer

 $(eval $(call AUTOTARGETS,package/games,prboom))

--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -14,4 +14,4 @@ SDL_NET_INSTALL_STAGING = YES

 SDL_NET_DEPENDENCIES = sdl

-$(eval $(call AUTOTARGETS,package,SDL_net))
+$(eval $(call AUTOTARGETS,package,sdl_net))
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_UTIL-LINUX
 	bool "util-linux"
+	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
 	help
 	  Various useful/essential Linux utilities.

--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -18,6 +18,11 @@ else
 UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
 endif

+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+UTIL-LINUX_DEPENDENCIES += libintl
+UTIL-LINUX_MAKE_OPT = LIBS=-lintl
+endif
+
 $(DL_DIR)/$(UTIL-LINUX_SOURCE):
 	$(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE))

@@ -30,6 +35,7 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
 	(cd $(UTIL-LINUX_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		ac_cv_lib_blkid_blkid_known_fstype=no \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -55,6 +61,7 @@ $(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured
 		ARCH=$(ARCH) \
 		CC=$(TARGET_CC) \
 		OPT="$(TARGET_CFLAGS)" \
+		$(UTIL-LINUX_MAKE_OPT) \
 		HAVE_SLANG="NO"

 $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
@@ -65,11 +72,10 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
 #If both util-linux and busybox are selected, make certain util-linux
 #wins the fight over who gets to have their utils actually installed
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-util-linux: uclibc busybox $(UTIL-LINUX_TARGET_BINARY)
-else
-util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY)
+UTIL-LINUX_DEPENDENCIES := busybox $(UTIL-LINUX_DEPENDENCIES)
 endif

+util-linux: uclibc $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY)

 util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)

--- a/project/project.mk
+++ b/project/project.mk
@@ -19,7 +19,7 @@ $(TARGET_DIR)/etc/br-version: .config
 	mkdir -p $(TARGET_DIR)/etc
 	echo $(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion) >$@

-saveconfig: $(CONFIG)/conf
+saveconfig:
 	mkdir -p $(LOCAL)/$(PROJECT)
 	-cp .config $(PROJECT_FILE)
 	if [ -f $(LINUX26_DIR)/.config ]; then \
@@ -48,14 +48,5 @@ saveconfig: $(CONFIG)/conf
 			$(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h; \
 	fi

-getconfig: $(CONFIG)/conf
+getconfig:
 	-cp $(LOCAL)/$(PROJECT)/$(PROJECT).config .config
-
-vendor-dbg:
-	@echo VENDOR_SITE=$(BR2_VENDOR_SITE)
-	@echo VENDOR_SUFFIX=$(BR2_VENDOR_SUFFIX)
-	@echo VENDOR_BINUTILS_RELEASE=$(BR2_VENDOR_BINUTILS_RELEASE)
-	@echo VENDOR_GCC_RELEASE=$(BR2_VENDOR_GCC_RELEASE)
-	@echo VENDOR_UCLIBC_RELEASE=$(BR2_VENDOR_UCLIBC_RELEASE)
-	@echo VENDOR_GDB_RELEASE=$(BR2_VENDOR_GDB_RELEASE)
-	@echo VENDOR_PATCH_DIR=$(BR2_VENDOR_PATCH_DIR)
--- a/scripts/buildall.sh
+++ b/scripts/buildall.sh
@@ -264,7 +264,7 @@ EXE	mk	sawman				OK
 EXE	mk	sdl				OK	
 EXE	mk	sdl_image			OK	
 EXE	mk	sdl_mixer			OK	
-EXE	mk	SDL_net				OK	
+EXE	mk	sdl_net				OK	
 EXE	mk	sdl_ttf				OK	
 EXE	mk	tiff				OK	
 comment	busybox graphic applications
--- a/target/u-boot/Config.in
+++ b/target/u-boot/Config.in
@@ -30,6 +30,7 @@ config BR2_TARGET_UBOOT_2009_01

 config BR2_TARGET_UBOOT_2008_10
 	bool "u-boot-2008.10"
+	depends on BR2_DEPRECATED

 config BR2_TARGET_UBOOT_1_3_4
 	bool "u-boot-1.3.4"
Author	SHA1	Message	Date
Peter Korsgaard	49c47f55a8	util-linux: use := instead of = to stop recursion Unbreaks util-linux together with busybox Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-31 22:11:36 +02:00
Peter Korsgaard	2f6e59d00b	docs/news: announce 2009.08 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-31 17:47:14 +02:00
Peter Korsgaard	f0eb8b58e4	buildroot: update for 2009.08 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-31 10:23:48 +02:00
Kelvin Cheung	cc8a917598	ctorrent: build with ssl support if available Closes #557 Build with openssl support if that is enabled. Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-31 07:23:59 +02:00
Peter Korsgaard	014df317d4	util-linux: fix build with locale in toolchain Closes #529. util-linux needs to link with libintl when locale support is available / requested in the toolchain, similar to how it is done for avahi. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-30 22:08:21 +02:00
Peter Korsgaard	621e8726f9	util-linux: fix libblkid detection We don't have libblkid in BR, so make sure the configure script doesn't detect it if it is installed on the host. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-30 21:59:55 +02:00
Peter Korsgaard	8ed829a179	buildroot: fix remaining references to SDL_net instead of sdl_net Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-29 17:21:52 +02:00
Peter Korsgaard	688c388ce7	sdl_net: use sdl_net instead of SDL_net as make target As suggested by Julien Boibessot <julien.boibessot@free.fr>. The other SDL extensions use sdl_xx, and not SDL_xx, so rename sdl_net to match. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-28 15:30:51 +02:00
Peter Korsgaard	1af58aff72	u-boot: mark old 2008.10 version as deprecated Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-27 14:39:30 +02:00
Peter Korsgaard	e5413e83d8	project: saveconfig/getconfig doesn't need conf And get rid of unused debugging code while we're at it. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2009-08-27 14:38:05 +02:00