diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-11-27 17:39:08 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-28 21:48:21 -0800 |
commit | 3fa7f4bbe27586ad1f7459993128e6315914774c (patch) | |
tree | 5249406fb8291aab4a4bba01e0145f1091d08ebd | |
parent | 0b71bf7bcf3e2b73b55384e9cf530b8704bcea61 (diff) | |
download | meta-openembedded-3fa7f4bbe27586ad1f7459993128e6315914774c.tar.gz |
sg3-utils: upgrade to 1.44
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb (renamed from meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb) | 5 |
2 files changed, 2 insertions, 27 deletions
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch b/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch deleted file mode 100644 index fbad4135d..000000000 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Fixes: | ||
2 | http://errors.yoctoproject.org/Errors/Details/185896/ | ||
3 | |||
4 | TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: sg_map26.o: in function `nd_match_scandir_select': | ||
5 | /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:359: undefined reference to `major' | ||
6 | TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:361: undefined reference to `minor' | ||
7 | TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: sg_map26.o: in function `nt_typ_from_filename': | ||
8 | /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:218: undefined reference to `major' | ||
9 | TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:219: undefined reference to `minor' | ||
10 | collect2: error: ld returned 1 exit status | ||
11 | Makefile:806: recipe for target 'sg_map26' failed | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | --- sg3_utils-1.42.orig/src/sg_map26.c 2018-08-09 11:53:26.907493996 +0000 | ||
16 | +++ sg3_utils-1.42/src/sg_map26.c 2018-08-09 11:51:56.713490763 +0000 | ||
17 | @@ -33,6 +33,7 @@ | ||
18 | #include <sys/ioctl.h> | ||
19 | #include <sys/types.h> | ||
20 | #include <sys/stat.h> | ||
21 | +#include <sys/sysmacros.h> | ||
22 | #include <linux/major.h> | ||
23 | |||
24 | #ifdef HAVE_CONFIG_H | ||
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb index c37c5e952..4909035b3 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb | |||
@@ -9,14 +9,13 @@ LICENSE = "GPLv2+ & BSD" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" |
10 | 10 | ||
11 | SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ | 11 | SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ |
12 | file://glibc-2.28.patch \ | ||
13 | " | 12 | " |
14 | MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" | 13 | MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" |
15 | 14 | ||
16 | UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" | 15 | UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" |
17 | 16 | ||
18 | SRC_URI[md5sum] = "28080de5bf2222f8b55a29093bec8aea" | 17 | SRC_URI[md5sum] = "c11d2b3ca4cc2fd01796473e5330afed" |
19 | SRC_URI[sha256sum] = "1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3" | 18 | SRC_URI[sha256sum] = "8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b" |
20 | 19 | ||
21 | inherit autotools-brokensep | 20 | inherit autotools-brokensep |
22 | 21 | ||