Skip to contentSkip to conversation

Package version updates

PATCH In review Alexander Kanavin 2 participants 13 messages Aug 10, 2015

lore
Share & tools
lore
#0 lore raw

cover Package version updates

This patchset contains a few easy version updates. I skipped recipes that require deep specialist knowledge (for example anything toolchain-related), or those with a big set of custom oe-core patches that would require a long study to understand and update those patches.

The following changes since commit c75cefe8a382a63f625123c156137782db118f64:

libpam: Fix patch broken during upgrade (2015-08-09 15:15:33 -0700)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alexander Kanavin (8):
autogen: update to 5.18.5
apmd: update to 3.2.2-15
apt: update to 1.0.10.1
blktool: update to 4-7
bluez5: update to 5.33
bootchart2: update to 0.14.7
cdrtools: update to 3.01a31
clutter-gst: update to 3.0.8

 .../apmd/{apmd-3.2.2-14 => apmd}/apmd.service      |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy        |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy.conf   |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/default           |   0
 meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/init |   0
 meta/recipes-bsp/apmd/apmd/legacy.patch            | 112 ++++++++++++
 .../apmd/{apmd-3.2.2-14 => apmd}/libtool.patch     |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/unlinux.patch     |   0
 .../apmd/{apmd_3.2.2-14.bb => apmd_3.2.2-15.bb}    |   6 +-
 .../bluez5/{bluez5_5.32.bb => bluez5_5.33.bb}      |   4 +-
 meta/recipes-devtools/apt/apt-native_1.0.10.1.bb   |   4 +
 meta/recipes-devtools/apt/apt-native_1.0.9.9.bb    |   9 -
 meta/recipes-devtools/apt/apt.inc                  |   5 +-
 ...ys-run-dpkg-configure-a-at-the-end-of-our.patch |   0
 .../0001-fix-the-gcc-version-check.patch           |   0
 ...001-remove-Wsuggest-attribute-from-CFLAGS.patch |   0
 .../disable-configure-in-makefile.patch            |   0
 .../apt/{apt-1.0.9.9 => apt}/disable-test.patch    |   0
 .../fix-gcc-4.6-null-not-defined.patch             |   0
 .../apt/{apt-1.0.9.9 => apt}/makerace.patch        |   0
 .../apt/{apt-1.0.9.9 => apt}/no-nls-dpkg.patch     |   0
 .../apt/{apt-1.0.9.9 => apt}/noconfigure.patch     |   0
 .../apt/{apt-1.0.9.9 => apt}/nodoc.patch           |   0
 .../{apt-1.0.9.9 => apt}/truncate-filename.patch   |   0
 .../apt/{apt-1.0.9.9 => apt}/use-host.patch        |   0
 .../apt/{apt_1.0.9.9.bb => apt_1.0.10.1.bb}        |   4 -
 ...n-native_5.18.4.bb => autogen-native_5.18.5.bb} |   5 +-
 meta/recipes-devtools/autogen/autogen/guile.patch  | 191 ---------------------
 .../bootchart2/bootchartd-no-bashism.patch         |  27 ---
 .../{bootchart2_git.bb => bootchart2_0.14.7.bb}    |   7 +-
 ...ative_3.01a20.bb => cdrtools-native_3.01a31.bb} |   4 +-
 .../blktool/0001-fix-typos-in-manpage.patch        |  34 ++++
 .../blktool/blktool/0002-fix-string-error.patch    |  25 +++
 ...rgument-for-BLKROSET-it-must-be-const-int.patch |  71 ++++++++
 .../blktool/{blktool_4-6.1.bb => blktool_4-7.bb}   |   9 +-
 ...r-gst-3.0_3.0.6.bb => clutter-gst-3.0_3.0.8.bb} |   4 +-
 36 files changed, 266 insertions(+), 255 deletions(-)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd.service (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy.conf (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/default (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/init (100%)
 create mode 100644 meta/recipes-bsp/apmd/apmd/legacy.patch
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/libtool.patch (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/unlinux.patch (100%)
 rename meta/recipes-bsp/apmd/{apmd_3.2.2-14.bb => apmd_3.2.2-15.bb} (92%)
 rename meta/recipes-connectivity/bluez5/{bluez5_5.32.bb => bluez5_5.33.bb} (88%)
 create mode 100644 meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
 delete mode 100644 meta/recipes-devtools/apt/apt-native_1.0.9.9.bb
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-fix-the-gcc-version-check.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-remove-Wsuggest-attribute-from-CFLAGS.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/disable-configure-in-makefile.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/disable-test.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/fix-gcc-4.6-null-not-defined.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/makerace.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/no-nls-dpkg.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/noconfigure.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/nodoc.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/truncate-filename.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/use-host.patch (100%)
 rename meta/recipes-devtools/apt/{apt_1.0.9.9.bb => apt_1.0.10.1.bb} (70%)
 rename meta/recipes-devtools/autogen/{autogen-native_5.18.4.bb => autogen-native_5.18.5.bb} (88%)
 delete mode 100644 meta/recipes-devtools/autogen/autogen/guile.patch
 delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch
 rename meta/recipes-devtools/bootchart2/{bootchart2_git.bb => bootchart2_0.14.7.bb} (97%)
 rename meta/recipes-devtools/cdrtools/{cdrtools-native_3.01a20.bb => cdrtools-native_3.01a31.bb} (81%)
 create mode 100644 meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
 create mode 100644 meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
 create mode 100644 meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
 rename meta/recipes-extended/blktool/{blktool_4-6.1.bb => blktool_4-7.bb} (72%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.6.bb => clutter-gst-3.0_3.0.8.bb} (58%)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/8 autogen: update to 5.18.5

Also, drop guile.patch, because the same problem has been fixed differently in the new upstream release.

---
 ...n-native_5.18.4.bb => autogen-native_5.18.5.bb} |   5 +-
 meta/recipes-devtools/autogen/autogen/guile.patch  | 191 ---------------------
 2 files changed, 2 insertions(+), 194 deletions(-)
 rename meta/recipes-devtools/autogen/{autogen-native_5.18.4.bb => autogen-native_5.18.5.bb} (88%)
 delete mode 100644 meta/recipes-devtools/autogen/autogen/guile.patch
meta/recipes-devtools/autogen/autogen-native_5.18.5.bb renamed from meta/recipes-devtools/autogen/autogen-native_5.18.4.bb +2 -3
similarity index 88%
rename from meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
rename to meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
index 5fd6b7e..2a28512 100644
@@ -9,14 +9,13 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
-           file://guile.patch \
            file://increase-timeout-limit.patch \
            file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
            file://redirect-output-dir.patch \
 "
 
-SRC_URI[md5sum] = "6f48029cc839303d28496e1609868938"
-SRC_URI[sha256sum] = "3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d"
+SRC_URI[md5sum] = "385d7c7dfbe60babbee261c054923a53"
+SRC_URI[sha256sum] = "7bbdb73b5518baf64c6d3739fb2ecc66d2cccda888ce5ad573abe235ab5d96ba"
 
 DEPENDS = "guile-native libtool-native libxml2-native"
 
meta/recipes-devtools/autogen/autogen/guile.patch deleted +0 -191

191 lines not on this page · raw message

Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/8 apmd: update to 3.2.2-15

In reply to Alexander Kanavin

This basically means replacing a "-14" Debian patch with "-15" patch.

---
 .../apmd/{apmd-3.2.2-14 => apmd}/apmd.service      |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy        |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy.conf   |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/default           |   0
 meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/init |   0
 meta/recipes-bsp/apmd/apmd/legacy.patch            | 112 +++++++++++++++++++++
 .../apmd/{apmd-3.2.2-14 => apmd}/libtool.patch     |   0
 .../apmd/{apmd-3.2.2-14 => apmd}/unlinux.patch     |   0
 .../apmd/{apmd_3.2.2-14.bb => apmd_3.2.2-15.bb}    |   6 +-
 9 files changed, 114 insertions(+), 4 deletions(-)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd.service (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/apmd_proxy.conf (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/default (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/init (100%)
 create mode 100644 meta/recipes-bsp/apmd/apmd/legacy.patch
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/libtool.patch (100%)
 rename meta/recipes-bsp/apmd/{apmd-3.2.2-14 => apmd}/unlinux.patch (100%)
 rename meta/recipes-bsp/apmd/{apmd_3.2.2-14.bb => apmd_3.2.2-15.bb} (92%)
meta/recipes-bsp/apmd/apmd/apmd.service renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service
rename to meta/recipes-bsp/apmd/apmd/apmd.service
meta/recipes-bsp/apmd/apmd/apmd_proxy renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
rename to meta/recipes-bsp/apmd/apmd/apmd_proxy
meta/recipes-bsp/apmd/apmd/apmd_proxy.conf renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
rename to meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
meta/recipes-bsp/apmd/apmd/default renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/default +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/default
rename to meta/recipes-bsp/apmd/apmd/default
meta/recipes-bsp/apmd/apmd/init renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/init +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/init
rename to meta/recipes-bsp/apmd/apmd/init
meta/recipes-bsp/apmd/apmd/legacy.patch new file +112 -0

112 lines not on this page · raw message

meta/recipes-bsp/apmd/apmd/libtool.patch renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
rename to meta/recipes-bsp/apmd/apmd/libtool.patch
meta/recipes-bsp/apmd/apmd/unlinux.patch renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch +0 -0
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
rename to meta/recipes-bsp/apmd/apmd/unlinux.patch
meta/recipes-bsp/apmd/apmd_3.2.2-15.bb renamed from meta/recipes-bsp/apmd/apmd_3.2.2-14.bb +2 -4
similarity index 92%
rename from meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
rename to meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index 65dd01b..ab00814 100644
@@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "libtool-cross"
 PR = "r2"
 
+# legacy.patch taken from ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
-           ${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.diff.gz;name=patch \
+           file://legacy.patch \
            file://libtool.patch \
            file://unlinux.patch \
            file://init \
@@ -23,9 +24,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
 SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
 SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d"
 
-SRC_URI[patch.md5sum] = "57e1b689264ea80f78353519eece0c92"
-SRC_URI[patch.sha256sum] = "7905ff96be93d725544d0040e425c42f9c05580db3c272f11cff75b9aa89d430"
-
 S = "${WORKDIR}/apmd-3.2.2.orig"
 
 inherit update-rc.d systemd
Signature · 1 line
2.1.4
#3 lore raw

Re: [PATCH 2/8] apmd: update to 3.2.2-15

Quoted 2 lines · Alexander Kanavin

+++ b/meta/recipes-bsp/apmd/apmd/legacy.patch

Patch needs a header/upstream-status/signed-off-by. Don't bother putting the comment in the recipe, but put that metadata in the patch itself.

Ross

#4 lore raw

PATCH 3/8 apt: update to 1.0.10.1

In reply to Alexander Kanavin
---
 meta/recipes-devtools/apt/apt-native_1.0.10.1.bb                 | 4 ++++
 meta/recipes-devtools/apt/apt-native_1.0.9.9.bb                  | 9 ---------
 meta/recipes-devtools/apt/apt.inc                                | 5 ++++-
 ...01-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch | 0
 .../{apt-1.0.9.9 => apt}/0001-fix-the-gcc-version-check.patch    | 0
 .../0001-remove-Wsuggest-attribute-from-CFLAGS.patch             | 0
 .../apt/{apt-1.0.9.9 => apt}/disable-configure-in-makefile.patch | 0
 .../recipes-devtools/apt/{apt-1.0.9.9 => apt}/disable-test.patch | 0
 .../apt/{apt-1.0.9.9 => apt}/fix-gcc-4.6-null-not-defined.patch  | 0
 meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/makerace.patch    | 0
 meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/no-nls-dpkg.patch | 0
 meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/noconfigure.patch | 0
 meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/nodoc.patch       | 0
 .../apt/{apt-1.0.9.9 => apt}/truncate-filename.patch             | 0
 meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/use-host.patch    | 0
 meta/recipes-devtools/apt/{apt_1.0.9.9.bb => apt_1.0.10.1.bb}    | 4 ----
 16 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
 delete mode 100644 meta/recipes-devtools/apt/apt-native_1.0.9.9.bb
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-fix-the-gcc-version-check.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/0001-remove-Wsuggest-attribute-from-CFLAGS.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/disable-configure-in-makefile.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/disable-test.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/fix-gcc-4.6-null-not-defined.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/makerace.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/no-nls-dpkg.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/noconfigure.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/nodoc.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/truncate-filename.patch (100%)
 rename meta/recipes-devtools/apt/{apt-1.0.9.9 => apt}/use-host.patch (100%)
 rename meta/recipes-devtools/apt/{apt_1.0.9.9.bb => apt_1.0.10.1.bb} (70%)
meta/recipes-devtools/apt/apt-native_1.0.10.1.bb new file +4 -0
new file mode 100644
index 0000000..1e660da
@@ -0,0 +1,4 @@
+require apt-native.inc
+
+SRC_URI += "file://noconfigure.patch \
+            file://no-curl.patch"
meta/recipes-devtools/apt/apt-native_1.0.9.9.bb deleted +0 -9
deleted file mode 100644
index cbaf25b..0000000
@@ -1,9 +0,0 @@
-require apt-native.inc
-
-SRC_URI += "file://noconfigure.patch \
-            file://no-curl.patch"
-
-SRC_URI[md5sum] = "e70c6d6227883cfc0dda6bc5db509bca"
-SRC_URI[sha256sum] = "96bebcd7bfee0b2386741a8315182ba39487bdd743ecf5c1fc5b8b889cca2478"
-
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
meta/recipes-devtools/apt/apt.inc +4 -1
index 94bd6e9..3248b9a 100644
@@ -2,7 +2,7 @@ SUMMARY = "Advanced front-end for dpkg"
 LICENSE = "GPLv2.0+"
 SECTION = "base"
 
-SRC_URI = "http://snapshot.debian.org/archive/debian/20150428T221633Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \
+SRC_URI = "http://snapshot.debian.org/archive/debian/20150805T094928Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \
            file://use-host.patch \
            file://makerace.patch \
            file://no-nls-dpkg.patch \
@@ -12,6 +12,9 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20150428T221633Z/pool/main/
            file://disable-configure-in-makefile.patch \
            file://disable-test.patch \
            "
+SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276"
+SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543"
+LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 inherit autotools gettext
 
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
rename to meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch
rename to meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
rename to meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/disable-configure-in-makefile.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/disable-configure-in-makefile.patch
rename to meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
meta/recipes-devtools/apt/apt/disable-test.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
rename to meta/recipes-devtools/apt/apt/disable-test.patch
meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/fix-gcc-4.6-null-not-defined.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/fix-gcc-4.6-null-not-defined.patch
rename to meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
meta/recipes-devtools/apt/apt/makerace.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/makerace.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/makerace.patch
rename to meta/recipes-devtools/apt/apt/makerace.patch
meta/recipes-devtools/apt/apt/no-nls-dpkg.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/no-nls-dpkg.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/no-nls-dpkg.patch
rename to meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
meta/recipes-devtools/apt/apt/noconfigure.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/noconfigure.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/noconfigure.patch
rename to meta/recipes-devtools/apt/apt/noconfigure.patch
meta/recipes-devtools/apt/apt/nodoc.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/nodoc.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/nodoc.patch
rename to meta/recipes-devtools/apt/apt/nodoc.patch
meta/recipes-devtools/apt/apt/truncate-filename.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/truncate-filename.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/truncate-filename.patch
rename to meta/recipes-devtools/apt/apt/truncate-filename.patch
meta/recipes-devtools/apt/apt/use-host.patch renamed from meta/recipes-devtools/apt/apt-1.0.9.9/use-host.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/apt/apt-1.0.9.9/use-host.patch
rename to meta/recipes-devtools/apt/apt/use-host.patch
meta/recipes-devtools/apt/apt_1.0.10.1.bb renamed from meta/recipes-devtools/apt/apt_1.0.9.9.bb +0 -4
similarity index 70%
rename from meta/recipes-devtools/apt/apt_1.0.9.9.bb
rename to meta/recipes-devtools/apt/apt_1.0.10.1.bb
index 4c40d0d..bf77e2a 100644
@@ -1,11 +1,7 @@
 DEPENDS = "curl db"
 RDEPENDS_${PN} = "dpkg bash debianutils"
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 require apt.inc
 
-SRC_URI[md5sum] = "e70c6d6227883cfc0dda6bc5db509bca"
-SRC_URI[sha256sum] = "96bebcd7bfee0b2386741a8315182ba39487bdd743ecf5c1fc5b8b889cca2478"
-
 require apt-package.inc
 
 PACKAGECONFIG ??= "lzma"
Signature · 1 line
2.1.4
#5 lore raw

PATCH 4/8 blktool: update to 4-7

In reply to Alexander Kanavin

This means replacing a "-6.1" Debian patch with "-7" patch.

---
 .../blktool/0001-fix-typos-in-manpage.patch        | 34 +++++++++++
 .../blktool/blktool/0002-fix-string-error.patch    | 25 ++++++++
 ...rgument-for-BLKROSET-it-must-be-const-int.patch | 71 ++++++++++++++++++++++
 .../blktool/{blktool_4-6.1.bb => blktool_4-7.bb}   |  9 +--
 4 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
 create mode 100644 meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
 create mode 100644 meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
 rename meta/recipes-extended/blktool/{blktool_4-6.1.bb => blktool_4-7.bb} (72%)
meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch new file +34 -0
new file mode 100644
index 0000000..4152210
@@ -0,0 +1,34 @@
+From ba5578e7d2c28011776e6c71dec441ad127d5c83 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <[email protected]>
+Date: Wed, 8 Jul 2015 01:37:09 +0300
+Subject: [PATCH] fix typos in manpage
+
+---
+ blktool.8 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/blktool.8 b/blktool.8
+index a1f5c96..45b7724 100644
+--- a/blktool.8
++++ b/blktool.8
+@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate)
+ Query the detected (or overridden, via -t) device class.
+ Typically this will result in 'ATA' or 'SCSI' for most devices.
+ Detection is based on device major; thus your SATA device may appear as
+-'SCSI'.
++\&'SCSI'.
+ 
+ .TP
+ .B cd-speed
+@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state.
+ 
+ .TP
+ .B media
+-Lock in (or unlock) a removeable device.
++Lock in (or unlock) a removable device.
+ 
+ .TP
+ .B multiple-count
+-- 
+2.1.4
+
meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch new file +25 -0
new file mode 100644
index 0000000..4188bac
@@ -0,0 +1,25 @@
+From 8571ba876fc914ccd71a875ae23b09012604a94e Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <[email protected]>
+Date: Wed, 8 Jul 2015 01:42:24 +0300
+Subject: [PATCH] fix string error
+
+---
+ util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index 1f3a9ca..2ccf56a 100644
+--- a/util.c
++++ b/util.c
+@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr)
+ 	if (perr)
+ 		perror(msg);
+ 	else
+-		fprintf(stderr, msg);
++		fprintf(stderr, "%s", msg);
+ 	if (blkdev >= 0)
+ 		close(blkdev);
+ 	exit(1);
+-- 
+2.1.4
+
meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch new file +71 -0

71 lines not on this page · raw message

meta/recipes-extended/blktool/blktool_4-7.bb renamed from meta/recipes-extended/blktool/blktool_4-6.1.bb +5 -4
similarity index 72%
rename from meta/recipes-extended/blktool/blktool_4-6.1.bb
rename to meta/recipes-extended/blktool/blktool_4-7.bb
index 69f2261..c7346dc 100644
@@ -10,15 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "glib-2.0"
 PR = "r1"
 
+# The three patches below are taken from ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
 SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \
-           ${DEBIAN_MIRROR}/main/b/blktool/blktool_4-6.1.diff.gz;apply=yes;name=patch"
+           file://0001-fix-typos-in-manpage.patch \
+           file://0002-fix-string-error.patch \
+           file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
+          "
 
 SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
 SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
 
-SRC_URI[patch.md5sum] = "cf605a683d54d1fbcb35b940076ddb0c"
-SRC_URI[patch.sha256sum] = "d7923527e1a00984620ab307c9047a653d7ae2856cd20a82de8a33328f381ae3"
-
 S = "${WORKDIR}/${BPN}-4.orig"
 
 inherit autotools pkgconfig
Signature · 1 line
2.1.4
#6 lore raw

Re: [PATCH 4/8] blktool: update to 4-7

Quoted 2 lines · Alexander Kanavin

PR = "r1"

This can be removed.

Review

Quoted 12 lines

+# The three patches below are taken from ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
SRC_URI =
"${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \

(quoted diff) +4 -1
-
 ${DEBIAN_MIRROR}/main/b/blktool/blktool_4-6.1.diff.gz;apply=yes;name=patch"
+           file://0001-fix-typos-in-manpage.patch \
+           file://0002-fix-string-error.patch \
+
 file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
+          "

The patch origin metadata should be in the patches, not the recipe.

Cheers,
Ross

#7 lore raw

PATCH 5/8 bluez5: update to 5.33

In reply to Alexander Kanavin
---
 meta/recipes-connectivity/bluez5/{bluez5_5.32.bb => bluez5_5.33.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/bluez5/{bluez5_5.32.bb => bluez5_5.33.bb} (88%)
meta/recipes-connectivity/bluez5/bluez5_5.33.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.32.bb +2 -2
similarity index 88%
rename from meta/recipes-connectivity/bluez5/bluez5_5.32.bb
rename to meta/recipes-connectivity/bluez5/bluez5_5.33.bb
index db02be4..23c7397 100644
@@ -1,6 +1,6 @@
 require bluez5.inc
-SRC_URI[md5sum] = "432b1f292c0b78771818c67140baf3d9"
-SRC_URI[sha256sum] = "fe4f35e701cbec04478818adf014ed9bbd1f7d11e2603370f1b70a78106f57f7"
+SRC_URI[md5sum] = "78782dc33d9a8b6344c4cc1af70c8a98"
+SRC_URI[sha256sum] = "1801807a13506678cbfeb15c6a4b89ecb5739efe1067eb464da6641d731436d3"
 
 # noinst programs in Makefile.tools that are conditional on READLINE
 # support
Signature · 1 line
2.1.4
#8 lore raw

PATCH 6/8 bootchart2: update to 0.14.7

In reply to Alexander Kanavin

Drop bootchartd-no-bashism.patch as it's been merged upstream

---
 .../bootchart2/bootchartd-no-bashism.patch         | 27 ----------------------
 .../{bootchart2_git.bb => bootchart2_0.14.7.bb}    |  7 +-----
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch
 rename meta/recipes-devtools/bootchart2/{bootchart2_git.bb => bootchart2_0.14.7.bb} (97%)
meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch deleted +0 -27
deleted file mode 100644
index b013995..0000000
@@ -1,27 +0,0 @@
-From ffb5bae5d588aaea6325623462a8070a04767196 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Thu, 14 Aug 2014 08:33:28 -0700
-Subject: [PATCH] bootchartd.in: no bashism
-
-No bashism in bootchartd.in, so use /bin/sh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
----
- bootchartd.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bootchartd.in b/bootchartd.in
-index a408bab..064f6a4 100755
---- a/bootchartd.in
-+++ b/bootchartd.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Bootchart logger script
- # Ziga Mahkovec  <[email protected]>
--- 
-1.7.9.5
-
meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb renamed from meta/recipes-devtools/bootchart2/bootchart2_git.bb +1 -6
similarity index 97%
rename from meta/recipes-devtools/bootchart2/bootchart2_git.bb
rename to meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
index ea9f179..4b0a980 100644
@@ -88,17 +88,12 @@ HOMEPAGE = "https://github.com/mmeeks/bootchart"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 
-# one commit beyond 1.14.6 for a systemd-related bugfix
-PV = "0.14.6+git${SRCPV}"
-
 SRC_URI = "git://github.com/mmeeks/bootchart.git \
            file://bootchartd_stop.sh \
-           file://bootchartd-no-bashism.patch \
           "
 
-SRCREV = "b65ed43b0ae832080fb728245de9ef1a4b48d8b5"
-
 S = "${WORKDIR}/git"
+SRCREV = "6f050b65ae9f266645f04f0aecab9efb88375f1c"
 
 inherit systemd
 inherit update-rc.d
Signature · 1 line
2.1.4
#9 lore raw

Re: [PATCH 6/8] bootchart2: update to 0.14.7

Quoted 2 lines · Alexander Kanavin

Drop bootchartd-no-bashism.patch as it's been merged upstream

This doesn't apply to master-next, could you rebase please?

Cheers,
Ross

#10 lore raw

Re: [PATCH 6/8] bootchart2: update to 0.14.7

Quoted 2 lines · Ross

This doesn't apply to master-next, could you rebase please?

Ignore this - it was a trivial merge.

Ross

#11 lore raw

PATCH 7/8 cdrtools: update to 3.01a31

In reply to Alexander Kanavin
---
 .../{cdrtools-native_3.01a20.bb => cdrtools-native_3.01a31.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/cdrtools/{cdrtools-native_3.01a20.bb => cdrtools-native_3.01a31.bb} (81%)
meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb renamed from meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb +2 -2
similarity index 81%
rename from meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb
rename to meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
index 2827109..d0f36e2 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/cdrtools/alpha/cdrtools-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "f8c6f0fdcba7df0606095498d10315a7"
-SRC_URI[sha256sum] = "e399ea964b8048793721b71461271e46d81f242bd2feefb8dbd259c30e75a5a9"
+SRC_URI[md5sum] = "78172557894f469b4584d008e93ec469"
+SRC_URI[sha256sum] = "183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a"
 
 S = "${WORKDIR}/cdrtools-3.01"
 
Signature · 1 line
2.1.4
#12 lore raw

PATCH 8/8 clutter-gst: update to 3.0.8

In reply to Alexander Kanavin
---
 .../clutter/{clutter-gst-3.0_3.0.6.bb => clutter-gst-3.0_3.0.8.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.6.bb => clutter-gst-3.0_3.0.8.bb} (58%)
meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb renamed from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.6.bb +2 -2
similarity index 58%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.6.bb
rename to meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb
index 27beed9..319a955 100644
@@ -3,5 +3,5 @@ require clutter-gst-3.0.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
 
-SRC_URI[archive.md5sum] = "3100f52225d8be92f57efe246943e3a2"
-SRC_URI[archive.sha256sum] = "d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76"
+SRC_URI[archive.md5sum] = "f7d97f96e7cca82f38317d1734d5dadb"
+SRC_URI[archive.sha256sum] = "582e85b88482e16f7ec719363e38fadf84fab4d4baaa21e5227a454b824f135c"
Signature · 1 line
2.1.4