rpm: remove 5.x recipe

(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 159 deletions

diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
deleted file mode 100644
index b55fe22c6a..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Enable a cross-install scriptlet helper.
-
-The helper is called from outside of the chroot with the arguments:
-
-<root> <prog> <script> <arg1> [<arg2> ... <argN>]
-
-The helper script is used by oe-core to facilitate shell script actions that
-can not be run from within a chroot on a foreign target system during a
-cross install.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: rpm/lib/psm.c
-===================================================================
---- rpm.orig/lib/psm.c
-+++ rpm/lib/psm.c
-@@ -846,6 +846,9 @@ static rpmRC runScript(rpmpsm psm, Heade
-     pid_t pid;
-     int xx;
-     int i;
-+#ifdef RPM_VENDOR_OE
-+    const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
-+#endif
- 
- #ifdef __clang__
- #pragma clang diagnostic push
-@@ -923,14 +926,29 @@ assert(he->p.str != NULL);
-                (F_ISSET(psm, UNORDERED) ? "a" : ""));
- 
-     if (Phe->p.argv == NULL) {
--       argv = (const char **) alloca(5 * sizeof(*argv));
--       argv[0] = "/bin/sh";
--       argc = 1;
-+       argv = (const char **) alloca(7 * sizeof(*argv));
-+       argc = 0;
-+    } else {
-+       argv = (const char **) alloca((Phe->c + 6) * sizeof(*argv));
-+       argc = 0;
-+    }
-+
-+#ifdef RPM_VENDOR_OE
-+    if (scriptletWrapper && *scriptletWrapper) {
-+       argv[argc++] = scriptletWrapper;
-+       argv[argc] = rpmtsRootDir(ts);
-+       if (!argv[argc] || !*argv[argc])
-+          argv[argc] = "/";
-+       argc++;
-+    }
-+#endif
-+
-+    if (Phe->p.argv == NULL) {
-+       argv[argc++] = "/bin/sh";
-        ldconfig_done = 0;
-     } else {
--       argv = (const char **) alloca((Phe->c + 4) * sizeof(*argv));
--       memcpy(argv, Phe->p.argv, Phe->c * sizeof(*argv));
--       argc = Phe->c;
-+       memcpy((argv + argc), Phe->p.argv, Phe->c * sizeof(*argv));
-+       argc += Phe->c;
-        ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path)
-                ? 1 : 0);
-     }
-@@ -981,7 +999,12 @@ assert(he->p.str != NULL);
-            goto exit;
- 
-        if (rpmIsDebug() &&
--           (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
-+           (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))
-+#ifdef RPM_VENDOR_OE
-+           || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh"))
-+           || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash"))
-+#endif
-+          )
-        {
-            static const char set_x[] = "set -x\n";
-            nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
-@@ -1116,12 +1139,22 @@ assert(he->p.str != NULL);
- 
-        {   const char * rootDir = rpmtsRootDir(ts);
-            if (!rpmtsChrootDone(ts) && rootDir != NULL &&
-+#ifdef RPM_VENDOR_OE
-+               !(scriptletWrapper && *scriptletWrapper) &&
-+#endif
-                !(rootDir[0] == '/' && rootDir[1] == '\0'))
-            {
-                /*@-modobserver@*/
-                xx = Chroot(rootDir);
-                /*@=modobserver@*/
-            }
-+#ifdef RPM_VENDOR_OE
-+           if (!rpmtsChrootDone(ts) && rootDir != NULL &&
-+               (scriptletWrapper && *scriptletWrapper) &&
-+               !(rootDir[0] == '/' && rootDir[1] == '\0'))
-+               xx = Chdir(rootDir);
-+           else 
-+#endif
-            xx = Chdir("/");
-            rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"),
-                        psm->stepName, sln, NVRA,
-@@ -3052,6 +3085,13 @@ assert(psm->te != NULL);
-     case PSM_SCRIPT:   /* Run current package scriptlets. */
-        /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
-     {  rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
-+
-+#ifdef RPM_VENDOR_OE
-+        const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
-+       if (scriptletWrapper && *scriptletWrapper)
-+            rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
-+#endif
-+
-        xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
-        rc = runInstScript(psm);
-        if (rc)
-@@ -3059,11 +3099,24 @@ assert(psm->te != NULL);
-        else
-             xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
-        rpmtsGetRdb(ts)->db_txn = NULL;
-+#ifdef RPM_VENDOR_OE
-+       if (scriptletWrapper && *scriptletWrapper)
-+            rc = rpmpsmNext(psm, PSM_CHROOT_IN);
-+#endif
-     }  break;
-     case PSM_TRIGGERS:
-        /* Run triggers in other package(s) this package sets off. */
-        if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)        break;
-+#ifdef RPM_VENDOR_OE
-+        const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
-+       if (scriptletWrapper && *scriptletWrapper)
-+            rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
-+#endif
-        rc = runTriggers(psm);
-+#ifdef RPM_VENDOR_OE
-+       if (scriptletWrapper && *scriptletWrapper)
-+            rc = rpmpsmNext(psm, PSM_CHROOT_IN);
-+#endif
-        break;
-     case PSM_IMMED_TRIGGERS:
-        /* Run triggers in this package other package(s) set off. */
-@@ -3073,7 +3126,18 @@ assert(psm->te != NULL);
-            F_SET(psm, GOTTRIGGERS);
-        }
-        if (psm->triggers != NULL)
-+#ifdef RPM_VENDOR_OE
-+       {
-+            const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
-+           if (scriptletWrapper && *scriptletWrapper)
-+                rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
-+#endif
-            rc = runImmedTriggers(psm);
-+#ifdef RPM_VENDOR_OE
-+           if (scriptletWrapper && *scriptletWrapper)
-+                rc = rpmpsmNext(psm, PSM_CHROOT_IN);
-+       }
-+#endif
-        break;
- 
-     case PSM_RPMIO_FLAGS: