Skip to contentSkip to conversation

e2fsprogs: bump to 1.41.14 and fixup

PATCH New Gustavo Zacarias 2 participants 30 messages Jan 7, 2011 – Feb 9, 2011

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/13 e2fsprogs: bump to 1.41.14 and fixup

Bump e2fsprogs to version 1.41.14

Also export libblkid properly for util-linux to use.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/e2fsprogs/e2fsprogs.mk |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)
package/e2fsprogs/e2fsprogs.mk +13 -7
index f525804..13c94ba 100644
@@ -3,15 +3,10 @@
 # e2fsprogs
 #
 #############################################################
-E2FSPROGS_VERSION:=1.41.12
-E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
-E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
-
-E2FSPROGS_AUTORECONF = NO
-E2FSPROGS_LIBTOOL_PATCH = NO
 
+E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 E2FSPROGS_INSTALL_STAGING = YES
-E2FSPROGS_INSTALL_TARGET = YES
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \

@@ -118,5 +113,16 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y)
 E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL
 endif
 
+define E2FSPROGS_STAGING_LIBBLKID_INSTALL
+	install -D $(@D)/lib/blkid/blkid.h \
+		$(STAGING_DIR)/usr/include/blkid/blkid.h
+	install -D $(@D)/lib/blkid/blkid_types.h \
+		$(STAGING_DIR)/usr/include/blkid/blkid_types.h
+endef
+
+ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBBLKID),y)
+E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBBLKID_INSTALL
+endif
+
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
 $(eval $(call AUTOTARGETS,package,e2fsprogs,host))
Signature · 1 line
1.7.2.2
author
#1 lore raw

PATCH 2/13 util-linux: convert to autotargets and bump to 2.18

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/util-linux/Config.in                       |   12 +-
 ...linux-2.13-pre17-hardcode-a-out-constants.patch |   41 --
 package/util-linux/util-linux-libmount.patch       |   20 +
 package/util-linux/util-linux-susv3-legacy.patch   |  429 --------------------
 package/util-linux/util-linux-umount2-fix.patch    |   20 -
 package/util-linux/util-linux.mk                   |  120 ++----
 6 files changed, 63 insertions(+), 579 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-libmount.patch
 delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch
 delete mode 100644 package/util-linux/util-linux-umount2-fix.patch
package/util-linux/Config.in +8 -4
index 434dae9..4e3287e 100644
@@ -1,8 +1,12 @@
-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
-	depends on BR2_INET_RPC
+	select BR2_PACKAGE_E2FSPROGS if BR2_LARGEFILE
+	select BR2_PACKAGE_E2FSPROGS_LIBBLKID if BR2_LARGEFILE
+	select BR2_PACKAGE_E2FSPROGS_LIBUUID if BR2_LARGEFILE
+	depends on BR2_PROGRAM_INVOCATION
+	depends on BR2_USE_WCHAR
 	help
 	  Various useful/essential Linux utilities.
 

@@ -10,5 +14,5 @@ config BR2_PACKAGE_UTIL-LINUX
 
 	  http://www.kernel.org/pub/linux/utils/util-linux/
 
-comment "util-linux requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC
+comment "util-linux requires a toolchain with PROGRAM_INVOCATION and WCHAR support"
+	depends on !(BR2_PROGRAM_INVOCATION && BR2_USE_WCHAR)
package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch deleted +0 -41

41 lines not on this page · raw message

package/util-linux/util-linux-libmount.patch new file +20 -0
new file mode 100644
index 0000000..3cf9f9b
@@ -0,0 +1,20 @@
+We need to disable libmount's check for --enable-libblkid otherwise
+it assumes we've got nothing even if we're using an external libblkid.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura util-linux-ng-2.18.orig/configure.ac util-linux-ng-2.18/configure.ac
+--- util-linux-ng-2.18.orig/configure.ac	2010-06-30 09:52:31.000000000 -0300
++++ util-linux-ng-2.18/configure.ac	2011-01-07 12:09:17.457043328 -0300
+@@ -406,11 +406,6 @@
+   [], enable_libmount=yes
+ )
+ 
+-case "$enable_libblkid:$enable_libmount" in
+-no:yes)
+-  AC_MSG_ERROR([cannot enable libmount when libblkid is disabled]) ;;
+-esac
+-
+ AC_SUBST([LIBMOUNT_VERSION])
+ AC_SUBST([LIBMOUNT_VERSION_INFO])
+ AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
package/util-linux/util-linux-susv3-legacy.patch deleted +0 -429

