Skip to contentSkip to conversation

Misc Fixes and Updates

PATCH In review Saul Wold 1 participant 8 messages Dec 28, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Misc Fixes and Updates

Richard,

Some fixes for issues that have popped up and a couple of recipe updates.

Sau!

The following changes since commit 8f348ccad083d6c02c200652ff6295e701e88f0d:

coreutils: ensure --color works so DEPEND on libcap (2011-12-24 10:05:35 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (6):
libiconv: Update to 1.14
dropbear: fix CRYPTLIB patch
python: add md5module support
boost: Cleanup multiple BJAM_OPTS
util-linux: Update to 2.20.1
distro_tracking: Update Manual Check Dates

 .../conf/distro/include/distro_tracking_fields.inc |   42 ++++++------
 .../dropbear-0.53.1-static_build_fix.patch         |   67 ++++++++++++++------
 meta/recipes-core/dropbear/dropbear_2011.54.bb     |    2 +-
 .../MCONFIG                                        |    0
 .../defines.h                                      |    0
 .../make_include                                   |    0
 .../remove-lscpu.patch                             |    0
 .../remove_sigsetmark.patch                        |    0
 .../swapargs.h                                     |    0
 .../uclibc-__progname-conflict.patch               |    0
 .../uclibc-compile.patch                           |    0
 .../util-linux-ng-2.16-mount_lock_path.patch       |    0
 .../util-linux-ng-replace-siginterrupt.patch       |    0
 meta/recipes-core/util-linux/util-linux.inc        |    6 +-
 .../{util-linux_2.19.1.bb => util-linux_2.20.1.bb} |   11 ++--
 .../recipes-devtools/python/python-native_2.7.2.bb |    6 +-
 .../python/python/add-md5module-support.patch      |   13 ++++
 meta/recipes-devtools/python/python_2.7.2.bb       |    3 +-
 meta/recipes-support/boost/boost.inc               |   11 +++-
 meta/recipes-support/boost/boost_1.47.0.bb         |   17 -----
 .../autoconf.patch                                 |    0
 .../{libiconv_1.13.1.bb => libiconv_1.14.bb}       |    4 +-
 22 files changed, 108 insertions(+), 74 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/MCONFIG (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/defines.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/make_include (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/remove-lscpu.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/remove_sigsetmark.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/swapargs.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/uclibc-__progname-conflict.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/uclibc-compile.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/util-linux-ng-2.16-mount_lock_path.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/util-linux-ng-replace-siginterrupt.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux_2.19.1.bb => util-linux_2.20.1.bb} (84%)
 create mode 100644 meta/recipes-devtools/python/python/add-md5module-support.patch
 rename meta/recipes-support/libiconv/{libiconv-1.13.1 => libiconv-1.14}/autoconf.patch (100%)
 rename meta/recipes-support/libiconv/{libiconv_1.13.1.bb => libiconv_1.14.bb} (88%)
Signature · 1 line
1.7.6.4
author
#1 lore raw

PATCH 1/6 libiconv: Update to 1.14

Signed-off-by Saul Wold <[email protected]>
---
 .../autoconf.patch                                 |    0
 .../{libiconv_1.13.1.bb => libiconv_1.14.bb}       |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libiconv/{libiconv-1.13.1 => libiconv-1.14}/autoconf.patch (100%)
 rename meta/recipes-support/libiconv/{libiconv_1.13.1.bb => libiconv_1.14.bb} (88%)
meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch renamed from meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch +0 -0
similarity index 100%
rename from meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
rename to meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch
meta/recipes-support/libiconv/libiconv_1.14.bb renamed from meta/recipes-support/libiconv/libiconv_1.13.1.bb +2 -2
similarity index 88%
rename from meta/recipes-support/libiconv/libiconv_1.13.1.bb
rename to meta/recipes-support/libiconv/libiconv_1.14.bb
index 6471e32..5eea823 100644
@@ -13,8 +13,8 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://autoconf.patch \
           "
 
-SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
-SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
+SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"
+SRC_URI[sha256sum] = "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613"
 
 S = "${WORKDIR}/libiconv-${PV}"
Signature · 1 line
1.7.6.4
author
#2 lore raw

PATCH 2/6 dropbear: fix CRYPTLIB patch

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../dropbear-0.53.1-static_build_fix.patch         |   67 ++++++++++++++------
 meta/recipes-core/dropbear/dropbear_2011.54.bb     |    2 +-
 2 files changed, 49 insertions(+), 20 deletions(-)
meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch +48 -19
index 14a8770..d125616 100644
@@ -1,29 +1,58 @@
-Upstream-Status: Inappropriate [Pending]
-Get this patch from  buildroot maillist.
+Upstream-Status: Submitted
 
-dropbear: fix static build
 
-The latest release 0.53.1 change: lcrypt needs to be before object files for static linking
+dropbear: fix static build
 
-the -lcrypt is missing during the link
+A more appropriate fix is to remove @CRYPTLIB@ from the objs
+line, since it will cause problems with target checking,
+this change also meets the goals of the orignal change which
+was to not link libcrypt to all binaries.
 
 svr-authpasswd.o: In function `svr_auth_password':
 svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
 collect2: ld returned 1 exit status
 
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
-Signed-off-by: Mei Lei <[email protected]>
+Signed-off-by: Saul Wold <[email protected]>
 
-diff --git a/Makefile.in b/Makefile.in
-index 8d81647..0b9b769 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -77,7 +77,7 @@ STRIP=@STRIP@
- INSTALL=@INSTALL@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
--LIBS+=@LIBS@
-+LIBS+=@CRYPTLIB@ @LIBS@
- LDFLAGS=@LDFLAGS@
+Index: dropbear-2011.54/Makefile.in
+===================================================================
+--- dropbear-2011.54.orig/Makefile.in	2011-11-08 04:48:15.000000000 -0800
++++ dropbear-2011.54/Makefile.in	2011-12-27 13:44:41.644354442 -0800
+@@ -56,7 +56,7 @@
+ 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
+ 		listener.h fake-rfc2553.h
+ 
+-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
+ dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
+ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
+ dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
+@@ -158,7 +158,10 @@
+ dropbearkey: $(dropbearkeyobjs)
+ dropbearconvert: $(dropbearconvertobjs)
+ 
+-dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
++dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
++	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@
++
++dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
+ 	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
+ 
+ # scp doesn't use the libs so is special.
+@@ -169,14 +172,14 @@
+ # multi-binary compilation.
+ MULTIOBJS=
+ ifeq ($(MULTI),1)
+-	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
++	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
+ 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
+ endif
+ 
+ dropbearmulti: multilink 
+ 
+ multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
+ 
+ multilink: multibinary $(addprefix link, $(PROGRAMS))
  
- EXEEXT=@EXEEXT@
meta/recipes-core/dropbear/dropbear_2011.54.bb +1 -1
index b7b4b83..1bd8bda 100644
@@ -3,4 +3,4 @@ require dropbear.inc
 SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
 SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
 
-PR = "r0"
+PR = "r1"
Signature · 1 line
1.7.6.4
author
#3 lore raw

PATCH 3/6 python: add md5module support

In reply to Saul Wold

The internal md5 module is needed for using "waf" to install other python packages such as pycairo.

Signed-off-by Saul Wold <[email protected]>
---
 .../recipes-devtools/python/python-native_2.7.2.bb |    6 ++++--
 .../python/python/add-md5module-support.patch      |   13 +++++++++++++
 meta/recipes-devtools/python/python_2.7.2.bb       |    3 ++-
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/add-md5module-support.patch
meta/recipes-devtools/python/python-native_2.7.2.bb +4 -2
index d036eca..7d8c597 100644
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \

@@ -11,7 +11,9 @@ SRC_URI += "file://04-default-is-optimized.patch \
            file://debug.patch \
            file://unixccompiler.patch \
            file://nohostlibs.patch \
-           file://multilib.patch "
+           file://multilib.patch \
+           file://add-md5module-support.patch \
+           "
 S = "${WORKDIR}/Python-${PV}"
 
 inherit native
meta/recipes-devtools/python/python/add-md5module-support.patch new file +13 -0
new file mode 100644
index 0000000..f715f40
@@ -0,0 +1,13 @@
+Index: Python-2.7.2/Modules/Setup.dist
+===================================================================
+--- Python-2.7.2.orig/Modules/Setup.dist	2011-06-11 08:46:26.000000000 -0700
++++ Python-2.7.2/Modules/Setup.dist	2011-12-27 15:51:41.244623219 -0800
+@@ -248,7 +248,7 @@
+ # Message-Digest Algorithm, described in RFC 1321.  The necessary files
+ # md5.c and md5.h are included here.
+ 
+-#_md5 md5module.c md5.c
++_md5 md5module.c md5.c
+ 
+ 
+ # The _sha module implements the SHA checksum algorithms.
meta/recipes-devtools/python/python_2.7.2.bb +2 -1
index 5e8e0d7..654c850 100644
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""

@@ -19,6 +19,7 @@ SRC_URI += "\
   file://cgi_py.patch \
   file://remove_sqlite_rpath.patch \
   file://setup_py_skip_cross_import_check.patch \
+  file://add-md5module-support.patch \
 "
 
 S = "${WORKDIR}/Python-${PV}"
Signature · 1 line
1.7.6.4
author
#5 lore raw

PATCH 4/6 boost: Cleanup multiple BJAM_OPTS

In reply to Saul Wold

There were 2 BJAM_OPTS = in the .bb and .inc, the .inc was being overwritten and the ICU dependency was not removed correctly.

Do some clean-up including moving install_append into do_install directly.

Finally the BJAM_EXTRAS += "threading=multi" was un-needed, since that is the default

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-support/boost/boost.inc       |   11 ++++++++++-
 meta/recipes-support/boost/boost_1.47.0.bb |   17 -----------------
 2 files changed, 10 insertions(+), 18 deletions(-)
meta/recipes-support/boost/boost.inc +10 -1
index aa577b3..d7ca00b 100644
@@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 

@@ -153,6 +153,15 @@ do_install() {
 		--libdir=${D}${libdir} \
 		--includedir=${D}${includedir} \
 		install
+	for lib in ${BOOST_LIBS}; do
+		if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
+			ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
+		fi
+		if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
+			ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
+		fi
+	done
+
 }
 
 BBCLASSEXTEND = "native"
meta/recipes-support/boost/boost_1.47.0.bb +0 -17
index e1e0ca1..333fdb1 100644
@@ -8,20 +8,3 @@ SRC_URI += "file://arm-intrinsics.patch"
 
 SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200"
 SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31"
-
-BJAM_OPTS    = '${BJAM_TOOLS} \
-                --builddir=${S}/${TARGET_SYS} \
-                ${BJAM_EXTRA}'
-
-# build only mt libraries and install symlinks for compatibility
-BJAM_EXTRA += "threading=multi"
-do_install_append() {
-	for lib in ${BOOST_LIBS}; do
-	    if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
-		ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
-	    fi
-	    if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
-		ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
-	    fi
-	done
-}
Signature · 1 line
1.7.6.4
author
#6 lore raw

PATCH 5/6 util-linux: Update to 2.20.1

In reply to Saul Wold

Add patch remove setting CC, LD and LDFLAGS on commandline since they are passed correctly via configure. Those setting also caused the configure information about -std=gnu99 from being passed correctly.

Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check

Signed-off-by Saul Wold <[email protected]>
---
 .../MCONFIG                                        |    0
 .../defines.h                                      |    0
 .../make_include                                   |    0
 .../remove-lscpu.patch                             |    0
 .../remove_sigsetmark.patch                        |    0
 .../swapargs.h                                     |    0
 .../uclibc-__progname-conflict.patch               |    0
 .../uclibc-compile.patch                           |    0
 .../util-linux-ng-2.16-mount_lock_path.patch       |    0
 .../util-linux-ng-replace-siginterrupt.patch       |    0
 meta/recipes-core/util-linux/util-linux.inc        |    6 ++----
 .../{util-linux_2.19.1.bb => util-linux_2.20.1.bb} |   11 +++++------
 12 files changed, 7 insertions(+), 10 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/MCONFIG (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/defines.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/make_include (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/remove-lscpu.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/remove_sigsetmark.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/swapargs.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/uclibc-__progname-conflict.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/uclibc-compile.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/util-linux-ng-2.16-mount_lock_path.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.19.1 => util-linux-2.20.1}/util-linux-ng-replace-siginterrupt.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux_2.19.1.bb => util-linux_2.20.1.bb} (84%)
meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG renamed from meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
rename to meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG
meta/recipes-core/util-linux/util-linux-2.20.1/defines.h renamed from meta/recipes-core/util-linux/util-linux-2.19.1/defines.h +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/defines.h
rename to meta/recipes-core/util-linux/util-linux-2.20.1/defines.h
meta/recipes-core/util-linux/util-linux-2.20.1/make_include renamed from meta/recipes-core/util-linux/util-linux-2.19.1/make_include +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/make_include
rename to meta/recipes-core/util-linux/util-linux-2.20.1/make_include
meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch
meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h renamed from meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h
rename to meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h
meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch
meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch
meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch
meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch renamed from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
meta/recipes-core/util-linux/util-linux.inc +2 -4
index acc4a39..5445f4f 100644
@@ -18,7 +18,7 @@ DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
 
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
            file://defines.h \

@@ -78,9 +78,7 @@ do_compile () {
 	install ${WORKDIR}/make_include ${S}/make_include
 	install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
 	install ${WORKDIR}/defines.h ${S}/defines.h
-	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
-		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
-		'LDFLAGS=${LDFLAGS}'
+	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 
 }
 
 checklink() {
meta/recipes-core/util-linux/util-linux_2.20.1.bb renamed from meta/recipes-core/util-linux/util-linux_2.19.1.bb +5 -6
similarity index 84%
rename from meta/recipes-core/util-linux/util-linux_2.19.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.20.1.bb
index 82040ef..a569131 100644
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.19"
-PR = "r12"
+MAJOR_VERSION = "2.20"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

@@ -8,11 +8,10 @@ LICENSE_util-linux-lscpu = "GPLv3+"
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \      
-            file://remove_sigsetmark.patch \
 "
 
-SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
-SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d"
+SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361"
+SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.

@@ -42,7 +41,7 @@ addtask remove_lscpu before do_configure after do_patch
 
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11
 # we need to disable it for older versions
-EXTRA_OECONF += "ac_cv_func_fallocate=no"
+EXTRA_OECONF += "ac_cv_func_fallocate=no scanf_cv_type_modifier=as"
 EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
 
 do_install_append () {
Signature · 1 line
1.7.6.4
author
#7 lore raw

PATCH 6/6 distro_tracking: Update Manual Check Dates

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   42 ++++++++++----------
 1 files changed, 21 insertions(+), 21 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +21 -21
index ab18e12..bcf9cc9 100644
@@ -504,7 +504,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-popt = "May 01, 2010"
 RECIPE_STATUS_pn-sqlite3 = "green"   # need upgrade
 RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.9"
 RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Nov 01, 2011"
-RECIPE_LAST_UPDATE_pn-sqlite3 = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-sqlite3 = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-sqlite3 = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-sqlite3 = "not done"

@@ -533,7 +533,7 @@ RECIPE_STATUS_pn-libcap = "yellow"   # hand crafted Makefiles
 RECIPE_LATEST_VERSION_pn-libcap = "2.22"
 RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
 RECIPE_LAST_UPDATE_pn-libcap = "Jul 25, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Dec 15, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libcap = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-libcap = "done"
 RECIPE_INTEL_SECTION_pn-libcap = "base libs"

@@ -591,7 +591,7 @@ RECIPE_DEPENDENCY_CHECK_pn-libcheck = "done"
 RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8"
 RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 23, 2009"
 RECIPE_LAST_UPDATE_pn-libcheck = "Aug 20, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libcheck = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-libcheck = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = "9 months"

@@ -1293,7 +1293,7 @@ RECIPE_LATEST_VERSION_pn-console-tools = "0.3.2"
 RECIPE_LAST_UPDATE_pn-console-tools = "Jul 21, 2006"
 RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <[email protected]>"
 DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
-RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Dec 27, 2011"
 
 RECIPE_STATUS_pn-fuse = "red"
 RECIPE_LATEST_VERSION_pn-fuse = "2.8.4"

@@ -1334,7 +1334,7 @@ RECIPE_MAINTAINER_pn-pm-utils = "Dongxiao Xu <[email protected]>"
 RECIPE_STATUS_pn-psmisc = "red"
 RECIPE_LATEST_VERSION_pn-psmisc = "22.14"
 RECIPE_LATEST_RELEASE_DATE_pn-psmisc = "Jun 20, 2011"
-RECIPE_LAST_UPDATE_pn-psmisc = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-psmisc = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-psmisc = "Saul Wold <[email protected]>"
 

@@ -1342,7 +1342,7 @@ RECIPE_STATUS_pn-boost = "yellow"
 RECIPE_LATEST_VERSION_pn-boost = "1.47.0"
 RECIPE_LATEST_RELEASE_DATE_pn-boost = "Jul 12, 2011"
 RECIPE_LAST_UPDATE_pn-boost = "Aug 19, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-boost = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-boost = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-boost = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-boost-jam-native = "green"

@@ -1489,8 +1489,8 @@ RECIPE_LAST_UPDATE_pn-sysfsutils = "Jun 18, 2010"
 RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done"
 RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
-RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Dec 01, 2011"
-RECIPE_COMMENTS_pn-sysfsutils = ""
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Dec 27, 2011"
+RECIPE_COMMENTS_pn-sysfsutils = "No update on kernel.org"
 RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-curl = "green"

@@ -1542,7 +1542,7 @@ RECIPE_STATUS_pn-less = "green"
 RECIPE_LATEST_VERSION_pn-less = "444"
 RECIPE_LATEST_RELEASE_DATE_pn-less = "Jun 9, 2011"
 RECIPE_LAST_UPDATE_pn-less = "Dec 01, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-less = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-less = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-less = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-less = "done"
 RECIPE_INTEL_SECTION_pn-less = "base utils"

@@ -1700,7 +1700,7 @@ RECIPE_MAINTAINER_pn-zip = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-zip = "not done"
 RECIPE_INTEL_SECTION_pn-zip = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
-RECIPE_MANUAL_CHECK_DATE_pn-zip = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "Dec 27, 2011"
 RECIPE_COMMENTS_pn-zip = ""
 
 RECIPE_STATUS_pn-strace = "green"

@@ -1789,7 +1789,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-shared-mime-info = "Feb 01, 2010"
 RECIPE_STATUS_pn-util-linux = "green"
 RECIPE_LATEST_VERSION_pn-util-linux = "2.20.1"
 RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "Nov 07, 2011"
-RECIPE_LAST_UPDATE_pn-util-linux = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-util-linux = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-util-linux = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-util-linux = "base utils"
 RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Dec 01, 2011"

@@ -1799,12 +1799,12 @@ RECIPE_STATUS_pn-usbutils = "green"
 RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
 RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
 RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-usbutils = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
 RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-usbutils = "2 months"
-RECIPE_COMMENTS_pn-usbutils = ""
+RECIPE_COMMENTS_pn-usbutils = "No update on kernel.org"
 
 RECIPE_STATUS_pn-pciutils = "yellow"    # custom build system, several hacks
 RECIPE_LAST_UPDATE_pn-pciutils = "Nov 10, 2010"

@@ -1843,7 +1843,7 @@ DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
 RECIPE_STATUS_pn-sysstat = "green"
 RECIPE_LATEST_VERSION_pn-sysstat = "10.0.3"
 RECIPE_LATEST_RELEASE_DATE_pn-sysstat = "Nov 27, 2011"
-RECIPE_LAST_UPDATE_pn-sysstat = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-sysstat = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <[email protected]>"
 

@@ -1877,7 +1877,7 @@ RECIPE_STATUS_pn-cracklib="green"
 RECIPE_LATEST_VERSION_pn-cracklib="2.8.18"
 RECIPE_LATEST_RELEASE_DATE_pn-cracklib = "Aug 29, 2010"
 RECIPE_LAST_UPDATE_pn-cracklib = "Nov 13, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-cracklib="Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-openobex = "red"

@@ -1963,7 +1963,7 @@ RECIPE_STATUS_pn-libexif = "green"
 RECIPE_LATEST_VERSION_pn-libexif = "0.6.20"
 RECIPE_LATEST_RELEASE_DATE_pn-libexif = "Dec 12, 2010"
 RECIPE_LAST_UPDATE_pn-libexif = "Apr 15, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libexif = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-setserial = "red"

@@ -3481,7 +3481,7 @@ RECIPE_INTEL_SECTION_pn-qemugl="graphic app"
 RECIPE_LAST_UPDATE_pn-qemugl = "Nov 28, 2010"
 RECIPE_NO_UPDATE_REASON_pn-qemugl = "Do not upgrade to version: 33466cd8 because the upstream is broken in x86_64 build"
 RECIPE_MAINTAINER_pn-qemugl="Saul Wold <[email protected]>"
-RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Dec 27, 2011"
 
 RECIPE_STATUS_pn-fotowall="green" # no update needed
 RECIPE_LATEST_VERSION_pn-fotowall="0.9"

@@ -5763,7 +5763,7 @@ RECIPE_MAINTAINER_pn-glew = "Saul Wold <[email protected]>"
 RECIPE_LATEST_VERSION_pn-squashfs-tools = "4.2"
 RECIPE_LATEST_RELEASE_DATE_pn-squashfs-tools = "Feb 28, 2011"
 RECIPE_LAST_UPDATE_pn-squashfs-tools = "Oct 21, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"

@@ -5774,14 +5774,14 @@ RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <[email protected]>"
 RECIPE_LATEST_VERSION_pn-lame = "3.99.3"
 RECIPE_LATEST_RELEASE_DATE_pn-lame = "Nov 26, 2011"
 RECIPE_LAST_UPDATE_pn-lame = "Nov 28, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-lame = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-lame = "Dec 27, 2011"
 DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
 RECIPE_MAINTAINER_pn-lame = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b"
 RECIPE_LATEST_RELEASE_DATE_pn-libmad = "Feb 18, 2004"
 RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006"
-RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libmad = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"

@@ -5789,7 +5789,7 @@ RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
 RECIPE_LATEST_VERSION_pn-lsb = "1.4"
 RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010"
 RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Dec 27, 2011"
 RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
 RECIPE_MAINTAINER_pn-lsb = "Saul Wold <[email protected]>"
Signature · 1 line
1.7.6.4
author
#4 lore raw

Re: [PATCH 3/6] python: add md5module support

In reply to Saul Wold
Quoted 3 lines · Saul Wold

The internal md5 module is needed for using "waf" to install other python packages such as pycairo.

I grabbed the wrong patch here, I need to add a patch here, v2 out soon!

Sau!

Quoted 71 lines
Signed-off-by Saul Wold<[email protected]>
---
  .../recipes-devtools/python/python-native_2.7.2.bb |    6 ++++--
  .../python/python/add-md5module-support.patch      |   13 +++++++++++++
  meta/recipes-devtools/python/python_2.7.2.bb       |    3 ++-
  3 files changed, 19 insertions(+), 3 deletions(-)

create mode 100644 meta/recipes-devtools/python/python/add-md5module-support.patch

meta/recipes-devtools/python/python-native_2.7.2.bb +4 -2
index d036eca..7d8c597 100644
@@ -1,6 +1,6 @@
  require python.inc
  DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
  SRC_URI += "file://04-default-is-optimized.patch \
             file://05-enable-ctypes-cross-build.patch \

@@ -11,7 +11,9 @@ SRC_URI += "file://04-default-is-optimized.patch \
             file://debug.patch \
             file://unixccompiler.patch \
             file://nohostlibs.patch \
-           file://multilib.patch "
+           file://multilib.patch \
+           file://add-md5module-support.patch \
+           "
  S = "${WORKDIR}/Python-${PV}"
 
  inherit native
meta/recipes-devtools/python/python/add-md5module-support.patch new file +13 -0
new file mode 100644
index 0000000..f715f40
@@ -0,0 +1,13 @@
+Index: Python-2.7.2/Modules/Setup.dist
+===================================================================
+--- Python-2.7.2.orig/Modules/Setup.dist	2011-06-11 08:46:26.000000000 -0700
++++ Python-2.7.2/Modules/Setup.dist	2011-12-27 15:51:41.244623219 -0800
+@@ -248,7 +248,7 @@
+ # Message-Digest Algorithm, described in RFC 1321.  The necessary files
+ # md5.c and md5.h are included here.
+
+-#_md5 md5module.c md5.c
++_md5 md5module.c md5.c
+
+
+ # The _sha module implements the SHA checksum algorithms.
meta/recipes-devtools/python/python_2.7.2.bb +2 -1
index 5e8e0d7..654c850 100644
@@ -1,7 +1,7 @@
  require python.inc
  DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
  DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
  DISTRO_SRC_URI ?= "file://sitecustomize.py"
  DISTRO_SRC_URI_linuxstdbase = ""

@@ -19,6 +19,7 @@ SRC_URI += "\
    file://cgi_py.patch \
    file://remove_sqlite_rpath.patch \
    file://setup_py_skip_cross_import_check.patch \
+  file://add-md5module-support.patch \
  "
 
  S = "${WORKDIR}/Python-${PV}"