* [Consolidated Pull 01/12] gail: update gail to 1.20.2
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 02/12] update-alternatives-dpkg: Update to dpkg base 1.15.8.7 Saul Wold
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
[YOCTO #1042]
- Added LIC_FILES_CHKSUM
- Corrected LICENSE
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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%)
diff --git a/meta/recipes-gnome/gnome/gail_1.20.0.bb b/meta/recipes-gnome/gnome/gail_1.20.2.bb
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
--- a/meta/recipes-gnome/gnome/gail_1.20.0.bb
+++ b/meta/recipes-gnome/gnome/gail_1.20.2.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 02/12] update-alternatives-dpkg: Update to dpkg base 1.15.8.7
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 01/12] gail: update gail to 1.20.2 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 03/12] send-pull-request: drop sendemail checks Saul Wold
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
[YOCTO #1062]
Due to failing fetch updated recipe and SRC_URI to use .bz2,
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index 9b53df8..f7f9ae9 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
@@ -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"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
deleted file mode 100644
index 5d38d5d..0000000
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ /dev/null
@@ -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}"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
new file mode 100644
index 0000000..5443122
--- /dev/null
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 03/12] send-pull-request: drop sendemail checks
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 01/12] gail: update gail to 1.20.2 Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 02/12] update-alternatives-dpkg: Update to dpkg base 1.15.8.7 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 04/12] syslinux: rdepends on mtools Saul Wold
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/send-pull-request | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index cee9253..5dfc246 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 04/12] syslinux: rdepends on mtools
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (2 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 03/12] send-pull-request: drop sendemail checks Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 05/12] pulseaudio: package udev rules Saul Wold
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
To be able to install into a disk, mtools are required thus we add it
as rdepends of 'syslinux' package.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-devtools/syslinux/syslinux_4.03.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index dc0785e..e76fe1f 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 05/12] pulseaudio: package udev rules
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (3 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 04/12] syslinux: rdepends on mtools Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 06/12] ghostscript: fix run failure on mpc8315e Saul Wold
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
From: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
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(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 78d790f..e46b716 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -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}/*"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb
index 7bac9f9..71e19e9 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb
@@ -1,7 +1,7 @@
require pulseaudio.inc
DEPENDS += "dbus gdbm speex"
-PR = "r14"
+PR = "r15"
SRC_URI += "\
file://buildfix.patch;patch=1 \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index 91893d7..863beda 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "gdbm speex"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 06/12] ghostscript: fix run failure on mpc8315e
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (4 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 05/12] pulseaudio: package udev rules Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 07/12] create-pull-request: generalize the repository URL parsing Saul Wold
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Kang Kai
From: Kang Kai <kai.kang@windriver.com>
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.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
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
diff --git a/meta/recipes-extended/ghostscript/arm/objarch.h b/meta/recipes-extended/ghostscript/arm/objarch.h
new file mode 100644
index 0000000..e8772cd
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/arm/objarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/arm/soobjarch.h b/meta/recipes-extended/ghostscript/arm/soobjarch.h
new file mode 100644
index 0000000..e8772cd
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/arm/soobjarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
new file mode 100644
index 0000000..149f9fc
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
@@ -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 <kai.kang@windriver.com>
+
+# Author: Chi Xu <chi.xu@windriver.com>
+# 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
+
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index dcdedad..e3d32dd 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -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
}
diff --git a/meta/recipes-extended/ghostscript/i586/objarch.h b/meta/recipes-extended/ghostscript/i586/objarch.h
new file mode 100644
index 0000000..5817b7a
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/i586/objarch.h
@@ -0,0 +1,41 @@
+/* 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 4
+
+ /* ---------------- 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
+
diff --git a/meta/recipes-extended/ghostscript/i586/soobjarch.h b/meta/recipes-extended/ghostscript/i586/soobjarch.h
new file mode 100644
index 0000000..5817b7a
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/i586/soobjarch.h
@@ -0,0 +1,41 @@
+/* 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 4
+
+ /* ---------------- 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
+
diff --git a/meta/recipes-extended/ghostscript/mips/objarch.h b/meta/recipes-extended/ghostscript/mips/objarch.h
new file mode 100644
index 0000000..359097f
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/mips/objarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/mips/soobjarch.h b/meta/recipes-extended/ghostscript/mips/soobjarch.h
new file mode 100644
index 0000000..359097f
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/mips/soobjarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/powerpc/objarch.h b/meta/recipes-extended/ghostscript/powerpc/objarch.h
new file mode 100644
index 0000000..359097f
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/powerpc/objarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/powerpc/soobjarch.h b/meta/recipes-extended/ghostscript/powerpc/soobjarch.h
new file mode 100644
index 0000000..359097f
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/powerpc/soobjarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/x86_64/objarch.h b/meta/recipes-extended/ghostscript/x86_64/objarch.h
new file mode 100644
index 0000000..a05de29
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/x86_64/objarch.h
@@ -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
diff --git a/meta/recipes-extended/ghostscript/x86_64/soobjarch.h b/meta/recipes-extended/ghostscript/x86_64/soobjarch.h
new file mode 100644
index 0000000..a05de29
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/x86_64/soobjarch.h
@@ -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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 07/12] create-pull-request: generalize the repository URL parsing
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (5 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 06/12] ghostscript: fix run failure on mpc8315e Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 08/12] git: upgrade from 1.7.4.3 to 1.7.5.1 Saul Wold
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Darren Hart
From: Darren Hart <dvhart@linux.intel.com>
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://git@git.pokylinux.org/poky-contrib
ssh://git@git.pokylinux.org/poky-contrib.git
git@git.pokylinux.org:poky-contrib
git@git.pokylinux.org:poky-contrib.git
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index b808146..19b640f 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -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://git@git.pokylinux.org*)
- 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://git@git.yoctoproject.org*)
- REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
- REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
- ;;
- *ssh://git@git.openembedded.org*)
- REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
- REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
- ;;
- git@github.com:*)
- REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#')
- REMOTE_URL=${REMOTE_URL/"git@github.com:"/"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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 08/12] git: upgrade from 1.7.4.3 to 1.7.5.1
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (6 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 07/12] create-pull-request: generalize the repository URL parsing Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 09/12] libpcre: upgrade from 8.10 to 8.12 Saul Wold
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
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.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
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%)
diff --git a/meta/recipes-devtools/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch
deleted file mode 100644
index cb21193..0000000
--- a/meta/recipes-devtools/git/files/autotools.patch
+++ /dev/null
@@ -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
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 49292fa..c884f9c 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -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"
diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
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
--- a/meta/recipes-devtools/git/git_1.7.4.3.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 09/12] libpcre: upgrade from 8.10 to 8.12
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (7 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 08/12] git: upgrade from 1.7.4.3 to 1.7.5.1 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 10/12] byacc: upgrade from 20101127 to 20101229 Saul Wold
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../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%)
diff --git a/meta/recipes-support/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
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
--- a/meta/recipes-support/libpcre/libpcre_8.10.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 10/12] byacc: upgrade from 20101127 to 20101229
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (8 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 09/12] libpcre: upgrade from 8.10 to 8.12 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 11/12] python-pygpbject: upgrade from 2.27 to 2.27.91 Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 12/12] distro-tracking: update toolchain recipe fields Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
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
diff --git a/meta/recipes-extended/byacc/byacc_20101127.bb b/meta/recipes-extended/byacc/byacc_20101127.bb
deleted file mode 100644
index b6b7b70..0000000
--- a/meta/recipes-extended/byacc/byacc_20101127.bb
+++ /dev/null
@@ -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"
diff --git a/meta/recipes-extended/byacc/byacc_20101229.bb b/meta/recipes-extended/byacc/byacc_20101229.bb
new file mode 100644
index 0000000..09e91e6
--- /dev/null
+++ b/meta/recipes-extended/byacc/byacc_20101229.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 11/12] python-pygpbject: upgrade from 2.27 to 2.27.91
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (9 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 10/12] byacc: upgrade from 20101127 to 20101229 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
2011-05-24 16:02 ` [Consolidated Pull 12/12] distro-tracking: update toolchain recipe fields Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...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%)
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.0.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
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
--- a/meta/recipes-devtools/python/python-pygobject_2.27.0.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Consolidated Pull 12/12] distro-tracking: update toolchain recipe fields
2011-05-24 16:02 [Consolidated Pull 00/12] 24-May-2011 Saul Wold
` (10 preceding siblings ...)
2011-05-24 16:02 ` [Consolidated Pull 11/12] python-pygpbject: upgrade from 2.27 to 2.27.91 Saul Wold
@ 2011-05-24 16:02 ` Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-05-24 16:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index ad45b94..bcf7a1a 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -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 <nitin.a.kamble@intel.com>"
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 <nitin.a.kamble@intel.com>"
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 <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-mpfr="green"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 13+ messages in thread