Skip to content

Add rpmdistro-gitoverlay as a submodule rather than RPM #134

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

Closed
wants to merge 1 commit into from
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: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "ostree-releng-scripts"]
path = ostree-releng-scripts
url = https://github.com/ostreedev/ostree-releng-scripts
[submodule "rpmdistro-gitoverlay"]
path = rpmdistro-gitoverlay
url = https://github.com/projectatomic/rpmdistro-gitoverlay
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
PREFIX ?= /usr
DESTDIR ?=

.PHONY: all mantle install
.PHONY: all mantle rdgo install

all: mantle
all: mantle rdgo

mantle:
cd mantle && ./build ore kola kolet

rdgo:
(cd rpmdistro-gitoverlay && ./autogen.sh --prefix=$(PREFIX) --sysconfdir=/etc && make)

install:
install -D -t $(DESTDIR)$(PREFIX)/bin coreos-assembler
install -D -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler $$(find src/ -maxdepth 1 -type f)
install -D -t $(DESTDIR)$(PREFIX)/bin mantle/bin/{ore,kola}
install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/amd64 mantle/bin/amd64/kolet
(cd rpmdistro-gitoverlay && make install)
15 changes: 0 additions & 15 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ configure_yum_repos() {
mv ${repo}.new ${repo}
done

# enable `walters/buildtools-fedora` copr
# pulled from https://copr.fedorainfracloud.org/coprs/walters/buildtools-fedora/repo/fedora-28/walters-buildtools-fedora-fedora-28.repo
cat > /etc/yum.repos.d/walters-buildtools-fedora-fedora-28.repo <<'EOF'
[walters-buildtools-fedora]
name=Copr repo for buildtools-fedora owned by walters
baseurl=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/fedora-$releasever-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1
EOF

# enable `dustymabe/ignition` copr
# pulled from https://copr.fedorainfracloud.org/coprs/dustymabe/ignition/repo/fedora-28/dustymabe-ignition-fedora-28.repo
cat > /etc/yum.repos.d/dustymabe-ignition-fedora-28.repo <<'EOF'
Expand Down
1 change: 1 addition & 0 deletions rpmdistro-gitoverlay
Submodule rpmdistro-gitoverlay added at 102037
2 changes: 1 addition & 1 deletion src/deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dumb-init
rpm-ostree

# rpmdistro-gitoverlay deps
dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients rpmdistro-gitoverlay
dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients

# Currently a transitive req of rpmdistro-gitoverlay via mock, but we
# expect people to use these explicitly in their repo configurations.
Expand Down