Having two directories with version numbers just leads to unnecessary churn everytime there's a version update.
We can have all patches in one single directory and differentiate b/w specific version by prefix php5-/php7- Signed-off-by: Anuj Mittal <anuj.mit...@intel.com> --- .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 ---------------------- .../0001-Add-lpthread-to-link.patch | 0 .../0001-Specify-tag-with-libtool.patch | 0 .../php/{php-7.1.9 => php}/CVE-2017-16642.patch | 0 .../php/{php-7.1.9 => php}/CVE-2018-5711.patch | 0 .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 0 6 files changed, 56 deletions(-) delete mode 100644 meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch rename meta-oe/recipes-devtools/php/{php-5.6.33 => php}/0001-Add-lpthread-to-link.patch (100%) rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/0001-Specify-tag-with-libtool.patch (100%) rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/CVE-2017-16642.patch (100%) rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/CVE-2018-5711.patch (100%) rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%) diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch deleted file mode 100644 index 39c334f..0000000 --- a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK - -Upstream-Status: Pending - -AC_TRY_RUN is not suitable for cross-compile - -Signed-off-by: Roy Li <rongqing...@windriver.com> ---- - ext/fileinfo/config.m4 | 31 ++++++------------------------- - 1 file changed, 6 insertions(+), 25 deletions(-) - -diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 -index 7e98d62..8a8ea0e 100644 ---- a/ext/fileinfo/config.m4 -+++ b/ext/fileinfo/config.m4 -@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then - libmagic/readcdf.c libmagic/softmagic.c" - - AC_MSG_CHECKING([for strcasestr]) -- AC_TRY_RUN([ --#include <string.h> --#include <strings.h> --#include <stdlib.h> -- --int main(void) --{ -- char *s0, *s1, *ret; -- -- s0 = (char *) malloc(42); -- s1 = (char *) malloc(8); -- -- memset(s0, 'X', 42); -- s0[24] = 'Y'; -- s0[26] = 'Z'; -- s0[41] = '\0'; -- memset(s1, 'x', 8); -- s1[0] = 'y'; -- s1[2] = 'Z'; -- s1[7] = '\0'; -- -- ret = strcasestr(s0, s1); -- -- return !(NULL != ret); --} -+ AC_TRY_COMPILE([ -+ #include <string.h> -+ #include <strings.h> -+ #include <stdlib.h> -+ ],[ -+ strcasestr(NULL, NULL); - ],[ - dnl using the platform implementation - AC_MSG_RESULT(yes) --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch similarity index 100% rename from meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch rename to meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch similarity index 100% rename from meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch rename to meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch similarity index 100% rename from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch rename to meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch similarity index 100% rename from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch rename to meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch similarity index 100% rename from meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch rename to meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel