Add the option of compressing using lz4
Using lz4 in squashfs reduces the time to complete the stage from 446s to 4s on my laptop while making the produced iso going from 1.6G to 2.0G.
This commit is contained in:
Thomas Lavocat
Thomas Lavocat
parent
d19d1b498d
commit
bb30ffa062
6 changed files with 3851 additions and 9 deletions
|
|
@ -27,7 +27,7 @@ SCHEMA_2 = """
|
|||
"required": ["method"],
|
||||
"properties": {
|
||||
"method": {
|
||||
"enum": ["gzip", "xz"]
|
||||
"enum": ["gzip", "xz", "lz4"]
|
||||
},
|
||||
"options": {
|
||||
"type": "object",
|
||||
|
|
|
|||
|
|
@ -69,6 +69,14 @@ def run_tests(args, tmpdir):
|
|||
}
|
||||
},
|
||||
},
|
||||
"fedora-ostree-bootiso-xz": {
|
||||
"manifest": "fedora-ostree-bootiso-xz.json",
|
||||
"exports": {
|
||||
"bootiso": {
|
||||
"artifact": "fedora-ostree-boot-xz.iso"
|
||||
}
|
||||
},
|
||||
},
|
||||
"fedora-ostree-image": {
|
||||
"manifest": "fedora-ostree-image.json",
|
||||
"exports": {
|
||||
|
|
|
|||
2992
test/data/manifests/fedora-ostree-bootiso-xz.json
Normal file
2992
test/data/manifests/fedora-ostree-bootiso-xz.json
Normal file
File diff suppressed because it is too large
Load diff
848
test/data/manifests/fedora-ostree-bootiso-xz.mpp.json
Normal file
848
test/data/manifests/fedora-ostree-bootiso-xz.mpp.json
Normal file
|
|
@ -0,0 +1,848 @@
|
|||
{
|
||||
"version": "2",
|
||||
"mpp-vars": {
|
||||
"arch": "x86_64",
|
||||
"version": 34,
|
||||
"relver": "f$version",
|
||||
"snapshot": "20210512",
|
||||
"ref": "fedora/$arch/osbuild",
|
||||
"isolabel": "Fedora-$version-X86_64"
|
||||
},
|
||||
"pipelines": [
|
||||
{
|
||||
"mpp-import-pipeline": {
|
||||
"path": "f34-build-v2.json",
|
||||
"id": "build"
|
||||
},
|
||||
"runner": "org.osbuild.fedora34"
|
||||
},
|
||||
{
|
||||
"name": "ostree-tree",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.rpm",
|
||||
"options": {
|
||||
"gpgkeys": [
|
||||
"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
|
||||
]
|
||||
},
|
||||
"inputs": {
|
||||
"packages": {
|
||||
"type": "org.osbuild.files",
|
||||
"origin": "org.osbuild.source",
|
||||
"mpp-depsolve": {
|
||||
"architecture": "$arch",
|
||||
"module-platform-id": "$relver",
|
||||
"repos": [
|
||||
{
|
||||
"id": "default",
|
||||
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/"
|
||||
}
|
||||
],
|
||||
"packages": [
|
||||
"fedora-release-iot",
|
||||
"glibc",
|
||||
"glibc-minimal-langpack",
|
||||
"nss-altfiles",
|
||||
"sssd-client",
|
||||
"libsss_sudo",
|
||||
"shadow-utils",
|
||||
"kernel",
|
||||
"dracut-config-generic",
|
||||
"dracut-network",
|
||||
"rpm-ostree",
|
||||
"polkit",
|
||||
"lvm2",
|
||||
"chrony",
|
||||
"zram-generator-defaults",
|
||||
"cryptsetup",
|
||||
"pinentry",
|
||||
"keyutils",
|
||||
"e2fsprogs",
|
||||
"dosfstools",
|
||||
"gnupg2",
|
||||
"basesystem",
|
||||
"python3",
|
||||
"bash",
|
||||
"xz",
|
||||
"gzip",
|
||||
"coreutils",
|
||||
"which",
|
||||
"curl",
|
||||
"firewalld",
|
||||
"iptables",
|
||||
"NetworkManager",
|
||||
"NetworkManager-wifi",
|
||||
"NetworkManager-wwan",
|
||||
"wpa_supplicant",
|
||||
"iwd",
|
||||
"dnsmasq",
|
||||
"traceroute",
|
||||
"hostname",
|
||||
"iproute",
|
||||
"iputils",
|
||||
"openssh-clients",
|
||||
"openssh-server",
|
||||
"passwd",
|
||||
"policycoreutils",
|
||||
"procps-ng",
|
||||
"rootfiles",
|
||||
"rpm",
|
||||
"selinux-policy-targeted",
|
||||
"setup",
|
||||
"shadow-utils",
|
||||
"sudo",
|
||||
"systemd",
|
||||
"util-linux",
|
||||
"vim-minimal",
|
||||
"less",
|
||||
"tar",
|
||||
"fwupd",
|
||||
"greenboot",
|
||||
"greenboot-grub2",
|
||||
"greenboot-rpm-ostree-grub2",
|
||||
"greenboot-reboot",
|
||||
"greenboot-status",
|
||||
"ignition",
|
||||
"rsync",
|
||||
"ima-evm-utils",
|
||||
"bash-completion",
|
||||
"tmux",
|
||||
"screen",
|
||||
"policycoreutils-python-utils",
|
||||
"setools-console",
|
||||
"audit",
|
||||
"rng-tools",
|
||||
"bluez",
|
||||
"bluez-libs",
|
||||
"bluez-mesh",
|
||||
"wpan-tools",
|
||||
"kernel-tools",
|
||||
"libgpiod-utils",
|
||||
"podman",
|
||||
"container-selinux",
|
||||
"skopeo",
|
||||
"criu",
|
||||
"slirp4netns",
|
||||
"clevis",
|
||||
"clevis-dracut",
|
||||
"clevis-luks",
|
||||
"attr",
|
||||
"grub2",
|
||||
"grub2-efi-x64",
|
||||
"efibootmgr",
|
||||
"shim-x64",
|
||||
"microcode_ctl",
|
||||
"iwl1000-firmware",
|
||||
"iwl100-firmware",
|
||||
"iwl105-firmware",
|
||||
"iwl135-firmware",
|
||||
"iwl2000-firmware",
|
||||
"iwl2030-firmware",
|
||||
"iwl3160-firmware",
|
||||
"iwl5000-firmware",
|
||||
"iwl5150-firmware",
|
||||
"iwl6000-firmware",
|
||||
"iwl6050-firmware",
|
||||
"iwl7260-firmware"
|
||||
],
|
||||
"excludes": [
|
||||
"dracut-config-rescue"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.locale",
|
||||
"options": {
|
||||
"language": "en_US.UTF-8"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.systemd",
|
||||
"options": {
|
||||
"enabled_services": [
|
||||
"NetworkManager.service",
|
||||
"firewalld.service",
|
||||
"rngd.service",
|
||||
"sshd.service"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.ostree.preptree",
|
||||
"options": {
|
||||
"etc_group_members": [
|
||||
"wheel",
|
||||
"docker"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ostree-commit",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.ostree.init",
|
||||
"options": {
|
||||
"path": "/repo"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.ostree.commit",
|
||||
"inputs": {
|
||||
"tree": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:ostree-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"ref": {
|
||||
"mpp-format-string": "{ref}"
|
||||
},
|
||||
"os_version": {
|
||||
"mpp-format-string": "{version}"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "anaconda-tree",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.rpm",
|
||||
"inputs": {
|
||||
"packages": {
|
||||
"type": "org.osbuild.files",
|
||||
"origin": "org.osbuild.source",
|
||||
"mpp-depsolve": {
|
||||
"architecture": "$arch",
|
||||
"module-platform-id": "$relver",
|
||||
"repos": [
|
||||
{
|
||||
"id": "default",
|
||||
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/"
|
||||
}
|
||||
],
|
||||
"packages": [
|
||||
"anaconda",
|
||||
"anaconda-widgets",
|
||||
"kexec-tools-anaconda-addon",
|
||||
"anaconda-install-env-deps",
|
||||
"dnf",
|
||||
"rpm-ostree",
|
||||
"ostree",
|
||||
"pigz",
|
||||
"kernel",
|
||||
"kernel-modules",
|
||||
"kernel-modules-extra",
|
||||
"grubby",
|
||||
"b43-openfwwf",
|
||||
"glibc-all-langpacks",
|
||||
"grub2-tools-efi",
|
||||
"efibootmgr",
|
||||
"shim-x64",
|
||||
"grub2-efi-x64-cdboot",
|
||||
"shim-ia32",
|
||||
"grub2-efi-ia32-cdboot",
|
||||
"biosdevname",
|
||||
"memtest86+",
|
||||
"syslinux",
|
||||
"grub2-tools",
|
||||
"grub2-tools-minimal",
|
||||
"grub2-tools-extra",
|
||||
"plymouth",
|
||||
"anaconda-dracut",
|
||||
"dracut-network",
|
||||
"dracut-config-generic",
|
||||
"initscripts",
|
||||
"cryptsetup",
|
||||
"rpcbind",
|
||||
"kbd",
|
||||
"kbd-misc",
|
||||
"tar",
|
||||
"xz",
|
||||
"curl",
|
||||
"bzip2",
|
||||
"systemd-sysv",
|
||||
"systemd-units",
|
||||
"rsyslog",
|
||||
"xorg-x11-drivers",
|
||||
"xorg-x11-server-Xorg",
|
||||
"xrandr",
|
||||
"xrdb",
|
||||
"xorg-x11-xauth",
|
||||
"xorg-x11-xauth",
|
||||
"dbus-x11",
|
||||
"metacity",
|
||||
"gsettings-desktop-schemas",
|
||||
"nm-connection-editor",
|
||||
"librsvg2",
|
||||
"btrfs-progs",
|
||||
"jfsutils",
|
||||
"xfsprogs",
|
||||
"reiserfs-utils",
|
||||
"gfs2-utils",
|
||||
"ntfs-3g",
|
||||
"ntfsprogs",
|
||||
"system-storage-manager",
|
||||
"device-mapper-persistent-data",
|
||||
"xfsdump",
|
||||
"udisks2",
|
||||
"udisks2-iscsi",
|
||||
"hostname",
|
||||
"libblockdev-lvm-dbus",
|
||||
"volume_key",
|
||||
"nss-tools",
|
||||
"selinux-policy-targeted",
|
||||
"audit",
|
||||
"ethtool",
|
||||
"openssh-server",
|
||||
"nfs-utils",
|
||||
"openssh-clients",
|
||||
"tigervnc-server-minimal",
|
||||
"tigervnc-server-module",
|
||||
"net-tools",
|
||||
"bridge-utils",
|
||||
"nmap-ncat",
|
||||
"pciutils",
|
||||
"usbutils",
|
||||
"ipmitool",
|
||||
"mt-st",
|
||||
"smartmontools",
|
||||
"hdparm",
|
||||
"pcmciautils",
|
||||
"libmlx4",
|
||||
"rdma-core",
|
||||
"rng-tools",
|
||||
"dmidecode",
|
||||
"aajohan-comfortaa-fonts",
|
||||
"abattis-cantarell-fonts",
|
||||
"bitmap-fangsongti-fonts",
|
||||
"dejavu-sans-fonts",
|
||||
"dejavu-sans-mono-fonts",
|
||||
"google-noto-sans-cjk-ttc-fonts",
|
||||
"google-noto-sans-gurmukhi-fonts",
|
||||
"google-noto-sans-sinhala-vf-fonts",
|
||||
"jomolhari-fonts",
|
||||
"khmeros-base-fonts",
|
||||
"lohit-assamese-fonts",
|
||||
"lohit-bengali-fonts",
|
||||
"lohit-devanagari-fonts",
|
||||
"lohit-gujarati-fonts",
|
||||
"lohit-kannada-fonts",
|
||||
"lohit-marathi-fonts",
|
||||
"lohit-odia-fonts",
|
||||
"lohit-tamil-fonts",
|
||||
"lohit-telugu-fonts",
|
||||
"madan-fonts",
|
||||
"paktype-naskh-basic-fonts",
|
||||
"sil-abyssinica-fonts",
|
||||
"sil-padauk-fonts",
|
||||
"sil-scheherazade-fonts",
|
||||
"smc-meera-fonts",
|
||||
"thai-scalable-waree-fonts",
|
||||
"xorg-x11-fonts-misc",
|
||||
"gdb-gdbserver",
|
||||
"libreport-plugin-bugzilla",
|
||||
"libreport-plugin-reportuploader",
|
||||
"fpaste",
|
||||
"python3-pyatspi",
|
||||
"vim-minimal",
|
||||
"strace",
|
||||
"lsof",
|
||||
"dump",
|
||||
"xz",
|
||||
"less",
|
||||
"wget",
|
||||
"rsync",
|
||||
"bind-utils",
|
||||
"ftp",
|
||||
"mtr",
|
||||
"vconfig",
|
||||
"icfg",
|
||||
"spice-vdagent",
|
||||
"gdisk",
|
||||
"hexedit",
|
||||
"sg3_utils",
|
||||
"notification-daemon"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"gpgkeys": [
|
||||
"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
|
||||
],
|
||||
"exclude": {
|
||||
"docs": true
|
||||
},
|
||||
"disable_dracut": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.buildstamp",
|
||||
"options": {
|
||||
"arch": {
|
||||
"mpp-format-string": "{arch}"
|
||||
},
|
||||
"product": "Fedora-IoT",
|
||||
"version": {
|
||||
"mpp-format-string": "{version}"
|
||||
},
|
||||
"variant": "osbuild",
|
||||
"final": true,
|
||||
"bugurl": "https://github.com/gicmo/ostree-osbuild-demo/issues"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut",
|
||||
"options": {
|
||||
"kernel": [
|
||||
{
|
||||
"mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}"
|
||||
}
|
||||
],
|
||||
"add_modules": [
|
||||
"anaconda",
|
||||
"convertfs",
|
||||
"dmsquash-live",
|
||||
"livenet",
|
||||
"pollcdrom",
|
||||
"qemu",
|
||||
"qemu-net"
|
||||
],
|
||||
"install": [
|
||||
"/.buildstamp"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.locale",
|
||||
"options": {
|
||||
"language": "en_US.UTF-8"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.users",
|
||||
"options": {
|
||||
"users": {
|
||||
"root": {
|
||||
"password": ""
|
||||
},
|
||||
"install": {
|
||||
"uid": 0,
|
||||
"gid": 0,
|
||||
"home": "/root",
|
||||
"shell": "/usr/libexec/anaconda/run-anaconda",
|
||||
"password": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.anaconda",
|
||||
"options": {
|
||||
"kickstart-modules": [
|
||||
"org.fedoraproject.Anaconda.Modules.Network",
|
||||
"org.fedoraproject.Anaconda.Modules.Payloads",
|
||||
"org.fedoraproject.Anaconda.Modules.Storage",
|
||||
"org.fedoraproject.Anaconda.Modules.Users"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.lorax-script",
|
||||
"options": {
|
||||
"path": "99-generic/runtime-postinstall.tmpl",
|
||||
"basearch": {
|
||||
"mpp-format-string": "{arch}"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "rootfs-image",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.mkdir",
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"path": "LiveOS"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.truncate",
|
||||
"options": {
|
||||
"filename": "LiveOS/rootfs.img",
|
||||
"size": "3GB"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.mkfs.ext4",
|
||||
"devices": {
|
||||
"device": {
|
||||
"type": "org.osbuild.loopback",
|
||||
"options": {
|
||||
"filename": "LiveOS/rootfs.img"
|
||||
}
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"label": "Anaconda",
|
||||
"uuid": "383367fa-6a09-4def-8c30-507e0b3cf1f7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.copy",
|
||||
"inputs": {
|
||||
"tree": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:anaconda-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"from": "input://tree/",
|
||||
"to": "mount://root/"
|
||||
}
|
||||
]
|
||||
},
|
||||
"devices": {
|
||||
"root": {
|
||||
"type": "org.osbuild.loopback",
|
||||
"options": {
|
||||
"filename": "LiveOS/rootfs.img"
|
||||
}
|
||||
}
|
||||
},
|
||||
"mounts": [
|
||||
{
|
||||
"name": "root",
|
||||
"type": "org.osbuild.ext4",
|
||||
"source": "root",
|
||||
"target": "/"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "efiboot-tree",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.grub2.iso",
|
||||
"options": {
|
||||
"product": {
|
||||
"name": "Fedora-IoT",
|
||||
"version": {
|
||||
"mpp-format-string": "{version}"
|
||||
}
|
||||
},
|
||||
"isolabel": {
|
||||
"mpp-format-string": "{isolabel}"
|
||||
},
|
||||
"kernel": {
|
||||
"dir": "/images/pxeboot",
|
||||
"opts": [
|
||||
{
|
||||
"mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks"
|
||||
}
|
||||
]
|
||||
},
|
||||
"architectures": [
|
||||
"IA32",
|
||||
"X64"
|
||||
],
|
||||
"vendor": "fedora"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "bootiso-tree",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.mkdir",
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"path": "images"
|
||||
},
|
||||
{
|
||||
"path": "images/pxeboot"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.copy",
|
||||
"inputs": {
|
||||
"base": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:anaconda-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"from": {
|
||||
"mpp-format-string": "input://base/boot/vmlinuz-{rpms['anaconda-tree']['kernel'].evra}"
|
||||
},
|
||||
"to": "tree:///images/pxeboot/vmlinuz"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"mpp-format-string": "input://base/boot/initramfs-{rpms['anaconda-tree']['kernel'].evra}.img"
|
||||
},
|
||||
"to": "tree:///images/pxeboot/initrd.img"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.squashfs",
|
||||
"inputs": {
|
||||
"tree": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:rootfs-image"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"filename": "images/install.img",
|
||||
"compression": {
|
||||
"method": "xz",
|
||||
"options": {
|
||||
"bcj": "x86"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.isolinux",
|
||||
"inputs": {
|
||||
"data": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:anaconda-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"product": {
|
||||
"name": "Fedora-IoT",
|
||||
"version": {
|
||||
"mpp-format-string": "{version}"
|
||||
}
|
||||
},
|
||||
"kernel": {
|
||||
"dir": "/images/pxeboot",
|
||||
"opts": [
|
||||
{
|
||||
"mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.truncate",
|
||||
"options": {
|
||||
"filename": "images/efiboot.img",
|
||||
"size": "20MB"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.mkfs.fat",
|
||||
"devices": {
|
||||
"device": {
|
||||
"type": "org.osbuild.loopback",
|
||||
"options": {
|
||||
"filename": "images/efiboot.img"
|
||||
}
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"label": "ANACONDA",
|
||||
"volid": "7B7795E7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.copy",
|
||||
"inputs": {
|
||||
"tree": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:efiboot-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"from": "input://tree/",
|
||||
"to": "mount://efi/"
|
||||
}
|
||||
]
|
||||
},
|
||||
"devices": {
|
||||
"efi": {
|
||||
"type": "org.osbuild.loopback",
|
||||
"options": {
|
||||
"filename": "images/efiboot.img"
|
||||
}
|
||||
}
|
||||
},
|
||||
"mounts": [
|
||||
{
|
||||
"name": "efi",
|
||||
"type": "org.osbuild.fat",
|
||||
"source": "efi",
|
||||
"target": "/"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.copy",
|
||||
"inputs": {
|
||||
"base": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:efiboot-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"paths": [
|
||||
{
|
||||
"from": "input://base/EFI",
|
||||
"to": "tree:///"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.ostree.init",
|
||||
"options": {
|
||||
"path": "/ostree"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.ostree.pull",
|
||||
"options": {
|
||||
"repo": "/ostree"
|
||||
},
|
||||
"inputs": {
|
||||
"commits": {
|
||||
"type": "org.osbuild.ostree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": {
|
||||
"name:ostree-commit": {
|
||||
"ref": {
|
||||
"mpp-format-string": "{ref}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.kickstart",
|
||||
"options": {
|
||||
"path": "install.ks",
|
||||
"ostree": {
|
||||
"osname": "fedora",
|
||||
"url": "file:///run/install/repo/ostree",
|
||||
"ref": {
|
||||
"mpp-format-string": "{ref}"
|
||||
},
|
||||
"gpg": false
|
||||
},
|
||||
"users": {
|
||||
"core": {
|
||||
"password": "edge",
|
||||
"groups": [
|
||||
"wheel"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.discinfo",
|
||||
"options": {
|
||||
"basearch": {
|
||||
"mpp-format-string": "{arch}"
|
||||
},
|
||||
"release": "202010217.n.0"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "bootiso",
|
||||
"build": "name:build",
|
||||
"stages": [
|
||||
{
|
||||
"type": "org.osbuild.xorrisofs",
|
||||
"inputs": {
|
||||
"tree": {
|
||||
"type": "org.osbuild.tree",
|
||||
"origin": "org.osbuild.pipeline",
|
||||
"references": [
|
||||
"name:bootiso-tree"
|
||||
]
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"filename": "fedora-ostree-boot.iso",
|
||||
"volid": {
|
||||
"mpp-format-string": "{isolabel}"
|
||||
},
|
||||
"boot": {
|
||||
"image": "isolinux/isolinux.bin",
|
||||
"catalog": "isolinux/boot.cat"
|
||||
},
|
||||
"efi": "images/efiboot.img",
|
||||
"isohybridmbr": "/usr/share/syslinux/isohdpfx.bin"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.implantisomd5",
|
||||
"options": {
|
||||
"filename": "fedora-ostree-boot.iso"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1873,10 +1873,7 @@
|
|||
"options": {
|
||||
"filename": "images/install.img",
|
||||
"compression": {
|
||||
"method": "xz",
|
||||
"options": {
|
||||
"bcj": "x86"
|
||||
}
|
||||
"method": "lz4"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -637,10 +637,7 @@
|
|||
"options": {
|
||||
"filename": "images/install.img",
|
||||
"compression": {
|
||||
"method": "xz",
|
||||
"options": {
|
||||
"bcj": "x86"
|
||||
}
|
||||
"method": "lz4"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue