* [PATCH 01/13] xf86-video-intel: upgrade to 2.21.13
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 02/13] git: upgrade to 1.8.3.4 Laurentiu Palcu
` (13 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...intel_2.21.9.bb => xf86-video-intel_2.21.13.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.21.9.bb => xf86-video-intel_2.21.13.bb} (85%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
index 6112089..9817049 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
@@ -21,5 +21,5 @@ EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = "fd96651b0d90dc7e977b23fd54f2c3e8"
-SRC_URI[sha256sum] = "1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189"
+SRC_URI[md5sum] = "018154293ea25b69568ff0340a89ae7c"
+SRC_URI[sha256sum] = "76e17cebf79d3c3c98af246fcfb55018aa12e2d56fe5f3b6d54b93e90837efa8"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 02/13] git: upgrade to 1.8.3.4
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 01/13] xf86-video-intel: upgrade to 2.21.13 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 03/13] nasm: upgrade to 2.10.09 Laurentiu Palcu
` (12 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../git/{git_1.8.3.bb => git_1.8.3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/git/{git_1.8.3.bb => git_1.8.3.4.bb} (67%)
diff --git a/meta/recipes-devtools/git/git_1.8.3.bb b/meta/recipes-devtools/git/git_1.8.3.4.bb
similarity index 67%
rename from meta/recipes-devtools/git/git_1.8.3.bb
rename to meta/recipes-devtools/git/git_1.8.3.4.bb
index 0295919..124a98e 100644
--- a/meta/recipes-devtools/git/git_1.8.3.bb
+++ b/meta/recipes-devtools/git/git_1.8.3.4.bb
@@ -1,8 +1,8 @@
require git.inc
SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
-SRC_URI[md5sum] = "d91b6099fb6763cf92c696977a247060"
-SRC_URI[sha256sum] = "f1d3c6d683f8f15035a8d0f3eb30ed160ff6607111dfc6026d8836307aebc53a"
+SRC_URI[md5sum] = "80eec3201a5d012913d287b85adaee8e"
+SRC_URI[sha256sum] = "dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9"
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} \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 03/13] nasm: upgrade to 2.10.09
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 01/13] xf86-video-intel: upgrade to 2.21.13 Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 02/13] git: upgrade to 1.8.3.4 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 04/13] powertop: upgrade to 2.4 Laurentiu Palcu
` (11 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../nasm/{nasm_2.10.07.bb => nasm_2.10.09.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/nasm/{nasm_2.10.07.bb => nasm_2.10.09.bb} (80%)
diff --git a/meta/recipes-devtools/nasm/nasm_2.10.07.bb b/meta/recipes-devtools/nasm/nasm_2.10.09.bb
similarity index 80%
rename from meta/recipes-devtools/nasm/nasm_2.10.07.bb
rename to meta/recipes-devtools/nasm/nasm_2.10.09.bb
index bcecce4..19663d6 100644
--- a/meta/recipes-devtools/nasm/nasm_2.10.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.10.09.bb
@@ -4,11 +4,10 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe"
COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
-PR = "r0"
SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 "
-SRC_URI[md5sum] = "af1cd6669f5e98148cd5ec42dee90f19"
-SRC_URI[sha256sum] = "c056e2abc83816892e448f9e9e95a3d21e9e096f44341b9d4853f62a443bba82"
+SRC_URI[md5sum] = "0e45ca0d3d7ff36d503777eaa673e2ae"
+SRC_URI[sha256sum] = "7141180d3874b5967c6a60191e8d45fba9cc86bd60a4803ad80b6b6b3eac36b9"
inherit autotools
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 04/13] powertop: upgrade to 2.4
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (2 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 03/13] nasm: upgrade to 2.10.09 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 05/13] libdrm: upgrade to 2.4.46 Laurentiu Palcu
` (10 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../powertop/{powertop_2.3.bb => powertop_2.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/powertop/{powertop_2.3.bb => powertop_2.4.bb} (87%)
diff --git a/meta/recipes-kernel/powertop/powertop_2.3.bb b/meta/recipes-kernel/powertop/powertop_2.4.bb
similarity index 87%
rename from meta/recipes-kernel/powertop/powertop_2.3.bb
rename to meta/recipes-kernel/powertop/powertop_2.4.bb
index 5dae1b6..465d117 100644
--- a/meta/recipes-kernel/powertop/powertop_2.3.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.4.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
-SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
-SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+SRC_URI[md5sum] = "3aa686bb245d6683b86cba9a6a4b8c6d"
+SRC_URI[sha256sum] = "42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7"
inherit autotools gettext
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 05/13] libdrm: upgrade to 2.4.46
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (3 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 04/13] powertop: upgrade to 2.4 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 06/13] libpciaccess: upgrade to 0.13.2 Laurentiu Palcu
` (9 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../drm/{libdrm_2.4.45.bb => libdrm_2.4.46.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.45.bb => libdrm_2.4.46.bb} (46%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.45.bb b/meta/recipes-graphics/drm/libdrm_2.4.46.bb
similarity index 46%
rename from meta/recipes-graphics/drm/libdrm_2.4.45.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.46.bb
index 52e6f65..c9900b1 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.45.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.46.bb
@@ -3,6 +3,6 @@ require libdrm.inc
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
"
-SRC_URI[md5sum] = "92ce56e7533a9b2fcb5c8f32d305328b"
-SRC_URI[sha256sum] = "3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208"
+SRC_URI[md5sum] = "9cba217fd3daa10b1d052ec60d3aa7d5"
+SRC_URI[sha256sum] = "33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 06/13] libpciaccess: upgrade to 0.13.2
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (4 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 05/13] libdrm: upgrade to 2.4.46 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 07/13] xrandr: upgrade to 1.4.1 Laurentiu Palcu
` (8 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Licence MD5 changed because some years were updated and some new people
added their own copyright text which, apparently, is similar with what
already exists in the file.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...bpciaccess_0.13.1.bb => libpciaccess_0.13.2.bb} | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.1.bb => libpciaccess_0.13.2.bb} (50%)
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
similarity index 50%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
index 0ec6814..6da86f2 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
@@ -6,9 +6,7 @@ PCI bus and devices in a platform-independent way."
require xorg-lib-common.inc
LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
-PR = "r1"
-
-SRC_URI[md5sum] = "399a419ac6a54f0fc07c69c9bdf452dc"
-SRC_URI[sha256sum] = "27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084"
+SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a"
+SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 07/13] xrandr: upgrade to 1.4.1
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (5 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 06/13] libpciaccess: upgrade to 0.13.2 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 08/13] xf86-input-evdev: upgrade to 2.8.1 Laurentiu Palcu
` (7 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xorg-app/{xrandr_1.4.0.bb => xrandr_1.4.1.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-app/{xrandr_1.4.0.bb => xrandr_1.4.1.bb} (70%)
diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.4.0.bb b/meta/recipes-graphics/xorg-app/xrandr_1.4.1.bb
similarity index 70%
rename from meta/recipes-graphics/xorg-app/xrandr_1.4.0.bb
rename to meta/recipes-graphics/xorg-app/xrandr_1.4.1.bb
index 687c9b8..35e53c8 100644
--- a/meta/recipes-graphics/xorg-app/xrandr_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-app/xrandr_1.4.1.bb
@@ -10,7 +10,6 @@ LICENSE= "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3"
DEPENDS += "libxrandr libxrender"
PE = "1"
-PR = "${INC_PR}.0"
-SRC_URI[md5sum] = "4d68317238bb14a33c0e419233d57d87"
-SRC_URI[sha256sum] = "a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693"
+SRC_URI[md5sum] = "52c3de0297bf45be6a189dc2e0515638"
+SRC_URI[sha256sum] = "67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 08/13] xf86-input-evdev: upgrade to 2.8.1
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (6 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 07/13] xrandr: upgrade to 1.4.1 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-08-01 23:57 ` Saul Wold
2013-07-31 13:09 ` [PATCH 09/13] subversion: upgrade to 1.8.1 Laurentiu Palcu
` (6 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...ut-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} (83%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
index d19b82f..bc6c7fc 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
DEPENDS += "mtdev"
-SRC_URI[md5sum] = "e9bef0779d364cb588aa93a0ee6736c8"
-SRC_URI[sha256sum] = "2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57"
+SRC_URI[md5sum] = "cc1f59e22edfbc69daecf01e43a8dba3"
+SRC_URI[sha256sum] = "09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 08/13] xf86-input-evdev: upgrade to 2.8.1
2013-07-31 13:09 ` [PATCH 08/13] xf86-input-evdev: upgrade to 2.8.1 Laurentiu Palcu
@ 2013-08-01 23:57 ` Saul Wold
0 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2013-08-01 23:57 UTC (permalink / raw)
To: Laurentiu Palcu, Luo Zhenhua-B19537, Zhenhua Luo, Otavio Salvador
Cc: openembedded-core
On 07/31/2013 06:09 AM, Laurentiu Palcu wrote:
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> ...ut-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} (83%)
>
Looks like this change will require a bbappend update to your layers.
It's not in master yet, but will be shortly.
Thanks
Sau!
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
> similarity index 83%
> rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb
> rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
> index d19b82f..bc6c7fc 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.0.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bb
> @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
>
> DEPENDS += "mtdev"
>
> -SRC_URI[md5sum] = "e9bef0779d364cb588aa93a0ee6736c8"
> -SRC_URI[sha256sum] = "2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57"
> +SRC_URI[md5sum] = "cc1f59e22edfbc69daecf01e43a8dba3"
> +SRC_URI[sha256sum] = "09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539"
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 09/13] subversion: upgrade to 1.8.1
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (7 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 08/13] xf86-input-evdev: upgrade to 2.8.1 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 22:34 ` Saul Wold
2013-07-31 13:09 ` [PATCH 10/13] xhost: upgrade to 1.0.6 Laurentiu Palcu
` (5 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
This patch adds a new recipe actually, for 1.8.1. The reason for that is
that subversion supports the 1.7 release with security patches and
fixes for critical bugs only. The recommended version, however, is 1.8.
Additionaly:
* change libtool2.patch to apply clean on the new version;
* removed fix-install-depends.patch since neon support has been removed
completely from 1.8;
* remove the 'neon' RDEPENDS/DEPENDS too from the reason explained above;
* added disable_mac_checks.patch in order to avoid MAC OS features checks.
Otherwise we'll end up with a configure error when cross-compiling;
* removed 1.6 recipes since this version is no longer supported by
subversion;
* licence changed slightly with the addition of a small piece for
libsvn_subr/utf_width.c (see below):
"Markus Kuhn -- 2007-05-26 (Unicode 5.0)
Permission to use, copy, modify, and distribute this software
for any purpose and without fee is hereby granted. The author
disclaims all warranties with regard to this software."
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../subversion-1.8.1/disable_mac_checks.patch | 21 +++++++++
.../libtool2.patch | 14 +++---
.../subversion/disable-revision-install.patch | 36 ----------------
.../subversion/fix-install-depends.patch | 45 --------------------
.../{subversion_1.6.15.bb => subversion_1.8.1.bb} | 24 +++++------
5 files changed, 40 insertions(+), 100 deletions(-)
create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
rename meta/recipes-devtools/subversion/{subversion => subversion-1.8.1}/libtool2.patch (54%)
delete mode 100644 meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
delete mode 100644 meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
rename meta/recipes-devtools/subversion/{subversion_1.6.15.bb => subversion_1.8.1.bb} (54%)
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
new file mode 100644
index 0000000..e8e1009
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
@@ -0,0 +1,21 @@
+Upstream-Status: Inappropriate (embedded specific)
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: subversion-1.8.1/configure.ac
+===================================================================
+--- subversion-1.8.1.orig/configure.ac 2013-07-30 14:44:23.745412720 +0300
++++ subversion-1.8.1/configure.ac 2013-07-30 14:45:19.784154761 +0300
+@@ -484,9 +484,9 @@
+
+ dnl Mac OS specific features -------------------
+
+-SVN_LIB_MACHO_ITERATE
+-SVN_LIB_MACOS_PLIST
+-SVN_LIB_MACOS_KEYCHAIN
++#SVN_LIB_MACHO_ITERATE
++#SVN_LIB_MACOS_PLIST
++#SVN_LIB_MACOS_KEYCHAIN
+
+ dnl APR_HAS_DSO -------------------
+
diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
similarity index 54%
rename from meta/recipes-devtools/subversion/subversion/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
index 32f88b7..4cc148a 100644
--- a/meta/recipes-devtools/subversion/subversion/libtool2.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
@@ -1,10 +1,12 @@
Upstream-Status: Inappropriate [embedded specific]
-Index: subversion-1.5.5/configure.ac
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: subversion-1.8.1/configure.ac
===================================================================
---- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
-+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000
-@@ -153,8 +153,8 @@
+--- subversion-1.8.1.orig/configure.ac 2013-07-30 13:41:09.000000000 +0300
++++ subversion-1.8.1/configure.ac 2013-07-30 13:45:01.430887155 +0300
+@@ -226,8 +226,8 @@
LIBTOOL="$sh_libtool"
SVN_LIBTOOL="$sh_libtool"
else
@@ -12,6 +14,6 @@ Index: subversion-1.5.5/configure.ac
- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
+ sh_libtool="$abs_builddir/$host_alias-libtool"
+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
- dnl libtoolize requires that the following line not be indented
- ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
fi
+ AC_SUBST(SVN_LIBTOOL)
+
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
deleted file mode 100644
index 66450fa..0000000
--- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: subversion-1.6.15/Makefile.in
-===================================================================
---- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800
-+++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800
-@@ -305,7 +305,7 @@
- clean: external-clean local-clean
- distclean: external-distclean local-distclean
- extraclean: external-extraclean local-extraclean
--install: external-install local-install revision-install
-+install: external-install local-install #revision-install
-
- @INCLUDE_OUTPUTS@
-
-@@ -363,13 +363,13 @@
- local-install: @INSTALL_RULES@
-
- ### HACK!! Find a better way to do this
--revision-install:
-- test -d $(DESTDIR)$(includedir)/subversion-1 || \
-- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
-- (subversion/svnversion/svnversion $(top_srcdir) || \
-- svnversion $(top_srcdir) || \
-- echo "unknown"; \
-- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
-+#revision-install:
-+# test -d $(DESTDIR)$(includedir)/subversion-1 || \
-+# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
-+# (subversion/svnversion/svnversion $(top_srcdir) || \
-+# svnversion $(top_srcdir) || \
-+# echo "unknown"; \
-+# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
-
- install-static: @INSTALL_STATIC_RULES@
-
diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
deleted file mode 100644
index 6f49ed4..0000000
--- a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-install-neon-lib should depend on libsvn_delta's installation
-
-install-neon-lib needs libsvn_delta-1.la which will be regenerated
-during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
-in regenerating and at the same time install-neon-lib links it, the
-error willl happen.
-
-Let install-neon-lib run after libsvn_delta-1.la is installed will fix
-the problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- build-outputs.mk | 2 +-
- build.conf | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build-outputs.mk b/build-outputs.mk
---- a/build-outputs.mk
-+++ b/build-outputs.mk
-@@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv
- $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
- cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
-
--install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
-+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS)
- $(MKDIR) $(DESTDIR)$(neon_libdir)
- cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
-
-diff --git a/build.conf b/build.conf
---- a/build.conf
-+++ b/build.conf
-@@ -272,6 +272,8 @@ type = ra-module
- path = subversion/libsvn_ra_neon
- install = neon-lib
- libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-+# conditionally add more dependencies
-+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
- msvc-static = yes
-
- # Accessing repositories via DAV through serf
---
-1.7.10.4
-
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
similarity index 54%
rename from meta/recipes-devtools/subversion/subversion_1.6.15.bb
rename to meta/recipes-devtools/subversion/subversion_1.8.1.bb
index ef679b3..d47d95c 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
@@ -1,29 +1,26 @@
DESCRIPTION = "The Subversion (svn) client"
SECTION = "console/network"
-DEPENDS = "apr-util neon sqlite3"
-RDEPENDS_${PN} = "neon"
+DEPENDS = "apr-util sqlite3"
LICENSE = "Apache-2"
HOMEPAGE = "http://subversion.tigris.org"
BBCLASSEXTEND = "native"
-PR = "r3"
+inherit gettext
-SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
- file://disable-revision-install.patch \
+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://libtool2.patch \
- file://fix-install-depends.patch \
- "
+ file://disable_mac_checks.patch \
+"
+SRC_URI[md5sum] = "f2ee0471b8a560f5efa0f2349d9c9ab9"
+SRC_URI[sha256sum] = "faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4"
-SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
-SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
EXTRA_OECONF = " \
- --without-berkeley-db --without-apxs --without-apache \
+ --without-berkeley-db --without-apxs \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS} \
ac_cv_path_RUBY=none"
@@ -36,6 +33,7 @@ acpaths = "-I build/ -I build/ac-macros/"
do_configure_prepend () {
rm -f ${S}/libtool
- rm -f ${S}/build/libtool.m4
+ rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
+ rm -f ${S}/aclocal.m4
sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 09/13] subversion: upgrade to 1.8.1
2013-07-31 13:09 ` [PATCH 09/13] subversion: upgrade to 1.8.1 Laurentiu Palcu
@ 2013-07-31 22:34 ` Saul Wold
2013-07-31 23:59 ` Flanagan, Elizabeth
2013-08-01 13:25 ` Laurentiu Palcu
0 siblings, 2 replies; 23+ messages in thread
From: Saul Wold @ 2013-07-31 22:34 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 07/31/2013 06:09 AM, Laurentiu Palcu wrote:
> This patch adds a new recipe actually, for 1.8.1. The reason for that is
> that subversion supports the 1.7 release with security patches and
> fixes for critical bugs only. The recommended version, however, is 1.8.
>
I am still not sure why you want to retain 1.7? 1.8 has addressed the
same bugs and security fixes, correct? We do not normally keep older
versions around.
Also, there was also an update to opkg and the newer 1.8 was not parsing
the URL correctly.
> NOTE: Executing RunQueue Tasks
> WARNING: Failed to fetch URL svn://opkg.googlecode.com/svn;module=trunk;protocol=http, attempting MIRRORS if available
> ERROR: Fetcher failure: Fetch command failed with exit code 1, output:
> svn: E170000: Unrecognized URL scheme for 'http://opkg.googlecode.com/svn/trunk'
>
> ERROR: Function failed: Fetcher failure for URL: 'svn://opkg.googlecode.com/svn;module=trunk;protocol=http'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /srv/ssd/sgw/builds/world/tmp/work/x86_64-linux/opkg-native/1_0.1.8+svnr650-r13.0/temp/log.do_fetch.9948
> ERROR: Task 0 (virtual:native:/srv/ssd/sgw/poky/meta/recipes-devtools/opkg/opkg_svn.bb, do_fetch) failed with exit code '1'
> NOTE: Tasks Summary: Attempted 141 tasks of which 140 didn't need to be rerun and 1 failed.
>
I tried running the svn command by hand it it infact did fail with 1.8,
but worked with the 1.7 release.
> /srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn --non-interactive --trust-server-cert co --no-auth-cache -r 650 http://opkg.googlecode.com/svn/trunk@650 trunk
> svn: E170000: Unrecognized URL scheme for 'http://opkg.googlecode.com/svn/trunk'
It looks like you are missing some modules or configuration:
1.7:
> /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn --version
> svn, version 1.7.10 (r1485443)
> compiled Jul 31 2013, 14:37:01
>
> Copyright (C) 2013 The Apache Software Foundation.
> This software consists of contributions made by many people; see the NOTICE
> file for more information.
> Subversion is open source software, see http://subversion.apache.org/
>
> The following repository access (RA) modules are available:
>
> * ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
> - handles 'http' scheme
> - handles 'https' scheme
> * ra_svn : Module for accessing a repository using the svn network protocol.
> - handles 'svn' scheme
> * ra_local : Module for accessing a repository on local disk.
> - handles 'file' scheme
>
1.8:
> /srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn --version
> svn, version 1.8.1 (r1503906)
> compiled Jul 31 2013, 10:32:05 on x86_64-pc-linux-gnu
>
> Copyright (C) 2013 The Apache Software Foundation.
> This software consists of contributions made by many people;
> see the NOTICE file for more information.
> Subversion is open source software, see http://subversion.apache.org/
>
> The following repository access (RA) modules are available:
>
> * ra_svn : Module for accessing a repository using the svn network protocol.
> - handles 'svn' scheme
> * ra_local : Module for accessing a repository on local disk.
> - handles 'file' scheme
>
Notice the missing RA Module for http(s) - ra_neon
Sau!
> Additionaly:
> * change libtool2.patch to apply clean on the new version;
> * removed fix-install-depends.patch since neon support has been removed
> completely from 1.8;
> * remove the 'neon' RDEPENDS/DEPENDS too from the reason explained above;
> * added disable_mac_checks.patch in order to avoid MAC OS features checks.
> Otherwise we'll end up with a configure error when cross-compiling;
> * removed 1.6 recipes since this version is no longer supported by
> subversion;
> * licence changed slightly with the addition of a small piece for
> libsvn_subr/utf_width.c (see below):
>
> "Markus Kuhn -- 2007-05-26 (Unicode 5.0)
>
> Permission to use, copy, modify, and distribute this software
> for any purpose and without fee is hereby granted. The author
> disclaims all warranties with regard to this software."
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> .../subversion-1.8.1/disable_mac_checks.patch | 21 +++++++++
> .../libtool2.patch | 14 +++---
> .../subversion/disable-revision-install.patch | 36 ----------------
> .../subversion/fix-install-depends.patch | 45 --------------------
> .../{subversion_1.6.15.bb => subversion_1.8.1.bb} | 24 +++++------
> 5 files changed, 40 insertions(+), 100 deletions(-)
> create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> rename meta/recipes-devtools/subversion/{subversion => subversion-1.8.1}/libtool2.patch (54%)
> delete mode 100644 meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> delete mode 100644 meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> rename meta/recipes-devtools/subversion/{subversion_1.6.15.bb => subversion_1.8.1.bb} (54%)
>
> diff --git a/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> new file mode 100644
> index 0000000..e8e1009
> --- /dev/null
> +++ b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> @@ -0,0 +1,21 @@
> +Upstream-Status: Inappropriate (embedded specific)
> +
> +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> +
> +Index: subversion-1.8.1/configure.ac
> +===================================================================
> +--- subversion-1.8.1.orig/configure.ac 2013-07-30 14:44:23.745412720 +0300
> ++++ subversion-1.8.1/configure.ac 2013-07-30 14:45:19.784154761 +0300
> +@@ -484,9 +484,9 @@
> +
> + dnl Mac OS specific features -------------------
> +
> +-SVN_LIB_MACHO_ITERATE
> +-SVN_LIB_MACOS_PLIST
> +-SVN_LIB_MACOS_KEYCHAIN
> ++#SVN_LIB_MACHO_ITERATE
> ++#SVN_LIB_MACOS_PLIST
> ++#SVN_LIB_MACOS_KEYCHAIN
> +
> + dnl APR_HAS_DSO -------------------
> +
> diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> similarity index 54%
> rename from meta/recipes-devtools/subversion/subversion/libtool2.patch
> rename to meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> index 32f88b7..4cc148a 100644
> --- a/meta/recipes-devtools/subversion/subversion/libtool2.patch
> +++ b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> @@ -1,10 +1,12 @@
> Upstream-Status: Inappropriate [embedded specific]
>
> -Index: subversion-1.5.5/configure.ac
> +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> +
> +Index: subversion-1.8.1/configure.ac
> ===================================================================
> ---- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
> -+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000
> -@@ -153,8 +153,8 @@
> +--- subversion-1.8.1.orig/configure.ac 2013-07-30 13:41:09.000000000 +0300
> ++++ subversion-1.8.1/configure.ac 2013-07-30 13:45:01.430887155 +0300
> +@@ -226,8 +226,8 @@
> LIBTOOL="$sh_libtool"
> SVN_LIBTOOL="$sh_libtool"
> else
> @@ -12,6 +14,6 @@ Index: subversion-1.5.5/configure.ac
> - SVN_LIBTOOL="\$(SHELL) $sh_libtool"
> + sh_libtool="$abs_builddir/$host_alias-libtool"
> + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
> - dnl libtoolize requires that the following line not be indented
> - ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
> fi
> + AC_SUBST(SVN_LIBTOOL)
> +
> diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> deleted file mode 100644
> index 66450fa..0000000
> --- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Index: subversion-1.6.15/Makefile.in
> -===================================================================
> ---- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800
> -+++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800
> -@@ -305,7 +305,7 @@
> - clean: external-clean local-clean
> - distclean: external-distclean local-distclean
> - extraclean: external-extraclean local-extraclean
> --install: external-install local-install revision-install
> -+install: external-install local-install #revision-install
> -
> - @INCLUDE_OUTPUTS@
> -
> -@@ -363,13 +363,13 @@
> - local-install: @INSTALL_RULES@
> -
> - ### HACK!! Find a better way to do this
> --revision-install:
> -- test -d $(DESTDIR)$(includedir)/subversion-1 || \
> -- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
> -- (subversion/svnversion/svnversion $(top_srcdir) || \
> -- svnversion $(top_srcdir) || \
> -- echo "unknown"; \
> -- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
> -+#revision-install:
> -+# test -d $(DESTDIR)$(includedir)/subversion-1 || \
> -+# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
> -+# (subversion/svnversion/svnversion $(top_srcdir) || \
> -+# svnversion $(top_srcdir) || \
> -+# echo "unknown"; \
> -+# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
> -
> - install-static: @INSTALL_STATIC_RULES@
> -
> diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> deleted file mode 100644
> index 6f49ed4..0000000
> --- a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -install-neon-lib should depend on libsvn_delta's installation
> -
> -install-neon-lib needs libsvn_delta-1.la which will be regenerated
> -during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
> -in regenerating and at the same time install-neon-lib links it, the
> -error willl happen.
> -
> -Let install-neon-lib run after libsvn_delta-1.la is installed will fix
> -the problem.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ----
> - build-outputs.mk | 2 +-
> - build.conf | 2 ++
> - 2 files changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/build-outputs.mk b/build-outputs.mk
> ---- a/build-outputs.mk
> -+++ b/build-outputs.mk
> -@@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv
> - $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
> - cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
> -
> --install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
> -+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS)
> - $(MKDIR) $(DESTDIR)$(neon_libdir)
> - cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
> -
> -diff --git a/build.conf b/build.conf
> ---- a/build.conf
> -+++ b/build.conf
> -@@ -272,6 +272,8 @@ type = ra-module
> - path = subversion/libsvn_ra_neon
> - install = neon-lib
> - libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
> -+# conditionally add more dependencies
> -+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
> - msvc-static = yes
> -
> - # Accessing repositories via DAV through serf
> ---
> -1.7.10.4
> -
> diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
> similarity index 54%
> rename from meta/recipes-devtools/subversion/subversion_1.6.15.bb
> rename to meta/recipes-devtools/subversion/subversion_1.8.1.bb
> index ef679b3..d47d95c 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
> @@ -1,29 +1,26 @@
> DESCRIPTION = "The Subversion (svn) client"
> SECTION = "console/network"
> -DEPENDS = "apr-util neon sqlite3"
> -RDEPENDS_${PN} = "neon"
> +DEPENDS = "apr-util sqlite3"
> LICENSE = "Apache-2"
> HOMEPAGE = "http://subversion.tigris.org"
>
> BBCLASSEXTEND = "native"
>
> -PR = "r3"
> +inherit gettext
>
> -SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
> - file://disable-revision-install.patch \
> +SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
> file://libtool2.patch \
> - file://fix-install-depends.patch \
> - "
> + file://disable_mac_checks.patch \
> +"
> +SRC_URI[md5sum] = "f2ee0471b8a560f5efa0f2349d9c9ab9"
> +SRC_URI[sha256sum] = "faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4"
>
> -SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
> -SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
>
> PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
>
> EXTRA_OECONF = " \
> - --without-berkeley-db --without-apxs --without-apache \
> + --without-berkeley-db --without-apxs \
> --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
> --with-apr-util=${STAGING_BINDIR_CROSS} \
> ac_cv_path_RUBY=none"
> @@ -36,6 +33,7 @@ acpaths = "-I build/ -I build/ac-macros/"
>
> do_configure_prepend () {
> rm -f ${S}/libtool
> - rm -f ${S}/build/libtool.m4
> + rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
> + rm -f ${S}/aclocal.m4
> sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
> }
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 09/13] subversion: upgrade to 1.8.1
2013-07-31 22:34 ` Saul Wold
@ 2013-07-31 23:59 ` Flanagan, Elizabeth
2013-08-01 6:30 ` Burton, Ross
2013-08-01 13:25 ` Laurentiu Palcu
1 sibling, 1 reply; 23+ messages in thread
From: Flanagan, Elizabeth @ 2013-07-31 23:59 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
If we do update this I'd like to also get this backported to earlier
and remove all older versions of subversion to keep from mixing and
matching with svn.
They made changes in 1.8 that requires an upgrade to the working copy
of a checkout. Once upgraded I don't believe you can go back to an
earlier version. If people try to utilize an svn 1.8 oe-core and an
svn 1.7 oe-core, this could destroy the svn working copies in DL_DIR.
Which would be bad for those of us who maintain source mirrors.
-b
On Wed, Jul 31, 2013 at 3:34 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 07/31/2013 06:09 AM, Laurentiu Palcu wrote:
>>
>> This patch adds a new recipe actually, for 1.8.1. The reason for that is
>> that subversion supports the 1.7 release with security patches and
>> fixes for critical bugs only. The recommended version, however, is 1.8.
>>
> I am still not sure why you want to retain 1.7? 1.8 has addressed the same
> bugs and security fixes, correct? We do not normally keep older versions
> around.
>
> Also, there was also an update to opkg and the newer 1.8 was not parsing the
> URL correctly.
>>
>> NOTE: Executing RunQueue Tasks
>> WARNING: Failed to fetch URL
>> svn://opkg.googlecode.com/svn;module=trunk;protocol=http, attempting MIRRORS
>> if available
>> ERROR: Fetcher failure: Fetch command failed with exit code 1, output:
>> svn: E170000: Unrecognized URL scheme for
>> 'http://opkg.googlecode.com/svn/trunk'
>>
>> ERROR: Function failed: Fetcher failure for URL:
>> 'svn://opkg.googlecode.com/svn;module=trunk;protocol=http'. Unable to fetch
>> URL from any source.
>> ERROR: Logfile of failure stored in:
>> /srv/ssd/sgw/builds/world/tmp/work/x86_64-linux/opkg-native/1_0.1.8+svnr650-r13.0/temp/log.do_fetch.9948
>> ERROR: Task 0
>> (virtual:native:/srv/ssd/sgw/poky/meta/recipes-devtools/opkg/opkg_svn.bb,
>> do_fetch) failed with exit code '1'
>> NOTE: Tasks Summary: Attempted 141 tasks of which 140 didn't need to be
>> rerun and 1 failed.
>>
>
> I tried running the svn command by hand it it infact did fail with 1.8, but
> worked with the 1.7 release.
>
>
>> /srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn
>> --non-interactive --trust-server-cert co --no-auth-cache -r 650
>> http://opkg.googlecode.com/svn/trunk@650 trunk
>> svn: E170000: Unrecognized URL scheme for
>> 'http://opkg.googlecode.com/svn/trunk'
>
>
> It looks like you are missing some modules or configuration:
>
> 1.7:
>>
>> /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn --version
>> svn, version 1.7.10 (r1485443)
>> compiled Jul 31 2013, 14:37:01
>>
>> Copyright (C) 2013 The Apache Software Foundation.
>> This software consists of contributions made by many people; see the
>> NOTICE
>> file for more information.
>> Subversion is open source software, see http://subversion.apache.org/
>>
>> The following repository access (RA) modules are available:
>>
>> * ra_neon : Module for accessing a repository via WebDAV protocol using
>> Neon.
>> - handles 'http' scheme
>> - handles 'https' scheme
>> * ra_svn : Module for accessing a repository using the svn network
>> protocol.
>> - handles 'svn' scheme
>> * ra_local : Module for accessing a repository on local disk.
>> - handles 'file' scheme
>>
>
> 1.8:
>>
>> /srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/bin/svn --version
>> svn, version 1.8.1 (r1503906)
>> compiled Jul 31 2013, 10:32:05 on x86_64-pc-linux-gnu
>>
>> Copyright (C) 2013 The Apache Software Foundation.
>> This software consists of contributions made by many people;
>> see the NOTICE file for more information.
>> Subversion is open source software, see http://subversion.apache.org/
>>
>> The following repository access (RA) modules are available:
>>
>> * ra_svn : Module for accessing a repository using the svn network
>> protocol.
>> - handles 'svn' scheme
>> * ra_local : Module for accessing a repository on local disk.
>> - handles 'file' scheme
>>
>
> Notice the missing RA Module for http(s) - ra_neon
>
> Sau!
>
>
>> Additionaly:
>> * change libtool2.patch to apply clean on the new version;
>> * removed fix-install-depends.patch since neon support has been removed
>> completely from 1.8;
>> * remove the 'neon' RDEPENDS/DEPENDS too from the reason explained
>> above;
>> * added disable_mac_checks.patch in order to avoid MAC OS features
>> checks.
>> Otherwise we'll end up with a configure error when cross-compiling;
>> * removed 1.6 recipes since this version is no longer supported by
>> subversion;
>> * licence changed slightly with the addition of a small piece for
>> libsvn_subr/utf_width.c (see below):
>>
>> "Markus Kuhn -- 2007-05-26 (Unicode 5.0)
>>
>> Permission to use, copy, modify, and distribute this software
>> for any purpose and without fee is hereby granted. The author
>> disclaims all warranties with regard to this software."
>>
>> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
>> ---
>> .../subversion-1.8.1/disable_mac_checks.patch | 21 +++++++++
>> .../libtool2.patch | 14 +++---
>> .../subversion/disable-revision-install.patch | 36
>> ----------------
>> .../subversion/fix-install-depends.patch | 45
>> --------------------
>> .../{subversion_1.6.15.bb => subversion_1.8.1.bb} | 24 +++++------
>> 5 files changed, 40 insertions(+), 100 deletions(-)
>> create mode 100644
>> meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
>> rename meta/recipes-devtools/subversion/{subversion =>
>> subversion-1.8.1}/libtool2.patch (54%)
>> delete mode 100644
>> meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
>> delete mode 100644
>> meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
>> rename meta/recipes-devtools/subversion/{subversion_1.6.15.bb =>
>> subversion_1.8.1.bb} (54%)
>>
>> diff --git
>> a/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
>> b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
>> new file mode 100644
>> index 0000000..e8e1009
>> --- /dev/null
>> +++
>> b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
>> @@ -0,0 +1,21 @@
>> +Upstream-Status: Inappropriate (embedded specific)
>> +
>> +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
>> +
>> +Index: subversion-1.8.1/configure.ac
>> +===================================================================
>> +--- subversion-1.8.1.orig/configure.ac 2013-07-30 14:44:23.745412720
>> +0300
>> ++++ subversion-1.8.1/configure.ac 2013-07-30 14:45:19.784154761
>> +0300
>> +@@ -484,9 +484,9 @@
>> +
>> + dnl Mac OS specific features -------------------
>> +
>> +-SVN_LIB_MACHO_ITERATE
>> +-SVN_LIB_MACOS_PLIST
>> +-SVN_LIB_MACOS_KEYCHAIN
>> ++#SVN_LIB_MACHO_ITERATE
>> ++#SVN_LIB_MACOS_PLIST
>> ++#SVN_LIB_MACOS_KEYCHAIN
>> +
>> + dnl APR_HAS_DSO -------------------
>> +
>> diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch
>> b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
>> similarity index 54%
>> rename from meta/recipes-devtools/subversion/subversion/libtool2.patch
>> rename to meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
>> index 32f88b7..4cc148a 100644
>> --- a/meta/recipes-devtools/subversion/subversion/libtool2.patch
>> +++ b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
>> @@ -1,10 +1,12 @@
>> Upstream-Status: Inappropriate [embedded specific]
>>
>> -Index: subversion-1.5.5/configure.ac
>> +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
>> +
>> +Index: subversion-1.8.1/configure.ac
>> ===================================================================
>> ---- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000
>> +0100
>> -+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000
>> +0000
>> -@@ -153,8 +153,8 @@
>> +--- subversion-1.8.1.orig/configure.ac 2013-07-30 13:41:09.000000000
>> +0300
>> ++++ subversion-1.8.1/configure.ac 2013-07-30 13:45:01.430887155
>> +0300
>> +@@ -226,8 +226,8 @@
>> LIBTOOL="$sh_libtool"
>> SVN_LIBTOOL="$sh_libtool"
>> else
>> @@ -12,6 +14,6 @@ Index: subversion-1.5.5/configure.ac
>> - SVN_LIBTOOL="\$(SHELL) $sh_libtool"
>> + sh_libtool="$abs_builddir/$host_alias-libtool"
>> + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
>> - dnl libtoolize requires that the following line not be indented
>> - ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
>> fi
>> + AC_SUBST(SVN_LIBTOOL)
>> +
>> diff --git
>> a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
>> b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
>> deleted file mode 100644
>> index 66450fa..0000000
>> ---
>> a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
>> +++ /dev/null
>> @@ -1,36 +0,0 @@
>> -Upstream-Status: Inappropriate [embedded specific]
>> -
>> -Index: subversion-1.6.15/Makefile.in
>> -===================================================================
>> ---- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000
>> -0800
>> -+++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686
>> -0800
>> -@@ -305,7 +305,7 @@
>> - clean: external-clean local-clean
>> - distclean: external-distclean local-distclean
>> - extraclean: external-extraclean local-extraclean
>> --install: external-install local-install revision-install
>> -+install: external-install local-install #revision-install
>> -
>> - @INCLUDE_OUTPUTS@
>> -
>> -@@ -363,13 +363,13 @@
>> - local-install: @INSTALL_RULES@
>> -
>> - ### HACK!! Find a better way to do this
>> --revision-install:
>> -- test -d $(DESTDIR)$(includedir)/subversion-1 || \
>> -- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
>> -- (subversion/svnversion/svnversion $(top_srcdir) || \
>> -- svnversion $(top_srcdir) || \
>> -- echo "unknown"; \
>> -- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
>> -+#revision-install:
>> -+# test -d $(DESTDIR)$(includedir)/subversion-1 || \
>> -+# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
>> -+# (subversion/svnversion/svnversion $(top_srcdir) || \
>> -+# svnversion $(top_srcdir) || \
>> -+# echo "unknown"; \
>> -+# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
>> -
>> - install-static: @INSTALL_STATIC_RULES@
>> -
>> diff --git
>> a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
>> b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
>> deleted file mode 100644
>> index 6f49ed4..0000000
>> ---
>> a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
>> +++ /dev/null
>> @@ -1,45 +0,0 @@
>> -install-neon-lib should depend on libsvn_delta's installation
>> -
>> -install-neon-lib needs libsvn_delta-1.la which will be regenerated
>> -during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
>> -in regenerating and at the same time install-neon-lib links it, the
>> -error willl happen.
>> -
>> -Let install-neon-lib run after libsvn_delta-1.la is installed will fix
>> -the problem.
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ----
>> - build-outputs.mk | 2 +-
>> - build.conf | 2 ++
>> - 2 files changed, 3 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/build-outputs.mk b/build-outputs.mk
>> ---- a/build-outputs.mk
>> -+++ b/build-outputs.mk
>> -@@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo
>> subversion/po/es.mo subversion/po/fr.mo subv
>> - $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
>> - cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo
>> $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
>> -
>> --install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
>> -+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
>> $(SVN_FS_LIB_INSTALL_DEPS)
>> - $(MKDIR) $(DESTDIR)$(neon_libdir)
>> - cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB)
>> libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
>> -
>> -diff --git a/build.conf b/build.conf
>> ---- a/build.conf
>> -+++ b/build.conf
>> -@@ -272,6 +272,8 @@ type = ra-module
>> - path = subversion/libsvn_ra_neon
>> - install = neon-lib
>> - libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
>> -+# conditionally add more dependencies
>> -+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
>> - msvc-static = yes
>> -
>> - # Accessing repositories via DAV through serf
>> ---
>> -1.7.10.4
>> -
>> diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
>> b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
>> similarity index 54%
>> rename from meta/recipes-devtools/subversion/subversion_1.6.15.bb
>> rename to meta/recipes-devtools/subversion/subversion_1.8.1.bb
>> index ef679b3..d47d95c 100644
>> --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
>> +++ b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
>> @@ -1,29 +1,26 @@
>> DESCRIPTION = "The Subversion (svn) client"
>> SECTION = "console/network"
>> -DEPENDS = "apr-util neon sqlite3"
>> -RDEPENDS_${PN} = "neon"
>> +DEPENDS = "apr-util sqlite3"
>> LICENSE = "Apache-2"
>> HOMEPAGE = "http://subversion.tigris.org"
>>
>> BBCLASSEXTEND = "native"
>>
>> -PR = "r3"
>> +inherit gettext
>>
>> -SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
>> - file://disable-revision-install.patch \
>> +SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
>> file://libtool2.patch \
>> - file://fix-install-depends.patch \
>> - "
>> + file://disable_mac_checks.patch \
>> +"
>> +SRC_URI[md5sum] = "f2ee0471b8a560f5efa0f2349d9c9ab9"
>> +SRC_URI[sha256sum] =
>> "faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4"
>>
>> -SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
>> -SRC_URI[sha256sum] =
>> "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
>> -
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
>>
>> PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
>>
>> EXTRA_OECONF = " \
>> - --without-berkeley-db --without-apxs --without-apache \
>> + --without-berkeley-db --without-apxs \
>> --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
>> --with-apr-util=${STAGING_BINDIR_CROSS} \
>> ac_cv_path_RUBY=none"
>> @@ -36,6 +33,7 @@ acpaths = "-I build/ -I build/ac-macros/"
>>
>> do_configure_prepend () {
>> rm -f ${S}/libtool
>> - rm -f ${S}/build/libtool.m4
>> + rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh
>> ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4
>> ${S}/build/lt~obsolete.m4
>> + rm -f ${S}/aclocal.m4
>> sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":'
>> ${S}/build/ac-macros/sasl.m4
>> }
>>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Elizabeth Flanagan
Yocto Project
Build and Release
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 09/13] subversion: upgrade to 1.8.1
2013-07-31 23:59 ` Flanagan, Elizabeth
@ 2013-08-01 6:30 ` Burton, Ross
2013-08-01 8:37 ` Martin Jansa
0 siblings, 1 reply; 23+ messages in thread
From: Burton, Ross @ 2013-08-01 6:30 UTC (permalink / raw)
To: Flanagan, Elizabeth; +Cc: Patches and discussions about the oe-core layer
On 1 August 2013 00:59, Flanagan, Elizabeth
<elizabeth.flanagan@intel.com> wrote:
> If we do update this I'd like to also get this backported to earlier
> and remove all older versions of subversion to keep from mixing and
> matching with svn.
>
> They made changes in 1.8 that requires an upgrade to the working copy
> of a checkout. Once upgraded I don't believe you can go back to an
> earlier version. If people try to utilize an svn 1.8 oe-core and an
> svn 1.7 oe-core, this could destroy the svn working copies in DL_DIR.
> Which would be bad for those of us who maintain source mirrors.
Again? Urgh. Sounds like an excellent reason to not move to 1.8 as
this bit us one already.
Ross
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 09/13] subversion: upgrade to 1.8.1
2013-08-01 6:30 ` Burton, Ross
@ 2013-08-01 8:37 ` Martin Jansa
0 siblings, 0 replies; 23+ messages in thread
From: Martin Jansa @ 2013-08-01 8:37 UTC (permalink / raw)
To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
On Thu, Aug 01, 2013 at 07:30:25AM +0100, Burton, Ross wrote:
> On 1 August 2013 00:59, Flanagan, Elizabeth
> <elizabeth.flanagan@intel.com> wrote:
> > If we do update this I'd like to also get this backported to earlier
> > and remove all older versions of subversion to keep from mixing and
> > matching with svn.
> >
> > They made changes in 1.8 that requires an upgrade to the working copy
> > of a checkout. Once upgraded I don't believe you can go back to an
> > earlier version. If people try to utilize an svn 1.8 oe-core and an
> > svn 1.7 oe-core, this could destroy the svn working copies in DL_DIR.
> > Which would be bad for those of us who maintain source mirrors.
>
> Again? Urgh. Sounds like an excellent reason to not move to 1.8 as
> this bit us one already.
Does this
http://git.openembedded.org/bitbake/commit/?id=ebd3ecdb5f3c6d3fe1fad27cbed4d80f4277e92e
work for 1.7 -> 1.8 transition?
It looks like it should from
http://subversion.apache.org/docs/release-notes/1.8.html
but someone should test it before builders will start distributing
downloads directory to PREMIRRORs with working copy format already
upgraded.
Good that we removed subversion-native from ASSUME_PROVIDED :).
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 09/13] subversion: upgrade to 1.8.1
2013-07-31 22:34 ` Saul Wold
2013-07-31 23:59 ` Flanagan, Elizabeth
@ 2013-08-01 13:25 ` Laurentiu Palcu
1 sibling, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-08-01 13:25 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On Wed, Jul 31, 2013 at 03:34:12PM -0700, Saul Wold wrote:
> On 07/31/2013 06:09 AM, Laurentiu Palcu wrote:
> I am still not sure why you want to retain 1.7? 1.8 has addressed
> the same bugs and security fixes, correct? We do not normally keep
> older versions around.
This is how it was done so far. We had two recipes: 1.7 and 1.6. The
recommended one and the stable one.
>
> I tried running the svn command by hand it it infact did fail with
> 1.8, but worked with the 1.7 release.
From the 1.8 release notes:
"Subversion 1.8 introduces changes to the working copy format. In
previous releases of Subversion (1.6 and earlier), Subversion would
automatically upgrade the working copy to the new format when a write
operation was performed. Subversion 1.8, however, requires an upgrade
for both read and write operations on the working copy, and makes the
upgrade a manual step.
Before using Subversion 1.8 with existing working copies, users will be
required to run the svn upgrade command to upgrade working copy metadata
to the new format. This command may take a while, and for some users, it
may be more practical to simply checkout a new working copy."
> >
>
> Notice the missing RA Module for http(s) - ra_neon
The commit message states that the neon module is not supported anymore
in 1.8... So, that's normal.
"* removed fix-install-depends.patch since neon support has been removed
completely from 1.8;
* remove the 'neon' RDEPENDS/DEPENDS too from the reason explained above;"
Thanks,
Laurentiu
>
> Sau!
>
> >Additionaly:
> > * change libtool2.patch to apply clean on the new version;
> > * removed fix-install-depends.patch since neon support has been removed
> > completely from 1.8;
> > * remove the 'neon' RDEPENDS/DEPENDS too from the reason explained above;
> > * added disable_mac_checks.patch in order to avoid MAC OS features checks.
> > Otherwise we'll end up with a configure error when cross-compiling;
> > * removed 1.6 recipes since this version is no longer supported by
> > subversion;
> > * licence changed slightly with the addition of a small piece for
> > libsvn_subr/utf_width.c (see below):
> >
> > "Markus Kuhn -- 2007-05-26 (Unicode 5.0)
> >
> > Permission to use, copy, modify, and distribute this software
> > for any purpose and without fee is hereby granted. The author
> > disclaims all warranties with regard to this software."
> >
> >Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> >---
> > .../subversion-1.8.1/disable_mac_checks.patch | 21 +++++++++
> > .../libtool2.patch | 14 +++---
> > .../subversion/disable-revision-install.patch | 36 ----------------
> > .../subversion/fix-install-depends.patch | 45 --------------------
> > .../{subversion_1.6.15.bb => subversion_1.8.1.bb} | 24 +++++------
> > 5 files changed, 40 insertions(+), 100 deletions(-)
> > create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> > rename meta/recipes-devtools/subversion/{subversion => subversion-1.8.1}/libtool2.patch (54%)
> > delete mode 100644 meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> > delete mode 100644 meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> > rename meta/recipes-devtools/subversion/{subversion_1.6.15.bb => subversion_1.8.1.bb} (54%)
> >
> >diff --git a/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> >new file mode 100644
> >index 0000000..e8e1009
> >--- /dev/null
> >+++ b/meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
> >@@ -0,0 +1,21 @@
> >+Upstream-Status: Inappropriate (embedded specific)
> >+
> >+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> >+
> >+Index: subversion-1.8.1/configure.ac
> >+===================================================================
> >+--- subversion-1.8.1.orig/configure.ac 2013-07-30 14:44:23.745412720 +0300
> >++++ subversion-1.8.1/configure.ac 2013-07-30 14:45:19.784154761 +0300
> >+@@ -484,9 +484,9 @@
> >+
> >+ dnl Mac OS specific features -------------------
> >+
> >+-SVN_LIB_MACHO_ITERATE
> >+-SVN_LIB_MACOS_PLIST
> >+-SVN_LIB_MACOS_KEYCHAIN
> >++#SVN_LIB_MACHO_ITERATE
> >++#SVN_LIB_MACOS_PLIST
> >++#SVN_LIB_MACOS_KEYCHAIN
> >+
> >+ dnl APR_HAS_DSO -------------------
> >+
> >diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> >similarity index 54%
> >rename from meta/recipes-devtools/subversion/subversion/libtool2.patch
> >rename to meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> >index 32f88b7..4cc148a 100644
> >--- a/meta/recipes-devtools/subversion/subversion/libtool2.patch
> >+++ b/meta/recipes-devtools/subversion/subversion-1.8.1/libtool2.patch
> >@@ -1,10 +1,12 @@
> > Upstream-Status: Inappropriate [embedded specific]
> >
> >-Index: subversion-1.5.5/configure.ac
> >+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> >+
> >+Index: subversion-1.8.1/configure.ac
> > ===================================================================
> >---- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
> >-+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000
> >-@@ -153,8 +153,8 @@
> >+--- subversion-1.8.1.orig/configure.ac 2013-07-30 13:41:09.000000000 +0300
> >++++ subversion-1.8.1/configure.ac 2013-07-30 13:45:01.430887155 +0300
> >+@@ -226,8 +226,8 @@
> > LIBTOOL="$sh_libtool"
> > SVN_LIBTOOL="$sh_libtool"
> > else
> >@@ -12,6 +14,6 @@ Index: subversion-1.5.5/configure.ac
> > - SVN_LIBTOOL="\$(SHELL) $sh_libtool"
> > + sh_libtool="$abs_builddir/$host_alias-libtool"
> > + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
> >- dnl libtoolize requires that the following line not be indented
> >- ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
> > fi
> >+ AC_SUBST(SVN_LIBTOOL)
> >+
> >diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> >deleted file mode 100644
> >index 66450fa..0000000
> >--- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
> >+++ /dev/null
> >@@ -1,36 +0,0 @@
> >-Upstream-Status: Inappropriate [embedded specific]
> >-
> >-Index: subversion-1.6.15/Makefile.in
> >-===================================================================
> >---- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800
> >-+++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800
> >-@@ -305,7 +305,7 @@
> >- clean: external-clean local-clean
> >- distclean: external-distclean local-distclean
> >- extraclean: external-extraclean local-extraclean
> >--install: external-install local-install revision-install
> >-+install: external-install local-install #revision-install
> >-
> >- @INCLUDE_OUTPUTS@
> >-
> >-@@ -363,13 +363,13 @@
> >- local-install: @INSTALL_RULES@
> >-
> >- ### HACK!! Find a better way to do this
> >--revision-install:
> >-- test -d $(DESTDIR)$(includedir)/subversion-1 || \
> >-- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
> >-- (subversion/svnversion/svnversion $(top_srcdir) || \
> >-- svnversion $(top_srcdir) || \
> >-- echo "unknown"; \
> >-- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
> >-+#revision-install:
> >-+# test -d $(DESTDIR)$(includedir)/subversion-1 || \
> >-+# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
> >-+# (subversion/svnversion/svnversion $(top_srcdir) || \
> >-+# svnversion $(top_srcdir) || \
> >-+# echo "unknown"; \
> >-+# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
> >-
> >- install-static: @INSTALL_STATIC_RULES@
> >-
> >diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> >deleted file mode 100644
> >index 6f49ed4..0000000
> >--- a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
> >+++ /dev/null
> >@@ -1,45 +0,0 @@
> >-install-neon-lib should depend on libsvn_delta's installation
> >-
> >-install-neon-lib needs libsvn_delta-1.la which will be regenerated
> >-during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
> >-in regenerating and at the same time install-neon-lib links it, the
> >-error willl happen.
> >-
> >-Let install-neon-lib run after libsvn_delta-1.la is installed will fix
> >-the problem.
> >-
> >-Upstream-Status: Pending
> >-
> >-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> >----
> >- build-outputs.mk | 2 +-
> >- build.conf | 2 ++
> >- 2 files changed, 3 insertions(+), 1 deletion(-)
> >-
> >-diff --git a/build-outputs.mk b/build-outputs.mk
> >---- a/build-outputs.mk
> >-+++ b/build-outputs.mk
> >-@@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv
> >- $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
> >- cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
> >-
> >--install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
> >-+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS)
> >- $(MKDIR) $(DESTDIR)$(neon_libdir)
> >- cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
> >-
> >-diff --git a/build.conf b/build.conf
> >---- a/build.conf
> >-+++ b/build.conf
> >-@@ -272,6 +272,8 @@ type = ra-module
> >- path = subversion/libsvn_ra_neon
> >- install = neon-lib
> >- libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
> >-+# conditionally add more dependencies
> >-+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
> >- msvc-static = yes
> >-
> >- # Accessing repositories via DAV through serf
> >---
> >-1.7.10.4
> >-
> >diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
> >similarity index 54%
> >rename from meta/recipes-devtools/subversion/subversion_1.6.15.bb
> >rename to meta/recipes-devtools/subversion/subversion_1.8.1.bb
> >index ef679b3..d47d95c 100644
> >--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> >+++ b/meta/recipes-devtools/subversion/subversion_1.8.1.bb
> >@@ -1,29 +1,26 @@
> > DESCRIPTION = "The Subversion (svn) client"
> > SECTION = "console/network"
> >-DEPENDS = "apr-util neon sqlite3"
> >-RDEPENDS_${PN} = "neon"
> >+DEPENDS = "apr-util sqlite3"
> > LICENSE = "Apache-2"
> > HOMEPAGE = "http://subversion.tigris.org"
> >
> > BBCLASSEXTEND = "native"
> >
> >-PR = "r3"
> >+inherit gettext
> >
> >-SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
> >- file://disable-revision-install.patch \
> >+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
> > file://libtool2.patch \
> >- file://fix-install-depends.patch \
> >- "
> >+ file://disable_mac_checks.patch \
> >+"
> >+SRC_URI[md5sum] = "f2ee0471b8a560f5efa0f2349d9c9ab9"
> >+SRC_URI[sha256sum] = "faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4"
> >
> >-SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
> >-SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
> >-
> >-LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
> >+LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
> >
> > PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
> >
> > EXTRA_OECONF = " \
> >- --without-berkeley-db --without-apxs --without-apache \
> >+ --without-berkeley-db --without-apxs \
> > --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
> > --with-apr-util=${STAGING_BINDIR_CROSS} \
> > ac_cv_path_RUBY=none"
> >@@ -36,6 +33,7 @@ acpaths = "-I build/ -I build/ac-macros/"
> >
> > do_configure_prepend () {
> > rm -f ${S}/libtool
> >- rm -f ${S}/build/libtool.m4
> >+ rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
> >+ rm -f ${S}/aclocal.m4
> > sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
> > }
> >
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 10/13] xhost: upgrade to 1.0.6
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (8 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 09/13] subversion: upgrade to 1.8.1 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 11/13] makedepend: upgrade to 1.0.5 Laurentiu Palcu
` (4 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xorg-app/{xhost_1.0.5.bb => xhost_1.0.6.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-app/{xhost_1.0.5.bb => xhost_1.0.6.bb} (79%)
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.5.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.6.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-app/xhost_1.0.5.bb
rename to meta/recipes-graphics/xorg-app/xhost_1.0.6.bb
index 6dc97a1..aba33f0 100644
--- a/meta/recipes-graphics/xorg-app/xhost_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/xhost_1.0.6.bb
@@ -11,8 +11,7 @@ protocol for passing other authentication data to the server."
LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
DEPENDS += "libxmu libxau"
-PR = "${INC_PR}.0"
PE = "1"
-SRC_URI[md5sum] = "a0fcd2cb6ddd9f378944cc6f4f83cd7c"
-SRC_URI[sha256sum] = "2870d19f3f4867ead5ba4e35bb73d1fa302be29d812c13e4195066c78d1f8850"
+SRC_URI[md5sum] = "f1669af1fe0554e876f03319c678e79d"
+SRC_URI[sha256sum] = "a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 11/13] makedepend: upgrade to 1.0.5
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (9 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 10/13] xhost: upgrade to 1.0.6 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:09 ` [PATCH 12/13] flex: upgrade to 2.5.37 Laurentiu Palcu
` (3 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Removed patch since it included upstream.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../obsolete_automake_macros.patch | 15 ---------------
.../{makedepend_1.0.4.bb => makedepend_1.0.5.bb} | 7 ++-----
2 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
rename meta/recipes-graphics/xorg-util/{makedepend_1.0.4.bb => makedepend_1.0.5.bb} (76%)
diff --git a/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
deleted file mode 100644
index 1356f8d..0000000
--- a/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Accepted [https://bugs.freedesktop.org/show_bug.cgi?id=59005]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd makedepend-1.0.4/configure.ac makedepend-1.0.4/configure.ac
---- makedepend-1.0.4/configure.ac 2012-03-08 07:54:20.000000000 +0200
-+++ makedepend-1.0.4/configure.ac 2013-01-02 16:28:21.920132502 +0200
-@@ -2,7 +2,7 @@
- AC_INIT([makedepend], [1.0.4],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--AM_CONFIG_HEADER([makedepend-config.h])
-+AC_CONFIG_HEADERS([makedepend-config.h])
-
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
rename to meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
index 899391d..84a967a 100644
--- a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
@@ -11,14 +11,11 @@ can reference files having other #include directives, and parsing will \
occur in these files as well."
DEPENDS = "xproto util-macros"
-PR = "r1"
PE = "1"
BBCLASSEXTEND = "native"
LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f"
-SRC_URI += "file://obsolete_automake_macros.patch"
-
-SRC_URI[md5sum] = "bf1c54028427829c9c3193bef710dbee"
-SRC_URI[sha256sum] = "f53b8ce5dec02a05f8994036a8ebac485a96324143ff2382e29578fdc096b04f"
+SRC_URI[md5sum] = "efb2d7c7e22840947863efaedc175747"
+SRC_URI[sha256sum] = "503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 12/13] flex: upgrade to 2.5.37
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (10 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 11/13] makedepend: upgrade to 1.0.5 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:56 ` Burton, Ross
2013-07-31 13:09 ` [PATCH 13/13] grub_2.00: fix compilation when using flex 2.5.37 Laurentiu Palcu
` (2 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Removed patches since they were included upstream.
Added a patch to not compile flex.pdf doc since it needs texi2dvi.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../flex/files/do_not_create_pdf_doc.patch | 17 ++++++
.../flex/flex/avoid-FORTIFY-warnings.patch | 59 --------------------
.../flex/int-is-not-the-same-size-as-size_t.patch | 42 --------------
meta/recipes-devtools/flex/flex_2.5.35.bb | 11 ----
meta/recipes-devtools/flex/flex_2.5.37.bb | 10 ++++
5 files changed, 27 insertions(+), 112 deletions(-)
create mode 100644 meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
delete mode 100644 meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
delete mode 100644 meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
delete mode 100644 meta/recipes-devtools/flex/flex_2.5.35.bb
create mode 100644 meta/recipes-devtools/flex/flex_2.5.37.bb
diff --git a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch b/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
new file mode 100644
index 0000000..02ececb
--- /dev/null
+++ b/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inapropriate (embedded specific)
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: flex-2.5.37/doc/Makefile.am
+===================================================================
+--- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300
++++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300
+@@ -2,7 +2,7 @@
+
+ info_TEXINFOS = flex.texi
+ dist_man_MANS = flex.1
+-dist_doc_DATA= flex.pdf
++EXTRA_DIST= flex.pdf
+
+ CLEANFILES = \
+ flex.hks \
diff --git a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch b/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
deleted file mode 100644
index c71eb82..0000000
--- a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Wrap ECHO macro to avoid FORTIFY warnings
-
-This change will enable flex scanners to be compiled with
--D_FORTIFY_SOURCE=2.
-
-Signed-off-by: Manoj Srivastava <srivasta@debian.org>
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-
-Origin: Cherry picked from Debian
-Upstream-Status: Pending
-
----
- flex.skl | 2 +-
- scan.c | 2 +-
- skel.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/flex.skl b/flex.skl
-index 6ebf2fd..eaa355e 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -1074,7 +1074,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff --git a/scan.c b/scan.c
-index d7f5db3..1a079bf 100644
---- a/scan.c
-+++ b/scan.c
-@@ -2093,7 +2093,7 @@ static int input (void );
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
-diff --git a/skel.c b/skel.c
-index ee9f6ef..b8a2b4b 100644
---- a/skel.c
-+++ b/skel.c
-@@ -1141,7 +1141,7 @@ const char *skel[] = {
- "/* This used to be an fputs(), but since the string might contain NUL's,",
- " * we now use fwrite().",
- " */",
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
- "%endif",
- "%if-c++-only C++ definition",
- "#define ECHO LexerOutput( yytext, yyleng )",
---
-1.7.9.5
-
diff --git a/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch b/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
deleted file mode 100644
index 8d05ee4..0000000
--- a/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-int is not the same size as size_t.
-
-Signed-off-by: Manoj Srivastava <srivasta@debian.org>
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-
-Origin: Cherry picked from Debian
-Upstream-Status: Pending
-
----
- gen.c | 2 +-
- scan.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gen.c b/gen.c
-index 848e2c5..5a5daef 100644
---- a/gen.c
-+++ b/gen.c
-@@ -1890,7 +1890,7 @@ void make_tables ()
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- outn ("\t\t{ \\");
- outn ("\t\tint c = '*'; \\");
-- outn ("\t\tint n; \\");
-+ outn ("\t\tsize_t n; \\");
- outn ("\t\tfor ( n = 0; n < max_size && \\");
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- outn ("\t\t\tbuf[n] = (char) c; \\");
-diff --git a/scan.c b/scan.c
-index 44559b6..15e2058 100644
---- a/scan.c
-+++ b/scan.c
-@@ -2105,7 +2105,7 @@ static int input (void );
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
-- int n; \
-+ size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
---
-1.7.9.5
-
diff --git a/meta/recipes-devtools/flex/flex_2.5.35.bb b/meta/recipes-devtools/flex/flex_2.5.35.bb
deleted file mode 100644
index 2218c91..0000000
--- a/meta/recipes-devtools/flex/flex_2.5.35.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require flex.inc
-PR = "r3"
-LICENSE="BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += "file://avoid-FORTIFY-warnings.patch \
- file://int-is-not-the-same-size-as-size_t.patch"
-
-SRC_URI[md5sum] = "10714e50cea54dc7a227e3eddcd44d57"
-SRC_URI[sha256sum] = "0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b"
diff --git a/meta/recipes-devtools/flex/flex_2.5.37.bb b/meta/recipes-devtools/flex/flex_2.5.37.bb
new file mode 100644
index 0000000..418fba6
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex_2.5.37.bb
@@ -0,0 +1,10 @@
+require flex.inc
+PR = "r3"
+LICENSE="BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://do_not_create_pdf_doc.patch"
+
+SRC_URI[md5sum] = "c75940e1fc25108f2a7b3ef42abdae06"
+SRC_URI[sha256sum] = "17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 13/13] grub_2.00: fix compilation when using flex 2.5.37
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (11 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 12/13] flex: upgrade to 2.5.37 Laurentiu Palcu
@ 2013-07-31 13:09 ` Laurentiu Palcu
2013-07-31 13:58 ` [PATCH 00/13] Package upgrades Burton, Ross
2013-08-02 10:40 ` [PATCH v2 00/13] Package upgrades (cover letter only) Laurentiu Palcu
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-07-31 13:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../grub-2.00/fix-issue-with-flex-2.5.37.patch | 21 ++++++++++++++++++++
meta/recipes-bsp/grub/grub_2.00.bb | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch b/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
new file mode 100644
index 0000000..61ae2f5
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
@@ -0,0 +1,21 @@
+Upstream-Status: Backport
+
+This fixes compilation issues when using flex-2.5.37. It was taken from upstream.
+
+Original author is: Vladimir Serbinenko <phcoder@gmail.com>
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: grub-2.00/grub-core/script/yylex.l
+===================================================================
+--- grub-2.00.orig/grub-core/script/yylex.l 2012-06-08 23:24:15.000000000 +0300
++++ grub-2.00/grub-core/script/yylex.l 2013-07-31 14:34:40.708100982 +0300
+@@ -29,6 +29,8 @@
+ #pragma GCC diagnostic ignored "-Wmissing-prototypes"
+ #pragma GCC diagnostic ignored "-Wmissing-declarations"
+ #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
++#pragma GCC diagnostic ignored "-Wunused-function"
++#pragma GCC diagnostic ignored "-Wsign-compare"
+
+ #define yyfree grub_lexer_yyfree
+ #define yyalloc grub_lexer_yyalloc
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index 5153b6a..e82996d 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -20,7 +20,9 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://grub-2.00-fpmath-sse-387-fix.patch \
file://remove-gets.patch \
file://check-if-liblzma-is-disabled.patch \
- file://40_custom"
+ file://40_custom \
+ file://fix-issue-with-flex-2.5.37.patch \
+ "
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 00/13] Package upgrades
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (12 preceding siblings ...)
2013-07-31 13:09 ` [PATCH 13/13] grub_2.00: fix compilation when using flex 2.5.37 Laurentiu Palcu
@ 2013-07-31 13:58 ` Burton, Ross
2013-08-02 10:40 ` [PATCH v2 00/13] Package upgrades (cover letter only) Laurentiu Palcu
14 siblings, 0 replies; 23+ messages in thread
From: Burton, Ross @ 2013-07-31 13:58 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 31 July 2013 14:09, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> Tests done:
> * build tested on AB running following nightlies: x86, x86_64, ppc, mips, arm;
> * basic functionality for X, powertop, nasm, xhost and xranr was tested on an
> ideapad s10-3t with a core-image-sato image. No issues spotted;
> * makedepend, flex, git, subversion are needed during the build process for
> various packages and were not tested directly. AB caught a grub compilation
> issue caused by the new flex version and this patchset contains a fix for
> that too;
Apart from the PR that needs to be removed, all looks good to me.
Cheers,
Ross
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH v2 00/13] Package upgrades (cover letter only)
2013-07-31 13:09 [PATCH 00/13] Package upgrades Laurentiu Palcu
` (13 preceding siblings ...)
2013-07-31 13:58 ` [PATCH 00/13] Package upgrades Burton, Ross
@ 2013-08-02 10:40 ` Laurentiu Palcu
14 siblings, 0 replies; 23+ messages in thread
From: Laurentiu Palcu @ 2013-08-02 10:40 UTC (permalink / raw)
To: openembedded-core
Changes in v2:
* dropped PR for flex;
Thanks,
Laurentiu
The following changes since commit 9de0ad47462c13ac4a2d73e12e92be6c1b4e0415:
genericx86: ship all the driver firmware by default (2013-07-31 07:00:00 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib lpalcu/upgrades_v2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/upgrades_v2
Laurentiu Palcu (13):
xf86-video-intel: upgrade to 2.21.13
git: upgrade to 1.8.3.4
nasm: upgrade to 2.10.09
powertop: upgrade to 2.4
libdrm: upgrade to 2.4.46
libpciaccess: upgrade to 0.13.2
xrandr: upgrade to 1.4.1
xf86-input-evdev: upgrade to 2.8.1
subversion: upgrade to 1.8.1
xhost: upgrade to 1.0.6
makedepend: upgrade to 1.0.5
flex: upgrade to 2.5.37
grub_2.00: fix compilation when using flex 2.5.37
.../grub-2.00/fix-issue-with-flex-2.5.37.patch | 21 +++++++
meta/recipes-bsp/grub/grub_2.00.bb | 4 +-
.../flex/files/do_not_create_pdf_doc.patch | 17 ++++++
.../flex/flex/avoid-FORTIFY-warnings.patch | 59 --------------------
.../flex/int-is-not-the-same-size-as-size_t.patch | 42 --------------
meta/recipes-devtools/flex/flex_2.5.35.bb | 11 ----
meta/recipes-devtools/flex/flex_2.5.37.bb | 9 +++
.../git/{git_1.8.3.bb => git_1.8.3.4.bb} | 4 +-
.../nasm/{nasm_2.10.07.bb => nasm_2.10.09.bb} | 5 +-
.../subversion-1.8.1/disable_mac_checks.patch | 21 +++++++
.../libtool2.patch | 14 +++--
.../subversion/disable-revision-install.patch | 36 ------------
.../subversion/fix-install-depends.patch | 45 ---------------
.../{subversion_1.6.15.bb => subversion_1.8.1.bb} | 24 ++++----
.../drm/{libdrm_2.4.45.bb => libdrm_2.4.46.bb} | 4 +-
.../xorg-app/{xhost_1.0.5.bb => xhost_1.0.6.bb} | 5 +-
.../xorg-app/{xrandr_1.4.0.bb => xrandr_1.4.1.bb} | 5 +-
...ut-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} | 4 +-
...intel_2.21.9.bb => xf86-video-intel_2.21.13.bb} | 4 +-
...bpciaccess_0.13.1.bb => libpciaccess_0.13.2.bb} | 8 +--
.../obsolete_automake_macros.patch | 15 -----
.../{makedepend_1.0.4.bb => makedepend_1.0.5.bb} | 7 +--
.../powertop/{powertop_2.3.bb => powertop_2.4.bb} | 4 +-
23 files changed, 111 insertions(+), 257 deletions(-)
create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
create mode 100644 meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
delete mode 100644 meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
delete mode 100644 meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
delete mode 100644 meta/recipes-devtools/flex/flex_2.5.35.bb
create mode 100644 meta/recipes-devtools/flex/flex_2.5.37.bb
rename meta/recipes-devtools/git/{git_1.8.3.bb => git_1.8.3.4.bb} (67%)
rename meta/recipes-devtools/nasm/{nasm_2.10.07.bb => nasm_2.10.09.bb} (80%)
create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.1/disable_mac_checks.patch
rename meta/recipes-devtools/subversion/{subversion => subversion-1.8.1}/libtool2.patch (54%)
delete mode 100644 meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
delete mode 100644 meta/recipes-devtools/subversion/subversion/fix-install-depends.patch
rename meta/recipes-devtools/subversion/{subversion_1.6.15.bb => subversion_1.8.1.bb} (54%)
rename meta/recipes-graphics/drm/{libdrm_2.4.45.bb => libdrm_2.4.46.bb} (46%)
rename meta/recipes-graphics/xorg-app/{xhost_1.0.5.bb => xhost_1.0.6.bb} (79%)
rename meta/recipes-graphics/xorg-app/{xrandr_1.4.0.bb => xrandr_1.4.1.bb} (70%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.8.0.bb => xf86-input-evdev_2.8.1.bb} (83%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.21.9.bb => xf86-video-intel_2.21.13.bb} (85%)
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.1.bb => libpciaccess_0.13.2.bb} (50%)
delete mode 100644 meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
rename meta/recipes-graphics/xorg-util/{makedepend_1.0.4.bb => makedepend_1.0.5.bb} (76%)
rename meta/recipes-kernel/powertop/{powertop_2.3.bb => powertop_2.4.bb} (87%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 23+ messages in thread