429 lines not on this page · raw message

package/util-linux/util-linux-umount2-fix.patch deleted +0 -20
deleted file mode 100644
index 14b6c34..0000000
@@ -1,20 +0,0 @@
-[PATCH] fix multiple definitions of umount2 issue
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- 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 */
package/util-linux/util-linux.mk +35 -85

135 lines not on this page · raw message

Signature · 1 line
1.7.2.2
#2 lore raw

PATCH 2/13 util-linux: convert to autotargets and bump to 2.18

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Gustavo> +++ b/package/util-linux/Config.in
Gustavo> @@ -1,8 +1,12 @@
Gustavo> -config BR2_PACKAGE_UTIL-LINUX
Gustavo> +config BR2_PACKAGE_UTIL_LINUX

 Gustavo>  	bool "util-linux"
 Gustavo>  	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 Gustavo>  	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE

Gustavo> - depends on BR2_INET_RPC
Gustavo> + select BR2_PACKAGE_E2FSPROGS if BR2_LARGEFILE
Gustavo> + select BR2_PACKAGE_E2FSPROGS_LIBBLKID if BR2_LARGEFILE
Gustavo> + select BR2_PACKAGE_E2FSPROGS_LIBUUID if BR2_LARGEFILE
Gustavo> + depends on BR2_PROGRAM_INVOCATION
Gustavo> + depends on BR2_USE_WCHAR
Gustavo> help
Gustavo> Various useful/essential Linux utilities.

I think it would be good to mention to the user that he's not getting mount+fsck if he doesn't enable LARGEFILE, E.G.:

+comment "mount and fsck requires a toolchain with LARGEFILE support"
+ depends on BR2_PACKAGE_UTIL_LINUX && !BR2_LARGEFILE

Gustavo> +++ b/package/util-linux/util-linux.mk
Gustavo> @@ -3,100 +3,50 @@

It unfortunately doesn't build here if I enable largefile support. It dies with:

make[8]: *** No rule to make target -luuid', needed by libblkid.la'. Stop. make[8]: *** Waiting for unfinished jobs....
CC crc32.lo
CC md5.lo
make[7]: *** [all-recursive] Error 1
make[6]: *** [../../../shlibs/blkid/src/libblkid.la] Error 2

It also seems like we always need host-pkg-config as a dep.

Could you take a look at it?

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 2/13 util-linux: convert to autotargets and bump to 2.18

Review

Quoted 5 lines · Peter Korsgaard

I think it would be good to mention to the user that he's not getting mount+fsck if he doesn't enable LARGEFILE, E.G.:

(quoted diff) +2 -0
+comment "mount and fsck requires a toolchain with LARGEFILE support"
+       depends on BR2_PACKAGE_UTIL_LINUX && !BR2_LARGEFILE

I'll look into it.

Quoted 10 lines

It unfortunately doesn't build here if I enable largefile support. It dies with:

make[8]: *** No rule to make target -luuid', needed by libblkid.la'. Stop. make[8]: *** Waiting for unfinished jobs....
CC crc32.lo
CC md5.lo
make[7]: *** [all-recursive] Error 1
make[6]: *** [../../../shlibs/blkid/src/libblkid.la] Error 2

Quoted 3 lines

It also seems like we always need host-pkg-config as a dep.

Could you take a look at it?

Did you apply the previous e2fsprogs patch? It's required for it to export libbklid :)
Regards.

#4 lore raw

PATCH 2/13 util-linux: convert to autotargets and bump to 2.18

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Hi,

Quoted 1 line
Quoted 1 line

Could you take a look at it?

Gustavo> Did you apply the previous e2fsprogs patch? It's required for it to Gustavo> export libbklid :)

Yes I did. I even fixed it to also install the pkg-config files.

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 3/13 procps: convert to gentargets and bump to 3.2.8

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/procps/procps-make-3.82.patch |   15 ++++++++
 package/procps/procps.mk              |   61 ++++++++++-----------------------
 2 files changed, 33 insertions(+), 43 deletions(-)
 create mode 100644 package/procps/procps-make-3.82.patch
package/procps/procps-make-3.82.patch new file +15 -0
new file mode 100644
index 0000000..b66945c
@@ -0,0 +1,15 @@
+ps/module.mk depends on vars set up in proc/module.mk, so make sure we always
+include the .mk files in the right order
+
+--- procps-3.2.8/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,8 @@
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+ 
+--include */module.mk
++-include proc/module.mk
++-include ps/module.mk
+ 
+ do_all:    $(ALL)
+
package/procps/procps.mk +18 -43

69 lines not on this page · raw message

Signature · 1 line
1.7.2.2
#6 lore raw

PATCH 3/13 procps: convert to gentargets and bump to 3.2.8

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Hi,

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/procps/procps-make-3.82.patch |   15 ++++++++
 Gustavo>  package/procps/procps.mk              |   61 ++++++++++-----------------------

Gustavo> 2 files changed, 33 insertions(+), 43 deletions(-) Gustavo> create mode 100644 package/procps/procps-make-3.82.patch

Gustavo> diff --git a/package/procps/procps-make-3.82.patch b/package/procps/procps-make-3.82.patch Gustavo> new file mode 100644
Gustavo> index 0000000..b66945c
Gustavo> --- /dev/null
Gustavo> +++ b/package/procps/procps-make-3.82.patch
Gustavo> @@ -0,0 +1,15 @@
Gustavo> +ps/module.mk depends on vars set up in proc/module.mk, so make sure we always Gustavo> +include the .mk files in the right order

Please add authorship / signed-off-by to patches. According to the name, this patch is to fix an issue with make 3.82, but from reading the description and fix, it doesn't look version dependent?

Gustavo> +
Gustavo> +--- procps-3.2.8/Makefile
Gustavo> ++++ procps-3.2.8/Makefile
Gustavo> +@@ -174,7 +174,8 @@
Gustavo> + # want this rule first, use := on ALL, and ALL not filled in yet Gustavo> + all: do_all
Gustavo> +
Gustavo> +--include */module.mk
Gustavo> ++-include proc/module.mk
Gustavo> ++-include ps/module.mk
Gustavo> +
Gustavo> + do_all: $(ALL)
Gustavo> +

Otherwise looks good.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 3/13 procps: convert to gentargets and bump to 3.2.8

Quoted 3 lines · Peter Korsgaard

Please add authorship / signed-off-by to patches. According to the name, this patch is to fix an issue with make 3.82, but from reading the description and fix, it doesn't look version dependent?

Author unknown, nixed from gentoo.
I think i shouldn't sign off on something i didn't write right?

#8 lore raw

PATCH 3/13 procps: convert to gentargets and bump to 3.2.8

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Quoted 3 lines · Peter Korsgaard
Quoted 3 lines

Please add authorship / signed-off-by to patches. According to the name, this patch is to fix an issue with make 3.82, but from reading the description and fix, it doesn't look version dependent?

Gustavo> Author unknown, nixed from gentoo.
Gustavo> I think i shouldn't sign off on something i didn't write right?

No, put putting the Gentoo URL in it would be very good for tracability. Is it a make 3.82 only thing, or does it also fail with 3.81?

Signature · 1 line
Bye, Peter Korsgaard
author
#9 lore raw

PATCH 3/13 procps: convert to gentargets and bump to 3.2.8

Quoted 6 lines · Peter Korsgaard

Gustavo> Author unknown, nixed from gentoo.
Gustavo> I think i shouldn't sign off on something i didn't write right?

No, put putting the Gentoo URL in it would be very good for tracability. Is it a make 3.82 only thing, or does it also fail with 3.81?

Only for 3.82.

author
#10 lore raw

PATCH 4/13 dosfstools: bump to version 3.0.11

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/dosfstools/dosfstools.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/dosfstools/dosfstools.mk +1 -1
index 8e6cfc9..c2d763d 100644
@@ -3,7 +3,7 @@
 # dosfstools
 #
 #############################################################
-DOSFSTOOLS_VERSION = 3.0.10
+DOSFSTOOLS_VERSION = 3.0.11
 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.gz
 DOSFSTOOLS_SITE = http://www.daniel-baumann.ch/software/dosfstools
 MKDOSFS_BINARY = mkdosfs
Signature · 1 line
1.7.2.2
#11 lore raw

PATCH 4/13 dosfstools: bump to version 3.0.11

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#12 lore raw

PATCH 5/13 i2c-tools: bump to version 3.0.3

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/i2c-tools/i2c-tools.mk |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
package/i2c-tools/i2c-tools.mk +4 -3
index 58dde05..d96bad3 100644
@@ -3,9 +3,10 @@
 # i2c-tools
 #
 #############################################################
-I2C_TOOLS_VERSION:=3.0.2
-I2C_TOOLS_SOURCE:=i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
-I2C_TOOLS_SITE:=http://dl.lm-sensors.org/i2c-tools/releases/
+
+I2C_TOOLS_VERSION = 3.0.3
+I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
+I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases/
 
 define I2C_TOOLS_BUILD_CMDS
  $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
Signature · 1 line
1.7.2.2
#13 lore raw

PATCH 5/13 i2c-tools: bump to version 3.0.3

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/i2c-tools/i2c-tools.mk |    7 ++++---

Gustavo> 1 files changed, 4 insertions(+), 3 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#14 lore raw

PATCH 6/13 lm-sensors: bump to version 3.2.0

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/lm-sensors/lm-sensors.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/lm-sensors/lm-sensors.mk +1 -1
index 9543d2e..eec969d 100644
@@ -3,7 +3,7 @@
 # lm-sensors
 #
 #############################################################
-LM_SENSORS_VERSION = 3.1.2
+LM_SENSORS_VERSION = 3.2.0
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES
Signature · 1 line
1.7.2.2
#15 lore raw

PATCH 6/13 lm-sensors: bump to version 3.2.0

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/lm-sensors/lm-sensors.mk |    2 +-

Gustavo> 1 files changed, 1 insertions(+), 1 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#16 lore raw

PATCH 7/13 hdparm: bump to version 9.36

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/hdparm/hdparm.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/hdparm/hdparm.mk +1 -1
index 02d76a9..4e3cfe5 100644
@@ -3,7 +3,7 @@
 # hdparm
 #
 #############################################################
-HDPARM_VERSION = 9.32
+HDPARM_VERSION = 9.36
 HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
 HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
Signature · 1 line
1.7.2.2
#17 lore raw

PATCH 7/13 hdparm: bump to version 9.36

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/hdparm/hdparm.mk |    2 +-

Gustavo> 1 files changed, 1 insertions(+), 1 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#18 lore raw

PATCH 8/13 psmisc: bump to version 22.13

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/psmisc/psmisc-no-__progname.patch |   36 +++++++++++++++++------------
 package/psmisc/psmisc.mk                  |   14 +++++++----
 2 files changed, 30 insertions(+), 20 deletions(-)
package/psmisc/psmisc-no-__progname.patch +21 -15
index 82e6daf..063b120 100644
@@ -4,21 +4,27 @@ uclibc (per default) doesn't implement __progname, and the pstree.x11
 stuff isn't that critical, so just disable it.
 
 Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/pstree.c |    3 ---
- 1 file changed, 3 deletions(-)
+Signed-off-by: Gustavo Zacarias <[email protected]>
 
