[Buildroot] [pull request] Pull request for branch for-2012.05/packages

[Buildroot] [pull request] Pull request for branch for-2012.05/packages

[Maxime Ripard]

The following changes since commit e1443db85bc7dc2a863c4bbfdf6fe777f390ad70:

  kernel-headers: bump 3.{0,2,3}.x stable versions (2012-04-02 23:46:55 +0200)

are available in the git repository at:
  git://git.free-electrons.com/users/maxime-ripard/buildroot.git for-2012.05/packages

Maxime Ripard (4):
      Convert tinyhttpd to gentargets
      Bump version of ltrace
      Fix libpng url
      Fix installation of socketcand

 package/libpng/libpng.mk                           |    2 +-
 package/ltrace/ltrace-0.5.3-configure-fixes.patch  |  128 --------------------
 package/ltrace/ltrace-0.5.3-susv3-legacy.patch     |   20 ---
 ...nning-in-ARM-arch_-dis-en-able_breakpoint.patch |   67 ++++++++++
 package/ltrace/ltrace.mk                           |   40 +------
 .../socketcand-replace-cp-by-install.patch         |   25 ++++
 package/tinyhttpd/tinyhttpd.mk                     |   58 ++-------
 7 files changed, 111 insertions(+), 229 deletions(-)
 delete mode 100644 package/ltrace/ltrace-0.5.3-configure-fixes.patch
 delete mode 100644 package/ltrace/ltrace-0.5.3-susv3-legacy.patch
 create mode 100644 package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
 create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch

Thanks,
-- 
Maxime Ripard

[Buildroot] [PATCH 1/4] Convert tinyhttpd to gentargets

[Maxime Ripard]

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 package/tinyhttpd/tinyhttpd.mk |   58 +++++++++-------------------------------
 1 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 0f95d06..95b624e 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -3,54 +3,22 @@
 # tinyhttpd
 #
 #############################################################
-TINYHTTPD_VER:=0.1.0
-TINYHTTPD_SOURCE:=tinyhttpd-$(TINYHTTPD_VER).tar.gz
-TINYHTTPD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/$(TINYHTTPD_SOURCE)
-TINYHTTPD_DIR:=$(BUILD_DIR)/tinyhttpd-$(TINYHTTPD_VER)
-TINYHTTPD_CAT:=$(ZCAT)
-TINYHTTPD_BINARY:=httpd
-TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd
+TINYHTTPD_VERSION := 0.1.0
+TINYHTTPD_SITE := http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/
 
-$(DL_DIR)/$(TINYHTTPD_SOURCE):
-	 $(call DOWNLOAD,$(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE))
+define TINYHTTPD_BUILD_CMDS
+		$(MAKE1) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" httpd
+endef
 
-tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
-
-#############################################################
-#
-# build tinyhttpd for use on the target system
-#
-#############################################################
-$(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
-	$(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
-	touch $(TINYHTTPD_DIR)/.unpacked
-
-$(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) -C $(TINYHTTPD_DIR)
-
-$(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY)
-	$(INSTALL) -m 0755 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
+define TINYHTTPD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(@D)/httpd $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d
 	mkdir -p $(TARGET_DIR)/var/www
+endef
 
-tinyhttpd: $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
+define TINYHTTPD_CLEAN_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/httpd
+	rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
+endef
 
-tinyhttpd-clean:
-	-$(MAKE) -C $(TINYHTTPD_DIR) clean
-	@rm -f $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-	@rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
-	@rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/var/www
-
-tinyhttpd-dirclean:
-	rm -rf $(TINYHTTPD_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_TINYHTTPD),y)
-TARGETS+=tinyhttpd
-endif
+$(eval $(call GENTARGETS))
-- 
1.7.5.4

[Buildroot] [PATCH 2/4] Bump version of ltrace

[Maxime Ripard]

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 package/ltrace/ltrace-0.5.3-configure-fixes.patch  |  128 --------------------
 package/ltrace/ltrace-0.5.3-susv3-legacy.patch     |   20 ---
 ...nning-in-ARM-arch_-dis-en-able_breakpoint.patch |   67 ++++++++++
 package/ltrace/ltrace.mk                           |   40 +------
 4 files changed, 72 insertions(+), 183 deletions(-)
 delete mode 100644 package/ltrace/ltrace-0.5.3-configure-fixes.patch
 delete mode 100644 package/ltrace/ltrace-0.5.3-susv3-legacy.patch
 create mode 100644 package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch

diff --git a/package/ltrace/ltrace-0.5.3-configure-fixes.patch b/package/ltrace/ltrace-0.5.3-configure-fixes.patch
deleted file mode 100644
index 8d95883..0000000
--- a/package/ltrace/ltrace-0.5.3-configure-fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Fix several issues with the configure script:
-
- * Allow option values to contains equal signs, like
-   CC="/foo/arm-linux-gcc --sysroot=/foobar/usr"
-
- * Parse the option before doing the tests so that CC/CFLAGS can be
-   used during the tests.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure |   72 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 37 insertions(+), 35 deletions(-)
-
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3.orig/configure
-+++ ltrace-0.5.3/configure
-@@ -6,6 +6,38 @@
-   exit 1
- fi
- 
-+CC=gcc
-+CPPFLAGS=' -I /usr/include/libelf'
-+CFLAGS='-g -O2'
-+LIBS='-lelf '
-+INSTALL='/usr/bin/install -c'
-+iquote='-iquote '
-+iquoteend=''
-+
-+prefix=/usr/local
-+sysconfdir='${prefix}/etc'
-+bindir='${prefix}/bin'
-+mandir='${prefix}/share/man'
-+docdir='${prefix}/share/doc/ltrace'
-+for x_option
-+do
-+  if test -n "$x_prev"; then
-+    eval $x_prev=\$x_option
-+    x_prev=
-+    continue
-+  fi
-+  case $x_option in
-+    --*=* | *=*)
-+      x_var=`echo $x_option | sed 's/^--//' | sed 's/=.*//'`
-+      x_val=`echo $x_option | sed 's/^[^=]*=//'`
-+      eval $x_var=\"$x_val\"
-+      ;;
-+    --*)
-+      x_prev=`echo $x_option | sed 's/^--//'`
-+      ;;
-+  esac
-+done
-+
- echo -n "checking package name... "
- PACKAGE_NAME='ltrace'
- echo $PACKAGE_NAME
-@@ -30,9 +62,10 @@
-   return cplus_demangle();
- }
- EOF
--if gcc conftest.c -liberty 2>/dev/null
-+if $CC $CFLAGS conftest.c -liberty 2>/dev/null
- then
-   HAVE_LIBIBERTY=1
-+  LIBS="$LIBS -liberty"
-   echo "yes"
- else
-   unset HAVE_LIBIBERTY
-@@ -48,9 +81,10 @@
-   return __cxa_demangle();
- }
- EOF
--if gcc conftest.c -lsupc++ 2>/dev/null
-+if $CC $CFLAGS conftest.c -lsupc++ 2>/dev/null
- then
-   HAVE_LIBSUPC__=1
-+  LIBS="$LIBS -lsupc++"
-   echo "yes"
- else
-   unset HAVE_LIBSUPC__
-@@ -67,7 +101,7 @@
-   return 0;
- }
- EOF
--if gcc conftest.c 2>/dev/null
-+if $CC $CFLAGS conftest.c 2>/dev/null
- then
-   HAVE_ELF_C_READ_MMAP=1
-   echo "yes"
-@@ -77,38 +111,6 @@
- fi
- rm -f conftest.c a.out
- 
--CC=gcc
--CPPFLAGS=' -I /usr/include/libelf'
--CFLAGS='-g -O2'
--LIBS='-lelf -lsupc++ -liberty '
--INSTALL='/usr/bin/install -c'
--iquote='-iquote '
--iquoteend=''
--
--prefix=/usr/local
--sysconfdir='${prefix}/etc'
--bindir='${prefix}/bin'
--mandir='${prefix}/share/man'
--docdir='${prefix}/share/doc/ltrace'
--for x_option
--do
--  if test -n "$x_prev"; then
--    eval $x_prev=\$x_option
--    x_prev=
--    continue
--  fi
--  case $x_option in
--    --*=* | *=*)
--      x_var=`echo $x_option | sed 's/^--//' | sed 's/=.*//'`
--      x_val=`echo $x_option | sed 's/^.*=//'`
--      eval $x_var=$x_val
--      ;;
--    --*)
--      x_prev=`echo $x_option | sed 's/^--//'`
--      ;;
--  esac
--done
--
- echo "configure: creating Makefile"
- #
- # Makefile.in -> Makefile
diff --git a/package/ltrace/ltrace-0.5.3-susv3-legacy.patch b/package/ltrace/ltrace-0.5.3-susv3-legacy.patch
deleted file mode 100644
index 4c9bb8a..0000000
--- a/package/ltrace/ltrace-0.5.3-susv3-legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use the strchr() function instead of the legacy index() function.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- read_config_file.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ltrace-0.5.3/read_config_file.c
-===================================================================
---- ltrace-0.5.3.orig/read_config_file.c
-+++ ltrace-0.5.3/read_config_file.c
-@@ -83,7 +83,7 @@
- 
- 	while (tmp->name) {
- 		if (!strncmp(*str, tmp->name, strlen(tmp->name))
--				&& index(" ,()#*;012345[", *(*str + strlen(tmp->name)))) {
-+				&& strchr(" ,()#*;012345[", *(*str + strlen(tmp->name)))) {
- 			*str += strlen(tmp->name);
- 			return lookup_prototype(tmp->pt);
- 		}
diff --git a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
new file mode 100644
index 0000000..c005932
--- /dev/null
+++ b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
@@ -0,0 +1,67 @@
+From c46448f4e5a4c124fbc75ca9b14697212e676893 Mon Sep 17 00:00:00 2001
+From: Michael K. Edwards <m.k.edwards@gmail.com>
+Date: Mon, 7 Mar 2011 16:15:48 +0000
+Subject: [PATCH] fix type punning in ARM arch_(dis|en)able_breakpoint
+
+---
+ sysdeps/linux-gnu/arm/breakpoint.c |   26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/sysdeps/linux-gnu/arm/breakpoint.c b/sysdeps/linux-gnu/arm/breakpoint.c
+index 4a5ab92..4e17940 100644
+--- a/sysdeps/linux-gnu/arm/breakpoint.c
++++ b/sysdeps/linux-gnu/arm/breakpoint.c
+@@ -35,10 +35,15 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
+ 	debug(1, "arch_enable_breakpoint(%d,%p)", pid, sbp->addr);
+ 
+ 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
+-		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+-		unsigned char *bytes = (unsigned char *)&a;
++		union _ { long l; unsigned char b[SIZEOF_LONG]; };
++		union _ orig, current;
++		unsigned char *bytes = current.b;
++		for (j = 0; j < sizeof(long); j++) {
++			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
++		}
++		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+ 
+-		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
++		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
+ 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
+ 
+ 			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
+@@ -49,7 +54,7 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
+ 				bytes[j] = thumb_break_insn[i * sizeof(long) + j];
+ 			}
+ 		}
+-		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
++		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
+ 	}
+ }
+ 
+@@ -60,13 +65,18 @@ arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
+ 	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
+ 
+ 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
+-		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+-		unsigned char *bytes = (unsigned char *)&a;
++		union _ { long l; unsigned char b[SIZEOF_LONG]; };
++		union _ orig, current;
++		unsigned char *bytes = current.b;
++		for (j = 0; j < sizeof(long); j++) {
++			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
++		}
++		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+ 
+-		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
++		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
+ 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
+ 			bytes[j] = sbp->orig_value[i * sizeof(long) + j];
+ 		}
+-		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
++		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
+ 	}
+ }
+-- 
+1.7.4.1
+
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 23094c8..8c0a145 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -3,40 +3,10 @@
 # ltrace
 #
 #############################################################
-LTRACE_VERSION      = 0.5.3
-LTRACE_SOURCE       = ltrace_$(LTRACE_VERSION).orig.tar.gz
-LTRACE_PATCH        = ltrace_$(LTRACE_VERSION)-2.1.diff.gz
-LTRACE_SITE         = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/ltrace
-LTRACE_MAKE         = $(MAKE1)
+LTRACE_VERSION      = 0.6.0
+LTRACE_SITE         = git://anonscm.debian.org/collab-maint/ltrace.git
 LTRACE_DEPENDENCIES = libelf
+LTRACE_AUTORECONF   = YES
+LTRACE_CONF_OPT     += --disable-werror
 
-# ltrace uses arch=ppc for powerpc
-LTRACE_ARCH:=$(KERNEL_ARCH:powerpc=ppc)
-ifeq ("$(strip $(ARCH))","armeb")
-LTRACE_ARCH:=arm
-endif
-
-define LTRACE_CONFIGURE_CMDS
-	(cd $(@D) ; ./configure 		\
-		--prefix=/usr			\
-		CC='$(TARGET_CC)' 		\
-		CFLAGS='$(TARGET_CFLAGS)')
-endef
-
-define LTRACE_BUILD_CMDS
-	$(MAKE) -C $(@D) ARCH=$(LTRACE_ARCH)
-endef
-
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-define LTRACE_INSTALL_DOCUMENTATION
-	$(INSTALL) -D $(@D)/ltrace.1 \
-		$(TARGET_DIR)/usr/share/man/man1/ltrace.1
-endef
-endif
-
-define LTRACE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/ltrace $(TARGET_DIR)/usr/bin
-	$(LTRACE_INSTALL_DOCUMENTATION)
-endef
-
-$(eval $(call GENTARGETS))
+$(eval $(call AUTOTARGETS))
-- 
1.7.5.4

[Buildroot] [PATCH 3/4] Fix libpng url

[Maxime Ripard]

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 package/libpng/libpng.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 19d2a71..0d6a008 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -6,7 +6,7 @@
 
 LIBPNG_VERSION = 1.4.10
 LIBPNG_SERIES = 14
-LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
+LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/older-releases/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkg-config zlib
-- 
1.7.5.4

[Buildroot] [PATCH 4/4] Fix installation of socketcand

[Maxime Ripard]

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 .../socketcand-replace-cp-by-install.patch         |   25 ++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch

diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
new file mode 100644
index 0000000..d66ed71
--- /dev/null
+++ b/package/socketcand/socketcand-replace-cp-by-install.patch
@@ -0,0 +1,25 @@
+From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 3 Apr 2012 10:35:09 +0200
+Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 40d8193..290a8dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,6 +38,6 @@ install: socketcand
+ 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)
+ 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
+ 	mkdir -p $(DESTDIR)$(sysroot)/etc/
+-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
++	install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
+ 	if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi
+ 	if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi
+-- 
+1.7.4.1
+
-- 
1.7.5.4

[Buildroot] [PATCH 4/4] Fix installation of socketcand

[Yegor Yefremov]

On Tue, Apr 3, 2012 at 10:55 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> ?.../socketcand-replace-cp-by-install.patch ? ? ? ? | ? 25 ++++++++++++++++++++
> ?1 files changed, 25 insertions(+), 0 deletions(-)
> ?create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch
>
> diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
> new file mode 100644
> index 0000000..d66ed71
> --- /dev/null
> +++ b/package/socketcand/socketcand-replace-cp-by-install.patch
> @@ -0,0 +1,25 @@
> +From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
> +From: Maxime Ripard <maxime.ripard@free-electrons.com>
> +Date: Tue, 3 Apr 2012 10:35:09 +0200
> +Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
> +
> +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> +---
> + Makefile.in | ? ?2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index 40d8193..290a8dd 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -38,6 +38,6 @@ install: socketcand
> + ? ? ? mkdir -p $(DESTDIR)$(sysroot)$(mandir)
> + ? ? ? cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
> + ? ? ? mkdir -p $(DESTDIR)$(sysroot)/etc/
> +- ? ? ?cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
> ++ ? ? ?install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
> + ? ? ? if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi
> + ? ? ? if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi
> +--
> +1.7.4.1
> +
> --
> 1.7.5.4

I've forwarded the patch to the maintainer. Let us apply it by now.

Yegor

[Buildroot] [PATCH 1/4] Convert tinyhttpd to gentargets

[Peter Korsgaard]

>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks, committed with minor changes (see below).

 Maxime> -TINYHTTPD_BINARY:=httpd
 Maxime> -TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd
 Maxime> +TINYHTTPD_VERSION := 0.1.0
 Maxime> +TINYHTTPD_SITE := http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/

We normally use '=' instead of ':=' for these.

 
 Maxime> -$(DL_DIR)/$(TINYHTTPD_SOURCE):
 Maxime> -	 $(call DOWNLOAD,$(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE))
 Maxime> +define TINYHTTPD_BUILD_CMDS
 Maxime> +		$(MAKE1) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" httpd

A few comments:
 - We normally break long lines like this
 - Makefile is very simple, with a single step so MAKE1 isn't needed
 - Default target builds httpd, so the final 'httpd' isn't needed.

 Maxime> +define TINYHTTPD_INSTALL_TARGET_CMDS
 Maxime> +	$(INSTALL) -m 0755 $(@D)/httpd $(TARGET_DIR)/usr/sbin/
 Maxime>  	$(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d
 Maxime>  	mkdir -p $(TARGET_DIR)/var/www
 Maxime> +endef

Please use install -D.
 

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/4] Fix libpng url

[Peter Korsgaard]

>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

I believe this is obsolete now the png version is bumped.

 Maxime> ---
 Maxime>  package/libpng/libpng.mk |    2 +-
 Maxime>  1 files changed, 1 insertions(+), 1 deletions(-)

 Maxime> diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
 Maxime> index 19d2a71..0d6a008 100644
 Maxime> --- a/package/libpng/libpng.mk
 Maxime> +++ b/package/libpng/libpng.mk
 Maxime> @@ -6,7 +6,7 @@
 
 Maxime>  LIBPNG_VERSION = 1.4.10
 Maxime>  LIBPNG_SERIES = 14
 Maxime> -LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 Maxime> +LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/older-releases/$(LIBPNG_VERSION)
 Maxime>  LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
 Maxime>  LIBPNG_INSTALL_STAGING = YES
 Maxime>  LIBPNG_DEPENDENCIES = host-pkg-config zlib
 Maxime> -- 
 Maxime> 1.7.5.4

 Maxime> _______________________________________________
 Maxime> buildroot mailing list
 Maxime> buildroot at busybox.net
 Maxime> http://lists.busybox.net/mailman/listinfo/buildroot


-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/4] Fix installation of socketcand

[Peter Korsgaard]

>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> ---
 Maxime>  .../socketcand-replace-cp-by-install.patch         |   25 ++++++++++++++++++++
 Maxime>  1 files changed, 25 insertions(+), 0 deletions(-)
 Maxime>  create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch

 Maxime> diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
 Maxime> new file mode 100644
 Maxime> index 0000000..d66ed71
 Maxime> --- /dev/null
 Maxime> +++ b/package/socketcand/socketcand-replace-cp-by-install.patch
 Maxime> @@ -0,0 +1,25 @@
 Maxime> +From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
 Maxime> +From: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> +Date: Tue, 3 Apr 2012 10:35:09 +0200
 Maxime> +Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
 Maxime> +
 Maxime> +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> +---
 Maxime> + Makefile.in |    2 +-
 Maxime> + 1 files changed, 1 insertions(+), 1 deletions(-)
 Maxime> +
 Maxime> +diff --git a/Makefile.in b/Makefile.in
 Maxime> +index 40d8193..290a8dd 100644
 Maxime> +--- a/Makefile.in
 Maxime> ++++ b/Makefile.in
 Maxime> +@@ -38,6 +38,6 @@ install: socketcand
 Maxime> + 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)
 Maxime> + 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
 Maxime> + 	mkdir -p $(DESTDIR)$(sysroot)/etc/
 Maxime> +-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
 Maxime> ++	install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/

install -D requires you to pass the full destination file name, but as
we have a mkdir -p ../etc just above, we can drop the -D option. It
would be good to add -m 0644 to not get the configuration file
executable though, so I adjusted the patch to do that.

Committed with that change, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/4] Bump version of ltrace

[Peter Korsgaard]

>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard