← Back to branch summary

~ubuntu-branches/ubuntu/precise/lxc/precise-updates

« back to all changes in this revision

Viewing changes to .pc/0061-lxc-start-apparmor/src/lxc/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2012-03-21 08:20:06 UTC
  • Revision ID: package-import@ubuntu.com-20120321082006-bsepg8w3z7qb79xt
Tags: 0.7.5-3ubuntu41
https://launchpad.net/bugs/953453
https://launchpad.net/bugs/645625
https://launchpad.net/bugs/942934
https://launchpad.net/bugs/960262
https://launchpad.net/bugs/951181
https://launchpad.net/bugs/960860
* add lxc-shutdown command:
  - 0060-lxc-shutdown: add the command to the source
  - debian/lxc.upstart: use lxc-shutdown to shut down containers cleanly
  - debian/lxc.default: add LXC_SHUTDOWN_TIMEOUT (default 120s)
* support per-container apparmor policies:  (LP: #953453)
  - 0061-lxc-start-apparmor: add lxc.aa_profile to config file.  If not
    specified, lxc-default profile is used for container.  Otherwise, the
    specified profile is used.
    Note that per-container profiles must be named 'lxc-*'.
  - split debian/lxc-default.apparmor from debian/lxc.apparmor.
  - have /etc/apparmor.d/lxc-containers #include /etc/apparmor.d/lxc/*
  - debian/lxc.postinst: load the new lxc-containers profiles
  - debian/lxc.postrm: remove lxc-containers profiles
  - debian/rules: make new etc/apparmor.d/lxc dir and copy lxc-default into it
  - debian/control: add libapparmor-dev to build-depends
  - debian/lxc.upstart: load apparmor per-container policies at pre-start.
* debian/lxc.apparmor: insert the stricter mount rules for lxc-start
  (LP: #645625) (LP: #942934)
* debian/local/lxc-start-ephemeral: re-enable aufs option (LP: #960262)
* replace upstream lxc-wait with our own bash script (LP: #951181)
  - debian/local/lxc-wait: the script
  - debian/rules: copy the script into place
* 0062-templates-relative-paths: update templates to use relative paths,
  and make lxc-start always accept /var/lib/lxc/CN/rootfs as target prefix,
  to make lvm containers work.  (LP: #960860)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0061-lxc-start-apparmor/src/lxc/Makefile.am
 
1
pkginclude_HEADERS = \
 
2
                start.h \
 
3
                console.h \
 
4
                error.h \
 
5
                monitor.h \
 
6
                utils.h \
 
7
                namespace.h \
 
8
                caps.h \
 
9
                lxc.h \
 
10
                cgroup.h \
 
11
                conf.h \
 
12
                list.h \
 
13
                log.h \
 
14
                state.h
 
15
 
 
16
sodir=$(libdir)
 
17
pkglibdir = $(libdir)
 
18
# use PROGRAMS to avoid complains from automake
 
19
so_PROGRAMS = liblxc.so
 
20
 
 
21
liblxc_so_SOURCES = \
 
22
        arguments.c arguments.h \
 
23
        commands.c commands.h \
 
24
        start.c start.h \
 
25
        stop.c \
 
26
        monitor.c monitor.h \
 
27
        console.c \
 
28
        freezer.c \
 
29
        checkpoint.c \
 
30
        restart.c \
 
31
        error.h error.c \
 
32
        parse.c parse.h \
 
33
        cgroup.c cgroup.h \
 
34
        lxc.h \
 
35
        utils.c utils.h \
 
36
        sync.c sync.h \
 
37
        namespace.h namespace.c \
 
38
        conf.c conf.h \
 
39
        confile.c confile.h \
 
40
        list.h \
 
41
        state.c state.h \
 
42
        log.c log.h \
 
43
        \
 
44
        network.c network.h \
 
45
        nl.c nl.h \
 
46
        rtnl.c rtnl.h \
 
47
        genl.c genl.h \
 
48
        \
 
49
        caps.c caps.h \
 
50
        mainloop.c mainloop.h \
 
51
        af_unix.c af_unix.h \
 
52
        \
 
53
        utmp.c utmp.h
 
54
 
 
55
AM_CFLAGS=-I$(top_srcdir)/src
 
56
 
 
57
liblxc_so_CFLAGS = -fPIC -DPIC $(AM_CFLAGS)
 
58
 
 
59
liblxc_so_LDFLAGS = \
 
60
        -shared \
 
61
        -Wl,-soname,liblxc.so.$(firstword $(subst ., ,$(VERSION)))
 
62
 
 
63
liblxc_so_LDADD = -lutil $(CAP_LIBS)
 
64
 
 
65
bin_SCRIPTS = \
 
66
        lxc-ps \
 
67
        lxc-netstat \
 
68
        lxc-ls \
 
69
        lxc-checkconfig \
 
70
        lxc-setcap \
 
71
        lxc-setuid \
 
72
        lxc-version \
 
73
        lxc-create \
 
74
        lxc-clone \
 
75
        lxc-shutdown \
 
76
        lxc-destroy
 
77
 
 
78
bin_PROGRAMS = \
 
79
        lxc-attach \
 
80
        lxc-unshare \
 
81
        lxc-stop \
 
82
        lxc-start \
 
83
        lxc-execute \
 
84
        lxc-monitor \
 
85
        lxc-wait \
 
86
        lxc-console \
 
87
        lxc-freeze \
 
88
        lxc-info \
 
89
        lxc-cgroup \
 
90
        lxc-unfreeze \
 
91
        lxc-checkpoint \
 
92
        lxc-restart \
 
93
        lxc-kill
 
94
 
 
95
pkglib_PROGRAMS = \
 
96
        lxc-init
 
97
 
 
98
AM_LDFLAGS=-Wl,-E -Wl,-rpath -Wl,$(libdir)
 
99
LDADD=liblxc.so @CAP_LIBS@
 
100
 
 
101
lxc_attach_SOURCES = lxc_attach.c
 
102
lxc_cgroup_SOURCES = lxc_cgroup.c
 
103
lxc_checkpoint_SOURCES = lxc_checkpoint.c
 
104
lxc_console_SOURCES = lxc_console.c
 
105
lxc_execute_SOURCES = lxc_execute.c
 
106
lxc_freeze_SOURCES = lxc_freeze.c
 
107
lxc_info_SOURCES = lxc_info.c
 
108
lxc_init_SOURCES = lxc_init.c
 
109
lxc_monitor_SOURCES = lxc_monitor.c
 
110
lxc_restart_SOURCES = lxc_restart.c
 
111
lxc_start_SOURCES = lxc_start.c
 
112
lxc_stop_SOURCES = lxc_stop.c
 
113
lxc_unfreeze_SOURCES = lxc_unfreeze.c
 
114
lxc_unshare_SOURCES = lxc_unshare.c
 
115
lxc_wait_SOURCES = lxc_wait.c
 
116
lxc_kill_SOURCES = lxc_kill.c
 
117
 
 
118
install-exec-local: install-soPROGRAMS
 
119
        mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 
120
        /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 
121
        cd $(DESTDIR)$(libdir); \
 
122
        ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
 
123
 
 
124
uninstall-local:
 
125
        $(RM) $(DESTDIR)$(libdir)/liblxc.so*
 
126
 
 
127
namespace.c: setns.h
 
128
 
 
129
setns.h:
 
130
        -$(CC) $(CPPFLAGS) -M -MT$@ $(LINUX_DIR)/arch/$(LINUX_SRCARCH)/include/asm/unistd.h >setns.P
 
131
        -$(CPP) $(CPPFLAGS) -dM $(LINUX_DIR)/arch/$(LINUX_SRCARCH)/include/asm/unistd.h |grep setns > $@
 
132
 
 
133
clean-local:
 
134
        $(RM) setns.h setns.P
 
135
 
 
136
-include setns.P