-Index: psmisc-22.8/src/pstree.c
-===================================================================
---- psmisc-22.8.orig/src/pstree.c
-+++ psmisc-22.8/src/pstree.c
-@@ -893,9 +893,6 @@ main (int argc, char **argv)
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
+diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c
+--- psmisc-22.13.orig/src/pstree.c	2010-07-12 08:10:03.000000000 -0300
++++ psmisc-22.13/src/pstree.c	2011-01-07 15:02:41.902741728 -0300
+@@ -49,8 +49,6 @@
+ #include <selinux/selinux.h>
+ #endif                                /*WITH_SELINUX */
+ 
+-extern const char *__progname;
+-
+ #define PROC_BASE    "/proc"
+ 
+ /* UTF-8 defines by Johan Myreen, updated by Ben Winslow */
+@@ -854,9 +852,6 @@
+     textdomain(PACKAGE);
  #endif
--  
--  if (!strcmp(__progname, "pstree.x11"))
--    wait_end=1;
  
-   /*
-    * Attempt to figure out a good default symbol set.  Will be overriden by
+-    if (!strcmp(__progname, "pstree.x11"))
+-        wait_end = 1;
+-
+     /*
+      * Attempt to figure out a good default symbol set.  Will be overriden by
+      * command-line options, if given.
package/psmisc/psmisc.mk +9 -5
index e4301da..1ff3844 100644
@@ -3,10 +3,14 @@
 # psmisc
 #
 #############################################################
-PSMISC_VERSION:=22.8
-PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz
-PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
-PSMISC_AUTORECONF:=NO
-PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+
+PSMISC_VERSION  = 22.13
+PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
+PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+
+# build after busybox, we prefer fat versions while we're at it
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+PSMISC_DEPENDENCIES += busybox
+endif
 
 $(eval $(call AUTOTARGETS,package,psmisc))
Signature · 1 line
1.7.2.2
#19 lore raw

PATCH 8/13 psmisc: bump to version 22.13

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/psmisc/psmisc-no-__progname.patch |   36 +++++++++++++++++------------
 Gustavo>  package/psmisc/psmisc.mk                  |   14 +++++++----

Gustavo> 2 files changed, 30 insertions(+), 20 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#20 lore raw

PATCH 9/13 libfuse: bump to version 2.8.5

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/fuse/libfuse.mk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
package/fuse/libfuse.mk +4 -4
index 87d746f..5a86e84 100644
@@ -3,12 +3,12 @@
 # libfuse
 #
 #############################################################
-LIBFUSE_VERSION:=2.8.4
-LIBFUSE_SOURCE:=fuse-$(LIBFUSE_VERSION).tar.gz
-LIBFUSE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
+
+LIBFUSE_VERSION = 2.8.5
+LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
+LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
 
 LIBFUSE_INSTALL_STAGING = YES
-LIBFUSE_LIBTOOL_PATCH = NO
 LIBFUSE_CONF_OPT= --program-prefix="" \
 		--enable-shared \
 		--enable-static \
Signature · 1 line
1.7.2.2
#21 lore raw

PATCH 9/13 libfuse: bump to version 2.8.5

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/fuse/libfuse.mk |    8 ++++----

Gustavo> 1 files changed, 4 insertions(+), 4 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#22 lore raw

PATCH 10/13 sshfs: select openssh instead of depending

In reply to Gustavo Zacarias

Select openssh in Config.in rather than depend on it. Otherwise the option is missing without an obvious reason.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/sshfs/Config.in |    2 +-
 package/sshfs/sshfs.mk  |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
package/sshfs/Config.in +1 -1
index 61d9bf3..1d9f759 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_SSHFS
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_PACKAGE_OPENSSH
+	select BR2_PACKAGE_OPENSSH
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	help
package/sshfs/sshfs.mk +3 -7
index 09f1e93..816f77a 100644
@@ -4,13 +4,9 @@
 #
 #############################################################
 
-SSHFS_VERSION:=2.2
-SSHFS_SOURCE:=sshfs-fuse-$(SSHFS_VERSION).tar.gz
-SSHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
-SSHFS_AUTORECONF:=NO
-SSHFS_INSTALL_STAGING:=NO
-SSHFS_INSTALL_TARGET:=YES
-
+SSHFS_VERSION = 2.2
+SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
+SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,sshfs))
Signature · 1 line
1.7.2.2
#23 lore raw

PATCH 10/13 sshfs: select openssh instead of depending

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Select openssh in Config.in rather than depend on it. Gustavo> Otherwise the option is missing without an obvious reason.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#24 lore raw

PATCH 11/13 ntfs-3g: bump to version 2010.10.2

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/ntfs-3g/ntfs-3g.mk |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
package/ntfs-3g/ntfs-3g.mk +6 -5
index a372d42..796e269 100644
@@ -3,10 +3,11 @@
 # ntfs-3g
 #
 #############################################################
-NTFS_3G_VERSION:=2009.3.8
-NTFS_3G_SOURCE:=ntfs-3g-$(NTFS_3G_VERSION).tgz
-NTFS_3G_SITE:=http://www.ntfs-3g.org/
-NTFS_3G_CONF_OPT:=--disable-ldconfig --program-prefix=""
-NTFS_3G_INSTALL_STAGING:=yes
+
+NTFS_3G_VERSION = 2010.10.2
+NTFS_3G_SOURCE = ntfs-3g-$(NTFS_3G_VERSION).tgz
+NTFS_3G_SITE = http://tuxera.com/opensource
+NTFS_3G_CONF_OPT = --disable-ldconfig --program-prefix=""
+NTFS_3G_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package,ntfs-3g))
Signature · 1 line
1.7.2.2
#25 lore raw

PATCH 11/13 ntfs-3g: bump to version 2010.10.2

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/ntfs-3g/ntfs-3g.mk |   11 ++++++-----

Gustavo> 1 files changed, 6 insertions(+), 5 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#26 lore raw

PATCH 12/13 php: security bump to 5.2.17

In reply to Gustavo Zacarias

PHP bug #53632 and CVE-2010-4645, where conversions from string to double might cause the PHP interpreter to hang on systems using x87 FPU registers.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/php/php.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
package/php/php.mk +1 -2
index aa99d23..ad0ae43 100644
@@ -4,14 +4,13 @@
 #
 #############################################################
 
-PHP_VERSION = 5.2.16
+PHP_VERSION = 5.2.17
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_LIBTOOL_PATCH = NO
-PHP_DEPENDENCIES =
 PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-all \
Signature · 1 line
1.7.2.2
#27 lore raw

PATCH 12/13 php: security bump to 5.2.17

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> PHP bug #53632 and CVE-2010-4645, where conversions from Gustavo> string to double might cause the PHP interpreter to hang on Gustavo> systems using x87 FPU registers.

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#28 lore raw

PATCH 13/13 mpg123: bump to version 1.13.1

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/multimedia/mpg123/mpg123.mk |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
package/multimedia/mpg123/mpg123.mk +15 -3
index ea35220..ddd891f 100644
@@ -3,11 +3,16 @@
 # mpg123
 #
 #############################################################
-MPG123_VERSION = 0.66
+
+MPG123_VERSION = 1.13.1
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
+MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
+MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)
 
-MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic)
+ifeq ($(BR2_arm),y)
+MPG123_CPU = arm_nofpu
+endif
 
 ifeq ($(BR2_i386),y)
 MPG123_CPU = x86

@@ -17,9 +22,16 @@ ifeq ($(BR2_powerpc),y)
 ifneq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),)
 MPG123_CPU = altivec
 endif
+ifeq ($(BR2_SOFT_FLOAT),y)
+MPG123_CPU = ppc_nofpu
+endif
+endif
+
+ifeq ($(BR2_x86_64),y)
+MPG123_CPU = x86-64
 endif
 
-MPG123_CONF_OPT = --program-prefix='' --with-cpu=$(MPG123_CPU)
+MPG123_CONF_OPT += --program-prefix='' --with-cpu=$(MPG123_CPU)
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
Signature · 1 line
1.7.2.2
#29 lore raw

PATCH 13/13 mpg123: bump to version 1.13.1

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/multimedia/mpg123/mpg123.mk |   18 +++++++++++++++---

Gustavo> 1 files changed, 15 insertions(+), 3 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard