Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "mantle"]
path = mantle
url = https://github.com/coreos/mantle
[submodule "ostree-releng-scripts"]
path = ostree-releng-scripts
url = https://github.com/ostreedev/ostree-releng-scripts
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:31
FROM localhost/mantle:latest
WORKDIR /root/containerbuild

# We split into multiple steps here so that local dev workflows which involve
Expand Down
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ DESTDIR ?=
# W504 line break after binary operator
PYIGNORE ?= E128,E241,E402,E501,E722,W503,W504

.PHONY: all check flake8 pycheck unittest clean mantle install
.PHONY: all check flake8 pycheck unittest clean install

all: mantle
all:
@echo "No build step."

src:=$(shell find src -maxdepth 1 -type f -executable -print)
pysources=$(shell find src -type f -name '*.py') $(shell for x in $(src); do if head -1 $$x | grep -q python; then echo $$x; fi; done)
Expand Down Expand Up @@ -51,9 +52,6 @@ clean:
find . -name "*.py[co]" -type f | xargs rm -f
find . -name "__pycache__" -type d | xargs rm -rf

mantle:
cd mantle && $(MAKE)

install:
install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler
install -D -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler $$(find src/ -maxdepth 1 -type f)
Expand All @@ -64,4 +62,3 @@ install:
ln -sf ../lib/coreos-assembler/coreos-assembler $(DESTDIR)$(PREFIX)/bin/
ln -sf ../lib/coreos-assembler/cp-reflink $(DESTDIR)$(PREFIX)/bin/
ln -sf coreos-assembler $(DESTDIR)$(PREFIX)/bin/cosa
cd mantle && $(MAKE) install DESTDIR=$(DESTDIR)
5 changes: 0 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ _prep_make_and_make_install() {
# /usr/bin/ostree-releng-script-rsync-repos
mkdir -p /usr/app/
rsync -rlv "${srcdir}"/ostree-releng-scripts/ /usr/app/ostree-releng-scripts/

if [ "$(git submodule status mantle | head -c1)" == "-" ]; then
echo -e "\033[1merror: submodules not initialized. Run: git submodule update --init\033[0m" 1>&2
exit 1
fi
}

make_and_makeinstall() {
Expand Down
1 change: 0 additions & 1 deletion mantle
Submodule mantle deleted from b729d0