* [Buildroot] [PATCH 4/6] coreutils: bump to 8.5
From: Martin Banky @ 2010-09-30 19:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285873416-20755-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/coreutils/coreutils-7.4-hostname-man.patch | 51 --------------------
.../coreutils/coreutils-7.4-rename-m4-fix.patch | 44 -----------------
package/coreutils/coreutils-8.5-hostname-man.patch | 51 ++++++++++++++++++++
package/coreutils/coreutils.mk | 10 +----
4 files changed, 52 insertions(+), 104 deletions(-)
delete mode 100644 package/coreutils/coreutils-7.4-hostname-man.patch
delete mode 100644 package/coreutils/coreutils-7.4-rename-m4-fix.patch
create mode 100644 package/coreutils/coreutils-8.5-hostname-man.patch
diff --git a/package/coreutils/coreutils-7.4-hostname-man.patch b/package/coreutils/coreutils-7.4-hostname-man.patch
deleted file mode 100644
index 843ecaa..0000000
--- a/package/coreutils/coreutils-7.4-hostname-man.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- /dev/null 2010-09-18 00:21:07.280000001 -0700
-+++ b/man/hostname.1 2010-09-23 12:08:06.000000000 -0700
-@@ -0,0 +1,48 @@
-+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-+.TH HOSTNAME "1" "September 2010" "GNU coreutils 7.4" "User Commands"
-+.SH NAME
-+hostname \- set or print the name of the current host system
-+.SH SYNOPSIS
-+.B hostname
-+[\fINAME\fR]
-+.br
-+.B hostname
-+\fIOPTION\fR
-+.SH DESCRIPTION
-+.\" Add any additional description here
-+.PP
-+Print or set the hostname of the current system.
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.SH AUTHOR
-+Written by Jim Meyering.
-+.SH "REPORTING BUGS"
-+Report hostname bugs to bug\-coreutils at gnu.org
-+.br
-+GNU coreutils home page: <http://www.gnu.org/software/coreutils/>
-+.br
-+General help using GNU software: <http://www.gnu.org/gethelp/>
-+.br
-+Report hostname translation bugs to <http://translationproject.org/team/>
-+.SH COPYRIGHT
-+Copyright \(co 2010 Free Software Foundation, Inc.
-+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-+.br
-+This is free software: you are free to change and redistribute it.
-+There is NO WARRANTY, to the extent permitted by law.
-+.SH "SEE ALSO"
-+The full documentation for
-+.B hostname
-+is maintained as a Texinfo manual. If the
-+.B info
-+and
-+.B hostname
-+programs are properly installed at your site, the command
-+.IP
-+.B info coreutils \(aqhostname invocation\(aq
-+.PP
-+should give you access to the complete manual.
diff --git a/package/coreutils/coreutils-7.4-rename-m4-fix.patch b/package/coreutils/coreutils-7.4-rename-m4-fix.patch
deleted file mode 100644
index 8177200..0000000
--- a/package/coreutils/coreutils-7.4-rename-m4-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Commit 7fcb389fb4cd5ba26e330fef991ffdc05392f289 from gnulib, to fix
-the rename bugs detection macros.
----
- m4/rename.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: coreutils-7.4/m4/rename.m4
-===================================================================
---- coreutils-7.4.orig/m4/rename.m4
-+++ coreutils-7.4/m4/rename.m4
-@@ -51,12 +51,12 @@
- AC_LIBOBJ([rename])
- AC_DEFINE([rename], [rpl_rename],
- [Define to rpl_rename if the replacement function should be used.])
-- if test $gl_cv_func_rename_trailing_slash_bug; then
-+ if test $gl_cv_func_rename_trailing_slash_bug = yes; then
- AC_DEFINE([RENAME_TRAILING_SLASH_BUG], [1],
- [Define if rename does not work for source file names with a trailing
- slash, like the one from SunOS 4.1.1_U1.])
- fi
-- if test $gl_cv_func_rename_dest_exists_bug; then
-+ if test $gl_cv_func_rename_dest_exists_bug = yes; then
- AC_DEFINE([RENAME_DEST_EXISTS_BUG], [1],
- [Define if rename does not work when the destination file exists,
- as on Windows.])
-Index: coreutils-7.4/configure
-===================================================================
---- coreutils-7.4.orig/configure
-+++ coreutils-7.4/configure
-@@ -28698,12 +28698,12 @@ $as_echo "$gl_cv_func_rename_dest_exists
-
- $as_echo "#define rename rpl_rename" >>confdefs.h
-
-- if test $gl_cv_func_rename_trailing_slash_bug; then
-+ if test $gl_cv_func_rename_trailing_slash_bug = yes; then
-
- $as_echo "#define RENAME_TRAILING_SLASH_BUG 1" >>confdefs.h
-
- fi
-- if test $gl_cv_func_rename_dest_exists_bug; then
-+ if test $gl_cv_func_rename_dest_exists_bug = yes; then
-
- $as_echo "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
-
diff --git a/package/coreutils/coreutils-8.5-hostname-man.patch b/package/coreutils/coreutils-8.5-hostname-man.patch
new file mode 100644
index 0000000..6025f56
--- /dev/null
+++ b/package/coreutils/coreutils-8.5-hostname-man.patch
@@ -0,0 +1,51 @@
+--- /dev/null 2010-09-18 00:21:07.280000001 -0700
++++ b/man/hostname.1 2010-09-23 12:08:06.000000000 -0700
+@@ -0,0 +1,48 @@
++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
++.TH HOSTNAME "1" "September 2010" "GNU coreutils 8.5" "User Commands"
++.SH NAME
++hostname \- set or print the name of the current host system
++.SH SYNOPSIS
++.B hostname
++[\fINAME\fR]
++.br
++.B hostname
++\fIOPTION\fR
++.SH DESCRIPTION
++.\" Add any additional description here
++.PP
++Print or set the hostname of the current system.
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.SH AUTHOR
++Written by Jim Meyering.
++.SH "REPORTING BUGS"
++Report hostname bugs to bug\-coreutils at gnu.org
++.br
++GNU coreutils home page: <http://www.gnu.org/software/coreutils/>
++.br
++General help using GNU software: <http://www.gnu.org/gethelp/>
++.br
++Report hostname translation bugs to <http://translationproject.org/team/>
++.SH COPYRIGHT
++Copyright \(co 2010 Free Software Foundation, Inc.
++License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
++.br
++This is free software: you are free to change and redistribute it.
++There is NO WARRANTY, to the extent permitted by law.
++.SH "SEE ALSO"
++The full documentation for
++.B hostname
++is maintained as a Texinfo manual. If the
++.B info
++and
++.B hostname
++programs are properly installed at your site, the command
++.IP
++.B info coreutils \(aqhostname invocation\(aq
++.PP
++should give you access to the complete manual.
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 7e64d25..73dd662 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -3,7 +3,7 @@
# coreutils
#
#############################################################
-COREUTILS_VERSION = 7.4
+COREUTILS_VERSION = 8.5
COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.gz
COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
@@ -57,14 +57,6 @@ COREUTILS_CONF_OPT = --disable-rpath \
--disable-dependency-tracking \
--enable-install-program=hostname
-define COREUTILS_TOUCH_RENAME_M4
- # ensure rename.m4 file is older than configure / aclocal.m4 so
- # auto* isn't rerun
- touch -d '1979-01-01' $(@D)/m4/rename.m4
-endef
-
-COREUTILS_POST_PATCH_HOOKS += COREUTILS_TOUCH_RENAME_M4
-
define COREUTILS_POST_INSTALL
# some things go in root rather than usr
for f in $(COREUTILS_BIN_PROGS); do \
--
1.7.3
^ permalink raw reply related
* [Buildroot] [PATCH 3/6] coreutils: fixed missing hostname
From: Martin Banky @ 2010-09-30 19:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285873416-20755-1-git-send-email-Martin.Banky@gmail.com>
hostname is no longer installed by default (ChangeLog-2007 - 2007-08-28), and
has to be enabled with --enable-install-program=hostname. hostname's man file is
not included, and because of this, during make, help2man is run against
src/hostname to generate it's man file. src/hostname will not run on the host
system, causing the build to fail.
Generated the hostname man file, after building coreutils on the host
system, and generated this patch, which fixes the build error.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/coreutils/coreutils-7.4-hostname-man.patch | 51 ++++++++++++++++++++
package/coreutils/coreutils.mk | 3 +-
2 files changed, 53 insertions(+), 1 deletions(-)
create mode 100644 package/coreutils/coreutils-7.4-hostname-man.patch
diff --git a/package/coreutils/coreutils-7.4-hostname-man.patch b/package/coreutils/coreutils-7.4-hostname-man.patch
new file mode 100644
index 0000000..843ecaa
--- /dev/null
+++ b/package/coreutils/coreutils-7.4-hostname-man.patch
@@ -0,0 +1,51 @@
+--- /dev/null 2010-09-18 00:21:07.280000001 -0700
++++ b/man/hostname.1 2010-09-23 12:08:06.000000000 -0700
+@@ -0,0 +1,48 @@
++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
++.TH HOSTNAME "1" "September 2010" "GNU coreutils 7.4" "User Commands"
++.SH NAME
++hostname \- set or print the name of the current host system
++.SH SYNOPSIS
++.B hostname
++[\fINAME\fR]
++.br
++.B hostname
++\fIOPTION\fR
++.SH DESCRIPTION
++.\" Add any additional description here
++.PP
++Print or set the hostname of the current system.
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.SH AUTHOR
++Written by Jim Meyering.
++.SH "REPORTING BUGS"
++Report hostname bugs to bug\-coreutils at gnu.org
++.br
++GNU coreutils home page: <http://www.gnu.org/software/coreutils/>
++.br
++General help using GNU software: <http://www.gnu.org/gethelp/>
++.br
++Report hostname translation bugs to <http://translationproject.org/team/>
++.SH COPYRIGHT
++Copyright \(co 2010 Free Software Foundation, Inc.
++License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
++.br
++This is free software: you are free to change and redistribute it.
++There is NO WARRANTY, to the extent permitted by law.
++.SH "SEE ALSO"
++The full documentation for
++.B hostname
++is maintained as a Texinfo manual. If the
++.B info
++and
++.B hostname
++programs are properly installed at your site, the command
++.IP
++.B info coreutils \(aqhostname invocation\(aq
++.PP
++should give you access to the complete manual.
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 6d510cb..7e64d25 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -54,7 +54,8 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
utils_cv_localtime_cache=no
COREUTILS_CONF_OPT = --disable-rpath \
- --disable-dependency-tracking
+ --disable-dependency-tracking \
+ --enable-install-program=hostname
define COREUTILS_TOUCH_RENAME_M4
# ensure rename.m4 file is older than configure / aclocal.m4 so
--
1.7.3
^ permalink raw reply related
* [Buildroot] [PATCH 2/6] coreutils: changed/removed some of the configure environmental variables
From: Martin Banky @ 2010-09-30 19:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285873416-20755-1-git-send-email-Martin.Banky@gmail.com>
ac_cv_func_closedir_void=no - no longer used
ac_cv_func_fnmatch_gnu=yes - no longer used
ac_cv_func_getcwd_null=yes - duplicate of gl_cv_func_getcwd_null
ac_cv_func_mkstemp=yes - changed to gl_cv_func_working_mkstemp
ac_cv_func_stat_empty_string_bug=no - no longer used
ac_cv_func_utime_null=yes - no longer used
ac_cv_have_decl_euidaccess=no - no longer used
ac_cv_have_decl_nanosleep=yes - no longer used
ac_cv_struct_st_mtim_nsec=no - no longer used
am_cv_func_working_getline=yes - duplicate
am_getline_needs_run_time_check=no - changed to gl_getline_needs_run_time_check
gl_cv_c_restrict=no - changed to ac_cv_c_restrict
gl_cv_func_mkstemp_limitations=no - no longer used
gl_cv_func_working_readdir=yes - no longer used
jm_ac_cv_func_link_follows_symlink=no - changed to gl_ac_cv_func_link_follows_symlink
jm_cv_func_gettimeofday_clobber=no - changed to gl_cv_func_gettimeofday_clobber
jm_cv_func_nanosleep_works=yes - no longer used
jm_cv_func_svid_putenv=yes - changed to gl_cv_func_svid_putenv
jm_cv_func_working_re_compile_pattern=yes - changed to gl_cv_func_re_compile_pattern_working
utils_cv_func_mkdir_trailing_slash_bug=no - duplicate of gl_cv_func_mkdir_trailing_slash_bug
utils_cv_func_mkstemp_limitations=no - duplicate of gl_cv_func_mkstemp_limitations
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/coreutils/coreutils.mk | 66 ++++++++++++++++------------------------
1 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 078e28f..6d510cb 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -17,55 +17,41 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostnam
ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
uname join
-COREUTILS_CONF_ENV = 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 \
+COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
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_getdelim=yes \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_getloadavg=no \
ac_cv_func_lstat_dereferences_slashed_symlink=yes \
ac_cv_func_lstat_empty_string_bug=no \
- ac_cv_func_stat_empty_string_bug=no \
- gl_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 \
- gl_cv_func_rename_dest_exists_bug=no \
- jm_cv_func_gettimeofday_clobber=no \
+ ac_cv_func_strnlen_working=yes \
+ ac_cv_func_strtod=yes \
+ ac_cv_func_working_mktime=yes \
+ ac_cv_have_decl_strerror_r=yes \
+ ac_cv_have_decl_strnlen=yes \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_fsusage_space=yes \
+ ac_use_included_regex=no \
am_cv_func_working_getline=yes \
- 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 \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ gl_ac_cv_func_link_follows_symlink=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_gettimeofday_clobber=no \
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
+ gl_cv_func_re_compile_pattern_working=yes \
+ gl_cv_func_rename_dest_exists_bug=no \
+ gl_cv_func_rename_trailing_slash_bug=no \
+ gl_cv_func_svid_putenv=yes \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_working_mkstemp=yes \
+ gl_cv_func_working_utimes=yes \
+ gl_getline_needs_run_time_check=no \
+ utils_cv_localtime_cache=no
COREUTILS_CONF_OPT = --disable-rpath \
--disable-dependency-tracking
--
1.7.3
^ permalink raw reply related
* [Buildroot] [PATCH 1/6] coreutils: converted to autotarget
From: Martin Banky @ 2010-09-30 19:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285873416-20755-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/coreutils/coreutils.mk | 107 ++++++++++-----------------------------
1 files changed, 28 insertions(+), 79 deletions(-)
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index f9910c6..078e28f 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -3,37 +3,21 @@
# coreutils
#
#############################################################
-COREUTILS_VERSION:=7.4
-COREUTILS_SOURCE:=coreutils-$(COREUTILS_VERSION).tar.gz
-#COREUTILS_SITE:=ftp://alpha.gnu.org/gnu/coreutils/
-COREUTILS_SITE:=$(BR2_GNU_MIRROR)/coreutils
-COREUTILS_CAT:=$(ZCAT)
-COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION)
-COREUTILS_BINARY:=src/vdir
-COREUTILS_TARGET_BINARY:=bin/vdir
-BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \
- ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
- uname join
+COREUTILS_VERSION = 7.4
+COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.gz
+COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
-$(DL_DIR)/$(COREUTILS_SOURCE):
- $(call DOWNLOAD,$(COREUTILS_SITE),$(COREUTILS_SOURCE))
-
-coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE)
+# If both coreutils and busybox are selected, make certain coreutils
+# wins the fight over who gets to have their utils actually installed.
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+COREUTILS_DEPENDENCIES = busybox
+endif
-$(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE)
- $(COREUTILS_CAT) $(DL_DIR)/$(COREUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(COREUTILS_DIR) package/coreutils/ coreutils\*.patch
- $(CONFIG_UPDATE) $(COREUTILS_DIR)/build-aux
- # ensure rename.m4 file is older than configure / aclocal.m4 so
- # auto* isn't rerun
- touch -d '1979-01-01' $(@D)/m4/rename.m4
- touch $@
+COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostname \
+ ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
+ uname join
-$(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
- (cd $(COREUTILS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ac_cv_func_strtod=yes \
+COREUTILS_CONF_ENV = ac_cv_func_strtod=yes \
ac_fsusage_space=yes \
fu_cv_sys_stat_statfs2_bsize=yes \
ac_cv_func_closedir_void=no \
@@ -81,68 +65,33 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
ac_cv_func_working_mktime=yes \
jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no \
- gl_cv_c_restrict=no \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- --disable-rpath \
- --disable-dependency-tracking \
- )
- touch $@
+ gl_cv_c_restrict=no
-$(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured
- $(MAKE) -C $(COREUTILS_DIR)
- rm -f $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
+COREUTILS_CONF_OPT = --disable-rpath \
+ --disable-dependency-tracking
-$(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(COREUTILS_DIR) install
+define COREUTILS_TOUCH_RENAME_M4
+ # ensure rename.m4 file is older than configure / aclocal.m4 so
+ # auto* isn't rerun
+ touch -d '1979-01-01' $(@D)/m4/rename.m4
+endef
+
+COREUTILS_POST_PATCH_HOOKS += COREUTILS_TOUCH_RENAME_M4
+
+define COREUTILS_POST_INSTALL
# some things go in root rather than usr
- for f in $(BIN_PROGS); do \
+ for f in $(COREUTILS_BIN_PROGS); do \
mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
done
# link for archaic shells
ln -fs test $(TARGET_DIR)/usr/bin/[
# gnu thinks chroot is in bin, debian thinks it's in sbin
mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
- $(STRIPCMD) $(TARGET_DIR)/usr/sbin/chroot > /dev/null 2>&1
- rm -rf $(TARGET_DIR)/share/locale
+endef
-# If both coreutils and busybox are selected, make certain coreutils
-# wins the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-coreutils: busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
-else
-coreutils: $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
-endif
+COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL
# If both coreutils and busybox are selected, the corresponding applets
# may need to be reinstated by the clean targets.
-coreutils-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(COREUTILS_DIR) uninstall
- -$(MAKE) -C $(COREUTILS_DIR) clean
-coreutils-dirclean:
- rm -rf $(COREUTILS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_COREUTILS),y)
-TARGETS+=coreutils
-endif
+$(eval $(call AUTOTARGETS,package,coreutils))
--
1.7.3
^ permalink raw reply related
* [Buildroot] [PATCH 0/6] Resubmit coreutils patchset
From: Martin Banky @ 2010-09-30 19:03 UTC (permalink / raw)
To: buildroot
Requested changes have been made
Martin
[PATCH 1/6] coreutils: converted to autotarget
[PATCH 2/6] coreutils: changed/removed some of the configure environmental variables
[PATCH 3/6] coreutils: fixed missing hostname
[PATCH 4/6] coreutils: bump to 8.5
[PATCH 5/6] coreutils: changed/removed some of the configure environmental variables
[PATCH 6/6] coreutils: add uname patch
^ permalink raw reply
* [Buildroot] [PATCH] cups: updating to version 1.4.x and autotargets
From: Marcus Osdoba @ 2010-09-30 18:38 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285871912-11737-1-git-send-email-marcus.osdoba@googlemail.com>
this patch introduces
- new version 1.4.4
this patch fixes
- do not install libs under target/usr/lib64
- rename etc/init.d-skript from cups->S89cups (which makes it run by default inittab)
- build only 32bit (need to be sure if building on 64bit hosts)
problems encountered
- this version still builds some executables, which are launched during the
build process, if cross comiling, this won't work
e.g. man2html -> modifying former patch from cups 1.3.x
- ppdc runs during build process, this is not desired for cross compiling,
Open Embedded solved these issues with switching off these optional features,
patches for switching off running ppdc on host were borrowed from OE
Signed-off-by: Marcus Osdoba <marcus.osdoba@googlemail.com>
---
package/cups/cups-configure.patch | 117 ++++++++++++++++++
package/cups/cups-fix-stack-protector-check.patch | 25 ----
package/cups/cups-mantohtml.patch | 8 +-
package/cups/cups-no-tests-man.patch | 13 --
package/cups/cups-skip-tools.patch | 51 ++++++++
package/cups/cups.mk | 132 ++++++---------------
6 files changed, 209 insertions(+), 137 deletions(-)
create mode 100644 package/cups/cups-configure.patch
delete mode 100644 package/cups/cups-fix-stack-protector-check.patch
delete mode 100644 package/cups/cups-no-tests-man.patch
create mode 100644 package/cups/cups-skip-tools.patch
diff --git a/package/cups/cups-configure.patch b/package/cups/cups-configure.patch
new file mode 100644
index 0000000..877e8d3
--- /dev/null
+++ b/package/cups/cups-configure.patch
@@ -0,0 +1,117 @@
+--- cups-1.4.3/configure.orig 2010-04-08 11:14:19.092296014 +0200
++++ cups-1.4.3/configure 2010-04-08 11:19:02.661417938 +0200
+@@ -10940,114 +10940,6 @@
+ OPTIM="-fPIC $OPTIM"
+ fi
+
+- # The -fstack-protector option is available with some versions of
+- # GCC and adds "stack canaries" which detect when the return address
+- # has been overwritten, preventing many types of exploit attacks.
+- { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5
+-echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; }
+- OLDCFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -fstack-protector"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
+- OPTIM="$OPTIM -fstack-protector"
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- CFLAGS="$OLDCFLAGS"
+-
+- # The -pie option is available with some versions of GCC and adds
+- # randomization of addresses, which avoids another class of exploits
+- # that depend on a fixed address for common functions.
+- { echo "$as_me:$LINENO: checking if GCC supports -pie" >&5
+-echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; }
+- OLDCFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -pie -fPIE"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- PIEFLAGS="-pie -fPIE"
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- CFLAGS="$OLDCFLAGS"
+-
+ if test "x$with_optim" = x; then
+ # Add useful warning options for tracking down problems...
+ OPTIM="-Wall -Wno-format-y2k $OPTIM"
diff --git a/package/cups/cups-fix-stack-protector-check.patch b/package/cups/cups-fix-stack-protector-check.patch
deleted file mode 100644
index 1db35ff..0000000
--- a/package/cups/cups-fix-stack-protector-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH]: use AC_TRY_LINK for stack protector check
-
-Actually try to link an executable to test for stack protector support,
-as gcc seems to accept the -fstack-protector argument even when it's
-compiled with --disable-libssp (but linking fails with a error
-finding -lssp_nonshared).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- config-scripts/cups-compiler.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: cups-1.3.9/config-scripts/cups-compiler.m4
-===================================================================
---- cups-1.3.9.orig/config-scripts/cups-compiler.m4
-+++ cups-1.3.9/config-scripts/cups-compiler.m4
-@@ -109,7 +109,7 @@ if test -n "$GCC"; then
- AC_MSG_CHECKING(if GCC supports -fstack-protector)
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fstack-protector"
-- AC_TRY_COMPILE(,,
-+ AC_TRY_LINK(,,
- OPTIM="$OPTIM -fstack-protector"
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
diff --git a/package/cups/cups-mantohtml.patch b/package/cups/cups-mantohtml.patch
index e6a10b0..0b24573 100644
--- a/package/cups/cups-mantohtml.patch
+++ b/package/cups/cups-mantohtml.patch
@@ -1,10 +1,10 @@
---- cups-1.3.5/man/Makefile 2007-07-12 21:01:14.000000000 -0400
-+++ cups-1.3.5/man/Makefile 2008-02-11 08:55:24.000000000 -0500
-@@ -173,7 +173,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
+--- cups-1.4.4.orig/man/Makefile 2007-07-12 21:01:14.000000000 -0400
++++ cups-1.4.4/man/Makefile 2008-02-11 08:55:24.000000000 -0500
+@@ -230,7 +230,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
done
mantohtml: mantohtml.o
-- $(CC) $(LDFLAGS) -o $@ mantohtml.o
+- $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o
+ gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
diff --git a/package/cups/cups-no-tests-man.patch b/package/cups/cups-no-tests-man.patch
deleted file mode 100644
index 567c801..0000000
--- a/package/cups/cups-no-tests-man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cups-1.3.5/Makefile 2007-12-06 15:09:39.000000000 -0500
-+++ cups-1.3.5/Makefile 2008-02-09 21:53:03.000000000 -0500
-@@ -19,8 +19,8 @@ include Makedefs
- # Directories to make...
- #
-
--DIRS = cups backend berkeley cgi-bin filter locale man monitor \
-- notifier $(PDFTOPS) scheduler systemv test \
-+DIRS = cups backend berkeley cgi-bin filter locale monitor \
-+ notifier $(PDFTOPS) scheduler systemv \
- $(PHPDIR) \
- conf data doc $(FONTS) ppd templates
-
diff --git a/package/cups/cups-skip-tools.patch b/package/cups/cups-skip-tools.patch
new file mode 100644
index 0000000..ed95583
--- /dev/null
+++ b/package/cups/cups-skip-tools.patch
@@ -0,0 +1,51 @@
+--- cups-1.4.3.orig/ppdc/Makefile.orig 2010-04-07 12:38:56.650327699 +0200
++++ cups-1.4.3/ppdc/Makefile 2010-04-07 12:40:05.842418876 +0200
+@@ -243,8 +243,8 @@
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
+ libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+- echo Generating localization strings...
+- ./genstrings >sample.c
++# echo Generating localization strings...
++# ./genstrings >sample.c
+
+
+ #
+@@ -261,9 +261,9 @@
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+ ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+ $(COMMONLIBS) $(LIBZ)
+- echo Testing PPD compiler...
+- ./ppdc-static -l en,fr -I ../data foo.drv
+- ./ppdc-static -l en,fr -z -I ../data foo.drv
++# echo Testing PPD compiler...
++# ./ppdc-static -l en,fr -I ../data foo.drv
++# ./ppdc-static -l en,fr -z -I ../data foo.drv
+
+
+ #
+@@ -291,15 +291,15 @@
+ $(COMMONLIBS) $(LIBZ)
+ echo Testing PPD importer...
+ $(RM) -r ppd ppd2 sample-import.drv
+- ./ppdc-static -I ../data sample.drv
+- ./ppdi-static -I ../data -o sample-import.drv ppd/*
+- ./ppdc-static -I ../data -d ppd2 sample-import.drv
+- if diff -qr ppd ppd2; then \
+- echo PPD import OK; \
+- else \
+- echo PPD import FAILED; \
+- exit 1; \
+- fi
++# ./ppdc-static -I ../data sample.drv
++# ./ppdi-static -I ../data -o sample-import.drv ppd/*
++# ./ppdc-static -I ../data -d ppd2 sample-import.drv
++# if diff -qr ppd ppd2; then \
++# echo PPD import OK; \
++# else \
++# echo PPD import FAILED; \
++# exit 1; \
++# fi
+
+
+ #
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 776fb57..886d90a 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -3,13 +3,27 @@
# cups
#
################################################################################
-CUPS_VERSION = 1.3.9
-CUPS_NAME = cups-$(CUPS_VERSION)
-CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
-CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
-CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
-CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
-CUPS_CAT:=$(BZCAT)
+CUPS_MAJORVERSION = 1.4
+CUPS_VERSION = $(CUPS_MAJORVERSION).4
+CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
+CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
+CUPS_CONF_OPT = --enable-shared --disable-doc
+CUPS_CONF_OPT += --without-java
+CUPS_CONF_OPT += --disable-64bit
+CUPS_CONF_OPT += --without-arch64flags
+# at least for amd64 squeeze, cups installed the libs under usr/lib64
+# even after disabeling 64bit above,
+# the strip command showed ELF 32bit ARM
+# - so make sure to install them really in usr/lib (not lib64)
+CUPS_CONF_OPT += --libdir=/usr/lib
+# cups would be the first package, which uses /usr/var
+# for reasons of simplicity,
+# this points to /var for small systems built with buildroot
+CUPS_CONF_OPT += --localstatedir=/var
+
+CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+
+CUPS_LIBTOOL_PATCH = YES
ifeq ($(BR2_PACKAGE_DBUS),y)
CUPS_CONF_OPT += --enable-dbus
@@ -22,40 +36,26 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
CUPS_DEPENDENCIES += xlib_libX11
endif
-CUPS_CONF_OPT += --disable-perl
-CUPS_CONF_OPT += --disable-java
-CUPS_CFLAGS = $(TARGET_CFLAGS)
-
-
ifeq ($(BR2_PACKAGE_PERL),disabled) # We do not provide perl (yet)
- CUPS_CONF_ENV += ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
- CUPS_CONF_OPT += --with-perl
- CUPS_DEPENDENCIES += microperl
+ CUPS_CONF_ENV += ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
+ CUPS_CONF_OPT += --with-perl
+ CUPS_DEPENDENCIES += microperl
else
- CUPS_CONF_OPT += --disable-perl
+ CUPS_CONF_OPT += --without-perl
endif
ifeq ($(BR2_PACKAGE_PHP),y)
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/main
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/regex
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/TSRM
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/Zend
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/ext
- CUPS_CONF_ENV += ac_cv_path_php=$(STAGING_DIR)/usr/bin/php
- CUPS_CONF_OPT += --with-php
- CUPS_DEPENDENCIES += php
+ CUPS_CONF_OPT += --with-php
+ CUPS_DEPENDENCIES += php
else
- CUPS_CONF_OPT += --disable-php
+ CUPS_CONF_OPT += --without-php
endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
- CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
- CUPS_CONF_ENV += ac_cv_path_python=$(STAGING_DIR)/usr/bin/python
- CUPS_CONF_OPT += --with-python
- CUPS_DEPENDENCIES += python
+ CUPS_CONF_OPT += --with-python
+ CUPS_DEPENDENCIES += python
else
- CUPS_CONF_OPT += --disable-python
+ CUPS_CONF_OPT += --without-python
endif
ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
@@ -64,68 +64,10 @@ else
CUPS_CONF_OPT += --disable-pdftops
endif
-$(DL_DIR)/$(CUPS_SOURCE):
- $(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE))
-
-$(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
- $(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(CUPS_DIR) package/cups/ \*.patch
- $(CONFIG_UPDATE) $(CUPS_DIR)
- touch $@
-
-$(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
- cd $(CUPS_DIR) && $(AUTOCONF)
- (cd $(CUPS_DIR) && \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(CUPS_CONF_ENV) \
- CFLAGS="$(CUPS_CFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-config-file-path=/etc \
- --disable-gnutls \
- --disable-gssapi \
- $(CUPS_CONF_OPT) \
- )
- touch $@
-
-$(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
- $(MAKE) CFLAGS="$(CUPS_CFLAGS)" -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
- locale monitor notifier pdftops scheduler systemv scripting/php \
- conf data doc fonts ppd templates
- touch $@
-
-$(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
- $(MAKE) -C $(CUPS_DIR) DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
- $(MAKE) -C $(CUPS_DIR) DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
- $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
- $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/cups-config
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
- touch $@
-
-cups: host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
-
-cups-source: $(DL_DIR)/$(CUPS_SOURCE)
-
-cups-clean:
- -$(MAKE) -C $(CUPS_DIR) clean
-
-cups-dirclean:
- rm -fr $(CUPS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CUPS),y)
-TARGETS+=cups
-endif
+define CUPS_RENAME_INIT_SKRIPT_INSTALL
+ $(call MESSAGE,"Renaming skript named 'cups' in etc/init.d to 'SXXcups'")
+ mv $(TARGET_DIR)/etc/init.d/cups $(TARGET_DIR)/etc/init.d/S89cups
+endef
+CUPS_POST_INSTALL_TARGET_HOOKS += CUPS_RENAME_INIT_SKRIPT_INSTALL
+$(eval $(call AUTOTARGETS,package,cups))
--
1.7.1
^ permalink raw reply related
* [Buildroot] patch for cups which had some build bugs in former version and update to autotargets
From: Marcus Osdoba @ 2010-09-30 18:38 UTC (permalink / raw)
To: buildroot
Hi mailinglist,
the former version of cups in br installed its libraries under usr/lib64
(at least if building on 64bit host)
which made cups not work by plain run through
this patch coverts cups to autotargets and updates to new version 1.4.4
furthermore the init.d skript was named cups - inittab launches a skript
which starts all S* skripts in init.d, so cups need to be prefixed with S?? too
Regards,
Ossy
^ permalink raw reply
* [Buildroot] Where is Bluez in the config?
From: Thomas Petazzoni @ 2010-09-30 17:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <000901cb6088$65a98ba0$30fca2e0$@com>
Hello Barry,
On Thu, 30 Sep 2010 11:15:24 +0100
"Barry Bridges" <barry@disignconsultants.com> wrote:
> I have a need to include Bluez into my build and have noticed it
> nemtioned in the mailing list, but can't find it anywhere in the
> config to build it in. What am I missing? Does it need patching into
> buildroot?
Bluez is not yet included in Buildroot. However, someone has recently
contributed a patch that you can find at
http://lists.busybox.net/pipermail/buildroot/2010-September/037749.html.
We didn't had the time to review and merge this patch yet, but if you
test it, please share your results with us !
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] CONFIG_BLK_DEV_INITRD deactivated on automatic build
From: Thomas Petazzoni @ 2010-09-30 17:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA47342.7020405@googlemail.com>
Hello Dennis,
On Thu, 30 Sep 2010 13:23:46 +0200
Dennis Borgmann <dennis.borgmann@googlemail.com> wrote:
> First of all - thank you for the work done for this project. It is
> awesome and I really like it. Straightforward and quick to use.
>
> I think, I found a bug. If you download buildroot and start
> configuring your project with "make menuconfig" and after that
> configure the kernel with "make linux26-menuconfig", everything seems
> to be ok. I did give it a custom kernel-config named
> "/tmp/config-2.6.34".
>
> After running "make", everything seems to be ok, but the resulting
> kernel does not contain the option "CONFIG_BLK_DEV_INITRD". I need to
> manually do a "make linux26-menuconfig" again and rebuild the kernel
> for the resulting kernel to contain this option.
>
> This was a really silly thing to find, took me around one week,
> because you wouldn't think of such a mistake. Could it be, that this
> is a bug? I am using buildroot-2010.08.
Yes, it was a bug. When "initramfs" isn't used as the target filesystem
format, we forcefully disabled the CONFIG_BLK_DEV_INITRD option. This
has been fixed post-2010.08, by the following commit:
http://git.buildroot.net/buildroot/commit/?id=ee3f319249e146d92b093ad8c45a3a908d44236f
So you can either apply this patch on top of 2010.08, or use the latest
Buildroot git. We unfortunately do not maintain "stabilized" versions
of Buildroot (such as 2010.08.x) for the moment.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH] New package: rrdtool
From: Gustavo Zacarias @ 2010-09-30 14:57 UTC (permalink / raw)
To: buildroot
Add new rrdtool package to make nitfy graphs.
Using the 1.2 branch as a good compromise of size versus features.
Enjoy.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-rrdtool-1.2.30.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100930/d932b7fe/attachment.ksh>
^ permalink raw reply
* [Buildroot] [SECURITY][PATCHv2] Bump quagga to 0.99.17
From: Gustavo Zacarias @ 2010-09-30 14:45 UTC (permalink / raw)
To: buildroot
Bump quagga to version 0.99.17.
[SECURITY] Fixes remote crash in bgpd.
Other fixes for ospfd, ospf6d, zebra and isisd.
Fix conflicting options in the package, enhance help, reorder options.
Should fix most breakage with randpackageconfig (Peter: ring me if you
hit another one!).
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-quagga-0.99.17.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100930/ad65b04b/attachment-0001.ksh>
^ permalink raw reply
* [Buildroot] [SECURITY] [PATCH] Bump quagga to 0.99.17
From: Gustavo Zacarias @ 2010-09-30 13:13 UTC (permalink / raw)
To: buildroot
Bump quagga to version 0.99.17.
[SECURITY] Fixes remote crash in bgpd.
Other fixes for ospfd, ospf6d, zebra and isisd.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-quagga-0.99.17.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100930/3173cda8/attachment.ksh>
^ permalink raw reply
* [Buildroot] [PATCH] Bump lighttpd to 1.4.28
From: Gustavo Zacarias @ 2010-09-30 13:11 UTC (permalink / raw)
To: buildroot
Bump lighttpd to version 1.4.28.
Fixes to SSL, IPv6, proxy and CGI handling.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-lighttpd-1.4.28.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100930/b2b8a563/attachment.ksh>
^ permalink raw reply
* [Buildroot] [PATCH] Bump iw to 0.9.21
From: Gustavo Zacarias @ 2010-09-30 13:09 UTC (permalink / raw)
To: buildroot
Bump iw package to version 0.9.21.
Introduces new bitrate setting command.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-iw-0.9.21.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100930/fd5542b7/attachment.ksh>
^ permalink raw reply
* [Buildroot] [PATCH 3/4] Create menu entry to select device creation method
From: Yegor Yefremov @ 2010-09-30 12:57 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA32E7B.4000506@visionsystems.de>
Create menu entry to select device creation method:
- static method uses device table as before
- devtmpfs method enables this feature in kernel
- mdev method adds mdev starting script to the file system
and selects mdev itself for installation
- udev method selects udev for installation
All dynamic methods are base on devtmpfs, so one doesn't
need to care about /dev folder.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Index: b/fs/Config.in
===================================================================
--- a/fs/Config.in 2010-09-30 14:52:42.000000000 +0200
+++ b/fs/Config.in 2010-09-30 14:54:12.000000000 +0200
@@ -15,13 +15,34 @@
only argument. Make sure the exit code of that script is 0,
otherwise make will stop after calling it.
+choice
+ prompt "/dev management"
+ default BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+config BR2_ROOTFS_DEVICE_CREATION_STATIC
+ bool "Static using device table"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
+ bool "Dynamic using devtmpfs only"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
+ bool "Dynamic using mdev"
+ select BR2_PACKAGE_BUSYBOX
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+ bool "Dynamic using udev"
+ select BR2_PACKAGE_UDEV
+
+endchoice
+
config BR2_ROOTFS_DEVICE_TABLE
- string "Path to the device table"
- default "target/generic/device_table.txt"
- help
- Specify the location of a device table, that will be passed
- to the makedevs utility to create all the special device
- files in the target filesystem.
+ string "Path to the device table"
+ depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
+ default "target/generic/device_table.txt"
+ help
+ Specify the location of a device table, that will be passed
+ to the makedevs utility to create all the special device
+ files in the target filesystem.
choice
prompt "Root FS skeleton"
Index: b/package/busybox/S10mdev
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/package/busybox/S10mdev 2010-09-30 14:54:12.000000000 +0200
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Start mdev....
+#
+
+case "$1" in
+ start)
+ echo "Starting mdev..."
+ /sbin/mdev -s
+ ;;
+ stop)
+ ;;
+ restart|reload)
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $?
+
+
Index: b/package/busybox/busybox.mk
===================================================================
--- a/package/busybox/busybox.mk 2010-09-30 14:52:43.000000000 +0200
+++ b/package/busybox/busybox.mk 2010-09-30 14:54:12.000000000 +0200
@@ -20,6 +20,19 @@
BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
endif
+# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
+define BUSYBOX_INSTALL_MDEV_SCRIPT
+ install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
+endef
+define BUSYBOX_SET_MDEV
+ $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
# If we have external syslogd, force busybox to use it
ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
define BUSYBOX_SET_SYSKLOGD
@@ -114,6 +127,7 @@
$(BUSYBOX_SET_IPV6)
$(BUSYBOX_SET_RPC)
$(BUSYBOX_PREFER_STATIC)
+ $(BUSYBOX_SET_MDEV)
$(BUSYBOX_NETKITBASE)
$(BUSYBOX_NETKITTELNET)
@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -142,6 +156,7 @@
define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_INSTALL_BINARY)
-chmod a+rx $(TARGET_DIR)/usr/share/udhcpc/default.script
+ $(BUSYBOX_INSTALL_MDEV_SCRIPT)
endef
define BUSYBOX_UNINSTALL_TARGET_CMDS
Index: b/linux/linux.mk
===================================================================
--- a/linux/linux.mk 2010-09-30 14:52:54.000000000 +0200
+++ b/linux/linux.mk 2010-09-30 14:54:12.000000000 +0200
@@ -109,6 +109,13 @@
$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
endif
+ifneq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)
+endif
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
+ $(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
+endif
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
$(Q)touch $@
^ permalink raw reply
* [Buildroot] [pull request] Pull request for branch for-2010.11/remove-deprecated-arch
From: Peter Korsgaard @ 2010-09-30 12:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1283334416.git.thomas.petazzoni@free-electrons.com>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit 4973632207fd496199298191ada01c8c8ec2bee7:
Thomas> Yann E. MORIN (1):
Thomas> packages/atk: fix Makefile
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot for-2010.11/remove-deprecated-arch
Pulled and pushed, thanks - And sorry for the slow response.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] CHANGES: alpha/cris/ia64/sparc64 support removed
From: Peter Korsgaard @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=9f36bd4976ce4fe0e108611ac82a694e434b1b7c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CHANGES b/CHANGES
index fad49f6..5910bb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,8 @@
A convenience Makefile wrapper is created when using
out-of-tree building, similar to how it is done for the kernel.
+ Alpha, Cris, IA64 and Sparc64 architecture support removed.
+
New packages: xz
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] Remove code specific to removed architectures
From: Thomas Petazzoni @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=97d8618c6cc2970ea5870ae214344b3bff083883
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/jffs2/Config.in | 4 ++--
package/liboil/liboil.mk | 3 ---
package/ltrace/Config.in | 2 +-
package/openssl/openssl.mk | 3 ---
toolchain/gcc/Config.in | 2 +-
toolchain/toolchain-common.in | 1 -
6 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index b787ec9..de13768 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -95,10 +95,10 @@ config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
choice
prompt "Endianess"
- default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_alpha || BR2_armeb || \
+ default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_armeb || \
BR2_avr32 || BR2_m68k || BR2_mips || \
BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
- BR2_sh3eb || BR2_sh4eb || BR2_sparc || BR2_sparc64
+ BR2_sh3eb || BR2_sh4eb || BR2_sparc
config BR2_TARGET_ROOTFS_JFFS2_LE
bool "little-endian"
diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk
index 1bb412f..44017be 100644
--- a/package/liboil/liboil.mk
+++ b/package/liboil/liboil.mk
@@ -16,9 +16,6 @@ LIBOIL_INSTALL_TARGET = YES
ifeq ($(BR2_avr32),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=no
endif
-ifeq ($(BR2_cris),y)
-LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
-endif
ifeq ($(BR2_x86_64),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
endif
diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 10a0e0a..9e71d82 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LTRACE
bool "ltrace"
- depends on !(BR2_avr32 || BR2_cris || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
+ depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
select BR2_PACKAGE_LIBELF
help
Debugging program which runs a specified command until it exits.
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index edbfe8b..22b14f2 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -11,9 +11,6 @@ OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH=generic32
# Some architectures are optimized in OpenSSL
-ifeq ($(ARCH),ia64)
-OPENSSL_TARGET_ARCH=ia64
-endif
ifeq ($(ARCH),powerpc)
OPENSSL_TARGET_ARCH=ppc
endif
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 70d8de9..760bb98 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -93,7 +93,7 @@ config BR2_GCC_SHARED_LIBGCC
bool "Build/install a shared libgcc?"
depends on !BR2_PREFER_STATIC_LIB
default y
- depends on !BR2_sparc && !BR2_sparc64
+ depends on !BR2_sparc
help
Build/install a shared libgcc library
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index ea06ace..f67c30a 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -9,7 +9,6 @@ comment "Common Toolchain Options"
config BR2_LARGEFILE
bool "Enable large file (files > 2 GB) support?"
- depends on !BR2_cris
help
If you are building your own toolchain and you want to
support files larger than 2GB then enable this option.
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] Remove architectures marked as deprecated
From: Thomas Petazzoni @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=343f480fe2647febe7fc713722d1131242ba20e3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The Alpha, CRIS, IA64 and Sparc64 architectures have been marked as
deprecated during the previous release cycle. They are not widely used
in embedded systems and/or no longer supported by their manufacturers
and/or not properly supported in Buildroot.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Patch is too large, so refusing to show it
^ permalink raw reply
* [Buildroot] [git commit master 1/1] cvs: convert to autotargets
From: Martin Banky @ 2010-09-30 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=82ab8b3b31b968b11f1e26bd52a63c127d6182cf
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: no strip, remove _BINARY vars]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/cvs/cvs.mk | 91 ++++++++++++++-------------------------------------
2 files changed, 26 insertions(+), 67 deletions(-)
diff --git a/CHANGES b/CHANGES
index cf85b85..fad49f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,7 +22,7 @@
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
- bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
+ bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index e0f97ec..023e93b 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -3,16 +3,15 @@
# cvs
#
#############################################################
-CVS_VERSION:=1.12.13
-CVS_SOURCE:=cvs_$(CVS_VERSION).orig.tar.gz
-CVS_PATCH:=cvs_$(CVS_VERSION)-8.diff.gz
-CVS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/
-CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VERSION)
-CVS_CAT:=$(ZCAT)
-CVS_BINARY:=src/cvs
-CVS_TARGET_BINARY:=usr/bin/cvs
+CVS_VERSION = 1.12.13
+CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz
+CVS_PATCH = cvs_$(CVS_VERSION)-12.diff.gz
+CVS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/
+CVS_DEPENDENCIES = ncurses
-CVS_CONFIGURE_ARGS:=--disable-old-info-format-support
+CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes
+
+CVS_CONFIGURE_ARGS=--disable-old-info-format-support
ifeq ($(BR2_PACKAGE_CVS_SERVER),y)
CVS_CONFIGURE_ARGS+=--enable-server
else
@@ -22,73 +21,33 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
CVS_CONFIGURE_ARGS+=--with-external-zlib
endif
-$(DL_DIR)/$(CVS_SOURCE):
- $(call DOWNLOAD,$(CVS_SITE),$(CVS_SOURCE))
+CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS)
-ifneq ($(CVS_PATCH),)
-CVS_PATCH_FILE=$(DL_DIR)/$(CVS_PATCH)
-$(CVS_PATCH_FILE):
- $(call DOWNLOAD,$(CVS_SITE),$(CVS_PATCH))
-endif
-cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
+define CVS_BZIP_UNPACK
+ $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2
+endef
+
+CVS_POST_PATCH_HOOKS += CVS_BZIP_UNPACK
-$(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
- -mkdir $(CVS_DIR)
- $(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(CVS_DIR) $(TAR_OPTIONS) -
- $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION)
- $(CONFIG_UPDATE) $(CVS_DIR)
- $(CONFIG_UPDATE) $(CVS_DIR)/build-aux
- toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch
ifneq ($(CVS_PATCH),)
- toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH)
- if [ -d $(CVS_DIR)/debian/patches ]; then \
- (cd $(CVS_DIR)/debian/patches && for i in *; \
+define CVS_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ (cd $(@D)/debian/patches && for i in *; \
do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
done; \
); \
- toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \*; \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
fi
+endef
endif
- touch $@
-
-$(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked
- (cd $(CVS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- cvs_cv_func_printf_ptr=yes \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_NLS) \
- $(CVS_CONFIGURE_ARGS) \
- )
- touch $@
-
-$(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured
- $(MAKE) -C $(CVS_DIR)
-$(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY)
- install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+CVS_POST_PATCH_HOOKS += CVS_DEBIAN_PATCHES
-cvs: ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+define CVS_INSTALL_TARGET_CMDS
+ install -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs
+endef
-cvs-clean:
- -$(MAKE) -C $(CVS_DIR) clean
- rm -f $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+$(eval $(call AUTOTARGETS,package,cvs))
-cvs-dirclean:
- rm -rf $(CVS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CVS),y)
-TARGETS+=cvs
-endif
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] Makefile: Force make to run serially in the top-level Makefile
From: Peter Korsgaard @ 2010-09-30 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d487168c711388efbe8185e94e2690bdf7cd5b4a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The top-level Makefile can be executed in parallel, as it causes problems.
We can force make to be not parallel.
It's been reported many times, and recent discussions on IRC with kos_tom,
and user nick-named knee, led to this patch.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index aab346e..9c2e6af 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# This top-level Makefile can *not* be executed in parallel
+.NOTPARALLEL:
+
#--------------------------------------------------------------
# Just run 'make menuconfig', configure stuff, then run 'make'.
# You shouldn't need to mess with anything beyond this point...
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] Makefile: Force make to run serially in the top-level Makefile
From: Peter Korsgaard @ 2010-09-30 12:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285710658-17096-1-git-send-email-yann.morin.1998@anciens.enib.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:
Yann> The top-level Makefile can be executed in parallel, as it causes problems.
Yann> We can force make to be not parallel.
Yann> It's been reported many times, and recent discussions on IRC with kos_tom,
Yann> and user nick-named knee, led to this patch.
Cool, I didn't know .NOTPARALLEL - Thanks, committed.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 1/3] libgtk2: bump to version 2.20.1 and mark Gtk/DirectFB as broken
From: Peter Korsgaard @ 2010-09-30 12:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20100929082914.3185053a@surf>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> On Wed, 29 Sep 2010 01:28:40 +0200
Thomas> Lionel Landwerlin <llandwerlin@gmail.com> wrote:
>> Gtk+ 2.22 has been released early this week, it brings back
>> compiling/quite-good-working DirectFB backend.
>>
>> Would you consider bumping to 2.22 ?
Thomas> Argh, I checked http://www.gtk.org/download-linux.html yesterday, and
Thomas> it still advertise Gtk 2.20 and Glib 2.24.
Thomas> I will bump those versions, yes, and mark the DirectFB support as
Thomas> working again.
Ok, I'll put your pull request on hold for now then. Please resend once
ready.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 06/18] cvs: convert to autotargets
From: Peter Korsgaard @ 2010-09-30 12:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-6-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] CONFIG_BLK_DEV_INITRD deactivated on automatic build
From: Dennis Borgmann @ 2010-09-30 11:23 UTC (permalink / raw)
To: buildroot
Hello buildroot-list!
First of all - thank you for the work done for this project. It is
awesome and I really like it. Straightforward and quick to use.
I think, I found a bug. If you download buildroot and start configuring
your project with "make menuconfig" and after that configure the kernel
with "make linux26-menuconfig", everything seems to be ok. I did give it
a custom kernel-config named "/tmp/config-2.6.34".
After running "make", everything seems to be ok, but the resulting
kernel does not contain the option "CONFIG_BLK_DEV_INITRD". I need to
manually do a "make linux26-menuconfig" again and rebuild the kernel for
the resulting kernel to contain this option.
This was a really silly thing to find, took me around one week, because
you wouldn't think of such a mistake. Could it be, that this is a bug? I
am using buildroot-2010.08.
Kind regards,
Dennis
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox