Compare commits
6 commits
main
...
f44-stable
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44f52cc33e | ||
|
|
943a248a2e | ||
|
|
fd5242392c | ||
|
|
750f789070 | ||
|
|
718f50a22c | ||
|
|
be50458d4c |
9 changed files with 18 additions and 19 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
# KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml
|
# KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml
|
||||||
# See also: https://forge.fedoraproject.org/atomic-desktops/config/src/branch/main/bootupd.yaml
|
# See also: https://pagure.io/workstation-ostree-config/blob/main/f/bootupd.yaml
|
||||||
#
|
#
|
||||||
# Integration with https://github.com/coreos/bootupd
|
# Integration with https://github.com/coreos/bootupd
|
||||||
packages:
|
packages:
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,9 @@ os_pretty_name = Fedora IoT
|
||||||
tree_name = docker-host
|
tree_name = docker-host
|
||||||
tree_file = %(os_name)s-%(tree_name)s.json
|
tree_file = %(os_name)s-%(tree_name)s.json
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
release = f46
|
release = f44
|
||||||
ref = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
|
ref = %(os_name)s/stable/%(arch)s/%(tree_name)s
|
||||||
yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/
|
yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/44/Everything/%(arch)s/os/
|
||||||
# lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
|
# lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
|
||||||
lorax_include_packages = fedora-productimg-iot
|
lorax_include_packages = fedora-productimg-iot
|
||||||
docker_os_name = fedora
|
docker_os_name = fedora
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
[fedora-46]
|
[fedora-44]
|
||||||
name=Fedora 46 - $basearch
|
name=Fedora 44 - $basearch
|
||||||
failovermethod=priority
|
failovermethod=priority
|
||||||
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/46/Everything/$basearch/os/
|
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/44/Everything/$basearch/os/
|
||||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-46&arch=$basearch
|
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=$basearch
|
||||||
enabled=1
|
enabled=1
|
||||||
#metadata_expire=7d
|
#metadata_expire=7d
|
||||||
repo_gpgcheck=0
|
repo_gpgcheck=0
|
||||||
type=rpm
|
type=rpm
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-46-$basearch
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-$basearch
|
||||||
skip_if_unavailable=False
|
skip_if_unavailable=False
|
||||||
|
|
@ -4,14 +4,14 @@ include:
|
||||||
- composefs.yaml
|
- composefs.yaml
|
||||||
# Read only sysroot
|
# Read only sysroot
|
||||||
- sysroot-ro.yaml
|
- sysroot-ro.yaml
|
||||||
ref: fedora/rawhide/${basearch}/iot
|
ref: fedora/stable/${basearch}/iot
|
||||||
repos: []
|
repos: []
|
||||||
selinux: true
|
selinux: true
|
||||||
tmp-is-dir: true
|
tmp-is-dir: true
|
||||||
recommends: false
|
recommends: false
|
||||||
documentation: false
|
documentation: false
|
||||||
automatic_version_prefix: '46'
|
automatic_version_prefix: '44'
|
||||||
mutate-os-release: '46'
|
mutate-os-release: '44'
|
||||||
initramfs-args:
|
initramfs-args:
|
||||||
- "--no-hostonly"
|
- "--no-hostonly"
|
||||||
- "--add"
|
- "--add"
|
||||||
|
|
@ -130,7 +130,6 @@ packages:
|
||||||
- iwlwifi-mvm-firmware
|
- iwlwifi-mvm-firmware
|
||||||
- kernel
|
- kernel
|
||||||
- keyutils
|
- keyutils
|
||||||
- kmscon
|
|
||||||
- less
|
- less
|
||||||
- libsss_sudo
|
- libsss_sudo
|
||||||
- linux-firmware
|
- linux-firmware
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
include: fedora-iot-base.yaml
|
include: fedora-iot-base.yaml
|
||||||
ref: fedora/rawhide/${basearch}/updates/iot
|
ref: fedora/stable/${basearch}/updates/iot
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
include: fedora-iot-base.yaml
|
include: fedora-iot-base.yaml
|
||||||
ref: fedora/rawhide/${basearch}/testing/iot
|
ref: fedora/stable/${basearch}/testing/iot
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
include: fedora-iot-base.yaml
|
include: fedora-iot-base.yaml
|
||||||
ref: fedora/rawhide/${basearch}/iot
|
ref: fedora/stable/${basearch}/iot
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- fedora-46
|
- fedora-44
|
||||||
|
|
|
||||||
2
justfile
2
justfile
|
|
@ -87,7 +87,7 @@ compose-legacy variant=default_variant:
|
||||||
|
|
||||||
${CMD} compose tree ${ARGS} \
|
${CMD} compose tree ${ARGS} \
|
||||||
--add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \
|
--add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \
|
||||||
"${variant}.yaml" \
|
"${variant}-ostree.yaml" \
|
||||||
|& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log"
|
|& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log"
|
||||||
|
|
||||||
if [[ ${EUID} -ne 0 ]]; then
|
if [[ ${EUID} -ne 0 ]]; then
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ done
|
||||||
|
|
||||||
# Remove loader directory causing issues in Anaconda in unified core mode
|
# Remove loader directory causing issues in Anaconda in unified core mode
|
||||||
# Will be obsolete once we start using bootupd
|
# Will be obsolete once we start using bootupd
|
||||||
# See - https://forge.fedoraproject.org/atomic-desktops/config/pulls/344
|
# See - https://pagure.io/workstation-ostree-config/pull-request/344
|
||||||
rm -rf /usr/lib/ostree-boot/loader
|
rm -rf /usr/lib/ostree-boot/loader
|
||||||
|
|
||||||
# Undo RPM scripts enabling units; we want the presets to be canonical
|
# Undo RPM scripts enabling units; we want the presets to be canonical
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue