diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-26 01:08:34 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-26 01:17:35 +0100 |
| commit | a25c1b06c4b6538e6ed2f0affc4f6063ffcec17e (patch) | |
| tree | 11ef0bc16acf13caef6ba7f9f6cb6af1dad8886e /main/lxc | |
| parent | 41dbf71a6f4eb9a2be1bca68f0270e97bd52b77f (diff) | |
| download | aports-a25c1b06c4b6538e6ed2f0affc4f6063ffcec17e.tar.bz2 aports-a25c1b06c4b6538e6ed2f0affc4f6063ffcec17e.tar.xz | |
main/lxc: remove unused patches
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch | 40 | ||||
| -rw-r--r-- | main/lxc/alpine-default-repos.patch | 37 |
2 files changed, 0 insertions, 77 deletions
diff --git a/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch b/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch deleted file mode 100644 index 4f9210e1f0..0000000000 --- a/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2933a5ce1c06724a5efceaee8b44ab197eb3b714 Mon Sep 17 00:00:00 2001 -From: Breno Leitao <breno.leitao@gmail.com> -Date: Mon, 12 Jun 2017 13:45:52 -0500 -Subject: [PATCH] lxc-alpine: Add support for ppc64le - -Starting at version 3.6, Alpine Linux has support for ppc64le -architecture. Adding the new keys also. - -Signed-off-by: Breno Leitao <breno.leitao@gmail.com> ---- - templates/lxc-alpine.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in -index 1547c2c1..9a9200f7 100644 ---- a/templates/lxc-alpine.in -+++ b/templates/lxc-alpine.in -@@ -43,7 +43,10 @@ readonly APK_KEYS_SHA256="\ - 2adcf7ce224f476330b5360ca5edb92fd0bf91c92d83292ed028d7c4e26333ab alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub - ebf31683b56410ecc4c00acd9f6e2839e237a3b62b5ae7ef686705c7ba0396a9 alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub - 1bb2a846c0ea4ca9d0e7862f970863857fc33c32f5506098c636a62a726a847b alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub --12f899e55a7691225603d6fb3324940fc51cd7f133e7ead788663c2b7eecb00c alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub" -+12f899e55a7691225603d6fb3324940fc51cd7f133e7ead788663c2b7eecb00c alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub -+73867d92083f2f8ab899a26ccda7ef63dfaa0032a938620eda605558958a8041 alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub -+9a4cd858d9710963848e6d5f555325dc199d1c952b01cf6e64da2c15deedbd97 alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub -+780b3ed41786772cbc7b68136546fa3f897f28a23b30c72dde6225319c44cfff alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub" - - readonly APK_KEYS_URI='http://alpinelinux.org/keys' - readonly DEFAULT_MIRROR_URL='http://dl-cdn.alpinelinux.org/alpine' -@@ -126,6 +129,7 @@ parse_arch() { - aarch64 | arm64) echo 'aarch64';; - armv7) echo 'armv7';; - arm*) echo 'armhf';; -+ ppc64le) echo 'ppc64le';; - *) return 1;; - esac - } --- -2.13.2 - diff --git a/main/lxc/alpine-default-repos.patch b/main/lxc/alpine-default-repos.patch deleted file mode 100644 index a1f03ab3a8..0000000000 --- a/main/lxc/alpine-default-repos.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 288142218ae6cc24bf084fdd5768ad2c83086fb1 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Tue, 14 Mar 2017 17:28:47 +0100 -Subject: [PATCH 1/2] lxc-alpine: add community repository to default - repositories - -Signed-off-by: Jakub Jirutka <jakub@jirutka.cz> -Upstream-Issue: https://github.com/lxc/lxc/pull/1461 ---- - templates/lxc-alpine.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in -index 06616b3..fd281f8 100644 ---- a/templates/lxc-alpine.in -+++ b/templates/lxc-alpine.in -@@ -236,7 +236,6 @@ install() { - local branch="$3" - local extra_packages="$4" - local apk_cache="$LXC_CACHE_DIR/apk/$arch" -- local repo_url="$MIRROR_URL/$branch/main" - - if [ "$FLUSH_CACHE" = 'yes' ] && [ -d "$apk_cache" ]; then - einfo "Cleaning cached APK packages for $arch" -@@ -249,7 +248,10 @@ install() { - - mkdir -p etc/apk - ln -s "$apk_cache" etc/apk/cache -- echo "$repo_url" > etc/apk/repositories -+ -+ local repo; for repo in main community; do -+ echo "$MIRROR_URL/$branch/$repo" >> etc/apk/repositories -+ done - - install_packages "$arch" "alpine-base $extra_packages" - make_dev_nodes - |