-
Notifications
You must be signed in to change notification settings - Fork 36
Build stacker on Ubuntu 24.04 LTS (noble) #644
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| SHELL=/bin/bash | ||
| TOP_LEVEL := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))) | ||
| BUILD_D = $(TOP_LEVEL)/.build | ||
| export GOPATH ?= $(BUILD_D)/gopath | ||
|
|
@@ -77,6 +78,16 @@ stacker-cov: $(STAGE1_STACKER) $(STACKER_DEPS) cmd/stacker/lxc-wrapper/lxc-wrapp | |
| --substitute VERSION_FULL=$(VERSION_FULL) \ | ||
| --substitute WITH_COV=yes | ||
|
|
||
| # On Ubuntu 24.04 the lxc package does not link against libsystemd so the pkg-config | ||
| # below does list -lsystemd; we must add it to the list but only for stacker-dynamic | ||
| ifeq ($(shell awk -F= '/VERSION_ID/ {print $$2}' /etc/os-release),"24.04") | ||
| ifeq (stacker-dynamic,$(firstword $(MAKECMDGOALS))) | ||
| LXC_WRAPPER_LIBS=-lsystemd | ||
| else | ||
| LXC_WRAPPER_LIBS= | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, it probably doesn't matter as I don't think it'll fail on undefined variables, but I think you meant for LXC_WRAPPER_LIBS= to also happen if it's not 24.04? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually I don't. On 24.04, the and However on 22.04; it doesn't seem to require the The intention then is to append the |
||
| endif | ||
| endif | ||
|
|
||
| stacker-static: $(STACKER_DEPS) cmd/stacker/lxc-wrapper/lxc-wrapper | ||
| $(call build_stacker,,static_build,-extldflags '-static',stacker) | ||
|
|
||
|
|
@@ -91,7 +102,7 @@ stacker-dynamic: $(STACKER_DEPS) cmd/stacker/lxc-wrapper/lxc-wrapper | |
| $(call build_stacker,,,,stacker-dynamic) | ||
|
|
||
| cmd/stacker/lxc-wrapper/lxc-wrapper: cmd/stacker/lxc-wrapper/lxc-wrapper.c | ||
| make -C cmd/stacker/lxc-wrapper LDFLAGS=-static LDLIBS="$(shell pkg-config --static --libs lxc) -lpthread -ldl" lxc-wrapper | ||
| make -C cmd/stacker/lxc-wrapper LDFLAGS=-static LDLIBS="$(shell pkg-config --static --libs lxc) $(LXC_WRAPPER_LIBS) -lpthread -ldl" lxc-wrapper | ||
|
|
||
|
|
||
| .PHONY: go-download | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.