Skip to content

Commit 18a5b71

Browse files
committed
Add rpmdistro-gitoverlay as a submodule rather than RPM
We want the ability to make breaking changes to how we build RPMs; having it as a submodule will allow us to break things. Further, today COPR doesn't support e.g. aarch64, which imposes an artificial limitation on building this container. (Today we're using the Ignition from COPR, but actually for validating configs we could probably just use the main repo) Obsoletes: coreos#30
1 parent 82a9334 commit 18a5b71

File tree

5 files changed

+11
-18
lines changed

5 files changed

+11
-18
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "ostree-releng-scripts"]
55
path = ostree-releng-scripts
66
url = https://github.com/ostreedev/ostree-releng-scripts
7+
[submodule "rpmdistro-gitoverlay"]
8+
path = rpmdistro-gitoverlay
9+
url = https://github.com/projectatomic/rpmdistro-gitoverlay

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
PREFIX ?= /usr
22
DESTDIR ?=
33

4-
.PHONY: all mantle install
4+
.PHONY: all mantle rdgo install
55

6-
all: mantle
6+
all: mantle rdgo
77

88
mantle:
99
cd mantle && ./build ore kola kolet
1010

11+
rdgo:
12+
(cd rpmdistro-gitoverlay && ./autogen.sh --prefix=$(PREFIX) --sysconfdir=/etc && make)
13+
1114
install:
1215
install -D -t $(DESTDIR)$(PREFIX)/bin coreos-assembler
1316
install -D -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler $$(find src/ -maxdepth 1 -type f)
1417
install -D -t $(DESTDIR)$(PREFIX)/bin mantle/bin/{ore,kola}
1518
install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/amd64 mantle/bin/amd64/kolet
19+
(cd rpmdistro-gitoverlay && make install)

build.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@ configure_yum_repos() {
1818
mv ${repo}.new ${repo}
1919
done
2020

21-
# enable `walters/buildtools-fedora` copr
22-
# pulled from https://copr.fedorainfracloud.org/coprs/walters/buildtools-fedora/repo/fedora-28/walters-buildtools-fedora-fedora-28.repo
23-
cat > /etc/yum.repos.d/walters-buildtools-fedora-fedora-28.repo <<'EOF'
24-
[walters-buildtools-fedora]
25-
name=Copr repo for buildtools-fedora owned by walters
26-
baseurl=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/fedora-$releasever-$basearch/
27-
type=rpm-md
28-
skip_if_unavailable=True
29-
gpgcheck=1
30-
gpgkey=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/pubkey.gpg
31-
repo_gpgcheck=0
32-
enabled=1
33-
enabled_metadata=1
34-
EOF
35-
3621
# enable `dustymabe/ignition` copr
3722
# pulled from https://copr.fedorainfracloud.org/coprs/dustymabe/ignition/repo/fedora-28/dustymabe-ignition-fedora-28.repo
3823
cat > /etc/yum.repos.d/dustymabe-ignition-fedora-28.repo <<'EOF'

rpmdistro-gitoverlay

Submodule rpmdistro-gitoverlay added at 1020376

src/deps.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dumb-init
99
rpm-ostree
1010

1111
# rpmdistro-gitoverlay deps
12-
dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients rpmdistro-gitoverlay
12+
dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients
1313

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

0 commit comments

Comments
 (0)