Skip to contentSkip to conversation

Updates and 1.1_M1 Targeted Fixes

GIT PULL Saul Wold 2 participants 22 messages May 25, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

Richard,

General consolidation of patches and updates over the last few days with testing done. This includes the proposed ROOTFS_SIZE cleanup, there will be a corresponding push to poky after this is in.

Once some of the M1 patches are in, I will cherry-pick them for the RC3 build.

Thanks
Sau!

The following changes since commit ad72ffadca975166cd8a416e4bf7b7fe33616d39:

Merge branch 'master', remote-tracking branch 'origin/master' (2011-05-23 23:00:20 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Darren Hart (1):
create-pull-request: generalize the repository URL parsing

Kang Kai (1):
ghostscript: fix run failure on mpc8315e

Khem Raj (2):
elfutils_0.148.bb: Fix compilation on uclibc eglibc.inc: Transfer PARALLEL_MAKE to PARALLELMFLAGS

Koen Kooi (1):
pulseaudio: package udev rules

Nitin A Kamble (5):
git: upgrade from 1.7.4.3 to 1.7.5.1
libpcre: upgrade from 8.10 to 8.12
byacc: upgrade from 20101127 to 20101229
python-pygpbject: upgrade from 2.27 to 2.27.91
distro-tracking: update toolchain recipe fields

Otavio Salvador (2):
send-pull-request: drop sendemail checks
syslinux: rdepends on mtools

Phil Blundell (1):
rootfs_ipk: issue a diagnostic if rootfs is declared read-only and
not all maintainer scripts could be applied offline

Saul Wold (6):
gail: update gail to 1.20.2
update-alternatives-dpkg: Update to dpkg base 1.15.8.7
gst-plugins-base: Add tremor to DEPENDS IMAGE_ROOTFS_SIZE Cleanup
image_types: add IMAGE_ROOTFS_EXTRA_SPACE
gnutls: update to 2.12.5

 meta/classes/image_types.bbclass                   |    9 ++-
 meta/classes/rootfs_ipk.bbclass                    |   10 ++
 meta/conf/bitbake.conf                             |    8 +-
 meta/conf/distro/include/default-distrovars.inc    |    2 -
 .../conf/distro/include/distro_tracking_fields.inc |    3 +
 meta/conf/machine/include/qemu.inc                 |    2 -
 meta/recipes-core/eglibc/eglibc.inc                |    6 ++
 .../images/core-image-minimal-initramfs.bb         |    2 +
 meta/recipes-core/images/core-image-minimal.bb     |    2 +
 .../elfutils/elfutils-0.148/uclibc-support.patch   |   91 ++++++++++++++++++++
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |   15 +++-
 meta/recipes-devtools/git/files/autotools.patch    |   16 ----
 meta/recipes-devtools/git/git.inc                  |    3 +-
 .../git/{git_1.7.4.3.bb => git_1.7.5.1.bb}         |    6 +-
 ...bject_2.27.0.bb => python-pygobject_2.27.91.bb} |    6 +-
 meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    4 +-
 .../update-alternatives-dpkg.inc                   |   12 ++-
 .../update-alternatives-dpkg_1.13.22.bb            |    7 --
 .../update-alternatives-dpkg_1.15.8.7.bb           |    8 ++
 meta/recipes-extended/byacc/byacc_20101127.bb      |    7 --
 meta/recipes-extended/byacc/byacc_20101229.bb      |    7 ++
 meta/recipes-extended/ghostscript/arm/objarch.h    |   40 +++++++++
 meta/recipes-extended/ghostscript/arm/soobjarch.h  |   40 +++++++++
 .../ghostscript/ghostscript-9.02-genarch.patch     |   27 ++++++
 .../ghostscript/ghostscript_9.02.bb                |   22 ++++-
 meta/recipes-extended/ghostscript/i586/objarch.h   |   41 +++++++++
 meta/recipes-extended/ghostscript/i586/soobjarch.h |   41 +++++++++
 meta/recipes-extended/ghostscript/mips/objarch.h   |   40 +++++++++
 meta/recipes-extended/ghostscript/mips/soobjarch.h |   40 +++++++++
 .../recipes-extended/ghostscript/powerpc/objarch.h |   40 +++++++++
 .../ghostscript/powerpc/soobjarch.h                |   40 +++++++++
 meta/recipes-extended/ghostscript/x86_64/objarch.h |   40 +++++++++
 .../ghostscript/x86_64/soobjarch.h                 |   40 +++++++++
 .../gnome/{gail_1.20.0.bb => gail_1.20.2.bb}       |   10 ++-
 .../gstreamer/gst-plugins-base_0.10.32.bb          |    2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    2 +-
 .../pulseaudio/pulseaudio_0.9.15.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../configure-fix.patch                            |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls.inc             |    2 +-
 .../gnutls/{gnutls_2.10.4.bb => gnutls_2.12.5.bb}  |    4 +-
 .../libpcre/{libpcre_8.10.bb => libpcre_8.12.bb}   |    6 +-
 scripts/create-pull-request                        |   29 +++----
 scripts/send-pull-request                          |   16 ----
 46 files changed, 648 insertions(+), 104 deletions(-)
 create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support.patch
 delete mode 100644 meta/recipes-devtools/git/files/autotools.patch
 rename meta/recipes-devtools/git/{git_1.7.4.3.bb => git_1.7.5.1.bb} (56%)
 rename meta/recipes-devtools/python/{python-pygobject_2.27.0.bb => python-pygobject_2.27.91.bb} (87%)
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
 delete mode 100644 meta/recipes-extended/byacc/byacc_20101127.bb
 create mode 100644 meta/recipes-extended/byacc/byacc_20101229.bb
 create mode 100644 meta/recipes-extended/ghostscript/arm/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/arm/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
 create mode 100644 meta/recipes-extended/ghostscript/i586/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/i586/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/mips/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/mips/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/powerpc/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/powerpc/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/x86_64/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/x86_64/soobjarch.h
 rename meta/recipes-gnome/gnome/{gail_1.20.0.bb => gail_1.20.2.bb} (72%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/configure-fix.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls_2.10.4.bb => gnutls_2.12.5.bb} (53%)
 rename meta/recipes-support/libpcre/{libpcre_8.10.bb => libpcre_8.12.bb} (94%)
Signature · 1 line
1.7.3.4
author
#1 lore raw

[Updated Consolidated Pull 01/19] gail: update gail to 1.20.2

[YOCTO #1042]

- Added LIC_FILES_CHKSUM
- Corrected LICENSE

---
 .../gnome/{gail_1.20.0.bb => gail_1.20.2.bb}       |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gnome/{gail_1.20.0.bb => gail_1.20.2.bb} (72%)
meta/recipes-gnome/gnome/gail_1.20.2.bb renamed from meta/recipes-gnome/gnome/gail_1.20.0.bb +7 -3
similarity index 72%
rename from meta/recipes-gnome/gnome/gail_1.20.0.bb
rename to meta/recipes-gnome/gnome/gail_1.20.2.bb
index 2e9f857..2c86228 100644
@@ -1,10 +1,14 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-PR = "r1"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
+SECTION = "x11/libs"
+
 DEPENDS = "gtk+"
 PROVIDES = "virtual/gail"
 
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r0"
+
 inherit gnome
 
 EXTRA_OECONF = "--disable-gtk-doc"
Signature · 1 line
1.7.3.4
author
#2 lore raw

[Updated Consolidated Pull 02/19] update-alternatives-dpkg: Update to dpkg base 1.15.8.7

In reply to Saul Wold

[YOCTO #1062]

Due to failing fetch updated recipe and SRC_URI to use .bz2,

---
 .../update-alternatives-dpkg.inc                   |   12 ++++++++++--
 .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
 .../update-alternatives-dpkg_1.15.8.7.bb           |    8 ++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc +10 -2
index 9b53df8..f7f9ae9 100644
@@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
 time."
 LICENSE = "GPL"
 SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
-PR = "r2"
+INC_PR = "r2"
+
+inherit gettext
 
 do_patch () {
     cat ${S}/scripts/update-alternatives.pl | \
@@ -32,4 +34,10 @@ do_install () {
     install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
 }
 
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_${PN} += "update-alternatives"
+EXTRA_RDEPENDS = "perl dpkg"
+EXTRA_RDEPENDS_virtclass-native = ""
+RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
+
 BBCLASSEXTEND = "native"
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb deleted +0 -7
deleted file mode 100644
index 5d38d5d..0000000
@@ -1,7 +0,0 @@
-require update-alternatives-dpkg.inc
-
-PROVIDES += "virtual/update-alternatives"
-RPROVIDES_${PN} += "update-alternatives"
-EXTRA_RDEPENDS = "perl dpkg"
-EXTRA_RDEPENDS_virtclass-native = ""
-RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb new file +8 -0
new file mode 100644
index 0000000..5443122
@@ -0,0 +1,8 @@
+require update-alternatives-dpkg.inc
+
+PR = "${INC_PR}.0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
+SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
Signature · 1 line
1.7.3.4
author
#3 lore raw

[Updated Consolidated Pull 03/19] send-pull-request: drop sendemail checks

In reply to Saul Wold

From: Otavio Salvador <[email protected]>

git send-email has the correct check on it. Basically the From is taken from the git 'user' and 'email' config values and in case 'sendemail.smtpserver' is not provided it defaults to use local sendmail command.

---
 scripts/send-pull-request |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
scripts/send-pull-request +0 -16
index cee9253..5dfc246 100755
@@ -67,19 +67,6 @@ harvest_recipients()
 	unset IFS
 }
 
-check_git_sendemail_config()
-{
-	GIT_SMTP=$(git config sendemail.smtpserver)
-	GIT_FROM=$(git config sendemail.from)
-	if [ -z "$GIT_SMTP" ] || [ -z "$GIT_FROM" ]; then
-		echo "ERROR: git sendemail is not configured."
-		echo "Please read GIT-SEND-EMAIL(1) and configure:"
-		echo "  sendemail.smtpserver"
-		echo "  sendemail.from"
-		exit 1
-	fi
-}
-
 # Parse and verify arguments
 while getopts "achp:t:" OPT; do
 	case $OPT in
@@ -113,9 +100,6 @@ while getopts "achp:t:" OPT; do
 	esac
 done
 
-# Abort early if git-send-email is not properly configured
-check_git_sendemail_config
-
 if [ -z "$PDIR" ]; then
 	echo "ERROR: you must specify a pull-dir."
 	usage
Signature · 1 line
1.7.3.4
author
#4 lore raw

[Updated Consolidated Pull 04/19] syslinux: rdepends on mtools

In reply to Saul Wold

From: Otavio Salvador <[email protected]>

To be able to install into a disk, mtools are required thus we add it as rdepends of 'syslinux' package.

---
 meta/recipes-devtools/syslinux/syslinux_4.03.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-devtools/syslinux/syslinux_4.03.bb +3 -1
index dc0785e..e76fe1f 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
            file://cross-build.patch"
@@ -48,6 +48,8 @@ do_install() {
 
 PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux"
 
+RDEPENDS_${PN} += "mtools"
+
 FILES_${PN} = "${bindir}/syslinux"
 FILES_${PN}-extlinux = "${sbindir}/extlinux"
 FILES_${PN}-mbr = "${libdir}/${PN}/mbr.bin"
Signature · 1 line
1.7.3.4
author
#5 lore raw

[Updated Consolidated Pull 07/19] create-pull-request: generalize the repository URL parsing

In reply to Saul Wold

From: Darren Hart <[email protected]>

The existing REMOTE_URL and REMOTE_REPO parsing made assumptions regarding the git URL format used for the known repository types. In fact, both of these ssh URL formats are valid for all the known repositories. Specifically:

ssh://git@server/repository/path
git@server:repository/path

Generalize the parsing to work with each of these for all push URLs matching *@*. Tested with the following URLs:

ssh://[email protected]/poky-contrib
ssh://[email protected]/poky-contrib.git
[email protected]:poky-contrib
[email protected]:poky-contrib.git

---
 scripts/create-pull-request |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)
scripts/create-pull-request +12 -17
index b808146..19b640f 100755
@@ -97,28 +97,22 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
 			exit 1
 		fi
 
-		# Rewrite known private URLs to public URLs
+		# Rewrite private URLs to public URLs
 		# Determine the repository name for use in the WEB_URL later
 		case "$REMOTE_URL" in
-		ssh://[email protected]*)
-			REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
-			REMOTE_URL=${REMOTE_URL/'ssh://git@'/'git://'}
+		*@*)
+			USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?"
+			PROTO_RE="[a-z][a-z]*://"
+			GIT_RE="\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)"
+			REMOTE_URL=${REMOTE_URL%.git}
+			REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\4#")
+			REMOTE_URL=$(echo $REMOTE_URL | sed "s#$GIT_RE#git://\3/\4#")
 			;;
-		ssh://[email protected]*)
-			REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
-			REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
-			;;
-		*ssh://[email protected]*)
-			REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
-			REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
-			;;
-		[email protected]:*)
-			REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#')
-			REMOTE_URL=${REMOTE_URL/"[email protected]:"/"git://github.com/"}
+		*)
+			echo "WARNING: Unrecognized remote URL: $REMOTE_URL"
+			echo "         The pull and browse URLs will likely be incorrect"
 			;;
 		esac
-		# The .git suffix is optional in the URL, drop in for the REPO
-		REMOTE_REPO=${REMOTE_REPO%.git}
 		;;
 	esac
 done
@@ -134,6 +128,7 @@ fi
 
 
 # Set WEB_URL from known remotes
+WEB_URL=""
 case "$REMOTE_URL" in
 	*git.yoctoproject.org*)
 		WEB_URL="http://git.yoctoproject.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
Signature · 1 line
1.7.3.4
author
#6 lore raw

[Updated Consolidated Pull 05/19] pulseaudio: package udev rules

In reply to Saul Wold

From: Koen Kooi <[email protected]>

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    2 +-
 .../pulseaudio/pulseaudio_0.9.15.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index 78d790f..e46b716 100644
@@ -69,7 +69,7 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la"
 FILES_${PN}-conf = "${sysconfdir}"
 FILES_${PN}-bin = "${bindir}/* \
                    ${sysconfdir}/default/volatiles/volatiles.04_pulse"
-FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl"
+FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules"
 FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
 FILES_${PN}-misc = "${bindir}/*"
 
meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb +1 -1
index 7bac9f9..71e19e9 100644
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus gdbm speex"
-PR = "r14"
+PR = "r15"
 
 SRC_URI += "\
   file://buildfix.patch;patch=1 \
meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb +1 -1
index 91893d7..863beda 100644
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "gdbm speex"
 
Signature · 1 line
1.7.3.4
author
#7 lore raw

[Updated Consolidated Pull 06/19] ghostscript: fix run failure on mpc8315e

In reply to Saul Wold

From: Kang Kai <[email protected]>

When run gs on mpc8315, it fails with:
GPL Ghostscript 9.02: ./psi/interp.c(291): Fatal error -20 in gs_interp_init! It is caused by cross compile.

Accoding to the ghostscript document on:
http://pages.cs.wisc.edu/~ghost/doc/cvs/Make.htm#Cross-compiling
it needs some manual work, so import patches from WindRiver Linux.

Update to using oe way to add arch.h, thanks to Richard.

---
 meta/recipes-extended/ghostscript/arm/objarch.h    |   40 +++++++++++++++++++
 meta/recipes-extended/ghostscript/arm/soobjarch.h  |   40 +++++++++++++++++++
 .../ghostscript/ghostscript-9.02-genarch.patch     |   27 +++++++++++++
 .../ghostscript/ghostscript_9.02.bb                |   22 +++++++++-
 meta/recipes-extended/ghostscript/i586/objarch.h   |   41 ++++++++++++++++++++
 meta/recipes-extended/ghostscript/i586/soobjarch.h |   41 ++++++++++++++++++++
 meta/recipes-extended/ghostscript/mips/objarch.h   |   40 +++++++++++++++++++
 meta/recipes-extended/ghostscript/mips/soobjarch.h |   40 +++++++++++++++++++
 .../recipes-extended/ghostscript/powerpc/objarch.h |   40 +++++++++++++++++++
 .../ghostscript/powerpc/soobjarch.h                |   40 +++++++++++++++++++
 meta/recipes-extended/ghostscript/x86_64/objarch.h |   40 +++++++++++++++++++
 .../ghostscript/x86_64/soobjarch.h                 |   40 +++++++++++++++++++
 12 files changed, 448 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/ghostscript/arm/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/arm/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
 create mode 100644 meta/recipes-extended/ghostscript/i586/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/i586/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/mips/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/mips/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/powerpc/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/powerpc/soobjarch.h
 create mode 100644 meta/recipes-extended/ghostscript/x86_64/objarch.h
 create mode 100644 meta/recipes-extended/ghostscript/x86_64/soobjarch.h
meta/recipes-extended/ghostscript/arm/objarch.h new file +40 -0
new file mode 100644
index 0000000..e8772cd
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 0
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/arm/soobjarch.h new file +40 -0
new file mode 100644
index 0000000..e8772cd
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 0
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch new file +27 -0
new file mode 100644
index 0000000..149f9fc
@@ -0,0 +1,27 @@
+Import patch from windriver linux for cross compilation, and split patches
+into oe way under different directories such as i586, powerpc etc according 
+to Richard's opinion.
+
+Upstream-status: Pending
+
+Signed-off-by: Kang Kai <[email protected]>
+
+# Author: Chi Xu <[email protected]>
+# Date: Feb 26 2010
+# Summary: Generate arch.h for ppc32
+#
+
+diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak
+--- ghostscript-8.64.orig/base/lib.mak	2010-02-10 10:30:02.000000000 +0800
++++ ghostscript-8.64/base/lib.mak	2010-02-10 10:56:21.000000000 +0800
+@@ -50,8 +50,8 @@
+ stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
+ stdint__h=$(GLSRC)stdint_.h $(std_h)
+
+-$(GLGEN)arch.h : $(GENARCH_XE)
+-	$(EXP)$(GENARCH_XE) $(GLGEN)arch.h
++##$(GLGEN)arch.h : $(GENARCH_XE)
++##	$(EXP)$(GENARCH_XE) $(GLGEN)arch.h
+
+ # Platform interfaces
+
meta/recipes-extended/ghostscript/ghostscript_9.02.bb +19 -3
index dcdedad..e3d32dd 100644
@@ -15,22 +15,32 @@ SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
 
-PR = "r0"
+PR = "r1"
 
-DEPENDS = "tiff ${PN}-native"
+DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
 DEPENDS_virtclass-native = ""
 
 SRC_URI = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2 \
            file://ghostscript-9.02-prevent_recompiling.patch \
+           file://ghostscript-9.02-genarch.patch \
+           file://objarch.h \
+           file://soobjarch.h \
            "
 
 SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
 SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
 
-EXTRA_OECONF = "--with-system-libtiff --without-jbig2dec --without-jasper --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
+EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
 
 inherit autotools
 
+do_configure_prepend () {
+     mkdir -p obj
+     mkdir -p soobj
+     cp ${WORKDIR}/objarch.h obj/arch.h
+     cp ${WORKDIR}/soobjarch.h soobj/arch.h
+}
+
 do_configure () {
     oe_runconf
 
@@ -42,6 +52,12 @@ do_configure () {
     done
 }
 
+do_install_append () {
+    mkdir -p ${D}${datadir}/ghostscript/${PV}/
+    cp -r Resource ${D}${datadir}/ghostscript/${PV}/
+    cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
+}
+
 python do_patch_virtclass-native () {
     pass
 }
meta/recipes-extended/ghostscript/i586/objarch.h new file +41 -0

41 lines not on this page · raw message

meta/recipes-extended/ghostscript/i586/soobjarch.h new file +41 -0

41 lines not on this page · raw message

meta/recipes-extended/ghostscript/mips/objarch.h new file +40 -0
new file mode 100644
index 0000000..359097f
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 1
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/mips/soobjarch.h new file +40 -0
new file mode 100644
index 0000000..359097f
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 1
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/powerpc/objarch.h new file +40 -0
new file mode 100644
index 0000000..359097f
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 1
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/powerpc/soobjarch.h new file +40 -0
new file mode 100644
index 0000000..359097f
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_PTR_MOD 4
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 2
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 4
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 1
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/x86_64/objarch.h new file +40 -0
new file mode 100644
index 0000000..a05de29
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 8
+#define ARCH_ALIGN_PTR_MOD 8
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 3
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 8
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 0
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/x86_64/soobjarch.h new file +40 -0
new file mode 100644
index 0000000..a05de29
@@ -0,0 +1,40 @@
+/* Parameters derived from machine and compiler architecture. */
+/* This file is generated mechanically by genarch.c. */
+
+	 /* ---------------- Scalar alignments ---------------- */
+
+#define ARCH_ALIGN_SHORT_MOD 2
+#define ARCH_ALIGN_INT_MOD 4
+#define ARCH_ALIGN_LONG_MOD 8
+#define ARCH_ALIGN_PTR_MOD 8
+#define ARCH_ALIGN_FLOAT_MOD 4
+#define ARCH_ALIGN_DOUBLE_MOD 8
+
+	 /* ---------------- Scalar sizes ---------------- */
+
+#define ARCH_LOG2_SIZEOF_CHAR 0
+#define ARCH_LOG2_SIZEOF_SHORT 1
+#define ARCH_LOG2_SIZEOF_INT 2
+#define ARCH_LOG2_SIZEOF_LONG 3
+#define ARCH_LOG2_SIZEOF_LONG_LONG 3
+#define ARCH_SIZEOF_GX_COLOR_INDEX 8
+#define ARCH_SIZEOF_PTR 8
+#define ARCH_SIZEOF_FLOAT 4
+#define ARCH_SIZEOF_DOUBLE 8
+#define ARCH_FLOAT_MANTISSA_BITS 24
+#define ARCH_DOUBLE_MANTISSA_BITS 53
+
+	 /* ---------------- Unsigned max values ---------------- */
+
+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+
+	 /* ---------------- Miscellaneous ---------------- */
+
+#define ARCH_IS_BIG_ENDIAN 0
+#define ARCH_PTRS_ARE_SIGNED 0
+#define ARCH_FLOATS_ARE_IEEE 1
+#define ARCH_ARITH_RSHIFT 2
+#define ARCH_DIV_NEG_POS_TRUNCATES 1
Signature · 1 line
1.7.3.4
author
#8 lore raw

[Updated Consolidated Pull 08/19] git: upgrade from 1.7.4.3 to 1.7.5.1

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

the autotools patch is not needed anymore. The code which the patch was patching is removed, and there is no use of the patch now.

---
 meta/recipes-devtools/git/files/autotools.patch    |   16 ----------------
 meta/recipes-devtools/git/git.inc                  |    3 +--
 .../git/{git_1.7.4.3.bb => git_1.7.5.1.bb}         |    6 +++---
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/files/autotools.patch
 rename meta/recipes-devtools/git/{git_1.7.4.3.bb => git_1.7.5.1.bb} (56%)
meta/recipes-devtools/git/files/autotools.patch deleted +0 -16
deleted file mode 100644
index cb21193..0000000
@@ -1,16 +0,0 @@
-Upstream-Status:Inappropriate [configuration]
-
-Index: git-1.7.2.1/configure.ac
-===================================================================
---- git-1.7.2.1.orig/configure.ac	2010-07-28 18:03:43.000000000 +0100
-+++ git-1.7.2.1/configure.ac	2010-08-13 14:54:29.181971250 +0100
-@@ -697,7 +697,8 @@
- 		else if (strcmp(buf, "12345"))
- 		  return 2;]])],
- 	[ac_cv_c_c99_format=yes],
--	[ac_cv_c_c99_format=no])
-+	[ac_cv_c_c99_format=no],
-+	[ac_cv_c_c99_format=yes])
- ])
- if test $ac_cv_c_c99_format = no; then
- 	NO_C99_FORMAT=YesPlease
meta/recipes-devtools/git/git.inc +1 -2
index 49292fa..c884f9c 100644
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "perl-native openssl curl zlib expat"
 
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1"
+SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
 S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
meta/recipes-devtools/git/git_1.7.5.1.bb renamed from meta/recipes-devtools/git/git_1.7.4.3.bb +3 -3
similarity index 56%
rename from meta/recipes-devtools/git/git_1.7.4.3.bb
rename to meta/recipes-devtools/git/git_1.7.5.1.bb
index 45ef61b..bfdbf62 100644
@@ -1,10 +1,10 @@
 require git.inc
 
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
                  "
 
-SRC_URI[md5sum] = "da6c8f4967393342a4397b955db72cb1"
-SRC_URI[sha256sum] = "44b3ebc87d83b34468718fb6fa424420877e1f66c190389d693d090662a3556d"
+SRC_URI[md5sum] = "a49291116e3b0564e069ae989e4db6fb"
+SRC_URI[sha256sum] = "a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c"
Signature · 1 line
1.7.3.4
author
#9 lore raw

[Updated Consolidated Pull 09/19] libpcre: upgrade from 8.10 to 8.12

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

---
 .../libpcre/{libpcre_8.10.bb => libpcre_8.12.bb}   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libpcre/{libpcre_8.10.bb => libpcre_8.12.bb} (94%)
meta/recipes-support/libpcre/libpcre_8.12.bb renamed from meta/recipes-support/libpcre/libpcre_8.10.bb +3 -3
similarity index 94%
rename from meta/recipes-support/libpcre/libpcre_8.10.bb
rename to meta/recipes-support/libpcre/libpcre_8.12.bb
index 2e17493..0301ddb 100644
@@ -5,15 +5,15 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r6"
+PR = "r0"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch;patch=1 \
            file://fix-pcre-name-collision.patch"
 
-SRC_URI[md5sum] = "780867a700e9d4e4b9cb47aa5453e4b2"
-SRC_URI[sha256sum] = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480"
+SRC_URI[md5sum] = "f14a9fef3c92f3fc6c5ac92d7a2c7eb3"
+SRC_URI[sha256sum] = "c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec"
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
Signature · 1 line
1.7.3.4
author
#10 lore raw

[Updated Consolidated Pull 11/19] python-pygpbject: upgrade from 2.27 to 2.27.91

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

---
 ...bject_2.27.0.bb => python-pygobject_2.27.91.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python-pygobject_2.27.0.bb => python-pygobject_2.27.91.bb} (87%)
meta/recipes-devtools/python/python-pygobject_2.27.91.bb renamed from meta/recipes-devtools/python/python-pygobject_2.27.0.bb +3 -3
similarity index 87%
rename from meta/recipes-devtools/python/python-pygobject_2.27.0.bb
rename to meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index 62024c3..d35f672 100644
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 DEPENDS = "python-pygobject-native-${PV} glib-2.0"
 DEPENDS_virtclass-native = "glib-2.0-native"
 RDEPENDS_virtclass-native = ""
-PR = "r2"
+PR = "r0"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "9e2496ffa4e55911f94232e29ee9f146"
-SRC_URI[sha256sum] = "7594bd86c5b92a4ba1f26927800f1b29e1ec5c246cad67aa085c279d6425b8a2"
+SRC_URI[md5sum] = "2b11a3050264721aac83188224b093a8"
+SRC_URI[sha256sum] = "a1dffbe2a8e0d490594554ed8d06f0ee4a371acb6c210e7f35158e9ae77e0df4"
 S = "${WORKDIR}/pygobject-${PV}"
 
 FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
Signature · 1 line
1.7.3.4
author
#11 lore raw

[Updated Consolidated Pull 12/19] distro-tracking: update toolchain recipe fields

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +3 -0
index ad45b94..bcf7a1a 100644
@@ -2908,11 +2908,13 @@ RECIPE_MAINTAINER_pn-linux-libc-headers = "Nitin A Kamble <nitin.a.kamble@intel.
 RECIPE_STATUS_pn-lsof="green" 
 RECIPE_LATEST_VERSION_pn-lsof="4.84"
 RECIPE_LAST_UPDATE_pn-lsof = "Nov 8, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-lsof = "May 23, 2011" 
 RECIPE_MAINTAINER_pn-lsof = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-make="green" 
 RECIPE_LATEST_VERSION_pn-make="3.82"
 RECIPE_LAST_UPDATE_pn-make = "Nov 8, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-make = "May 23, 2011" 
 RECIPE_MAINTAINER_pn-make = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-run-postinsts="green" # all local code
@@ -3003,6 +3005,7 @@ RECIPE_STATUS_pn-gnu-config="green"
 RECIPE_LATEST_VERSION_pn-gnu-config="0.0+git3155524"
 DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand"
 RECIPE_LAST_UPDATE_pn-gnu-config = "Jun 21, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gnu-config = "May 23, 2011" 
 RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-mpfr="green"
Signature · 1 line
1.7.3.4
author
#12 lore raw

[Updated Consolidated Pull 10/19] byacc: upgrade from 20101127 to 20101229

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

---
 meta/recipes-extended/byacc/byacc_20101127.bb |    7 -------
 meta/recipes-extended/byacc/byacc_20101229.bb |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta/recipes-extended/byacc/byacc_20101127.bb
 create mode 100644 meta/recipes-extended/byacc/byacc_20101229.bb
meta/recipes-extended/byacc/byacc_20101127.bb deleted +0 -7
deleted file mode 100644
index b6b7b70..0000000
@@ -1,7 +0,0 @@
-PR = "r0"
-LICENSE="other-BSD"
-LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=4dc4c30f840a7203fb6edf20b3db849e"
-require byacc.inc
-
-SRC_URI[md5sum] = "5931a27e43102dc868745bf4dce91fb4"
-SRC_URI[sha256sum] = "c172c7ed2ee2130510d4d6e134bcac791b217e4883051137690613ac011aca47"
meta/recipes-extended/byacc/byacc_20101229.bb new file +7 -0
new file mode 100644
index 0000000..09e91e6
@@ -0,0 +1,7 @@
+PR = "r0"
+LICENSE="other-BSD"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=4dc4c30f840a7203fb6edf20b3db849e"
+require byacc.inc
+
+SRC_URI[md5sum] = "e359702cda080c15f656a244aab132e5"
+SRC_URI[sha256sum] = "67a5e4c7888bf7921949e38d4fd6eec855ec8b5a60d83f8d6f34eddb6d42a70c"
Signature · 1 line
1.7.3.4
author
#13 lore raw

[Updated Consolidated Pull 13/19] gst-plugins-base: Add tremor to DEPENDS

In reply to Saul Wold

gst-plugins-base requires the libvorbisidec library which is part of tremor

---
 .../gstreamer/gst-plugins-base_0.10.32.bb          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb +1 -1
index 2d09c6c..f81011f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi util-linux"
+DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi util-linux tremor"
 RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
 
Signature · 1 line
1.7.3.4
author
#14 lore raw

[Updated Consolidated Pull 14/19] elfutils_0.148.bb: Fix compilation on uclibc

In reply to Saul Wold

From: Khem Raj <[email protected]>

Currently all components of elfutils dont compile with uclibc but elfutils is one part which is needed by other recipes e.g. gcc 4.5 to compile. we make adjustments so that when compiling for uclibc targets it _only_ builds and packages libelf

use --enable-uclibc only when building for uclibc targets

The supporting patch is also needed for compiling with uclibc to specify -lintl and -luargp on linker commandline

Add missing inherit on gettext

---
 .../elfutils/elfutils-0.148/uclibc-support.patch   |   91 ++++++++++++++++++++
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |   15 +++-
 2 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support.patch
meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support.patch new file +91 -0
new file mode 100644
index 0000000..3cf16ac
@@ -0,0 +1,91 @@
+on uclibc systems libintl and libuargp are separate from libc.
+so they need to be specified on commandline when we use proxy-libintl
+then libintl is a static archive so it should be listed last since
+elfutils does not respect disable-nls we need to link in libintl
+
+We add a new option --enable-uclibc which will be used to control
+the uclibc specific configurations during build.
+
+Signed-off-by: Khem Raj <raj.khem>
+
+Upstream-Status: Inappropriate [uclibc specific]
+
+Index: elfutils-0.148/configure.ac
+===================================================================
+--- elfutils-0.148.orig/configure.ac
++++ elfutils-0.148/configure.ac
+@@ -55,9 +55,16 @@ AS_IF([test "$use_locks" = yes], [AC_DEF
+ 
+ AH_TEMPLATE([USE_LOCKS], [Defined if libraries should be thread-safe.])
+ 
++AC_ARG_ENABLE([uclibc],
++AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]),
++use_uclibc=yes, use_uclibc=no)
++AM_CONDITIONAL(USE_UCLIBC, test "$use_uclibc" = yes)
++AS_IF([test "$use_uclibc" = yes], [AC_DEFINE(USE_UCLIBC)])
++
++AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.])
++
+ dnl Add all the languages for which translations are available.
+ ALL_LINGUAS=
+-
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+Index: elfutils-0.148/libelf/Makefile.am
+===================================================================
+--- elfutils-0.148.orig/libelf/Makefile.am
++++ elfutils-0.148/libelf/Makefile.am
+@@ -93,7 +93,12 @@ if !MUDFLAP
+ libelf_pic_a_SOURCES =
+ am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
+ 
++
+ libelf_so_LDLIBS =
++if USE_UCLIBC
++libelf_so_LDLIBS += -lintl -luargp
++endif
++
+ if USE_LOCKS
+ libelf_so_LDLIBS += -lpthread
+ endif
+Index: elfutils-0.148/libdw/Makefile.am
+===================================================================
+--- elfutils-0.148.orig/libdw/Makefile.am
++++ elfutils-0.148/libdw/Makefile.am
+@@ -98,6 +98,11 @@ if !MUDFLAP
+ libdw_pic_a_SOURCES =
+ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+ 
++libdw_so_LDLIBS =
++if USE_UCLIBC
++libdw_so_LDLIBS += -lintl -luargp
++endif
++
+ libdw_so_SOURCES =
+ libdw.so: $(srcdir)/libdw.map libdw_pic.a \
+ 	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
+@@ -108,7 +113,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.
+ 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
+ 		-Wl,--version-script,$<,--no-undefined \
+ 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+-		-ldl $(zip_LIBS)
++		-ldl $(zip_LIBS) $(libdw_so_LDLIBS)
+ 	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 
+Index: elfutils-0.148/libcpu/Makefile.am
+===================================================================
+--- elfutils-0.148.orig/libcpu/Makefile.am
++++ elfutils-0.148/libcpu/Makefile.am
+@@ -63,6 +63,10 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i3
+ i386_lex.o: i386_parse.h
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ 
++if USE_UCLIBC
++i386_gendis_LDADD += -luargp -lintl
++endif
++
+ i386_parse.h: i386_parse.c ;
+ 
+ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
meta/recipes-devtools/elfutils/elfutils_0.148.bb +12 -3
index df933f6..115ff9b 100644
@@ -30,6 +30,9 @@ SRC_URI += "\
 	file://remove-unused.patch \
 	file://mempcpy.patch \
 "
+# Only apply when building uclibc based target recipe
+SRC_URI_append_libc-uclibc = " ${@['', 'file://uclibc-support.patch']['${PN}' == '${BPN}']}"
+
 # The buildsystem wants to generate 2 .h files from source using a binary it just built,
 # which can not pass the cross compiling, so let's work around it by adding 2 .h files
 # along with the do_configure_prepend()
@@ -38,9 +41,10 @@ SRC_URI += "\
         file://i386_dis.h \
         file://x86_64_dis.h \
 "
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--program-prefix=eu-"
+EXTRA_OECONF_append_libc-uclibc = " ${@['', '--enable-uclibc']['${PN}' == '${BPN}']}"
 
 do_configure_prepend() {
 	sed -i 's:./i386_gendis:echo\ \#:g' ${S}/libcpu/Makefile.am
@@ -48,8 +52,13 @@ do_configure_prepend() {
 	cp ${WORKDIR}/*dis.h ${S}/libcpu
 }
 
-# Only append ldflags for target recipe
-TARGET_LDFLAGS_libc-uclibc += "${@['', '-lintl -luargp']['${PN}' == '${BPN}']}"
+# we can not build complete elfutils when using uclibc
+# but some recipes e.g. gcc 4.5 depends on libelf so we
+# build only libelf for uclibc case
+
+EXTRA_OEMAKE_libc-uclibc = "-C libelf"
+EXTRA_OEMAKE_virtclass-native = ""
+EXTRA_OEMAKE_virtclass-nativesdk = ""
 
 BBCLASSEXTEND = "native nativesdk"
 
Signature · 1 line
1.7.3.4
author
#15 lore raw

[Updated Consolidated Pull 15/19] eglibc.inc: Transfer PARALLEL_MAKE to PARALLELMFLAGS

In reply to Saul Wold

From: Khem Raj <[email protected]>

* Currently we are passing -jN or -j N flags to eglibc makefiles however eglibc uses a make variable called PARALLELMFLAGS to pass information about parallel build to sub-makes

* Currently make install ran without parallelism but now it should have parallel building flags passed to do_install correctly which inturn should improve build time of eglibc on systems using parallel build -j with values > 1

---
 meta/recipes-core/eglibc/eglibc.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
meta/recipes-core/eglibc/eglibc.inc +6 -0
index 8314cb1..46ffa82 100644
@@ -36,4 +36,10 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 ARM_INSTRUCTION_SET = "arm"
 
+# eglibc uses PARALLELMFLAGS variable to pass parallel build info so transfer
+# PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE
+EGLIBCPARALLELISM := "PARALLELMFLAGS="${PARALLEL_MAKE}""
+EXTRA_OEMAKE += ${EGLIBCPARALLELISM}
+PARALLEL_MAKE = ""
+
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
Signature · 1 line
1.7.3.4
author
#16 lore raw

[Updated Consolidated Pull 17/19] image_types: add IMAGE_ROOTFS_EXTRA_SPACE

In reply to Saul Wold

[YOCTO #886]

This address 2 needs after the IMAGE_ROOTFS_SIZE is cleaned up, by removing the _ext2/3 overrides it allows for a cleaner override using IMAGE_ROOTFS_SIZE to create a large rootfs, or by setting the IMAGE_ROOTFS_EXTRA_SPACE, will allow for extra space allocated in Kilobytes above the base size (determined by du of the rootfs * IMAGE_OVERHEAD_FACTOR, default of 1.3).

---
 meta/classes/image_types.bbclass |    2 +-
 meta/conf/bitbake.conf           |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)
meta/classes/image_types.bbclass +1 -1
index 69f859e..601a5fb 100644
@@ -13,7 +13,7 @@ def get_imagecmds(d):
 
 runimagecmd () {
 	# Image generation code for image type ${type}
-	ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
+	ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
 	${cmd}
 	cd ${DEPLOY_DIR_IMAGE}/
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
meta/conf/bitbake.conf +4 -0
index 18028f3..35fd6f8 100644
@@ -350,6 +350,10 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 # This option allows for a precentage overage of the actaul image size rather than a
 # fixed extra space
 IMAGE_OVERHEAD_FACTOR ?= 1.3
+# This option allow for adding addition space in K above and beyond what the 
+# IMAGE_OVERHEAD_FACTOR might add. To set a fixed size then overrideing IMAGE_ROOTFS_SIZE
+# with the max size one wants should do the trick
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
 
 EXTRA_IMAGEDEPENDS = ""
 
Signature · 1 line
1.7.3.4
author
#17 lore raw

[Updated Consolidated Pull 18/19] rootfs_ipk: issue a diagnostic if rootfs is declared read-only and not all maintainer scripts could be applied offline

In reply to Saul Wold

From: Phil Blundell <[email protected]>

---
 meta/classes/rootfs_ipk.bbclass |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
meta/classes/rootfs_ipk.bbclass +10 -0
index 5727d15..edd84fb 100644
@@ -54,17 +54,27 @@ fakeroot rootfs_ipk_do_rootfs () {
 	${OPKG_POSTPROCESS_COMMANDS}
 	${ROOTFS_POSTINSTALL_COMMAND}
 	
+	runtime_script_required=0
 	for i in ${IMAGE_ROOTFS}${opkglibdir}/info/*.preinst; do
 		if [ -f $i ] && ! sh $i; then
+		     	runtime_script_required=1
 			opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
 		fi
 	done
 	for i in ${IMAGE_ROOTFS}${opkglibdir}/info/*.postinst; do
 		if [ -f $i ] && ! sh $i configure; then
+		     	runtime_script_required=1
 			opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
 		fi
 	done
 
+	if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
+		if [ $runtime_script_required -eq 1 ]; then
+			echo "Some packages could not be configured offline and rootfs is read-only."
+			exit 1
+		fi
+	fi
+
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
Signature · 1 line
1.7.3.4
author
#18 lore raw

[Updated Consolidated Pull 16/19] IMAGE_ROOTFS_SIZE Cleanup

In reply to Saul Wold

This basic cleanup removes the _ext2/3 overrides from places they no longer belong since they did not allow further overrides. In doing this the core-image-minimal* recipes can now set a reasonably small rootfs so that it's a realistic size for minimal.

The new default for minimal is 8M and will be adujsted upward by the IMAGE_OVERHEAD_FACTOR (default of 1.3).

This also fixes the ROOTFS_SIZE usage in the IMAGE_CMD_<fstype> code

---
 meta/classes/image_types.bbclass                   |    7 +++++--
 meta/conf/bitbake.conf                             |    4 ----
 meta/conf/distro/include/default-distrovars.inc    |    2 --
 meta/conf/machine/include/qemu.inc                 |    2 --
 .../images/core-image-minimal-initramfs.bb         |    2 ++
 meta/recipes-core/images/core-image-minimal.bb     |    2 ++
 6 files changed, 9 insertions(+), 10 deletions(-)
meta/classes/image_types.bbclass +5 -2
index ec0cafd..69f859e 100644
@@ -21,22 +21,25 @@ runimagecmd () {
 }
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
+
 IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
 IMAGE_CMD_ext2.gz () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
-	genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
 	gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
 	mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
 	rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
 }
+
 IMAGE_CMD_ext3 () {
 	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
 	tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
 }
 IMAGE_CMD_ext3.gz () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
-	genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
 	tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
 	gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
 	mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
meta/conf/bitbake.conf +0 -4
index a0af672..18028f3 100644
@@ -645,10 +645,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
 IMAGE_ROOTFS_SIZE ?= "65536"
-IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
-IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
-IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
-IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
 
 # Forcefully set CACHE now so future changes to things like 
 # MACHINE don't change the path to the cache
meta/conf/distro/include/default-distrovars.inc +0 -2
index 1aa45c8..4b68a0a 100644
@@ -1,7 +1,5 @@
 QA_LOGFILE = "${TMPDIR}/qa.log"
 
-IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
-
 OEINCLUDELOGS ?= "yes"
 KERNEL_CONSOLE ?= "ttyS0"
 
meta/conf/machine/include/qemu.inc +0 -2
index 4122a88..9ef242f 100644
@@ -6,8 +6,6 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 IMAGE_FSTYPES ?= "tar.bz2 ext3"
 
 ROOT_FLASH_SIZE = "280"
-IMAGE_ROOTFS_SIZE_ext2 ?= "280000"
-IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
 
 # Don't include kernels in standard images
 RDEPENDS_kernel-base = ""
meta/recipes-core/images/core-image-minimal-initramfs.bb +2 -0
index 21aaa6c..3246d5c 100644
@@ -8,3 +8,5 @@ IMAGE_LINGUAS = ""
 LICENSE = "MIT"
 
 inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
meta/recipes-core/images/core-image-minimal.bb +2 -0
index aa00e67..743e121 100644
@@ -9,5 +9,7 @@ LICENSE = "MIT"
 
 inherit core-image
 
+IMAGE_ROOTFS_SIZE = "8192"
+
 # remove not needed ipkg informations
 ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
Signature · 1 line
1.7.3.4
author
#19 lore raw

[Updated Consolidated Pull 19/19] gnutls: update to 2.12.5

In reply to Saul Wold

- Add libcap to depends

---
 .../configure-fix.patch                            |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls.inc             |    2 +-
 .../gnutls/{gnutls_2.10.4.bb => gnutls_2.12.5.bb}  |    4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/configure-fix.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls_2.10.4.bb => gnutls_2.12.5.bb} (53%)
meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
meta/recipes-support/gnutls/gnutls.inc +1 -1
index 2dcd8a0..d220a24 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2)"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
 
 BBCLASSEXTEND = "native"
 
meta/recipes-support/gnutls/gnutls_2.12.5.bb renamed from meta/recipes-support/gnutls/gnutls_2.10.4.bb +2 -2
similarity index 53%
rename from meta/recipes-support/gnutls/gnutls_2.10.4.bb
rename to meta/recipes-support/gnutls/gnutls_2.12.5.bb
index 3924ecd..ad4fd3d 100644
@@ -6,5 +6,5 @@ SRC_URI += "file://gnutls-openssl.patch \
             file://gnutls-texinfo-euro.patch \
             file://configure-fix.patch"
 
-SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528"
-SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
+SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
+SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"
Signature · 1 line
1.7.3.4
author
#20 lore raw

Re: [Updated Consolidated Pull 19/19] gnutls: update to 2.12.5

Quoted 48 lines · Saul Wold

- Add libcap to depends

---
  .../configure-fix.patch                            |    0
  .../gnutls-openssl.patch                           |    0
  .../gnutls-texinfo-euro.patch                      |    0
  meta/recipes-support/gnutls/gnutls.inc             |    2 +-
  .../gnutls/{gnutls_2.10.4.bb =>  gnutls_2.12.5.bb}  |    4 ++--
  5 files changed, 3 insertions(+), 3 deletions(-)
  rename meta/recipes-support/gnutls/{gnutls-2.10.4 =>  gnutls-2.12.5}/configure-fix.patch (100%)
  rename meta/recipes-support/gnutls/{gnutls-2.10.4 =>  gnutls-2.12.5}/gnutls-openssl.patch (100%)
  rename meta/recipes-support/gnutls/{gnutls-2.10.4 =>  gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)

rename meta/recipes-support/gnutls/{gnutls_2.10.4.bb => gnutls_2.12.5.bb} (53%)

meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
meta/recipes-support/gnutls/gnutls.inc +1 -1
index 2dcd8a0..d220a24 100644
@@ -1,7 +1,7 @@
  DESCRIPTION = "GNU Transport Layer Security Library"
  HOMEPAGE = "http://www.gnu.org/software/gnutls/"
  BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2)"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
 
  BBCLASSEXTEND = "native"
 
meta/recipes-support/gnutls/gnutls_2.12.5.bb renamed from meta/recipes-support/gnutls/gnutls_2.10.4.bb +0 -0
similarity index 53%
rename from meta/recipes-support/gnutls/gnutls_2.10.4.bb
rename to meta/recipes-support/gnutls/gnutls_2.12.5.bb
index 3924ecd..ad4fd3d 100644

meta/recipes-support/gnutls/gnutls_2.12.5.bb SRC_URI += "file://gnutls-openssl.patch \ · line 10

Quoted 7 lines
meta/recipes-support/gnutls/gnutls_2.12.5.bb renamed from meta/recipes-support/gnutls/gnutls_2.10.4.bb +2 -2
@@ -6,5 +6,5 @@ SRC_URI += "file://gnutls-openssl.patch \
              file://gnutls-texinfo-euro.patch \
              file://configure-fix.patch"
 
-SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528"
-SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
+SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
+SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"

Please don't take this gnutls update, I was a little too hasty in sending it up, was testing it and it should not be here.

Sau!

#21 lore raw
In reply to Saul Wold
Quoted 7 lines · Saul Wold

General consolidation of patches and updates over the last few days with testing done. This includes the proposed ROOTFS_SIZE cleanup, there will be a corresponding push to poky after this is in.

Once some of the M1 patches are in, I will cherry-pick them for the RC3 build.

Merged with the exception of gnutls as discussed.

Cheers,

Richard