Skip to contentSkip to conversation

dracut: upgrade 049 -> 051

PATCH New Yi Zhao 1 participant 5 messages Jan 3, 2021

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 dracut: upgrade 049 -> 051

Drop the following patches which have been merged upstream:
0001-dracut.sh-improve-udevdir.patch 0001-set-viriable-_drv-not-local.patch

---
 .../0001-dracut.sh-improve-udevdir.patch      | 39 -----------
 .../0001-set-viriable-_drv-not-local.patch    | 69 -------------------
 .../recipes-devtools/dracut/dracut_git.bb     |  7 +-
 3 files changed, 2 insertions(+), 113 deletions(-)
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch
meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch deleted +0 -39
deleted file mode 100644
index 06e0a094f..000000000
@@ -1,39 +0,0 @@
-From 974f728410052bc8fa18d93dc0c1a991bcdb96e6 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Wed, 3 Apr 2019 15:24:47 +0800
-Subject: [PATCH] dracut.sh: improve udevdir
-
-In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir
-fallback logic], it checked a common binary `collect' to localte
-udevdir.
-
-But upstream systemd drop binary `collect'.
-[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb]
-
-So check binary `ata_id' to instead.
-
-Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558]
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3dc2adc..cc8b01a 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1311,8 +1311,8 @@ done
- [[ -d $udevdir ]] \
-     || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
- if ! [[ -d "$udevdir" ]]; then
--    [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
--    [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
-+    [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev
-+    [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
- fi
- 
- [[ -d $systemdutildir ]] \
--- 
-2.7.4
-
meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch deleted +0 -69

69 lines not on this page · raw message

meta-initramfs/recipes-devtools/dracut/dracut_git.bb +2 -5
index 13cf5f6de..ce975f5a1 100644
@@ -6,14 +6,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PE = "1"
-PV = "049"
+PV = "051"
 
-# v048 tag
-SRCREV = "225e4b94cbdb702cf512490dcd2ad9ca5f5b22c1"
+SRCREV = "e473057ae1de303340dec297c786c4a701cc61bd"
 SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \
            file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \
-           file://0001-dracut.sh-improve-udevdir.patch \
-           file://0001-set-viriable-_drv-not-local.patch \
            "
 
 DEPENDS += "kmod"
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 phpmyadmin: 5.0.2 -> 5.0.4

---
 .../phpmyadmin/{phpmyadmin_5.0.2.bb => phpmyadmin_5.0.4.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_5.0.2.bb => phpmyadmin_5.0.4.bb} (91%)
meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb +2 -2
similarity index 91%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb
index ac878c5fd..43fed1081 100644
@@ -11,8 +11,8 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la
            file://apache.conf \
 "
 
-SRC_URI[md5sum] = "442eb85912d3a2ad2fc0b9d6c21b1527"
-SRC_URI[sha256sum] = "cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8"
+SRC_URI[md5sum] = "38c6b9f38e4aeb68a2840d5903dd00c5"
+SRC_URI[sha256sum] = "1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db"
 
 UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/"
 UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz"
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 1/2 yaffs2-utils: update to latest git rev

In reply to Yi Zhao
---
 meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +1 -1
index 7ecae4c1c..bd0886d67 100644
@@ -19,7 +19,7 @@ SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \
            file://0001-define-loff_t-if-not-already-defined.patch \
            "
 
-SRCREV = "b4ce1bb1b46accb1619dc07164ef6945feded9db"
+SRCREV = "9a6f486e56f927eeb8dc7e4e0d84f6bb95eeaa0f"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 2/2 f2fs-tools: upgrade 1.13.0 -> 1.14.0

In reply to Yi Zhao

* Drop 0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch since it has been merged upstream.

* Add UPSTREAM_CHECK_GITTAGREGEX to check the correct latest version.

---
 ...srcdir-prefix-to-denote-include-path.patch | 29 -------------------
 ...s-tools_1.13.0.bb => f2fs-tools_1.14.0.bb} |  6 ++--
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch
 rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.13.0.bb => f2fs-tools_1.14.0.bb} (75%)
meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch deleted +0 -29
deleted file mode 100644
index 0a3261b4e..000000000
@@ -1,29 +0,0 @@
-From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 11 Aug 2018 18:49:03 -0700
-Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path
-
-This helps builds when builddir != srcdir
-
-Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1]
-Signed-off-by: Khem Raj <[email protected]>
----
- tools/sg_write_buffer/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am
-index 922c328..19c438d 100644
---- a/tools/sg_write_buffer/Makefile.am
-+++ b/tools/sg_write_buffer/Makefile.am
-@@ -1,7 +1,7 @@
- ## Makefile.am
- 
- if LINUX
--AM_CPPFLAGS = -I./include
-+AM_CPPFLAGS = -I$(srcdir)/include
- AM_CFLAGS = -Wall
- sbin_PROGRAMS = sg_write_buffer
- sg_write_buffer_SOURCES = sg_write_buffer.c \
--- 
-2.18.0
-
meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb renamed from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb +3 -3
similarity index 75%
rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb
rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb
index 98bd478f3..d0b299f0b 100644
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
 # to provide libuuid
 DEPENDS = "util-linux"
 
-# v1.13.0
-SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d"
+SRCREV = "d41dcbdf46dc3841cd0a0507e6573e38cb6c55bb"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \
-           file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \
            "
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
+
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 1/1 tcpdump: add UPSTREAM_CHECK_REGEX

In reply to Yi Zhao

Add UPSTREAM_CHECK_REGEX to skip checking testing version (e.g. 4.99.0).

---
 meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +2 -0
index 8f7bd59f1..afcb4d508 100644
@@ -23,6 +23,8 @@ SRC_URI = " \
 SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae"
 SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410"
 
+UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.(?!99)\d+)+)\.tar"
+
 inherit autotools-brokensep ptest
 
 PACKAGECONFIG ?= "openssl"
Signature · 1 line
2.25.1