Skip to content

Commit

Permalink
pkg/lxc: update and add pkg/seccomp dep
Browse files Browse the repository at this point in the history
  • Loading branch information
soul9 committed Aug 30, 2014
1 parent 54b47d1 commit 2fb19ff
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 302 deletions.
11 changes: 0 additions & 11 deletions KEEP/lxc-defrundir.patch

This file was deleted.

11 changes: 0 additions & 11 deletions KEEP/lxc-malloc.patch

This file was deleted.

10 changes: 0 additions & 10 deletions KEEP/lxc-no-suid.patch

This file was deleted.

96 changes: 0 additions & 96 deletions KEEP/lxc-scripts.patch

This file was deleted.

90 changes: 0 additions & 90 deletions KEEP/lxc-undef.patch

This file was deleted.

63 changes: 0 additions & 63 deletions KEEP/lxc-utmpxname.patch

This file was deleted.

11 changes: 11 additions & 0 deletions KEEP/seccomp.patch
@@ -0,0 +1,11 @@
--- libseccomp-2.1.1.old/macros.mk
+++ libseccomp-2.1.1/macros.mk
@@ -193,7 +193,7 @@
$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-d "$(INSTALL_LIB_DIR)/pkgconfig"; \
$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
- "$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
+ "$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}' |tail -1)" \
"$(INSTALL_LIB_DIR)/pkgconfig"; \#

ifeq ($(V),0)
25 changes: 8 additions & 17 deletions pkg/lxc
@@ -1,28 +1,19 @@
[mirrors]
https://launchpad.net/ubuntu/+archive/primary/+files/lxc_1.0.0~beta2.orig.tar.gz
http://archive.ubuntu.com/ubuntu/pool/main/l/lxc/lxc_1.0.0~beta2.orig.tar.gz
http://mirror.r0x0r.me/lxc_1.0.0~beta2.orig.tar.gz

https://linuxcontainers.org/downloads/lxc-1.0.5.tar.gz
http://pkgs.fedoraproject.org/repo/extras/lxc/lxc-1.0.5.tar.gz/9d9af9e9e69a831cd50b58d91c786013/lxc-1.0.5.tar.gz
[main]
filesize=745824
sha512=973c7713020b0a11b3574e180f93794876bc501f7ece9516f2269c030526ef9a18b0cbac094bbcf65213e975f4ee434c2a38cc887127fe61a0fc711cef9083e1
tardir=lxc-1.0.0.beta2
filesize=783260
sha512=e0b7dc866ea14ea4de4e28ad59c8dd6ef4258e21215a72cdf0a425463206661b3cf3c33013e65cac6ff8e958922ab0981b6b056260f6534ea6a7c52b95000c04

[deps]
libcap2
bash
debootstrap
rsync
seccomp

[build]
patch -p1 < "$K"/lxc-undef.patch || exit 1
patch -p1 < "$K"/lxc-utmpxname.patch || exit 1
patch -p1 < "$K"/lxc-malloc.patch || exit 1
patch -p1 < "$K"/lxc-no-suid.patch || exit 1
patch -p1 < "$K"/lxc-defrundir.patch || exit 1
patch -p1 < "$K"/lxc-scripts.patch || exit 1

sed -i 's@-Wall -Werror@-Wall@' configure

CFLAGS="-D_GNU_SOURCE $optcflags" LDFLAGS="$optldflags" \
CFLAGS="$optcflags" LDFLAGS="$optldflags" \
./configure -C --prefix="$butch_prefix" \
--bindir="$butch_prefix"/bin \
--sbindir="$butch_prefix"/bin \
Expand Down
4 changes: 0 additions & 4 deletions pkg/lxc-debootstrap

This file was deleted.

16 changes: 16 additions & 0 deletions pkg/seccomp
@@ -0,0 +1,16 @@
[mirrors]
http://downloads.sourceforge.net/project/libseccomp/libseccomp-2.1.1/libseccomp-2.1.1.tar.gz
[main]
filesize=113133
sha512=1f2916d80a9b9937d2ab9ecf9c4f1e2a8ffc27f90f14e8481eb2f32c8122ea1756950f753f25fb571053f492cc97c8792760e0f058e7ea07ec4bb442508d1112

[deps]
bash

[build]
patch -p1 < "$K"/seccomp.patch || exit 1
CFLAGS="$optcflags" LDFLAGS="$optldflags" \
./configure -C --prefix="$butch_prefix" \
--libdir=/lib || exit 1
make -j$MAKE_THREADS || exit 1
make DESTDIR="$butch_install_dir" install || exit 1

0 comments on commit 2fb19ff

Please sign in to comment.