[Buildroot] [PATCH 1/9] alsa-lib : bump to 1.0.24.1

[Buildroot] [PATCH 1/9] alsa-lib : bump to 1.0.24.1

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/multimedia/alsa-lib/alsa-lib.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 2085a97..317e78f 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -3,7 +3,7 @@
 # alsa-lib
 #
 #############################################################
-ALSA_LIB_VERSION = 1.0.23
+ALSA_LIB_VERSION = 1.0.24.1
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_INSTALL_STAGING = YES
-- 
1.7.0.4

[Buildroot] [PATCH 2/9] alsa-utils : bump to 1.0.24.2

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/multimedia/alsa-utils/alsa-utils.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 4ab49d3..26c270b 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,7 +3,7 @@
 # alsa-utils
 #
 #############################################################
-ALSA_UTILS_VERSION = 1.0.23
+ALSA_UTILS_VERSION = 1.0.24.2
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
 ALSA_UTILS_INSTALL_STAGING = YES
-- 
1.7.0.4

[Buildroot] [PATCH 2/9] alsa-utils : bump to 1.0.24.2

[Peter Korsgaard]

>>>>> "Chih-Min" == Chih-Min Chao <cmchao@gmail.com> writes:

 Chih-Min> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
 Chih-Min> ---
 Chih-Min>  package/multimedia/alsa-utils/alsa-utils.mk |    2 +-
 Chih-Min>  1 files changed, 1 insertions(+), 1 deletions(-)

 Chih-Min> diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
 Chih-Min> index 4ab49d3..26c270b 100644
 Chih-Min> --- a/package/multimedia/alsa-utils/alsa-utils.mk
 Chih-Min> +++ b/package/multimedia/alsa-utils/alsa-utils.mk
 Chih-Min> @@ -3,7 +3,7 @@
 Chih-Min>  # alsa-utils
 Chih-Min>  #
 Chih-Min>  #############################################################
 Chih-Min> -ALSA_UTILS_VERSION = 1.0.23
 Chih-Min> +ALSA_UTILS_VERSION = 1.0.24.2

This breaks on uClibc where we don't have the exp10 glibc extension:

volume_mapping.o: In function `get_normalized_volume':
volume_mapping.c:(.text+0x160): undefined reference to `exp10'
volume_mapping.c:(.text+0x19c): undefined reference to `exp10'
volume_mapping.o: In function `set_normalized_volume':
volume_mapping.c:(.text+0x298): undefined reference to `exp10'
collect2: ld returned 1 exit status
make[3]: *** [alsamixer] Error 1

I guess we'll need to come up with an emulation for it.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/9] alsa-utils : bump to 1.0.24.2

[Chih-Min Chao]

On Mon, Mar 14, 2011 at 7:27 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Chih-Min" == Chih-Min Chao <cmchao@gmail.com> writes:
>
> ?Chih-Min> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
> ?Chih-Min> ---
> ?Chih-Min> ?package/multimedia/alsa-utils/alsa-utils.mk | ? ?2 +-
> ?Chih-Min> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> ?Chih-Min> diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
> ?Chih-Min> index 4ab49d3..26c270b 100644
> ?Chih-Min> --- a/package/multimedia/alsa-utils/alsa-utils.mk
> ?Chih-Min> +++ b/package/multimedia/alsa-utils/alsa-utils.mk
> ?Chih-Min> @@ -3,7 +3,7 @@
> ?Chih-Min> ?# alsa-utils
> ?Chih-Min> ?#
> ?Chih-Min> ?#############################################################
> ?Chih-Min> -ALSA_UTILS_VERSION = 1.0.23
> ?Chih-Min> +ALSA_UTILS_VERSION = 1.0.24.2
>
> This breaks on uClibc where we don't have the exp10 glibc extension:
>
> volume_mapping.o: In function `get_normalized_volume':
> volume_mapping.c:(.text+0x160): undefined reference to `exp10'
> volume_mapping.c:(.text+0x19c): undefined reference to `exp10'
> volume_mapping.o: In function `set_normalized_volume':
> volume_mapping.c:(.text+0x298): undefined reference to `exp10'
> collect2: ld returned 1 exit status
> make[3]: *** [alsamixer] Error 1
>
> I guess we'll need to come up with an emulation for it.
>
> --
> Bye, Peter Korsgaard
>

replace exp10(x) with   exp(x * ln 10)

10^x = 10 ^(ln e^x) = (e^x)^ln10 = e ^ (x * ln 10)

[Buildroot] [PATCH 2/9] alsa-utils : bump to 1.0.24.2

[Peter Korsgaard]

>>>>> "Chih-Min" == Chih-Min Chao <cmchao@gmail.com> writes:

Hi,

 >> I guess we'll need to come up with an emulation for it.

 Chih-Min> replace exp10(x) with   exp(x * ln 10)

 Chih-Min> 10^x = 10 ^(ln e^x) = (e^x)^ln10 = e ^ (x * ln 10)

Ahh yes, thanks. Committed and patch sent upstream.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/9] pixman : bump to 0.20.2

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/pixman/pixman-0.10.0-no-tests.patch |   11 -----------
 package/pixman/pixman.mk                    |    3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch

diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
deleted file mode 100644
index fbd0d26..0000000
--- a/package/pixman/pixman-0.10.0-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig	2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in	2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 8c7a233..261b85a 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,8 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.17.6
+# "even, 0,2,4,6,8" major is stable version
+PIXMAN_VERSION = 0.20.2
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = http://cairographics.org/releases/
 PIXMAN_AUTORECONF = NO
-- 
1.7.0.4

[Buildroot] [PATCH 3/9] pixman : bump to 0.20.2

[Will Newton]

On Fri, Mar 11, 2011 at 8:13 AM, Chih-Min Chao <cmchao@gmail.com> wrote:
>
> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
> ---
> ?package/pixman/pixman-0.10.0-no-tests.patch | ? 11 -----------
> ?package/pixman/pixman.mk ? ? ? ? ? ? ? ? ? ?| ? ?3 ++-
> ?2 files changed, 2 insertions(+), 12 deletions(-)
> ?delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch

Has the "no tests" patch been applied upstream or is it fixed in some other way?

It would be good to note how this issue was resolved in the commit message.

[Buildroot] [PATCH 3/9] pixman : bump to 0.20.2

[Chih-Min Chao]

On Fri, Mar 11, 2011 at 5:55 PM, Will Newton <will.newton@gmail.com> wrote:
> On Fri, Mar 11, 2011 at 8:13 AM, Chih-Min Chao <cmchao@gmail.com> wrote:
>>
>> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
>> ---
>> ?package/pixman/pixman-0.10.0-no-tests.patch | ? 11 -----------
>> ?package/pixman/pixman.mk ? ? ? ? ? ? ? ? ? ?| ? ?3 ++-
>> ?2 files changed, 2 insertions(+), 12 deletions(-)
>> ?delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch
>
> Has the "no tests" patch been applied upstream or is it fixed in some other way?
>
> It would be good to note how this issue was resolved in the commit message.
>

Thanks for your review
I will check this and resend the patch

[Buildroot] [PATCH 4/9] cairo : bump to 1.10.2

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/cairo/cairo-1.8.10-directfb.patch |   39 -----------------------------
 package/cairo/cairo.mk                    |   28 +--------------------
 2 files changed, 1 insertions(+), 66 deletions(-)
 delete mode 100644 package/cairo/cairo-1.8.10-directfb.patch

diff --git a/package/cairo/cairo-1.8.10-directfb.patch b/package/cairo/cairo-1.8.10-directfb.patch
deleted file mode 100644
index 12a51ec..0000000
--- a/package/cairo/cairo-1.8.10-directfb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
-index bb02dbf..65f2d55 100644
---- a/src/cairo-directfb-surface.c
-+++ b/src/cairo-directfb-surface.c
-@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void                  *abstract_surf
- 		     surface->dfbsurface->Blit (surface->dfbsurface,
- 						buffer, NULL,
- 						image_rect->x, image_rect->y));
-+
-+    surface->dfbsurface->ReleaseSource (surface->dfbsurface);
-     }
- 
-     cairo_surface_destroy (&image->base);
-@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t   *dst,
-                             cairo_surface_attributes_t *src_attr)
- {
-     _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+    if (dst->dfbsurface)
-+         dst->dfbsurface->ReleaseSource( dst->dfbsurface );
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
- 
-@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
- 
- 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
- 					 cache->dfbsurface, NULL, 0, 0);
-+        new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
- 
- 	    _directfb_destroy_font_cache (cache);
- 	    scaled_font->surface_private = cache = new_cache;
-@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
-     RUN_CLIPPED (dst, NULL,
- 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
- 					     cache->dfbsurface, rects, points, num));
-+    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
- 
-     return CAIRO_STATUS_SUCCESS;
- }
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 7955e08..3acbf15 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,39 +3,13 @@
 # cairo
 #
 #############################################################
-CAIRO_VERSION = 1.8.10
+CAIRO_VERSION = 1.10.2
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
 CAIRO_SITE = http://cairographics.org/releases
 CAIRO_AUTORECONF = NO
 CAIRO_INSTALL_STAGING = YES
 CAIRO_INSTALL_TARGET = YES
 
-CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
-		glib_cv_uscore=no ac_cv_func_strtod=yes \
-		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
-		gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no gl_cv_c_restrict=no
-
 CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-- 
1.7.0.4

[Buildroot] [PATCH 4/9] cairo : bump to 1.10.2

[Will Newton]

On Fri, Mar 11, 2011 at 8:13 AM, Chih-Min Chao <cmchao@gmail.com> wrote:

Thanks for the patch!

>
> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
> ---
> ?package/cairo/cairo-1.8.10-directfb.patch | ? 39 -----------------------------
> ?package/cairo/cairo.mk ? ? ? ? ? ? ? ? ? ?| ? 28 +--------------------
> ?2 files changed, 1 insertions(+), 66 deletions(-)
> ?delete mode 100644 package/cairo/cairo-1.8.10-directfb.patch

Does this mean the DirectFB patch has been applied upstream? If so it
would be useful to note this in the commit message.

> diff --git a/package/cairo/cairo-1.8.10-directfb.patch b/package/cairo/cairo-1.8.10-directfb.patch
> deleted file mode 100644
> index 12a51ec..0000000
> --- a/package/cairo/cairo-1.8.10-directfb.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
> -index bb02dbf..65f2d55 100644
> ---- a/src/cairo-directfb-surface.c
> -+++ b/src/cairo-directfb-surface.c
> -@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void ? ? ? ? ? ? ? ? ?*abstract_surf
> - ? ? ? ? ? ? ? ? ? ?surface->dfbsurface->Blit (surface->dfbsurface,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? buffer, NULL,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? image_rect->x, image_rect->y));
> -+
> -+ ? ?surface->dfbsurface->ReleaseSource (surface->dfbsurface);
> - ? ? }
> -
> - ? ? cairo_surface_destroy (&image->base);
> -@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t ? *dst,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? cairo_surface_attributes_t *src_attr)
> - {
> - ? ? _cairo_pattern_release_surface (src_pattern, src, src_attr);
> -+
> -+ ? ?if (dst->dfbsurface)
> -+ ? ? ? ? dst->dfbsurface->ReleaseSource( dst->dfbsurface );
> - }
> - #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
> -
> -@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t ? ? *surface,
> -
> - ? ? ? ? ? new_cache->dfbsurface->Blit (new_cache->dfbsurface,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, NULL, 0, 0);
> -+ ? ? ? ?new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
> -
> - ? ? ? ? ? _directfb_destroy_font_cache (cache);
> - ? ? ? ? ? scaled_font->surface_private = cache = new_cache;
> -@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void ? ? ? ? ? ? ? ?*abstract_dst,
> - ? ? RUN_CLIPPED (dst, NULL,
> - ? ? ? ? ? ? ? ?dst->dfbsurface->BatchBlit (dst->dfbsurface,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, rects, points, num));
> -+ ? ?dst->dfbsurface->ReleaseSource (dst->dfbsurface);
> -
> - ? ? return CAIRO_STATUS_SUCCESS;
> - }
> diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
> index 7955e08..3acbf15 100644
> --- a/package/cairo/cairo.mk
> +++ b/package/cairo/cairo.mk
> @@ -3,39 +3,13 @@
> ?# cairo
> ?#
> ?#############################################################
> -CAIRO_VERSION = 1.8.10
> +CAIRO_VERSION = 1.10.2
> ?CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
> ?CAIRO_SITE = http://cairographics.org/releases
> ?CAIRO_AUTORECONF = NO
> ?CAIRO_INSTALL_STAGING = YES
> ?CAIRO_INSTALL_TARGET = YES
>
> -CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
> - ? ? ? ? ? ? ? glib_cv_uscore=no ac_cv_func_strtod=yes \
> - ? ? ? ? ? ? ? ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
> - ? ? ? ? ? ? ? ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
> - ? ? ? ? ? ? ? ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
> - ? ? ? ? ? ? ? ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
> - ? ? ? ? ? ? ? ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
> - ? ? ? ? ? ? ? ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
> - ? ? ? ? ? ? ? ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
> - ? ? ? ? ? ? ? ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
> - ? ? ? ? ? ? ? vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
> - ? ? ? ? ? ? ? jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
> - ? ? ? ? ? ? ? ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
> - ? ? ? ? ? ? ? ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
> - ? ? ? ? ? ? ? ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
> - ? ? ? ? ? ? ? ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
> - ? ? ? ? ? ? ? utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
> - ? ? ? ? ? ? ? gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
> - ? ? ? ? ? ? ? utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
> - ? ? ? ? ? ? ? gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
> - ? ? ? ? ? ? ? gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
> - ? ? ? ? ? ? ? am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
> - ? ? ? ? ? ? ? gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
> - ? ? ? ? ? ? ? ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
> - ? ? ? ? ? ? ? ac_use_included_regex=no gl_cv_c_restrict=no
> -

Why have these env variables been removed?

Again, this should be documented in the commit message.

[Buildroot] [PATCH 4/9] cairo : bump to 1.10.2

[Chih-Min Chao]

On Fri, Mar 11, 2011 at 5:54 PM, Will Newton <will.newton@gmail.com> wrote:
> On Fri, Mar 11, 2011 at 8:13 AM, Chih-Min Chao <cmchao@gmail.com> wrote:
>
> Thanks for the patch!
>
>>
>> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
>> ---
>> ?package/cairo/cairo-1.8.10-directfb.patch | ? 39 -----------------------------
>> ?package/cairo/cairo.mk ? ? ? ? ? ? ? ? ? ?| ? 28 +--------------------
>> ?2 files changed, 1 insertions(+), 66 deletions(-)
>> ?delete mode 100644 package/cairo/cairo-1.8.10-directfb.patch
>
> Does this mean the DirectFB patch has been applied upstream? If so it
> would be useful to note this in the commit message.
>
>> diff --git a/package/cairo/cairo-1.8.10-directfb.patch b/package/cairo/cairo-1.8.10-directfb.patch
>> deleted file mode 100644
>> index 12a51ec..0000000
>> --- a/package/cairo/cairo-1.8.10-directfb.patch
>> +++ /dev/null
>> @@ -1,39 +0,0 @@
>> -diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
>> -index bb02dbf..65f2d55 100644
>> ---- a/src/cairo-directfb-surface.c
>> -+++ b/src/cairo-directfb-surface.c
>> -@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void ? ? ? ? ? ? ? ? ?*abstract_surf
>> - ? ? ? ? ? ? ? ? ? ?surface->dfbsurface->Blit (surface->dfbsurface,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? buffer, NULL,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? image_rect->x, image_rect->y));
>> -+
>> -+ ? ?surface->dfbsurface->ReleaseSource (surface->dfbsurface);
>> - ? ? }
>> -
>> - ? ? cairo_surface_destroy (&image->base);
>> -@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t ? *dst,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? cairo_surface_attributes_t *src_attr)
>> - {
>> - ? ? _cairo_pattern_release_surface (src_pattern, src, src_attr);
>> -+
>> -+ ? ?if (dst->dfbsurface)
>> -+ ? ? ? ? dst->dfbsurface->ReleaseSource( dst->dfbsurface );
>> - }
>> - #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
>> -
>> -@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t ? ? *surface,
>> -
>> - ? ? ? ? ? new_cache->dfbsurface->Blit (new_cache->dfbsurface,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, NULL, 0, 0);
>> -+ ? ? ? ?new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
>> -
>> - ? ? ? ? ? _directfb_destroy_font_cache (cache);
>> - ? ? ? ? ? scaled_font->surface_private = cache = new_cache;
>> -@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void ? ? ? ? ? ? ? ?*abstract_dst,
>> - ? ? RUN_CLIPPED (dst, NULL,
>> - ? ? ? ? ? ? ? ?dst->dfbsurface->BatchBlit (dst->dfbsurface,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, rects, points, num));
>> -+ ? ?dst->dfbsurface->ReleaseSource (dst->dfbsurface);
>> -
>> - ? ? return CAIRO_STATUS_SUCCESS;
>> - }
>> diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
>> index 7955e08..3acbf15 100644
>> --- a/package/cairo/cairo.mk
>> +++ b/package/cairo/cairo.mk
>> @@ -3,39 +3,13 @@
>> ?# cairo
>> ?#
>> ?#############################################################
>> -CAIRO_VERSION = 1.8.10
>> +CAIRO_VERSION = 1.10.2
>> ?CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
>> ?CAIRO_SITE = http://cairographics.org/releases
>> ?CAIRO_AUTORECONF = NO
>> ?CAIRO_INSTALL_STAGING = YES
>> ?CAIRO_INSTALL_TARGET = YES
>>
>> -CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
>> - ? ? ? ? ? ? ? glib_cv_uscore=no ac_cv_func_strtod=yes \
>> - ? ? ? ? ? ? ? ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
>> - ? ? ? ? ? ? ? ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
>> - ? ? ? ? ? ? ? ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
>> - ? ? ? ? ? ? ? ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
>> - ? ? ? ? ? ? ? vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
>> - ? ? ? ? ? ? ? jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
>> - ? ? ? ? ? ? ? ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
>> - ? ? ? ? ? ? ? utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
>> - ? ? ? ? ? ? ? gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
>> - ? ? ? ? ? ? ? utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
>> - ? ? ? ? ? ? ? gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
>> - ? ? ? ? ? ? ? gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
>> - ? ? ? ? ? ? ? am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
>> - ? ? ? ? ? ? ? gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
>> - ? ? ? ? ? ? ? ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
>> - ? ? ? ? ? ? ? ac_use_included_regex=no gl_cv_c_restrict=no
>> -
>
> Why have these env variables been removed?
>
> Again, this should be documented in the commit message.
>

Thanks for your review
I will check this and resend the patch

[Buildroot] how to select predefined external toolchain profile

[Justin Mark]

Hi,

Buildroot document says "Buildroot already knows about a few CodeSourcery toolchains for ARM, PowerPC, MIPS and SuperH. Just select the toolchain profile in Toolchain through the available ones."

I got the latest buildroot, did "make menuconfig", after I selected "External Toolchain" as "Toolchain Type", I didn't see any toolchain profiles in the menu, did I miss something?

Thanks,
  


      

[Buildroot] how to select predefined external toolchain profile

[Justin Mark]

That was because I selected "i386" as target architecture, if I select "arm", I can see those predefined external toolchain profiles.
 
--- On Sat, 3/12/11, Justin Mark <oilehus@yahoo.com> wrote:

> From: Justin Mark <oilehus@yahoo.com>
> Subject: [Buildroot] how to select predefined external toolchain profile
> To: buildroot at busybox.net
> Date: Saturday, March 12, 2011, 6:04 PM
> Hi,
> 
> Buildroot document says "Buildroot already knows about a
> few CodeSourcery toolchains for ARM, PowerPC, MIPS and
> SuperH. Just select the toolchain profile in Toolchain
> through the available ones."
> 
> I got the latest buildroot, did "make menuconfig", after I
> selected "External Toolchain" as "Toolchain Type", I didn't
> see any toolchain profiles in the menu, did I miss
> something?
> 
> Thanks,
> ? 
> 
> 
> ? ? ? 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 


      

[Buildroot] [PATCH 4/9] cairo : bump to 1.10.2

[Chih-Min Chao]

On Sat, Mar 12, 2011 at 11:25 PM, Chih-Min Chao <cmchao@gmail.com> wrote:
> On Fri, Mar 11, 2011 at 5:54 PM, Will Newton <will.newton@gmail.com> wrote:
>> On Fri, Mar 11, 2011 at 8:13 AM, Chih-Min Chao <cmchao@gmail.com> wrote:
>>
>> Thanks for the patch!
>>
>>>
>>> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
>>> ---
>>> ?package/cairo/cairo-1.8.10-directfb.patch | ? 39 -----------------------------
>>> ?package/cairo/cairo.mk ? ? ? ? ? ? ? ? ? ?| ? 28 +--------------------
>>> ?2 files changed, 1 insertions(+), 66 deletions(-)
>>> ?delete mode 100644 package/cairo/cairo-1.8.10-directfb.patch
>>
>> Does this mean the DirectFB patch has been applied upstream? If so it
>> would be useful to note this in the commit message.
>>
>>> diff --git a/package/cairo/cairo-1.8.10-directfb.patch b/package/cairo/cairo-1.8.10-directfb.patch
>>> deleted file mode 100644
>>> index 12a51ec..0000000
>>> --- a/package/cairo/cairo-1.8.10-directfb.patch
>>> +++ /dev/null
>>> @@ -1,39 +0,0 @@
>>> -diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
>>> -index bb02dbf..65f2d55 100644
>>> ---- a/src/cairo-directfb-surface.c
>>> -+++ b/src/cairo-directfb-surface.c
>>> -@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void ? ? ? ? ? ? ? ? ?*abstract_surf
>>> - ? ? ? ? ? ? ? ? ? ?surface->dfbsurface->Blit (surface->dfbsurface,
>>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? buffer, NULL,
>>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? image_rect->x, image_rect->y));
>>> -+
>>> -+ ? ?surface->dfbsurface->ReleaseSource (surface->dfbsurface);
>>> - ? ? }
>>> -
>>> - ? ? cairo_surface_destroy (&image->base);
>>> -@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t ? *dst,
>>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? cairo_surface_attributes_t *src_attr)
>>> - {
>>> - ? ? _cairo_pattern_release_surface (src_pattern, src, src_attr);
>>> -+
>>> -+ ? ?if (dst->dfbsurface)
>>> -+ ? ? ? ? dst->dfbsurface->ReleaseSource( dst->dfbsurface );
>>> - }
>>> - #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
>>> -
>>> -@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t ? ? *surface,
>>> -
>>> - ? ? ? ? ? new_cache->dfbsurface->Blit (new_cache->dfbsurface,
>>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, NULL, 0, 0);
>>> -+ ? ? ? ?new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
>>> -
>>> - ? ? ? ? ? _directfb_destroy_font_cache (cache);
>>> - ? ? ? ? ? scaled_font->surface_private = cache = new_cache;
>>> -@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void ? ? ? ? ? ? ? ?*abstract_dst,
>>> - ? ? RUN_CLIPPED (dst, NULL,
>>> - ? ? ? ? ? ? ? ?dst->dfbsurface->BatchBlit (dst->dfbsurface,
>>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cache->dfbsurface, rects, points, num));
>>> -+ ? ?dst->dfbsurface->ReleaseSource (dst->dfbsurface);
>>> -
>>> - ? ? return CAIRO_STATUS_SUCCESS;
>>> - }
>>> diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
>>> index 7955e08..3acbf15 100644
>>> --- a/package/cairo/cairo.mk
>>> +++ b/package/cairo/cairo.mk
>>> @@ -3,39 +3,13 @@
>>> ?# cairo
>>> ?#
>>> ?#############################################################
>>> -CAIRO_VERSION = 1.8.10
>>> +CAIRO_VERSION = 1.10.2
>>> ?CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
>>> ?CAIRO_SITE = http://cairographics.org/releases
>>> ?CAIRO_AUTORECONF = NO
>>> ?CAIRO_INSTALL_STAGING = YES
>>> ?CAIRO_INSTALL_TARGET = YES
>>>
>>> -CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
>>> - ? ? ? ? ? ? ? glib_cv_uscore=no ac_cv_func_strtod=yes \
>>> - ? ? ? ? ? ? ? ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
>>> - ? ? ? ? ? ? ? ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
>>> - ? ? ? ? ? ? ? ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
>>> - ? ? ? ? ? ? ? ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
>>> - ? ? ? ? ? ? ? vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
>>> - ? ? ? ? ? ? ? jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
>>> - ? ? ? ? ? ? ? ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
>>> - ? ? ? ? ? ? ? utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
>>> - ? ? ? ? ? ? ? gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
>>> - ? ? ? ? ? ? ? utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
>>> - ? ? ? ? ? ? ? gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
>>> - ? ? ? ? ? ? ? gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
>>> - ? ? ? ? ? ? ? am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
>>> - ? ? ? ? ? ? ? gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
>>> - ? ? ? ? ? ? ? ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
>>> - ? ? ? ? ? ? ? ac_use_included_regex=no gl_cv_c_restrict=no
>>> -
>>
>> Why have these env variables been removed?
>>
>> Again, this should be documented in the commit message.
>>
>
> Thanks for your review
> I will check this and resend the patch
>

The original patch, which i remove,  come from this discussion and
was contributed by llandwerlin
http://lists.cairographics.org/archives/cairo/2009-November/018552.html
(2009-11-20)

Thomas Petazzoni  commited it to upstream at 2010-07-19
At the same time, directfb's version is 1.4.3

At present, however,  directfb's version has been upgrade to 1.4.11
and the patch is not included in cairo's main truck.
I need llandwerlin help to clarify this or just use mainline source

[Buildroot] [PATCH 5/9] bash : bump to version 4.2

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/bash/bash-4.1-001.patch              |   48 ----------------
 package/bash/bash-4.1-002.patch              |   65 ----------------------
 package/bash/bash-4.1-003.patch              |   48 ----------------
 package/bash/bash-4.1-004.patch              |   47 ----------------
 package/bash/bash-4.1-005.patch              |   56 -------------------
 package/bash/bash-4.1-006.patch              |   76 --------------------------
 package/bash/bash-4.1-007.patch              |   47 ----------------
 package/bash/bash-4.1-008.patch              |   49 -----------------
 package/bash/bash-4.1-009.patch              |   48 ----------------
 package/bash/bash-4.1-mkbuiltins-cross.patch |   31 -----------
 package/bash/bash-4.2-mkbuiltins-cross.patch |   30 ++++++++++
 package/bash/bash.mk                         |    5 ++-
 12 files changed, 34 insertions(+), 516 deletions(-)
 delete mode 100644 package/bash/bash-4.1-001.patch
 delete mode 100644 package/bash/bash-4.1-002.patch
 delete mode 100644 package/bash/bash-4.1-003.patch
 delete mode 100644 package/bash/bash-4.1-004.patch
 delete mode 100644 package/bash/bash-4.1-005.patch
 delete mode 100644 package/bash/bash-4.1-006.patch
 delete mode 100644 package/bash/bash-4.1-007.patch
 delete mode 100644 package/bash/bash-4.1-008.patch
 delete mode 100644 package/bash/bash-4.1-009.patch
 delete mode 100644 package/bash/bash-4.1-mkbuiltins-cross.patch
 create mode 100644 package/bash/bash-4.2-mkbuiltins-cross.patch

diff --git a/package/bash/bash-4.1-001.patch b/package/bash/bash-4.1-001.patch
deleted file mode 100644
index be5f982..0000000
--- a/package/bash/bash-4.1-001.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-001
-
-Bug-Reported-by:	Yann Rouillard <yann@pleiades.fr.eu.org>
-Bug-Reference-ID:	<4B44A410.4070107@pleiades.fr.eu.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html
-
-Bug-Description:
-
-A prototype for vsnprintf was incorrect, and caused compilation failures
-on systems that did not have a suitable vsnprintf, but had a declaration in
-one of the system header files.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
---- ./builtins/printf.def	2010-01-07 08:50:06.000000000 -0500
-***************
-*** 173,177 ****
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-  #endif
-  
---- 173,177 ----
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
-  #endif
-  
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-002.patch b/package/bash/bash-4.1-002.patch
deleted file mode 100644
index 7601ab2..0000000
--- a/package/bash/bash-4.1-002.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-002
-
-Bug-Reported-by:	guillaume.outters at free.fr
-Bug-Reference-ID:	<20100105230441.70D171AA7F52@asterix.local>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html
-
-Bug-Description:
-
-Bash-4.1/Readline-6.1 introduced a hook function that allows applications
-to rewrite or modify filenames read from the file system before comparing
-them with a word to be completed.  The converted filename, if it matches,
-needs to be inserted into the line buffer, replacing the original contents.
-
-This fixes a completion bug on Mac OS X involving filenames containing
-UTF-8 characters.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500
---- ./lib/readline/complete.c	2010-01-06 08:30:23.000000000 -0500
-***************
-*** 2139,2143 ****
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
-  	    continue;
-  
---- 2139,2143 ----
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
-  	    continue;
-  
-***************
-*** 2220,2224 ****
-  	    }
-  
-! 	  strcpy (temp + dirlen, entry->d_name);
-  	}
-        else
---- 2220,2224 ----
-  	    }
-  
-! 	  strcpy (temp + dirlen, convfn);
-  	}
-        else
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-003.patch b/package/bash/bash-4.1-003.patch
deleted file mode 100644
index fc12bb5..0000000
--- a/package/bash/bash-4.1-003.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-003
-
-Bug-Reported-by:	coyote at wariat.org.pl
-Bug-Reference-ID:	<4b64a1f8.06e2660a.60af.4bfb@mx.google.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html
-
-Bug-Description:
-
-If command completion is attempted on a word with a quoted globbing
-character (e.g., `*' or `?'), bash can reference a NULL pointer and
-dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/bashline.c	2009-10-24 14:10:19.000000000 -0400
---- ./bashline.c	2010-01-30 21:53:49.000000000 -0500
-***************
-*** 1681,1685 ****
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (glob_pattern_p (hint))
-      {
-        if (state == 0)
---- 1681,1685 ----
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (globpat)
-      {
-        if (state == 0)
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-004.patch b/package/bash/bash-4.1-004.patch
deleted file mode 100644
index a6b8335..0000000
--- a/package/bash/bash-4.1-004.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-004
-
-Bug-Reported-by:	Crestez Dan Leonard <cdleonard@gmail.com>
-Bug-Reference-ID:	<1265592839.30682.21.camel@deskbox>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html
-
-Bug-Description:
-
-When running in Posix mode and executing a shell function without local
-variables, bash will not propagate a variable in a special builtin's temporary
-environment to have global scope.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/variables.c	2009-11-03 14:13:58.000000000 -0500
---- ./variables.c	2010-02-08 17:36:18.000000000 -0500
-***************
-*** 3809,3812 ****
---- 3809,3817 ----
-    if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-      {
-+       /* Make sure we have a hash table to store the variable in while it is
-+ 	 being propagated down to the global variables table.  Create one if
-+ 	 we have to */
-+       if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
-+ 	shell_variables->table = hash_create (0);
-        /* XXX - should we set v->context here? */
-        v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-005.patch b/package/bash/bash-4.1-005.patch
deleted file mode 100644
index 7974547..0000000
--- a/package/bash/bash-4.1-005.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-005
-
-Bug-Reported-by:	werner at suse.de
-Bug-Reference-ID:	<201002251238.o1PCcYcg016893@boole.suse.de>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html
-
-Bug-Description:
-
-When the `read' builtin times out after the timeout specified with -t is
-exceeded, it does not reset the flags that tell signal handlers to process
-signals immediately instead of deferring their handling.  This can result
-in unsafe functions being called from signal handlers, which can cause bash
-to hang or dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/read.def	2009-10-08 11:35:46.000000000 -0400
---- ./builtins/read.def	2010-03-17 17:35:39.000000000 -0400
-***************
-*** 616,621 ****
-      zsyncfd (fd);
-  
--   interrupt_immediately--;
--   terminate_immediately--;
-    discard_unwind_frame ("read_builtin");
-  
---- 616,619 ----
-***************
-*** 624,627 ****
---- 622,628 ----
-  assign_vars:
-  
-+   interrupt_immediately--;
-+   terminate_immediately--;
-+ 
-  #if defined (ARRAY_VARS)
-    /* If -a was given, take the string read, break it into a list of words,
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-006.patch b/package/bash/bash-4.1-006.patch
deleted file mode 100644
index c33d0bd..0000000
--- a/package/bash/bash-4.1-006.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-006
-
-Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID:	<201003210155.56618.vapier@gentoo.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
-
-Bug-Description:
-
-Bash did not correctly print/reproduce here documents attached to commands
-inside compound commands such as for and while.  This affected the
-execution of such commands inside a shell function when the function
-definition is saved and later restored using `.' or `eval'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
---- ./print_cmd.c	2010-03-22 21:15:30.000000000 -0400
-***************
-*** 114,117 ****
---- 114,123 ----
-  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
-  
-+ #define PRINT_DEFERRED_HEREDOCS(x) \
-+   do { \
-+     if (deferred_heredocs) \
-+       print_deferred_heredocs (x); \
-+   } while (0)
-+ 
-  /* Non-zero means the stuff being printed is inside of a function def. */
-  static int inside_function_def;
-***************
-*** 561,571 ****
-  {
-    print_for_command_head (for_command);
-- 
-    cprintf (";");
-    newline ("do\n");
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-    semicolon ();
-    indentation -= indentation_amount;
-    newline ("done");
-  }
---- 566,578 ----
-  {
-    print_for_command_head (for_command);
-    cprintf (";");
-    newline ("do\n");
-+ 
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-+   PRINT_DEFERRED_HEREDOCS ("");
-    semicolon ();
-    indentation -= indentation_amount;
-+ 
-    newline ("done");
-  }
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-007.patch b/package/bash/bash-4.1-007.patch
deleted file mode 100644
index a421b0c..0000000
--- a/package/bash/bash-4.1-007.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-007
-
-Bug-Reported-by:	Rob Robason <rob@robason.net>
-Bug-Reference-ID:	<1269513145.22336.9.camel@home.robason.homelinux.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
-
-Bug-Description:
-
-A typo caused bash to not honor a precision specification in a printf
-format.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2010-01-18 10:50:22.000000000 -0500
---- ./builtins/printf.def	2010-03-25 09:40:56.000000000 -0400
-***************
-*** 118,122 ****
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
---- 118,122 ----
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-008.patch b/package/bash/bash-4.1-008.patch
deleted file mode 100644
index 72b855e..0000000
--- a/package/bash/bash-4.1-008.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-008
-
-Bug-Reported-by:	Dennis van Dok <dvandok@gmail.com>
-Bug-Reference-ID:	<4BBF2501.5050703@gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
-
-Bug-Description:
-
-When declaring an associative array and implicitly assigning a value
-to element "0", bash does not correctly allocate memory, leading to
-a segmentation violation when that element or the array itself is
-unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
---- ./builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
-***************
-*** 513,517 ****
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, "0", value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
---- 519,523 ----
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-009.patch b/package/bash/bash-4.1-009.patch
deleted file mode 100644
index ed136a9..0000000
--- a/package/bash/bash-4.1-009.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-009
-
-Bug-Reported-by:	Tomas Trnka <tomastrnka@gmx.com>
-Bug-Reference-ID:	<201003242030.02166.tomastrnka@gmx.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
-
-Bug-Description:
-
-An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
-or read(2) from a terminal.  This results in an error message and truncated
-input or output.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
---- ./sig.c	Fri Mar 26 22:34:11 2010
-***************
-*** 655,660 ****
---- 655,663 ----
-      act.sa_flags |= SA_INTERRUPT;	/* XXX */
-    else
-      act.sa_flags |= SA_RESTART;		/* XXX */
-+ #else
-+   if (sig == SIGCHLD)
-+     act.sa_flags |= SA_RESTART;
-  #endif
-    sigemptyset (&act.sa_mask);
-    sigemptyset (&oact.sa_mask);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
-
diff --git a/package/bash/bash-4.1-mkbuiltins-cross.patch b/package/bash/bash-4.1-mkbuiltins-cross.patch
deleted file mode 100644
index 4252d53..0000000
--- a/package/bash/bash-4.1-mkbuiltins-cross.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Let mkbuiltins use config.h even if cross compiling
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- builtins/mkbuiltins.c |    9 ---------
- 1 files changed, 0 insertions(+), 9 deletions(-)
-
-diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
-index cdd45e4..1349093 100644
---- a/builtins/mkbuiltins.c
-+++ b/builtins/mkbuiltins.c
-@@ -19,16 +19,7 @@
-    along with Bash.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
--#if !defined (CROSS_COMPILING) 
- #  include <config.h>
--#else	/* CROSS_COMPILING */
--/* A conservative set of defines based on POSIX/SUS3/XPG6 */
--#  define HAVE_UNISTD_H
--#  define HAVE_STRING_H
--#  define HAVE_STDLIB_H
--
--#  define HAVE_RENAME
--#endif /* CROSS_COMPILING */
- 
- #if defined (HAVE_UNISTD_H)
- #  ifdef _MINIX
--- 
-1.7.2.2
-
diff --git a/package/bash/bash-4.2-mkbuiltins-cross.patch b/package/bash/bash-4.2-mkbuiltins-cross.patch
new file mode 100644
index 0000000..f2cc606
--- /dev/null
+++ b/package/bash/bash-4.2-mkbuiltins-cross.patch
@@ -0,0 +1,30 @@
+Let mkbuiltins use config.h even if cross compiling
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ builtins/mkbuiltins.c |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
+index cdd45e4..1349093 100644
+--- a/builtins/mkbuiltins.c
++++ b/builtins/mkbuiltins.c
+@@ -19,16 +19,7 @@
+    along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#if !defined (CROSS_COMPILING)
+ #  include <config.h>
+-#else	/* CROSS_COMPILING */
+-/* A conservative set of defines based on POSIX/SUS3/XPG6 */
+-#  define HAVE_UNISTD_H
+-#  define HAVE_STRING_H
+-#  define HAVE_STDLIB_H
+-
+-#  define HAVE_RENAME
+-#endif /* CROSS_COMPILING */
+
+ #if defined (HAVE_UNISTD_H)
+ #  ifdef _MINIX
+--
+1.7.2.2
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 2bcf0c4..fa9d6df 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BASH_VERSION = 4.1
+BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses
 
@@ -13,6 +13,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 BASH_DEPENDENCIES += busybox
 endif
 
+#enable job control for cross-compiling condition
+BASH_CONF_ENV += bash_cv_job_control_missing=no
+
 # Save the old sh file/link if there is one and symlink bash->sh
 define BASH_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-- 
1.7.0.4

[Buildroot] [PATCH 6/9] util-linux : convert to autotarget and bump to 2.19

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/util-linux/Config.in                       |  113 +++++-
 ...linux-2.13-pre17-hardcode-a-out-constants.patch |   41 --
 .../util-linux-2.19-context_umount.patch           |   52 +++
 package/util-linux/util-linux-no-nls-fix.patch     |   25 --
 package/util-linux/util-linux-susv3-legacy.patch   |  429 --------------------
 package/util-linux/util-linux-umount2-fix.patch    |   20 -
 package/util-linux/util-linux.mk                   |  185 +++++----
 7 files changed, 268 insertions(+), 597 deletions(-)
 delete mode 100644 package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
 create mode 100644 package/util-linux/util-linux-2.19-context_umount.patch
 delete mode 100644 package/util-linux/util-linux-no-nls-fix.patch
 delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch
 delete mode 100644 package/util-linux/util-linux-umount2-fix.patch

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 434dae9..8cd9821 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_UTIL-LINUX
+config BR2_PACKAGE_UTIL_LINUX
 	bool "util-linux"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -12,3 +12,114 @@ config BR2_PACKAGE_UTIL-LINUX
 
 comment "util-linux requires a toolchain with RPC support"
 	depends on !BR2_INET_RPC
+
+menu "util-linux tool support"
+	depends on BR2_PACKAGE_UTIL_LINUX
+
+############################################
+# default enabled and should be disabled by
+#  --disable-foo
+#
+
+config BR2_PACKAGE_UTIL_LINUX_MOUNT
+	bool "build mount utilties"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_FSCK
+	bool "build \"fsck\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	bool "build libuuid and uuid utilities"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_UUIDD
+	bool "build \"uuidd\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	bool "build libblkid and blkid utilities"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_AGETTY
+	bool "build \"agetty\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_CRAMFS
+	bool "build \"fsck.cramfs, mkfs.cramfs\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
+	bool "build \"switch_root\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
+	bool "build \"pivot_root\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
+	bool "build \"fallocate\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_UNSHARE
+	bool "build \"unshare\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_RENAME
+	bool "build \"rename\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
+	bool "build \"chrt, ionice, teskset\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_WALL
+	bool "build \"wall\""
+	default y
+
+
+############################################
+# default disabled and should be enabled by
+#  --enable-foo
+#
+config BR2_PACKAGE_UTIL_LINUX_ARCH
+	bool "build \"arch\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_INIT
+	bool "build \"simpleinit, shutdown, initctl\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_KILL
+	bool "build \"kill\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_LAST
+	bool "build \"last\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_MESG
+	bool "build \"kill\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_PARTX
+	bool "build \"addpart, delpart, partx\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_RAW
+	bool "build \"raw\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_RESET
+	bool "build \"reset\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
+	bool "build \"chfn, chsh, login, newgrp, vipw\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_WRITE
+	bool "build \"addpart, delpart, partx\""
+	default n
+
+endmenu
diff --git a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch b/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
deleted file mode 100644
index b115c41..0000000
--- a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Hardcode a.out related constants
-
-The OMAGIC, NMAGIC and ZMAGIC constants, related to the legacy a.out
-binary format, are no longer available in the headers of all
-architectures, due to this binary format being deprecated. For that
-reason, util-linux fails to build.
-
-We therefore take the approach used in newer versions of
-util-linux-ng: hardcoding those values. See
-http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- text-utils/more.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-Index: util-linux-2.13-pre7/text-utils/more.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/more.c
-+++ util-linux-2.13-pre7/text-utils/more.c
-@@ -53,7 +53,6 @@
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#include <a.out.h>
- #include <locale.h>
- #include "xstrncpy.h"
- #include "nls.h"
-@@ -504,9 +503,9 @@
- 
- 	if (fread(twobytes, 2, 1, f) == 1) {
- 		switch(twobytes[0] + (twobytes[1]<<8)) {
--		case OMAGIC:	/* 0407 */
--		case NMAGIC:	/* 0410 */
--		case ZMAGIC:	/* 0413 */
-+		case 0407:	/* a.out obj */
-+		case 0410:	/* a.out exec */
-+		case 0413:	/* a.out demand exec */
- 		case 0405:
- 		case 0411:
- 		case 0177545:
diff --git a/package/util-linux/util-linux-2.19-context_umount.patch b/package/util-linux/util-linux-2.19-context_umount.patch
new file mode 100644
index 0000000..9b0fed7
--- /dev/null
+++ b/package/util-linux/util-linux-2.19-context_umount.patch
@@ -0,0 +1,52 @@
+From db9bd703a9a696bd73cb7d41e98c66854a604477 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 11 Feb 2011 10:45:09 +0100
+Subject: [PATCH] libmount: add fallbacks for old systems without umount2() syscall
+
+Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ shlibs/mount/src/context_umount.c |   28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
+
+diff --git a/shlibs/mount/src/context_umount.c b/shlibs/mount/src/context_umount.c
+index bd9be69..1187a87 100644
+--- a/shlibs/mount/src/context_umount.c
++++ b/shlibs/mount/src/context_umount.c
+@@ -21,6 +21,34 @@
+ #include "strutils.h"
+ #include "mountP.h"
+
++#if defined(MNT_FORCE)
++/* Interesting ... it seems libc knows about MNT_FORCE and presumably
++   about umount2 as well -- need not do anything */
++#else /* MNT_FORCE */
++/* Does the present kernel source know about umount2? */
++# include <linux/unistd.h>
++# ifdef __NR_umount2
++static int umount2(const char *path, int flags);
++_syscall2(int, umount2, const char *, path, int, flags);
++# else /* __NR_umount2 */
++static int
++umount2(const char *path, int flags) {
++	fprintf(stderr, _("umount: compiled without support for -f\n"));
++	errno = ENOSYS;
++	return -1;
++}
++#endif /* __NR_umount2 */
++# if !defined(MNT_FORCE)
++# define MNT_FORCE 1
++#endif
++
++#endif /* MNT_FORCE */
++
++#if !defined(MNT_DETACH)
++#define MNT_DETACH 2
++#endif
++
++
+ static int lookup_umount_fs(struct libmnt_context *cxt)
+ {
+	int rc;
+--
+1.7.4.1
diff --git a/package/util-linux/util-linux-no-nls-fix.patch b/package/util-linux/util-linux-no-nls-fix.patch
deleted file mode 100644
index c02009f..0000000
--- a/package/util-linux/util-linux-no-nls-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH]: fix util-linux build without NLS support
-
-util-linux partly supports builds without NLS support, but it forgets to
-provide a dummy setlocale() macro.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/nls.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: util-linux-2.13-pre7/include/nls.h
-===================================================================
---- util-linux-2.13-pre7.orig/include/nls.h
-+++ util-linux-2.13-pre7/include/nls.h
-@@ -19,6 +19,10 @@
- # define textdomain(Domain) /* empty */
- # define _(Text) (Text)
- # define N_(Text) (Text)
-+# undef LC_ALL
-+# define LC_ALL 0
-+# undef setlocale
-+# define setlocale(category, locale)
- #endif
- 
- 
diff --git a/package/util-linux/util-linux-susv3-legacy.patch b/package/util-linux/util-linux-susv3-legacy.patch
deleted file mode 100644
index 2239119..0000000
--- a/package/util-linux/util-linux-susv3-legacy.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- fdisk/cfdisk.c         |    2 +-
- fdisk/fdiskbsdlabel.c  |   16 ++++++++--------
- fdisk/sfdisk.c         |   10 +++++-----
- login-utils/login.c    |    6 +++---
- login-utils/shutdown.c |    2 +-
- login-utils/ttymsg.c   |    2 +-
- login-utils/vipw.c     |    4 ++--
- login-utils/wall.c     |    2 +-
- misc-utils/logger.c    |    2 +-
- misc-utils/namei.c     |    2 +-
- misc-utils/whereis.c   |    4 ++--
- mount/mntent.c         |    4 ++--
- mount/mount.c          |    4 ++--
- mount/mount_by_label.c |    2 +-
- mount/sundries.c       |    2 +-
- mount/umount.c         |    2 +-
- partx/partx.c          |    2 +-
- text-utils/colcrt.c    |    4 ++--
- text-utils/display.c   |    2 +-
- text-utils/parse.c     |    8 ++++----
- 20 files changed, 41 insertions(+), 41 deletions(-)
-
-Index: util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/fdiskbsdlabel.c
-+++ util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c
-@@ -538,10 +538,10 @@
- 
-   /* We need a backup of the disklabel (xbsd_dlabel might have changed). */
-   d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE];
--  bcopy (d, &dl, sizeof (struct xbsd_disklabel));
-+  memmove (&dl, d, sizeof (struct xbsd_disklabel));
- 
-   /* The disklabel will be overwritten by 0's from bootxx anyway */
--  bzero (d, sizeof (struct xbsd_disklabel));
-+  memset (d, 0, sizeof (struct xbsd_disklabel));
- 
-   snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
-   if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
-@@ -555,7 +555,7 @@
-       exit ( EXIT_FAILURE );
-     }
- 
--  bcopy (&dl, d, sizeof (struct xbsd_disklabel));
-+  memmove (d, &dl, sizeof (struct xbsd_disklabel));
- 
- #if defined (__powerpc__) || defined (__hppa__)
-   sector = 0;
-@@ -657,7 +657,7 @@
- 	struct geom g;
- 
- 	get_geometry (fd, &g);
--	bzero (d, sizeof (struct xbsd_disklabel));
-+	memset (d, 0, sizeof (struct xbsd_disklabel));
- 
- 	d -> d_magic = BSD_DISKMAGIC;
- 
-@@ -740,8 +740,8 @@
- 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
- 		fatal (unable_to_read);
- 
--	bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
--	       d, sizeof (struct xbsd_disklabel));
-+	memmove (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+	       sizeof (struct xbsd_disklabel));
- 
- 	if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
- 		return 0;
-@@ -776,8 +776,8 @@
-   /* This is necessary if we want to write the bootstrap later,
-      otherwise we'd write the old disklabel with the bootstrap.
-   */
--  bcopy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
--	 sizeof (struct xbsd_disklabel));
-+  memmove (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+	 d, sizeof (struct xbsd_disklabel));
- 
- #if defined (__alpha__) && BSD_LABELSECTOR == 0
-   alpha_bootblock_checksum (disklabelbuffer);
-Index: util-linux-2.13-pre7/login-utils/ttymsg.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/ttymsg.c
-+++ util-linux-2.13-pre7/login-utils/ttymsg.c
-@@ -111,7 +111,7 @@
- 		if (wret >= 0) {
- 			left -= wret;
- 			if (iov != localiov) {
--				bcopy(iov, localiov,
-+				memmove(localiov, iov,
- 				    iovcnt * sizeof(struct iovec));
- 				iov = localiov;
- 			}
-Index: util-linux-2.13-pre7/login-utils/vipw.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/vipw.c
-+++ util-linux-2.13-pre7/login-utils/vipw.c
-@@ -313,8 +313,8 @@
- 	bindtextdomain(PACKAGE, LOCALEDIR);
- 	textdomain(PACKAGE);
- 
--	bzero(tmp_file, FILENAMELEN);
--	progname = (rindex(argv[0], '/')) ? rindex(argv[0], '/') + 1 : argv[0];
-+	memset(tmp_file, 0, FILENAMELEN);
-+	progname = (strrchr(argv[0], '/')) ? strrchr(argv[0], '/') + 1 : argv[0];
- 	if (!strcmp(progname, "vigr")) {
- 		program = VIGR;
- 		xstrncpy(orig_file, GROUP_FILE, sizeof(orig_file));
-Index: util-linux-2.13-pre7/misc-utils/logger.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/logger.c
-+++ util-linux-2.13-pre7/misc-utils/logger.c
-@@ -198,7 +198,7 @@
- 			} else {
- 				if (p != buf)
- 					*p++ = ' ';
--				bcopy(*argv++, p, len);
-+				memmove(p, *argv++, len);
- 				*(p += len) = '\0';
- 			}
- 		}
-Index: util-linux-2.13-pre7/misc-utils/namei.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/namei.c
-+++ util-linux-2.13-pre7/misc-utils/namei.c
-@@ -242,7 +242,7 @@
- 		 * call namei()
- 		 */
- 		
--		bzero(sym, BUFSIZ);
-+		memset(sym, 0, BUFSIZ);
- 		if(readlink(buf, sym, BUFSIZ) == -1){
- 		    (void)printf(_(" ? problems reading symlink %s - %s (%d)\n"), buf, ERR);
- 		    return;
-Index: util-linux-2.13-pre7/text-utils/colcrt.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/colcrt.c
-+++ util-linux-2.13-pre7/text-utils/colcrt.c
-@@ -252,8 +252,8 @@
- 		}
- 		putwchar('\n');
- 	}
--	bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
--	bzero(page[267- ol], ol * 132 * sizeof(wchar_t));
-+	memmove(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t));
-+	memset(page[267- ol], 0, ol * 132 * sizeof(wchar_t));
- 	outline -= ol;
- 	outcol = 0;
- 	first = 1;
-Index: util-linux-2.13-pre7/fdisk/sfdisk.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/sfdisk.c
-+++ util-linux-2.13-pre7/fdisk/sfdisk.c
-@@ -40,7 +40,7 @@
- #include <unistd.h>		/* read, write */
- #include <fcntl.h>		/* O_RDWR */
- #include <errno.h>		/* ERANGE */
--#include <string.h>		/* index() */
-+#include <string.h>		/* strchr() */
- #include <ctype.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-@@ -1709,12 +1709,12 @@
- 	eof = 1;
- 	return RD_EOF;
-     }
--    if (!(lp = index(lp, '\n')))
-+    if (!(lp = strchr(lp, '\n')))
-       fatal(_("long or incomplete input line - quitting\n"));
-     *lp = 0;
- 
-     /* remove comments, if any */
--    if ((lp = index(line+2, '#')) != 0)
-+    if ((lp = strchr(line+2, '#')) != 0)
-       *lp = 0;
- 
-     /* recognize a few commands - to be expanded */
-@@ -1724,7 +1724,7 @@
-     }
- 
-     /* dump style? - then bad input is fatal */
--    if ((ip = index(line+2, ':')) != 0) {
-+    if ((ip = strchr(line+2, ':')) != 0) {
- 	struct dumpfld *d;
- 
-       nxtfld:
-@@ -2491,7 +2491,7 @@
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;
-Index: util-linux-2.13-pre7/login-utils/login.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/login.c
-+++ util-linux-2.13-pre7/login-utils/login.c
-@@ -337,7 +337,7 @@
-      */
-     gethostname(tbuf, sizeof(tbuf));
-     xstrncpy(thishost, tbuf, sizeof(thishost));
--    domain = index(tbuf, '.');
-+    domain = strchr(tbuf, '.');
-     
-     username = tty_name = hostname = NULL;
-     fflag = hflag = pflag = 0;
-@@ -356,7 +356,7 @@
- 	      exit(1);
- 	  }
- 	  hflag = 1;
--	  if (domain && (p = index(optarg, '.')) &&
-+	  if (domain && (p = strchr(optarg, '.')) &&
- 	      strcasecmp(p, domain) == 0)
- 	    *p = 0;
- 
-@@ -1101,7 +1101,7 @@
- 	childArgv[childArgc++] = buff;
-     } else {
- 	tbuf[0] = '-';
--	xstrncpy(tbuf + 1, ((p = rindex(pwd->pw_shell, '/')) ?
-+	xstrncpy(tbuf + 1, ((p = strrchr(pwd->pw_shell, '/')) ?
- 			   p + 1 : pwd->pw_shell),
- 		sizeof(tbuf)-1);
- 	
-Index: util-linux-2.13-pre7/login-utils/shutdown.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/shutdown.c
-+++ util-linux-2.13-pre7/login-utils/shutdown.c
-@@ -279,7 +279,7 @@
- 			if (fgets (line, sizeof(line), fp) != NULL &&
- 			    strncasecmp (line, "HALT_ACTION", 11) == 0 &&
- 			    iswhitespace(line[11])) {
--				p = index(line, '\n');
-+				p = strchr(line, '\n');
- 				if (p)
- 					*p = 0;		/* strip final '\n' */
- 				p = line+11;
-Index: util-linux-2.13-pre7/misc-utils/whereis.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/whereis.c
-+++ util-linux-2.13-pre7/misc-utils/whereis.c
-@@ -323,14 +323,14 @@
- 	char dirbuf[1024];
- 	struct stat statbuf;
- 
--	dd = index(dir, '*');
-+	dd = strchr(dir, '*');
- 	if (!dd)
- 		goto noglob;
- 
- 	l = strlen(dir);
- 	if (l < sizeof(dirbuf)) { 	/* refuse excessively long names */
- 		strcpy (dirbuf, dir);
--		d = index(dirbuf, '*');
-+		d = strchr(dirbuf, '*');
- 		*d = 0;
- 		dirp = opendir(dirbuf);
- 		if (dirp == NULL)
-Index: util-linux-2.13-pre7/mount/mntent.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mntent.c
-+++ util-linux-2.13-pre7/mount/mntent.c
-@@ -158,7 +158,7 @@
- 			return NULL;
- 
- 		mfp->mntent_lineno++;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
-@@ -166,7 +166,7 @@
- 				fprintf(stderr, _("[mntent]: warning: no final "
- 					"newline at the end of %s\n"),
- 					mfp->mntent_file);
--				s = index (buf, 0);
-+				s = strchr (buf, 0);
- 			} else {
- 				mfp->mntent_errs = 1;
- 				goto err;
-Index: util-linux-2.13-pre7/mount/mount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mount.c
-+++ util-linux-2.13-pre7/mount/mount.c
-@@ -488,11 +488,11 @@
- 
-    /* Accept a comma-separated list of types, and try them one by one */
-    /* A list like "nonfs,.." indicates types not to use */
--   if (*types && strncmp(*types, "no", 2) && index(*types,',')) {
-+   if (*types && strncmp(*types, "no", 2) && strchr(*types,',')) {
-       char *t = strdup(*types);
-       char *p;
- 
--      while((p = index(t,',')) != NULL) {
-+      while((p = strchr(t,',')) != NULL) {
- 	 *p = 0;
- 	 args.type = *types = t;
- 	 if(do_mount_syscall (&args) == 0)
-Index: util-linux-2.13-pre7/mount/mount_by_label.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mount_by_label.c
-+++ util-linux-2.13-pre7/mount/mount_by_label.c
-@@ -213,7 +213,7 @@
- 	    fseek(procpt, 0, SEEK_SET);
- 
- 	    while (fgets(line, sizeof(line), procpt)) {
--		if (!index(line, '\n'))
-+		if (!strchr(line, '\n'))
- 			break;
- 
- 		if (sscanf (line, " %d %d %d %[^\n ]",
-Index: util-linux-2.13-pre7/mount/sundries.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/sundries.c
-+++ util-linux-2.13-pre7/mount/sundries.c
-@@ -138,7 +138,7 @@
- 	     if (strncmp(p, type, len) == 0 &&
- 		 (p[len] == 0 || p[len] == ','))
- 		     return !no;
--	     p = index(p,',');
-+	     p = strchr(p,',');
- 	     if (!p)
- 		     break;
- 	     p++;
-Index: util-linux-2.13-pre7/mount/umount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/umount.c
-+++ util-linux-2.13-pre7/mount/umount.c
-@@ -332,7 +332,7 @@
- 			if (res < 0)
- 				umnt_err2 = errno;
- 			/* Do not complain about remote NFS mount points */
--			if (errno == ENOENT && index(spec, ':'))
-+			if (errno == ENOENT && strchr(spec, ':'))
- 				umnt_err2 = 0;
- 		}
- 	}
-Index: util-linux-2.13-pre7/partx/partx.c
-===================================================================
---- util-linux-2.13-pre7.orig/partx/partx.c
-+++ util-linux-2.13-pre7/partx/partx.c
-@@ -130,7 +130,7 @@
- 	case 'n':
- 		p = optarg;
- 		lower = atoi(p);
--		p = index(p, '-');
-+		p = strchr(p, '-');
- 		if (p)
- 			upper = atoi(p+1);
- 		else
-Index: util-linux-2.13-pre7/text-utils/display.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/display.c
-+++ util-linux-2.13-pre7/text-utils/display.c
-@@ -163,7 +163,7 @@
- 	pr->cchar[0] = 's';
- 	pr->cchar[1] = 0;
- 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
--	for (p2 = ++p1; *p1 && index(spec, *p1); ++p1);
-+	for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1);
- 	while ((*p2++ = *p1++) != 0) ;
- }
- 
-Index: util-linux-2.13-pre7/text-utils/parse.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/parse.c
-+++ util-linux-2.13-pre7/text-utils/parse.c
-@@ -64,7 +64,7 @@
- 		exit(1);
- 	}
- 	while (fgets(buf, sizeof(buf), fp)) {
--		if ((p = index(buf, '\n')) == NULL) {
-+		if ((p = strchr(buf, '\n')) == NULL) {
- 			(void)fprintf(stderr, _("hexdump: line too long.\n"));
- 			while ((ch = getchar()) != '\n' && ch != EOF);
- 			continue;
-@@ -171,7 +171,7 @@
- 			 * skip any special chars -- save precision in
- 			 * case it's a %s format.
- 			 */
--			while (index(spec + 1, *++fmt));
-+			while (strchr(spec + 1, *++fmt));
- 			if (*fmt == '.' && isdigit((unsigned char)*++fmt)) {
- 				prec = atoi(fmt);
- 				while (isdigit((unsigned char)*++fmt));
-@@ -244,10 +244,10 @@
- 			if (fu->bcnt) {
- 				sokay = USEBCNT;
- 				/* skip to conversion character */
--				for (++p1; index(spec, *p1); ++p1);
-+				for (++p1; strchr(spec, *p1); ++p1);
- 			} else {
- 				/* skip any special chars, field width */
--				while (index(spec + 1, *++p1));
-+				while (strchr(spec + 1, *++p1));
- 				if (*p1 == '.' &&
- 				    isdigit((unsigned char)*++p1)) {
- 					sokay = USEPREC;
-Index: util-linux-2.13-pre7/fdisk/cfdisk.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/cfdisk.c
-+++ util-linux-2.13-pre7/fdisk/cfdisk.c
-@@ -348,7 +348,7 @@
- /* Some libc's have their own basename() */
- static char *
- my_basename(char *devname) {
--    char *s = rindex(devname, '/');
-+    char *s = strrchr(devname, '/');
-     return s ? s+1 : devname;
- }
- 
-Index: util-linux-2.13-pre7/login-utils/wall.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/wall.c
-+++ util-linux-2.13-pre7/login-utils/wall.c
-@@ -87,7 +87,7 @@
-         textdomain(PACKAGE);
- 
- 	progname = argv[0];
--	p = rindex(progname, '/');
-+	p = strrchr(progname, '/');
- 	if (p)
- 	     progname = p+1;
- 
diff --git a/package/util-linux/util-linux-umount2-fix.patch b/package/util-linux/util-linux-umount2-fix.patch
deleted file mode 100644
index 14b6c34..0000000
--- a/package/util-linux/util-linux-umount2-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] fix multiple definitions of umount2 issue
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- mount/umount.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: util-linux-2.13-pre7/mount/umount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/umount.c
-+++ util-linux-2.13-pre7/mount/umount.c
-@@ -29,7 +29,7 @@
- #include "nfsmount.h"
- #include <arpa/inet.h>
- 
--#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
-+#if 1
- /* Interesting ... it seems libc knows about MNT_FORCE and presumably
-    about umount2 as well -- need not do anything */
- #else /* MNT_FORCE */
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 445b4d1..f01dd47 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -3,100 +3,123 @@
 # util-linux
 #
 #############################################################
-UTIL-LINUX_VERSION:=2.13-pre7
-UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2
-UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux/testing
-UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION)
-UTIL-LINUX_CAT:=$(BZCAT)
-UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe
-UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe
-
-# schedutils isn't support for all archs
-ifneq ($(BR2_i386)$(BR2_powerpc)$(BR2_x86_64)$(BR2_ia64)$(BR2_alpha),)
-UTIL-LINUX_SCHED_UTILS:=--enable-schedutils
+UTIL_LINUX_VERSION:=2.19
+UTIL_LINUX_SOURCE:=util-linux-$(UTIL_LINUX_VERSION).tar.bz2
+UTIL_LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION)/
+
+UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
+
+#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_DEPENDENCIES += busybox
+endif
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+UTIL_LINUX_DEPENDENCIES += ncurses
 else
-UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
+UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-UTIL-LINUX_DEPENDENCIES += gettext libintl
-UTIL-LINUX_MAKE_OPT = LIBS=-lintl
+
+#############################################
+#
+# disable default utilities
+#
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_MOUNT),n)
+UTIL_LINUX_CONF_OPT += --disable-mount
 endif
 
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-UTIL-LINUX_DEPENDENCIES += ncurses
-endif
-
-$(DL_DIR)/$(UTIL-LINUX_SOURCE):
-	$(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE))
-
-$(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE)
-	$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch
-	touch $(UTIL-LINUX_DIR)/.unpacked
-
-$(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 $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--disable-use-tty-group \
-		--prefix=/ \
-		--exec-prefix=/ \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(UTIL-LINUX_SCHED_UTILS) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		ARCH=$(ARCH) \
-	)
-	touch $(UTIL-LINUX_DIR)/.configured
-
-$(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured
-	$(MAKE) \
-		-C $(UTIL-LINUX_DIR) \
-		ARCH=$(ARCH) \
-		CC="$(TARGET_CC)" \
-		OPT="$(TARGET_CFLAGS)" \
-		$(UTIL-LINUX_MAKE_OPT) \
-		HAVE_SLANG="NO"
-
-$(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
-	$(MAKE) ARCH=$(ARCH) DESTDIR=$(TARGET_DIR) USE_TTY_GROUP=no -C $(UTIL-LINUX_DIR) install
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/info \
-		$(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/share/doc
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_FSCK),n)
+UTIL_LINUX_CONF_OPT += --disable-fsck
+endif
 
-#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_DEPENDENCIES := busybox $(UTIL-LINUX_DEPENDENCIES)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),n)
+UTIL_LINUX_CONF_OPT += --disable-libuuid
 endif
 
-util-linux: $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_UUIDD),n)
+UTIL_LINUX_CONF_OPT += --disable-uuidd
+endif
 
-util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),n)
+UTIL_LINUX_CONF_OPT += --disable-libblkid
+endif
 
-util-linux-clean:
-	#There is no working 'uninstall' target. Just skip it...
-	#$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall
-	-$(MAKE) -C $(UTIL-LINUX_DIR) clean
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),n)
+UTIL_LINUX_CONF_OPT += --disable-agetty
+endif
 
-util-linux-dirclean:
-	rm -rf $(UTIL-LINUX_DIR)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_CRAMFS),n)
+UTIL_LINUX_CONF_OPT += --disable-cramfs
+endif
 
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),n)
+UTIL_LINUX_CONF_OPT += --disable-switch_root
+endif
 
