MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-03 01:58:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macos podman build

Browse Source
This commit is contained in:
Wildan M 2025-05-27 12:32:59 +07:00
parent 6916d14dd0
commit 134bc3d507
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/ci.mk
View File

@ -24,7 +24,7 @@ minimal minimal-net server desktop demo: FORCE
# CI packaging target # CI packaging target
ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release
@ -40,7 +40,7 @@ endif
# CI toolchain # CI toolchain
ci-toolchain: $(CONTAINER_TAG) FORCE ci-toolchain: $(CONTAINER_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
$(MAKE) PREFIX_BINARY=0 \ $(MAKE) PREFIX_BINARY=0 \
"prefix/$(TARGET)/gcc-install.tar.gz" \ "prefix/$(TARGET)/gcc-install.tar.gz" \

2
mk/fstools.mk
View File

@ -6,6 +6,7 @@ fstools: $(FSTOOLS_TAG)
$(FSTOOLS_TAG): cookbook installer $(CONTAINER_TAG) $(FSTOOLS_TAG): cookbook installer $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release
@ -26,6 +27,7 @@ $(HOST_FSTOOLS): installer redoxfs
fstools_clean: FORCE $(CONTAINER_TAG) fstools_clean: FORCE $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
$(HOST_CARGO) clean --manifest-path cookbook/Cargo.toml $(HOST_CARGO) clean --manifest-path cookbook/Cargo.toml
$(HOST_CARGO) clean --manifest-path cookbook/pkgar/Cargo.toml $(HOST_CARGO) clean --manifest-path cookbook/pkgar/Cargo.toml

12
mk/podman.mk
View File

@ -17,10 +17,10 @@ endif
## Podman Home Directory ## Podman Home Directory
PODMAN_HOME?=$(ROOT)/build/podman PODMAN_HOME?=$(ROOT)/build/podman
## Podman command with its many arguments ## Podman command with its many arguments
PODMAN_VOLUMES?=--volume $(ROOT):$(CONTAINER_WORKDIR)$(PODMAN_VOLUME_FLAG) --volume $(PODMAN_HOME):/home$(PODMAN_VOLUME_FLAG) PODMAN_VOLUMES?=--volume $(ROOT):$(CONTAINER_WORKDIR)$(PODMAN_VOLUME_FLAG) --volume $(PODMAN_HOME):/root$(PODMAN_VOLUME_FLAG)
PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0 PODMAN_ENV?=--env PATH=/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0
PODMAN_CONFIG?=--env ARCH=$(ARCH) --env BOARD=$(BOARD) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG) PODMAN_CONFIG?=--env ARCH=$(ARCH) --env BOARD=$(BOARD) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG)
PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --userns keep-id --user `id -u` --interactive --tty --env TERM=$(TERM) PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --interactive --tty --env TERM=$(TERM)
PODMAN_RUN?=podman run $(PODMAN_OPTIONS) $(PODMAN_VOLUMES) $(PODMAN_ENV) $(PODMAN_CONFIG) $(IMAGE_TAG) PODMAN_RUN?=podman run $(PODMAN_OPTIONS) $(PODMAN_VOLUMES) $(PODMAN_ENV) $(PODMAN_CONFIG) $(IMAGE_TAG)
container_shell: build/container.tag container_shell: build/container.tag
@ -31,7 +31,7 @@ else
endif endif
container_su: FORCE container_su: FORCE
podman exec --user=0 --latest --interactive --tty bash podman run $(PODMAN_VOLUMES) --interactive --tty $(IMAGE_TAG) bash
container_clean: FORCE container_clean: FORCE
rm -f build/container.tag rm -f build/container.tag
@ -56,12 +56,12 @@ container_kill: FORCE
build/container.tag: $(CONTAINERFILE) build/container.tag: $(CONTAINERFILE)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
rm -f build/container.tag rm -f build/container.tag
@echo "If podman_home dir cannot be removed, remove with \"sudo rm\"." -chmod -R 0700 $(PODMAN_HOME) || true
-rm -rf $(PODMAN_HOME) || true -rm -rf $(PODMAN_HOME) || true
-podman image rm --force $(IMAGE_TAG) || true -podman image rm --force $(IMAGE_TAG) || true
mkdir -p $(PODMAN_HOME) mkdir -p $(PODMAN_HOME)
@echo "Building Podman image. This may take some time." @echo "Building Podman image. This may take some time."
sed s/_UID_/`id -u`/ $(CONTAINERFILE) | podman build --file - $(PODMAN_VOLUMES) --tag $(IMAGE_TAG) cat $(CONTAINERFILE) | podman build --file - $(PODMAN_VOLUMES) --tag $(IMAGE_TAG)
@echo "Mapping Podman user space. Please wait." @echo "Mapping Podman user space. Please wait."
$(PODMAN_RUN) bash -e podman/rustinstall.sh $(PODMAN_RUN) bash -e podman/rustinstall.sh
mkdir -p build mkdir -p build

