X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=5245a3ad456fad834cf83bf88a1cebbab2d7b3e6;hb=6905a2f3ba95975c38df315275d20054d8f4ac6b;hp=f852ab86293f5ac965616f215716636736e3b07d;hpb=ebef30fcccdb002e9425caed6b529ce23b34e9ba;p=build.git diff --git a/lxc.mk b/lxc.mk index f852ab86..5245a3ad 100644 --- a/lxc.mk +++ b/lxc.mk @@ -122,11 +122,13 @@ IN_NODEIMAGE += codemux # # fprobe-ulog # -# xxx temporarily turning this off +# xxx temporarily turning this off on f21 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)" fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec -#ALL += fprobe-ulog -#IN_NODEIMAGE += fprobe-ulog +ALL += fprobe-ulog +IN_NODEIMAGE += fprobe-ulog +endif #################### libvirt version selection # settling with using version 1.2.1 on all fedoras @@ -249,10 +251,13 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec IN_NODEIMAGE += vsys-scripts ALL += vsys-scripts +# xxx temporarily turning this off on f21 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)" vsys-wrapper-MODULES := vsys-scripts vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec IN_SLICEIMAGE += vsys-wrapper ALL += vsys-wrapper +endif # # bind_public