-#############################################################
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),n)
+UTIL_LINUX_CONF_OPT += --disable-pivot_root
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),n)
+UTIL_LINUX_CONF_OPT += --disable-fallocate
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_RENAME),n)
+UTIL_LINUX_CONF_OPT += --disable-rename
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),n)
+UTIL_LINUX_CONF_OPT += --disable-schedutils
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_WALL),n)
+UTIL_LINUX_CONF_OPT += --disable-unshare
+endif
+
+#############################################
 #
-# Toplevel Makefile options
+# enable extra utilities
 #
-#############################################################
-ifeq ($(BR2_PACKAGE_UTIL-LINUX),y)
-TARGETS+=util-linux
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_ARCH),y)
+UTIL_LINUX_CONF_OPT += --enable-arch
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_INIT),y)
+UTIL_LINUX_CONF_OPT += --enable-init
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_KILL),y)
+UTIL_LINUX_CONF_OPT += --enable-kill
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LAST),y)
+UTIL_LINUX_CONF_OPT += --enable-last
 endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_MESG),y)
+UTIL_LINUX_CONF_OPT += --enable-mesg
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_PARTX),y)
+UTIL_LINUX_CONF_OPT += --enable-partx
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_RAW),y)
+UTIL_LINUX_CONF_OPT += --enable-raw
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_RESET),y)
+UTIL_LINUX_CONF_OPT += --enable-reset
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
+UTIL_LINUX_CONF_OPT += --enable-login-utils
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_WRITE),y)
+UTIL_LINUX_CONF_OPT += --enable-write
+endif
+
+$(eval $(call AUTOTARGETS,package,util-linux))
-- 
1.7.0.4

[Buildroot] [PATCH 7/9] libopenal : new package. Cross-platform audio library

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/multimedia/Config.in              |    1 +
 package/multimedia/libopenal/Config.in    |    8 ++++++++
 package/multimedia/libopenal/libopenal.mk |   10 ++++++++++
 3 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 package/multimedia/libopenal/Config.in
 create mode 100644 package/multimedia/libopenal/libopenal.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index b8a0f21..0f5ac4e 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -26,6 +26,7 @@ source "package/multimedia/libmms/Config.in"
 source "package/multimedia/libmpd/Config.in"
 source "package/multimedia/libmpeg2/Config.in"
 source "package/multimedia/libogg/Config.in"
+source "package/multimedia/libopenal/Config.in"
 source "package/multimedia/libreplaygain/Config.in"
 source "package/multimedia/libsamplerate/Config.in"
 source "package/multimedia/libsndfile/Config.in"
diff --git a/package/multimedia/libopenal/Config.in b/package/multimedia/libopenal/Config.in
new file mode 100644
index 0000000..7262708
--- /dev/null
+++ b/package/multimedia/libopenal/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBOPENAL
+	bool "libopenal"
+	help
+	  OpenAL is a cross-platform 3D audio API appropriate
+	  for use with gaming applications and many other types
+	  of audio applications
+
+	  http://connect.creativelabs.com/openal/default.aspx
diff --git a/package/multimedia/libopenal/libopenal.mk b/package/multimedia/libopenal/libopenal.mk
new file mode 100644
index 0000000..79de855
--- /dev/null
+++ b/package/multimedia/libopenal/libopenal.mk
@@ -0,0 +1,10 @@
+################################################################################
+#
+# libopenal
+#
+################################################################################
+LIBOPENAL_VERSION=1.13
+LIBOPENAL_SITE=http://kcat.strangesoft.net/openal-releases
+LIBOPENAL_SOURCE=openal-soft-$(LIBOPENAL_VERSION).tar.bz2
+
+$(eval $(call CMAKETARGETS,package/multimedia,libopenal))
-- 
1.7.0.4

[Buildroot] [PATCH 8/9] libraw : new package

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/Config.in        |    1 +
 package/libraw/Config.in |   10 ++++++++++
 package/libraw/libraw.mk |   15 +++++++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 package/libraw/Config.in
 create mode 100644 package/libraw/libraw.mk

diff --git a/package/Config.in b/package/Config.in
index f459c1b..eefcde8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -278,6 +278,7 @@ source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
+source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
diff --git a/package/libraw/Config.in b/package/libraw/Config.in
new file mode 100644
index 0000000..61df2c6
--- /dev/null
+++ b/package/libraw/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBRAW
+	bool "libraw"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  libraw is an dc raw image manipulation library
+
+	  http://www.libraw.org/
+
+comment "libraw requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
new file mode 100644
index 0000000..9cc2f8f
--- /dev/null
+++ b/package/libraw/libraw.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libraw
+#
+#############################################################
+LIBRAW_VERSION:=0.13.1
+LIBRAW_SOURCE:=LibRaw-$(LIBRAW_VERSION).tar.gz
+LIBRAW_SITE:=http://www.libraw.org/data/
+
+LIBRAW_INSTALL_STAGING = YES
+LIBRAW_CONF_OPT += --disable-examples --disable-lcms \
+			--disable-openmp --disable-demosaic-pack-gpl2 \
+			--disable-demosaic-pack-gpl3
+
+$(eval $(call AUTOTARGETS,package,libraw))
-- 
1.7.0.4

[Buildroot] [PATCH 8/9] libraw : new package

[Peter Korsgaard]

>>>>> "Chih-Min" == Chih-Min Chao <cmchao@gmail.com> writes:

 Chih-Min> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>

Sorry for slow response - Committed with minor tweaks, thanks!

 Chih-Min> +++ b/package/libraw/libraw.mk
 Chih-Min> @@ -0,0 +1,15 @@
 Chih-Min> +#############################################################
 Chih-Min> +#
 Chih-Min> +# libraw
 Chih-Min> +#
 Chih-Min> +#############################################################
 Chih-Min> +LIBRAW_VERSION:=0.13.1
 Chih-Min> +LIBRAW_SOURCE:=LibRaw-$(LIBRAW_VERSION).tar.gz
 Chih-Min> +LIBRAW_SITE:=http://www.libraw.org/data/

We normally use ' = ' here rather than ':='

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 9/9] boost : new package

[Chih-Min Chao]

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
---
 package/Config.in       |    1 +
 package/boost/Config.in |   81 +++++++++++++++++++++++++++++++++
 package/boost/boost.mk  |  113 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 195 insertions(+), 0 deletions(-)
 create mode 100644 package/boost/Config.in
 create mode 100644 package/boost/boost.mk

diff --git a/package/Config.in b/package/Config.in
index eefcde8..91a8aa3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -324,6 +324,7 @@ endmenu
 
 menu "Other"
 source "package/argp-standalone/Config.in"
+source "package/boost/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
 source "package/libdaemon/Config.in"
diff --git a/package/boost/Config.in b/package/boost/Config.in
new file mode 100644
index 0000000..c0e3b7b
--- /dev/null
+++ b/package/boost/Config.in
@@ -0,0 +1,81 @@
+config BR2_PACKAGE_BOOST
+	bool "boost"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  A well-knownd C++ library
+	  http://www.boost.org
+
+if BR2_PACKAGE_BOOST
+
+config BR2_PACKAGE_BOOST_DATETIME
+	bool "enable date_time library"
+	default n
+
+config BR2_PACKAGE_BOOST_FILESYSTEM
+	bool "enable filesystem library"
+	default n
+
+config BR2_PACKAGE_BOOST_GRAPH
+	bool "enable graph library"
+	default n
+
+config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
+	bool "enable graph_parallel library"
+	default n
+
+config BR2_PACKAGE_BOOST_IOSTREAMS
+	bool "enable iostreams library"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_BZIP2
+	default n
+
+config BR2_PACKAGE_BOOST_MATH
+	bool "enable math library"
+	default n
+
+config BR2_PACKAGE_BOOST_MPI
+	bool "enable mpi library"
+	default n
+
+config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	bool "enable program_options library"
+	default n
+
+config BR2_PACKAGE_BOOST_PYTHON
+	bool "enable python library"
+	select BR2_PACKAGE_PYTHON
+	default n
+
+config BR2_PACKAGE_BOOST_RANDOM
+	bool "enable random library"
+	default n
+
+config BR2_PACKAGE_BOOST_REGEX
+	bool "enable regex library"
+	default n
+
+config BR2_PACKAGE_BOOST_SERIALIZATION
+	bool "enable serialization library"
+	default n
+
+config BR2_PACKAGE_BOOST_SIGNALS
+	bool "enable signals library"
+	default n
+
+config BR2_PACKAGE_BOOST_SYSTEM
+	bool "enable system library"
+	default n
+
+config BR2_PACKAGE_BOOST_TEST
+	bool "enable test library"
+	default n
+
+config BR2_PACKAGE_BOOST_THREAD
+	bool "enable thread library"
+	default n
+
+config BR2_PACKAGE_BOOST_WAVE
+	bool "enable wave library"
+	default n
+
+endif #BR2_PACKAGE_BOOST
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
new file mode 100644
index 0000000..7186010
--- /dev/null
+++ b/package/boost/boost.mk
@@ -0,0 +1,113 @@
+#############################################################
+#
+# bzip2
+#
+#############################################################
+BOOST_VERSION:=1_46_0
+BOOST_VERSION2:=1.46.0
+BOOST_SOURCE:=boost_$(BOOST_VERSION).tar.bz2
+BOOST_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost/
+#BOOST_INSTALL_STAGING=YES
+
+ifneq ($(BR2_PACKAGE_BOOST_DATETIME),y)
+BOOST_LIB_CONF += --without-date_time
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_FILESYSTEM),y)
+BOOST_LIB_CONF += --without-filesystem
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_GRAPH),y)
+BOOST_LIB_CONF += --without-graph
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),y)
+BOOST_LIB_CONF += --without-graph_parallel
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
+BOOST_LIB_CONF += --without-iostreams
+else
+BOOST_DEPENDENCIES += zlib bzip2
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_MATH),y)
+BOOST_LIB_CONF += --without-math
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_MPI),y)
+BOOST_LIB_CONF += --without-mpi
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),y)
+BOOST_LIB_CONF += --without-program_options
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_PYTHON),y)
+BOOST_LIB_CONF += --without-python
+else
+BOOST_DEPENDENCIES += python
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_RANDOM),y)
+BOOST_LIB_CONF += --without-random
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_REGEX),y)
+BOOST_LIB_CONF += --without-regex
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_SERIALIZATION),y)
+BOOST_LIB_CONF += --without-serialization
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_SIGNALS),y)
+BOOST_LIB_CONF += --without-signals
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_SYSTEM),y)
+BOOST_LIB_CONF += --without-system
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_TEST),y)
+BOOST_LIB_CONF += --without-test
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_THREAD),y)
+BOOST_LIB_CONF += --without-thread
+endif
+
+ifneq ($(BR2_PACKAGE_BOOST_WAVE),y)
+BOOST_LIB_CONF += --without-wave
+endif
+
+define BOOST_BUILD_CMDS
+	(cd $(@D);\
+		./bootstrap.sh \
+	)
+	$(SED) "s,using gcc,using gcc : $(ARCH) : $(TARGET_CXX),g" $(@D)/project-config.jam
+	$(SED) "s,using python : 2.6 : /usr,using python : $(PYTHON_VERSION_MAJOR) \
+			: $(STAGING_DIR)/usr,g" $(@D)/project-config.jam
+	(cd $(@D); \
+		./bjam $(BOOST_LIB_CONF);\
+	)
+endef
+
+define BOOST_INSTALL_STAGING_CMDS
+	./bjam install --prefix=$(STAGING_DIR)/usr --layout=system
+endef
+
+define BOOST_INSTALL_TARGET_CMDS
+	(cd $(@D); \
+		./bjam install --prefix=$(TARGET_DIR)/usr --layout=system $(BOOST_LIB_CONF) ;\
+	)
+endef
+
+define BOOST_CLEAN_CMDS
+	rm -f $(TARGET_DIR)/lib/boost*
+	rm -f $(STAGING_DIR)/lib/boost*
+	rm -f $(TARGET_DIR)/include/boost
+	rm -f $(STAGING_DIR)/include/boost
+endef
+
+$(eval $(call GENTARGETS,package,boost))
-- 
1.7.0.4

[Buildroot] [PATCH 1/9] alsa-lib : bump to 1.0.24.1

[Peter Korsgaard]

>>>>> "Chih-Min" == Chih-Min Chao <cmchao@gmail.com> writes:

 Chih-Min> Signed-off-by: Chih-Min Chao <cmchao@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard