Re: [yocto] [meta-security] keyutils: migrate to meta-oe
On 7/29/19 3:47 AM, dbarysh...@gmail.com wrote:
> From: Dmitry Eremin-Solenikov
>
> keyutils are now part of meta-oe, so remove them from meta-security.
This should be sitting in master-next already
- armin
>
> Signed-off-by: Dmitry Eremin-Solenikov
> ---
> .../files/fix_library_install_path.patch | 28 --
> ...ror-report-by-adding-default-message.patch | 42 ---
> .../keyutils-test-fix-output-format.patch | 41 --
> recipes-security/keyutils/files/run-ptest | 3 --
> recipes-security/keyutils/keyutils_1.6.bb | 53 ---
> 5 files changed, 167 deletions(-)
> delete mode 100644
> recipes-security/keyutils/files/fix_library_install_path.patch
> delete mode 100644
> recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
> delete mode 100644
> recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
> delete mode 100755 recipes-security/keyutils/files/run-ptest
> delete mode 100644 recipes-security/keyutils/keyutils_1.6.bb
>
> diff --git a/recipes-security/keyutils/files/fix_library_install_path.patch
> b/recipes-security/keyutils/files/fix_library_install_path.patch
> deleted file mode 100644
> index 938fe2eb57a4..
> --- a/recipes-security/keyutils/files/fix_library_install_path.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
> -From: Wenzong Fan
> -Date: Tue, 26 Sep 2017 07:59:51 +
> -Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
> -
> -The absolute path of the symlink will be invalid
> -when populated in sysroot, so use relative path instead.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Jackie Huang
> -Signed-off-by: Wenzong Fan
> -{rebased for 1.6]
> -Signed-off-by: Armin Kuster
> -
> -Index: keyutils-1.6/Makefile
> -===
> keyutils-1.6.orig/Makefile
> -+++ keyutils-1.6/Makefile
> -@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
> - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
> - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
> - mkdir -p $(DESTDIR)$(USRLIBDIR)
> --$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
> -+$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
> - sed \
> - -e 's,@VERSION\@,$(VERSION),g' \
> - -e 's,@prefix\@,$(PREFIX),g' \
> diff --git
> a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
>
> b/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
> deleted file mode 100644
> index acd91c01c483..
> ---
> a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -fix keyutils test error report
> -
> -Upstream-Status: Pending
> -
> -"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED.
> -"Required key not available" may be the reason of EKEYREVOKED.
> -EXPIRED and REVOKED are 2 status of kernel security keys features.
> -But the userspace keyutils lib will output the error message, which may
> -have several reasons.
> -
> -Signed-off-by: Han Chao
> -
> -diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
> -index bbca00a..739e9d0 100644
> a/tests/toolbox.inc.sh
> -+++ b/tests/toolbox.inc.sh
> -@@ -227,11 +227,12 @@ function expect_error ()
> - ;;
> - EKEYEXPIRED)
> - my_err="Key has expired"
> --alt_err="Unknown error 127"
> -+alt_err="Permission denied"
> - ;;
> - EKEYREVOKED)
> - my_err="Key has been revoked"
> --alt_err="Unknown error 128"
> -+alt_err="Permission denied"
> -+alt2_err="Required key not available"
> - ;;
> - EKEYREJECTED)
> - my_err="Key has been rejected"
> -@@ -249,6 +250,9 @@ function expect_error ()
> - elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err"
> >&/dev/null
> - then
> - :
> -+elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err"
> >&/dev/null
> -+then
> -+:
> - elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err"
> >&/dev/null
> - then
> - :
> -
> diff --git
> a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
> b/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
> deleted file mode 100644
> index a4ffd50ce54c..
> --- a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From 49b6321368e4bd3cd233d045cd09004ddd7968b2 Mon Sep 17 00:00:00 2001
> -From: Jackie Huang
> -Date: Mon, 15 May 2017 14:52:00 +0800
> -Subject: [PATCH] keyutils: fix output format
> -
> -keyutils ptest output format is incorrect, according to yocto
> -Development Manual
>
[yocto] [meta-security] keyutils: migrate to meta-oe
From: Dmitry Eremin-Solenikov
keyutils are now part of meta-oe, so remove them from meta-security.
Signed-off-by: Dmitry Eremin-Solenikov
---
.../files/fix_library_install_path.patch | 28 --
...ror-report-by-adding-default-message.patch | 42 ---
.../keyutils-test-fix-output-format.patch | 41 --
recipes-security/keyutils/files/run-ptest | 3 --
recipes-security/keyutils/keyutils_1.6.bb | 53 ---
5 files changed, 167 deletions(-)
delete mode 100644
recipes-security/keyutils/files/fix_library_install_path.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
delete mode 100755 recipes-security/keyutils/files/run-ptest
delete mode 100644 recipes-security/keyutils/keyutils_1.6.bb
diff --git a/recipes-security/keyutils/files/fix_library_install_path.patch
b/recipes-security/keyutils/files/fix_library_install_path.patch
deleted file mode 100644
index 938fe2eb57a4..
--- a/recipes-security/keyutils/files/fix_library_install_path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
-From: Wenzong Fan
-Date: Tue, 26 Sep 2017 07:59:51 +
-Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
-
-The absolute path of the symlink will be invalid
-when populated in sysroot, so use relative path instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jackie Huang
-Signed-off-by: Wenzong Fan
-{rebased for 1.6]
-Signed-off-by: Armin Kuster
-
-Index: keyutils-1.6/Makefile
-===
keyutils-1.6.orig/Makefile
-+++ keyutils-1.6/Makefile
-@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- mkdir -p $(DESTDIR)$(USRLIBDIR)
-- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- sed \
- -e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@prefix\@,$(PREFIX),g' \
diff --git
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
b/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
deleted file mode 100644
index acd91c01c483..
---
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-fix keyutils test error report
-
-Upstream-Status: Pending
-
-"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED.
-"Required key not available" may be the reason of EKEYREVOKED.
-EXPIRED and REVOKED are 2 status of kernel security keys features.
-But the userspace keyutils lib will output the error message, which may
-have several reasons.
-
-Signed-off-by: Han Chao
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index bbca00a..739e9d0 100644
a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -227,11 +227,12 @@ function expect_error ()
- ;;
- EKEYEXPIRED)
- my_err="Key has expired"
-- alt_err="Unknown error 127"
-+ alt_err="Permission denied"
- ;;
- EKEYREVOKED)
- my_err="Key has been revoked"
-- alt_err="Unknown error 128"
-+ alt_err="Permission denied"
-+ alt2_err="Required key not available"
- ;;
- EKEYREJECTED)
- my_err="Key has been rejected"
-@@ -249,6 +250,9 @@ function expect_error ()
- elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err"
>&/dev/null
- then
- :
-+elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err"
>&/dev/null
-+then
-+ :
- elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err"
>&/dev/null
- then
- :
-
diff --git
a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
b/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
deleted file mode 100644
index a4ffd50ce54c..
--- a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 49b6321368e4bd3cd233d045cd09004ddd7968b2 Mon Sep 17 00:00:00 2001
-From: Jackie Huang
-Date: Mon, 15 May 2017 14:52:00 +0800
-Subject: [PATCH] keyutils: fix output format
-
-keyutils ptest output format is incorrect, according to yocto
-Development Manual
-(http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#testing-packages-with-ptest)
-5.10.6. Testing Packages With ptestThe test generates output in the format
used by Automake:
-:
-where the result can be PASS, FAIL, or SKIP, and the testname can be any
-identifying string.
-So we should change the test result format to match yocto ptest rules.
-
