X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Frpm%2F0006-ordering-fix.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Frpm%2F0006-ordering-fix.patch;h=a618e1f2c9e32df7678e02da57861d4470134136;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/rpm/0006-ordering-fix.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/rpm/0006-ordering-fix.patch
new file mode 100644
index 0000000..a618e1f
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/rpm/0006-ordering-fix.patch
@@ -0,0 +1,45 @@
+Included upstream
+--- x/lib/depends.c	2009/05/15 13:40:58	1.445
++++ y/lib/depends.c	2009/08/22 22:12:02	1.446
+@@ -2216,9 +2216,6 @@
+ {
+     rpmte q, qprev;
+ 
+-    /* Mark the package as queued. */
+-    rpmteTSI(p)->tsi_queued = 1;
+-
+     if ((*rp) == NULL) {	/* 1st element */
+ 	/*@-dependenttrans@*/ /* FIX: double indirection */
+ 	(*rp) = (*qp) = p;
+@@ -2238,6 +2235,12 @@
+ 	/* XXX Insure removed after added. */
+ 	if (rpmteType(p) == TR_REMOVED && rpmteType(p) != rpmteType(q))
+ 	    continue;
++
++	/* XXX Follow all previous generations in the queue. */
++	if (rpmteTSI(p)->tsi_queued > rpmteTSI(q)->tsi_queued)
++	    continue;
++
++	/* XXX Within a generation, queue behind more "important". */
+ 	if (rpmteTSI(q)->tsi_qcnt <= rpmteTSI(p)->tsi_qcnt)
+ 	    break;
+     }
+@@ -2521,6 +2524,9 @@
+ 
+ 	if (rpmteTSI(p)->tsi_count != 0)
+ 	    continue;
++
++	/* Mark the package as queued. */
++	rpmteTSI(p)->tsi_queued = orderingCount + 1;
+ 	rpmteTSI(p)->tsi_suc = NULL;
+ 	addQ(p, &q, &r, prefcolor);
+ 	qlen++;
+@@ -2584,6 +2590,8 @@
+ 		(void) rpmteSetParent(p, q);
+ 		(void) rpmteSetDegree(q, rpmteDegree(q)+1);
+ 
++		/* Mark the package as queued. */
++		rpmteTSI(p)->tsi_queued = orderingCount + 1;
+ 		/* XXX TODO: add control bit. */
+ 		rpmteTSI(p)->tsi_suc = NULL;
+ /*@-nullstate@*/	/* XXX FIX: rpmteTSI(q)->tsi_suc can be NULL. */