Remove binaries from -git.

2 files changed, 7 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74dc59c7c854..8fde3733cb18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kata-containers-git
 	pkgdesc = Lightweight virtual machines for containers
 	pkgver = 1.10.0~rc0~runtime.r31.3ea682d6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://katacontainers.io/
 	arch = x86_64
 	license = Apache
@@ -12,14 +12,12 @@ pkgbase = kata-containers-git
 	source = proxy::git+https://github.com/kata-containers/proxy
 	source = runtime::git+https://github.com/kata-containers/runtime
 	source = shim::git+https://github.com/kata-containers/shim
-	source = https://github.com/kata-containers/runtime/releases/download/1.10.0-rc0/kata-static-1.10.0-rc0-x86_64.tar.xz
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = f0e69db2327f87234b053c554793ee28f0f102835e1778e85772d14c90c0caf63890541a780cc5439e08d39a419fa86bd5ff4750228c93f70f2511328afe1aa5
 
 pkgname = kata-ksm-throttler-git
 	provides = kata-ksm-throttler
@@ -35,8 +33,8 @@ pkgname = kata-runtime-git
 	depends = kata-ksm-throttler=1.10.0~rc0~runtime.r31.3ea682d6
 	depends = kata-proxy=1.10.0~rc0~runtime.r31.3ea682d6
 	depends = kata-shim=1.10.0~rc0~runtime.r31.3ea682d6
-	depends = kata-linux-container=1.10.0~rc0~runtime.r31.3ea682d6
-	depends = kata-containers-image=1.10.0~rc0~runtime.r31.3ea682d6
+	depends = kata-linux-container
+	depends = kata-containers-image
 	optdepends = firecracker
 	optdepends = cloud-hypervisor
 	provides = kata-runtime
@@ -50,11 +48,3 @@ pkgname = kata-agent-git
 	provides = kata-agent
 	conflicts = kata-agent
 
-pkgname = kata-containers-image-git
-	provides = kata-containers-image
-	conflicts = kata-containers-image
-
-pkgname = kata-linux-container-git
-	provides = kata-linux-container
-	conflicts = kata-linux-container
-
diff --git a/PKGBUILD b/PKGBUILD
index 1e16db1f4eeb..cc232f93c27e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 pkgbase=kata-containers-git
-pkgname=(kata-ksm-throttler-git kata-proxy-git kata-runtime-git kata-shim-git kata-agent-git kata-containers-image-git kata-linux-container-git)
+pkgname=(kata-ksm-throttler-git kata-proxy-git kata-runtime-git kata-shim-git kata-agent-git)
 pkgver=1.10.0~rc0~runtime.r31.3ea682d6
 _pkgver=1.10.0-rc0
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight virtual machines for containers"
 arch=('x86_64')
 url="https://katacontainers.io/"
@@ -16,12 +16,8 @@ source=(
   "proxy::git+https://${_gh_org}/proxy"
   "runtime::git+https://${_gh_org}/runtime"
   "shim::git+https://${_gh_org}/shim"
-  "https://${_gh_org}/runtime/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz"
-)
-sha512sums=(
-  'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-  'f0e69db2327f87234b053c554793ee28f0f102835e1778e85772d14c90c0caf63890541a780cc5439e08d39a419fa86bd5ff4750228c93f70f2511328afe1aa5'
 )
+sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 pkgver(){
     cd "${srcdir}/src/${_gh_org}/runtime"
@@ -76,7 +72,7 @@ package_kata-proxy-git(){
 package_kata-runtime-git(){
   conflicts=('kata-runtime')
   provides=('kata-runtime')
-  depends=('qemu-headless' "kata-ksm-throttler=${pkgver}" "kata-proxy=${pkgver}" "kata-shim=${pkgver}" "kata-linux-container=${pkgver}" "kata-containers-image=${pkgver}")
+  depends=('qemu-headless' "kata-ksm-throttler=${pkgver}" "kata-proxy=${pkgver}" "kata-shim=${pkgver}" "kata-linux-container" "kata-containers-image")
   optdepends=(
     'firecracker'
     'cloud-hypervisor'
@@ -93,29 +89,3 @@ package_kata-shim-git(){
   cd "${srcdir}/src/${_gh_org}/shim"
   GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
 }
-
-package_kata-containers-image-git(){
-  conflicts=('kata-containers-image')
-  provides=('kata-containers-image')
-  install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
-    ${srcdir}/opt/kata/share/kata-containers/kata-containers-image_clearlinux_${_pkgver}_agent_*.img \
-    ${srcdir}/opt/kata/share/kata-containers/kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd
-  cd "${pkgdir}/usr/share/kata-containers/"
-  ln -s kata-containers-image_clearlinux_${_pkgver}_agent_*.img kata-containers.img
-  ln -s kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd kata-containers-initrd.img
-}
-
-package_kata-linux-container-git(){
-  conflicts=('kata-linux-container')
-  provides=('kata-linux-container')
-  install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
-    ${srcdir}/opt/kata/share/kata-containers/config-* \
-    ${srcdir}/opt/kata/share/kata-containers/vmlinux-* \
-    ${srcdir}/opt/kata/share/kata-containers/vmlinuz-*
-  cd "${pkgdir}/usr/share/kata-containers/"
-  ln -sf vmlinux-virtio-fs-* vmlinux-virtiofs.container
-  ln -sf vmlinuz-virtio-fs-* vmlinuz-virtiofs.container
-  # bash-specific behavior?
-  ln -s vmlinux-[0-9].[0-9]* vmlinux.container
-  ln -s vmlinuz-[0-9].[0-9]* vmlinuz.container
-}