diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-04 13:05:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-04 13:05:01 +0000 |
| commit | f37b7da842eba47d12f465f70764ab2a3619f908 (patch) | |
| tree | a7f0f2681cdfc6091bb7b6df11fa6cc1a2f61c91 /main/lxc | |
| parent | b142b567f05fb4abbe39ad92a3d576d1156ca50a (diff) | |
| download | aports-f37b7da842eba47d12f465f70764ab2a3619f908.tar.bz2 aports-f37b7da842eba47d12f465f70764ab2a3619f908.tar.xz | |
main/lxc: another build fix for musl
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/0001-Don-t-include-linux-if_bridge.h.patch | 39 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 6 |
2 files changed, 44 insertions, 1 deletions
diff --git a/main/lxc/0001-Don-t-include-linux-if_bridge.h.patch b/main/lxc/0001-Don-t-include-linux-if_bridge.h.patch new file mode 100644 index 0000000000..4ebf2db5d0 --- /dev/null +++ b/main/lxc/0001-Don-t-include-linux-if_bridge.h.patch @@ -0,0 +1,39 @@ +From a7673ab3ebaaf9bdb6bd840791c1ad672ab7f341 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 29 Jan 2014 13:36:37 +0000 +Subject: [PATCH] Don't include linux/if_bridge.h + +Instead rely on struct ethhdr from net/ethernet.h + +This fixes build error with musl libc: +In file included from /usr/include/linux/if_bridge.h:17:0, + from network.c:47: +/usr/include/linux/if_ether.h:133:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^ +In file included from /usr/include/net/ethernet.h:10:0, + from network.c:42: +/usr/include/netinet/if_ether.h:93:8: note: originally defined here + struct ethhdr { + ^ + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + src/lxc/network.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lxc/network.c b/src/lxc/network.c +index bd2a37c..34845d1 100644 +--- a/src/lxc/network.c ++++ b/src/lxc/network.c +@@ -44,7 +44,6 @@ + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + #include <linux/sockios.h> +-#include <linux/if_bridge.h> + + #include "nl.h" + #include "network.h" +-- +1.8.5.3 + diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 2ca53d1499..417fd90053 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=8 +pkgrel=9 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -27,6 +27,7 @@ source="http://linuxcontainers.org/downloads/lxc-$_mypkgver.tar.gz 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch + 0001-Don-t-include-linux-if_bridge.h.patch lxc-fix-headers.patch lxc.initd @@ -78,6 +79,7 @@ c12ea194274b6c8d3b05bd43ed70c61d 0001-lxc-alpine-enable-4-consoles-by-default.p 75979789ec45ef865895f5ce5721dd3e 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 6c188f8dd2ba18e895eed2dec79fcab9 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch c172314d12b6bc2ef7b39e891bb74a9c 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch +83e105a961993d46fb901e49230c69f2 0001-Don-t-include-linux-if_bridge.h.patch 24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch 9f780f761dcaec3ce40d083c6df044d4 lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz @@ -93,6 +95,7 @@ eb5043672ef81cd5b20f25dc847bfad7e9e14b42a794856c3a8c8c1e4e408dfc 0001-lxc-alpin 51bd2fc5f166499c8996d1b89f324168b0c1bbb6b2b79260591d442120098a34 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 92d7f479d8d466e03f187076a1187112a116f3a37426ba6d1dfd87ed7999c4c8 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch b85e307faaacfa79854564032e17325bc30efdccf9e8ab3929ab7b44a5a74205 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch +f0911ff82ef8fc3f1832f3af771fe6d9944f12d7409feb7d4233136e6720ad05 0001-Don-t-include-linux-if_bridge.h.patch 82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch 8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz @@ -108,5 +111,6 @@ dd686d8ce9cd73807b744163e6b20e41eca17f3ee618cef66f19488cb2527b56d38c04231d25177d 75130578c4103586b973c6e9586833acfa89de8021f4dd320385905c4f9d3d1bf7a1e8d3cfe8704a3add00d41d19c30a371bce232a863e9c837a148e9066a0d6 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 7c5e6656565ed0ec51449baab4d310520cc43805428515d6541d4c4e03cc2f44b6762b3239983ee06596dcdec68d395250f944aabe92afc91ba2432f4847555b 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 850bc35c56e7c7b7e7a3efde504e2ceefbb790a3298d96e195ab610a83a946b3783e409ce14639fb9e8ac03ccc05b973c0c81803c514148c0e1c726249277eaa 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch +ebdc01504a3e4d48ba96f6e9c6786c02f6803a14ae6754f52aee12c462c7a24e678cf520318662e2f7e4efcd65cd577c2d415ca13fcb7ace323f59bdcfec9f75 0001-Don-t-include-linux-if_bridge.h.patch 2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" |