sig_ostree/ostree-config
3
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sig_ostree:9e91c02015638d0d7ee828fb29fec08d26a4cc74
Branches Tags
sig_ostree:r8-devel
sig_ostree:r9-devel
..
compare: sig_ostree:9d39f706862e622e39ebde3ad5ce9c172c8ba4a0
Branches Tags
sig_ostree:r9-devel
sig_ostree:r8-devel

No commits in common. "9e91c02015638d0d7ee828fb29fec08d26a4cc74" and "9d39f706862e622e39ebde3ad5ce9c172c8ba4a0" have entirely different histories.
9e91c02015 ... 9d39f70686

6 changed files with 10 additions and 15 deletions
Show Stats Expand all files Collapse all files

6
build/Makefile
View File

@ -1,5 +1,5 @@
RELEASE_VER_MAJOR = 9 RELEASE_VER_MAJOR = 8
RELEASE_VER_MINOR = 4 RELEASE_VER_MINOR = 7
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
RELEASE_NAME = rocky-linux-ostree-$(ARCH)-$(RELEASE_VER_MAJOR).$(RELEASE_VER_MINOR) RELEASE_NAME = rocky-linux-ostree-$(ARCH)-$(RELEASE_VER_MAJOR).$(RELEASE_VER_MINOR)
DEFAULT_OSTREE_REMOTE = https://dl.rockylinux.org/pub/sig/$(RELEASE_VER_MAJOR)/ostree/$(ARCH)/standard/ DEFAULT_OSTREE_REMOTE = https://dl.rockylinux.org/pub/sig/$(RELEASE_VER_MAJOR)/ostree/$(ARCH)/standard/
@ -26,7 +26,7 @@ mirror: init
.PHONY: tree .PHONY: tree
tree: tree:
rpm-ostree compose tree --repo=./repo --cachedir=./cache --unified-core ../manifest.9-minimal.yaml && \ rpm-ostree compose tree --repo=./repo --cachedir=./cache --unified-core ../manifest.8-minimal.yaml && \
ostree summary --repo=./repo --update ostree summary --repo=./repo --update
.PHONY: iso .PHONY: iso

4
kickstarts/rockylinux-9-x86_64-minimal-devel.ks → kickstarts/rockylinux-8-x86_64-minimal-devel.ks
View File

@ -1,6 +1,6 @@
ostreesetup --nogpg --osname=rockylinux --remote=rockylinux --url=https://dl.rockylinux.org/pub/sig/9/ostree/x86_64/standard/ --ref=rockylinux/9/x86_64/minimal/devel ostreesetup --nogpg --osname=rockylinux --remote=rockylinux --url=https://dl.rockylinux.org/pub/sig/8/ostree/x86_64/standard/ --ref=rockylinux/8/x86_64/minimal/devel
%post --erroronfail %post --erroronfail
rm -f /etc/ostree/remotes.d/rockylinux.conf rm -f /etc/ostree/remotes.d/rockylinux.conf
ostree remote add --no-gpg-verify rockylinux https://dl.rockylinux.org/pub/sig/9/ostree/x86_64/standard/ ostree remote add --no-gpg-verify rockylinux https://dl.rockylinux.org/pub/sig/8/ostree/x86_64/standard/
%end %end

2
manifest.9-minimal.yaml → manifest.8-minimal.yaml
View File

@ -3,7 +3,7 @@ variables:
stream: devel stream: devel
prod: false prod: false
releasever: 9 releasever: 8
repovars: repovars:
rltype: ${rltype} rltype: ${rltype}

4
manifests/arch/x86_64.yaml
View File

@ -1,11 +1,11 @@
# Anything specific to making x86_64 work # Anything specific to making x86_64 work
packages: packages:
# - grub2-efi-ia32 - grub2-efi-ia32
- grub2-efi-x64 - grub2-efi-x64
- grub2-pc - grub2-pc
- ostree-grub2 - ostree-grub2
- efibootmgr - efibootmgr
# - shim-ia32 - shim-ia32
- shim-x64 - shim-x64
- microcode_ctl - microcode_ctl
- mcelog - mcelog

2
manifests/dnf-groups/Standard.yaml
View File

@ -21,7 +21,7 @@ packages:
# - dbus # - dbus
# - ed # - ed
- file - file
# - iptstate - iptstate
# - irqbalance # - irqbalance
# - kpatch # - kpatch
- logrotate - logrotate

7
manifests/fixes.yaml
View File

@ -27,9 +27,4 @@ postprocess:
# THIS IS ONLY NEEDED FOR 8.6 AND LOWER # THIS IS ONLY NEEDED FOR 8.6 AND LOWER
# Workaround for https://github.com/coreos/rpm-ostree/pull/3623 which is not included until rpm-ostree v2022.08 # Workaround for https://github.com/coreos/rpm-ostree/pull/3623 which is not included until rpm-ostree v2022.08
# sed -i 's/InaccessiblePaths=/InaccessiblePaths=-/g' /usr/lib/systemd/system/rpm-ostreed.service # sed -i 's/InaccessiblePaths=/InaccessiblePaths=-/g' /usr/lib/systemd/system/rpm-ostreed.service
# See: https://pagure.io/fork/siosm/workstation-ostree-config/c/9dc9105ddbcfe18c83bf4b0c6a75a2d3e794b385
# and https://github.com/coreos/rpm-ostree/issues/3270#issuecomment-995160984
# Remove loader directory causing issues in Anaconda in unified core mode
rm -rf /usr/lib/ostree-boot/loader