From a322d066483814db80a15b8c0c7f44224b134429 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 25 Aug 2022 15:13:46 +0530 Subject: [PATCH] chore: remove img Remove `img` since it no longer used Signed-off-by: Noel Georgi --- Pkgfile | 5 ---- img/patches/reproducibility.patch | 13 -------- img/pkg.yaml | 50 ------------------------------- tools/pkg.yaml | 1 - 4 files changed, 69 deletions(-) delete mode 100644 img/patches/reproducibility.patch delete mode 100644 img/pkg.yaml diff --git a/Pkgfile b/Pkgfile index 1f04216..69094a4 100644 --- a/Pkgfile +++ b/Pkgfile @@ -143,11 +143,6 @@ vars: gzip_sha256: ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956 gzip_sha512: 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24 - # renovate: datasource=github-releases depName=genuinetools/img - img_version: v0.5.11 - img_sha256: c6d805ab899db639fa08f0e33fe6673593be8336d288bb1cb4cb81a3229a916f - img_sha512: de80c2c26dd2fb780fb0447f07b5478e1571067ec934fb2adb32dff1aa3853ff872388b9c9c168c139194ab5d38672fb3b4c76c4f77fd8e61ce48bde8cae8c1b - # renovate: datasource=git-tags extractVersion=^v(?.*)$ versioning=loose depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git kmod_version: 25 kmod_sha256: 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd diff --git a/img/patches/reproducibility.patch b/img/patches/reproducibility.patch deleted file mode 100644 index 83e12f9..0000000 --- a/img/patches/reproducibility.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index b336159f..7d1e071c 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,7 +24,7 @@ $(BUILDDIR)/bin/runc: $(RUNCBUILDDIR) - mkdir -p $(BUILDDIR)/bin - mv $(RUNCBUILDDIR)/runc $(BUILDDIR)/bin/runc - --internal/binutils/runc.go: $(BUILDDIR)/bin/runc -+internal/binutils/runc.go: - go-bindata -tags \!noembed -pkg binutils -prefix "$(BUILDDIR)/bin" -o $(CURDIR)/internal/binutils/runc.go $(BUILDDIR)/bin - gofmt -s -w $(CURDIR)/internal/binutils/runc.go - diff --git a/img/pkg.yaml b/img/pkg.yaml deleted file mode 100644 index fc681e5..0000000 --- a/img/pkg.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: img -dependencies: - - stage: base - - stage: ca-certificates - - stage: golang - - stage: make - - stage: git - - stage: pkg-config - - stage: libseccomp - - stage: patch -steps: - - env: - GOPATH: /go - PKGPATH: src/github.com/genuinetools/img - CGO_ENABLED: "1" - LD_LIBRARY_PATH: /toolchain/lib - sources: - - url: https://github.com/genuinetools/img/archive/refs/tags/{{ .img_version }}.tar.gz - destination: img.tar.gz - sha256: "{{ .img_sha256 }}" - sha512: "{{ .img_sha512 }}" - prepare: - - | - export PATH=${GOPATH}/bin:${TOOLCHAIN}/go/bin:${PATH} - - go install github.com/go-bindata/go-bindata/go-bindata@v3.1.2+incompatible - - mkdir -p ${GOPATH}/${PKGPATH} - tar -xzf img.tar.gz --strip-components=1 -C ${GOPATH}/${PKGPATH} - - cd ${GOPATH}/${PKGPATH} - patch -p1 < /pkg/patches/reproducibility.patch - build: - - | - export PATH=${GOPATH}/bin:${TOOLCHAIN}/go/bin:${PATH} - - cd ${GOPATH}/${PKGPATH} - make $PWD/cross/bin/runc - touch -ch -t 202108110000 ./cross/bin/runc - make internal/binutils/runc.go - touch -ch -t 202108110000 internal/binutils/runc.go - make static - install: - - | - mkdir -p /rootfs${TOOLCHAIN}/bin - cd ${GOPATH}/${PKGPATH} - mv img /rootfs${TOOLCHAIN}/bin -finalize: - - from: /rootfs - to: / diff --git a/tools/pkg.yaml b/tools/pkg.yaml index 663288e..b0866ff 100644 --- a/tools/pkg.yaml +++ b/tools/pkg.yaml @@ -33,7 +33,6 @@ dependencies: - stage: gperf - stage: grep - stage: gzip - - stage: img - stage: kmod - stage: libffi - stage: libtool