8
mk/prefix.mk
View File

@ -45,6 +45,7 @@ $(PREFIX)/relibc: $(ROOT)/relibc
$(PREFIX)/relibc-install: $(PREFIX)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG) $(PREFIX)/relibc-install: $(PREFIX)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
cp -r "$(PREFIX)/rust-install" "$@.partial" cp -r "$(PREFIX)/rust-install" "$@.partial"
@ -89,6 +90,7 @@ $(PREFIX)/libtool:
$(PREFIX)/libtool-build: $(PREFIX)/libtool $(PREFIX)/rust-install $(PREFIX)/libtool-build: $(PREFIX)/libtool $(PREFIX)/rust-install
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.partial" mkdir -p "$@.partial"
@ -113,6 +115,7 @@ endif
$(PREFIX)/sysroot: $(PREFIX)/relibc-install $(PREFIX)/libtool-build $(CONTAINER_TAG) $(PREFIX)/sysroot: $(PREFIX)/relibc-install $(PREFIX)/libtool-build $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$@" rm -rf "$@"
cp -r "$(PREFIX)/relibc-install/" "$@" cp -r "$(PREFIX)/relibc-install/" "$@"
@ -162,6 +165,7 @@ $(PREFIX)/binutils: $(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2
$(PREFIX)/binutils-install: $(PREFIX)/binutils $(CONTAINER_TAG) $(PREFIX)/binutils-install: $(PREFIX)/binutils $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$<-build" "$@.partial" "$@" rm -rf "$<-build" "$@.partial" "$@"
mkdir -p "$<-build" "$@.partial" mkdir -p "$<-build" "$@.partial"
@ -198,6 +202,7 @@ $(PREFIX)/gcc: $(PREFIX)/gcc-$(GCC_BRANCH).tar.bz2
$(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install $(CONTAINER_TAG) $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$<-freestanding-build" "$@.partial" "$@" rm -rf "$<-freestanding-build" "$@.partial" "$@"
mkdir -p "$<-freestanding-build" mkdir -p "$<-freestanding-build"
@ -234,6 +239,7 @@ $(PREFIX)/relibc-freestanding: $(ROOT)/relibc
$(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG) $(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.partial" mkdir -p "$@.partial"
@ -253,6 +259,7 @@ endif
$(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG) $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$<-build" "$@.partial" "$@" rm -rf "$<-build" "$@.partial" "$@"
mkdir -p "$<-build" mkdir -p "$<-build"
@ -295,6 +302,7 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
$(PREFIX)/rust-install: $(ROOT)/rust/configure | $(PREFIX)/gcc-install $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG) $(PREFIX)/rust-install: $(ROOT)/rust/configure | $(PREFIX)/gcc-install $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
$(PODMAN_RUN) make $@
else else
rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@" rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@"
mkdir -p "$(PREFIX)/rust-build" mkdir -p "$(PREFIX)/rust-build"

14
mk/repo.mk
View File

@ -2,7 +2,7 @@
$(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG) $(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
@ -15,7 +15,7 @@ endif
$(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG) $(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
@ -32,7 +32,7 @@ endif
# Find recipe # Find recipe
find.%: $(FSTOOLS_TAG) FORCE find.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
@ -45,7 +45,7 @@ comma := ,
# Invoke clean.sh for one or more targets separated by comma # Invoke clean.sh for one or more targets separated by comma
c.%: $(FSTOOLS_TAG) FORCE c.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
@if echo "$*" | grep -q ','; then \ @if echo "$*" | grep -q ','; then \
$(MAKE) $(foreach f,$(subst $(comma), ,$*),c.$(f)); \ $(MAKE) $(foreach f,$(subst $(comma), ,$*),c.$(f)); \
@ -60,7 +60,7 @@ endif
# Invoke fetch.sh for one or more targets separated by comma # Invoke fetch.sh for one or more targets separated by comma
f.%: $(FSTOOLS_TAG) FORCE f.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
@if echo "$*" | grep -q ','; then \ @if echo "$*" | grep -q ','; then \
$(MAKE) $(foreach f,$(subst $(comma), ,$*),f.$(f)); \ $(MAKE) $(foreach f,$(subst $(comma), ,$*),f.$(f)); \
@ -75,7 +75,7 @@ endif
# Invoke repo.sh for one or more targets separated by comma # Invoke repo.sh for one or more targets separated by comma
r.%: $(FSTOOLS_TAG) FORCE r.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
@if echo "$*" | grep -q ','; then \ @if echo "$*" | grep -q ','; then \
$(MAKE) $(foreach f,$(subst $(comma), ,$*),r.$(f)); \ $(MAKE) $(foreach f,$(subst $(comma), ,$*),r.$(f)); \
@ -90,7 +90,7 @@ endif
# Invoke unfetch.sh for one or more targets separated by comma # Invoke unfetch.sh for one or more targets separated by comma
u.%: $(FSTOOLS_TAG) FORCE u.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) make $@
else else
@if echo "$*" | grep -q ','; then \ @if echo "$*" | grep -q ','; then \
$(MAKE) $(foreach f,$(subst $(comma), ,$*),u.$(f)); \ $(MAKE) $(foreach f,$(subst $(comma), ,$*),u.$(f)); \

12
podman/redox-base-containerfile
View File

@ -5,10 +5,9 @@ FROM debian:stable-backports
# _UID_ must be replaced with the user's uid on host # _UID_ must be replaced with the user's uid on host
# podman root is mapped to your user id on host during build, # podman root is mapped to your user id on host during build,
# poduser is mapped to your user id during podman run # poduser is mapped to your user id during podman run
RUN useradd --create-home --no-log-init --uid _UID_ poduser \ RUN apt-get update
&& chown -R root:root /home \
&& apt-get update \ RUN apt-get install -y --no-install-recommends -t stable-backports \
&& apt-get install -y --no-install-recommends -t stable-backports \
ant \ ant \
appstream \ appstream \
appstream-compose \ appstream-compose \
@ -36,7 +35,6 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
gtk-doc-tools \ gtk-doc-tools \
help2man \ help2man \
intltool \ intltool \
libc6-dev-i386 \
libexpat-dev \ libexpat-dev \
libfontconfig1-dev \ libfontconfig1-dev \
libfuse3-dev \ libfuse3-dev \
@ -72,7 +70,6 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
ruby \ ruby \
scons \ scons \
ssh \ ssh \
syslinux-utils \
texinfo \ texinfo \
unifdef \ unifdef \
unzip \ unzip \
@ -85,3 +82,6 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
zip \ zip \
zlib1g-dev \ zlib1g-dev \
zstd zstd
RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
apt-get install -y --no-install-recommends libc6-dev-i386 syslinux-utils;