From 3a7651eb19f34ab0a53c4f51143e220533d0ff9e Mon Sep 17 00:00:00 2001
From: Micah Abbott <miabbott@redhat.com>
Date: Sep 13 2017 15:52:13 +0000
Subject: [PATCH 1/2] manifest: freeze skopeo distgit


The tests against FAHC have been failing because of

https://github.com/projectatomic/skopeo/issues/416

I think the best way to address this is to freeze the distgit so that
we build it using the older source.tar.gz file.

---

diff --git a/overlay.yml b/overlay.yml
index 67968a0..dcad36f 100644
--- a/overlay.yml
+++ b/overlay.yml
@@ -43,6 +43,9 @@ components:
 
   - src: github:projectatomic/skopeo
     distgit:
+      # pull in older source via distgit because of:
+      # https://github.com/projectatomic/skopeo/issues/416
+      freeze: 4ff6a6a1cd75e512f8e403ffdb4262fff0b13406
       patches: drop
 
   - src: github:projectatomic/atomic

From f0a2b9c1051af995989b6b0a119a1b9fed495131 Mon Sep 17 00:00:00 2001
From: Micah Abbott <miabbott@redhat.com>
Date: Sep 13 2017 16:08:58 +0000
Subject: [PATCH 2/2] manifest:  get skopeo from updates repo


Stop tracking skopeo from git master until we know the following is
fixed:

https://github.com/projectatomic/skopeo/issues/416

---

diff --git a/overlay.yml b/overlay.yml
index dcad36f..3aee1e0 100644
--- a/overlay.yml
+++ b/overlay.yml
@@ -41,12 +41,11 @@ components:
     distgit:
       patches: drop
 
-  - src: github:projectatomic/skopeo
-    distgit:
-      # pull in older source via distgit because of:
-      # https://github.com/projectatomic/skopeo/issues/416
-      freeze: 4ff6a6a1cd75e512f8e403ffdb4262fff0b13406
-      patches: drop
+# Get skopeo from the updates repo because of:
+# https://github.com/projectatomic/skopeo/issues/416
+#  - src: github:projectatomic/skopeo
+#    distgit:
+#      patches: drop
 
   - src: github:projectatomic/atomic
     distgit: