vladan/workstation-ostree-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Split workstation-base from "atomic"

Browse source 
This is obviously confusing but right now "ostree workstation" is really
"Atomic". I'm not changing the refs or the names of the manifest JSON files yet,
but the high level idea here is we have:

 - workstatoin-base (should be like comps...that's another issue)
 - atomic (inherits desktop-base, adds rpm-ostree + container tooling)
   Also I added a compat symlink so pungi doesn't need an immediate change.
This commit is contained in:
Colin Walters 2018-02-08 15:07:29 -05:00
parent 483baf6b7d
commit e08b908904
3 changed files with 445 additions and 440 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fedora-atomic-workstation.json Normal file
View file

@ -0,0 +1,15 @@
{
"ref": "fedora/rawhide/x86_64/workstation",
"include": "fedora-workstation-base.json",
"automatic_version_prefix": "28",
"mutate-os-release": "28",
"packages": [
"atomic",
"rpm-ostree",
"skopeo",
"docker"
]
}

440
fedora-ostree-workstation.json
View file

@ -1,440 +0,0 @@
{
"ref": "fedora/rawhide/x86_64/workstation",
"repos": ["fedora-rawhide"],
"selinux": true,
"documentation": true,
"automatic_version_prefix": "28",
"mutate-os-release": "28",
"boot_location": "new",
"etc-group-members": ["wheel"],
"ignore-removed-users": ["root"],
"ignore-removed-groups": ["root"],
"check-passwd": { "type": "file", "filename": "passwd" },
"check-groups": { "type": "file", "filename": "group" },
"postprocess-script": "post.sh",
"packages": [
"aajohan-comfortaa-fonts",
"adobe-source-han-sans-cn-fonts",
"adobe-source-han-sans-tw-fonts",
"adwaita-qt4",
"adwaita-qt5",
"alsa-plugins-pulseaudio",
"alsa-utils",
"atmel-firmware",
"at-spi2-atk",
"at-spi2-core",
"atomic",
"attr",
"audit",
"authconfig",
"avahi",
"b43-fwcutter",
"b43-openfwwf",
"baobab",
"basesystem",
"bash",
"bash-completion",
"bc",
"bcache-tools",
"bind-license",
"bind-utils",
"bluez-cups",
"bridge-utils",
"btrfs-progs",
"bzip2",
"caribou",
"caribou-gtk2-module",
"caribou-gtk3-module",
"cheese",
"chrony",
"cifs-utils",
"control-center",
"coreutils",
"crda",
"cryptsetup",
"cups",
"cups-client",
"cups-filesystem",
"cups-filters",
"curl",
"dejavu-sans-fonts",
"dejavu-sans-mono-fonts",
"dejavu-serif-fonts",
"device-mapper-multipath",
"dmidecode",
"dmraid",
"dmraid-events",
"docker",
"dos2unix",
"dracut-config-generic",
"dracut-network",
"ebtables",
"efibootmgr",
"eog",
"ethtool",
"fcoe-utils",
"fedora-bookmarks",
"fedora-productimg-workstation",
"fedora-release-workstation",
"fedora-user-agent-chrome",
"file-roller",
"firefox",
"firewalld",
"firewalld-filesystem",
"flatpak",
"foomatic",
"foomatic-db",
"foomatic-db-filesystem",
"foomatic-db-ppds",
"fpaste",
"fprintd-pam",
"fros",
"fros-gnome",
"gdm",
"gedit",
"glibc",
"glibc-all-langpacks",
"glib-networking",
"gnome-backgrounds",
"gnome-bluetooth",
"gnome-boxes",
"gnome-calculator",
"gnome-characters",
"gnome-classic-session",
"gnome-clocks",
"gnome-color-manager",
"gnome-contacts",
"gnome-disk-utility",
"gnome-font-viewer",
"gnome-getting-started-docs",
"gnome-initial-setup",
"gnome-logs",
"gnome-maps",
"gnome-screenshot",
"gnome-session-wayland-session",
"gnome-session-xsession",
"gnome-settings-daemon",
"gnome-shell",
"gnome-shell-extension-background-logo",
"gnome-software",
"gnome-system-monitor",
"gnome-terminal",
"gnome-themes-standard",
"gnome-user-docs",
"gnome-user-share",
"gnome-weather",
"gnu-free-fonts-common",
"gnu-free-mono-fonts",
"gnu-free-sans-fonts",
"gnu-free-serif-fonts",
"gnupg",
"gnupg2",
"google-noto-emoji-fonts",
"google-noto-sans-lisu-fonts",
"google-noto-sans-mandaic-fonts",
"google-noto-sans-meetei-mayek-fonts",
"google-noto-sans-tagalog-fonts",
"google-noto-sans-tai-tham-fonts",
"google-noto-sans-tai-viet-fonts",
"gutenprint",
"gutenprint-cups",
"gvfs-afc",
"gvfs-afp",
"gvfs-archive",
"gvfs-fuse",
"gvfs-goa",
"gvfs-gphoto2",
"gvfs-mtp",
"gvfs-smb",
"gzip",
"hfsplus-tools",
"highlight",
"hostname",
"hplip",
"hyperv-daemons",
"hyperv-daemons-license",
"hypervfcopyd",
"hypervkvpd",
"hypervvssd",
"ibus",
"ibus-gtk2",
"ibus-gtk3",
"ibus-hangul",
"ibus-kkc",
"ibus-libpinyin",
"ibus-libzhuyin",
"ibus-m17n",
"ibus-qt",
"ibus-rawcode",
"ibus-setup",
"ibus-typing-booster",
"initscripts",
"iproute",
"ipset",
"iptstate",
"iputils",
"ipw2100-firmware",
"ipw2200-firmware",
"isomd5sum",
"iw",
"iwl1000-firmware",
"iwl100-firmware",
"iwl105-firmware",
"iwl135-firmware",
"iwl2000-firmware",
"iwl2030-firmware",
"iwl3160-firmware",
"iwl3945-firmware",
"iwl4965-firmware",
"iwl5000-firmware",
"iwl5150-firmware",
"iwl6000-firmware",
"iwl6000g2a-firmware",
"iwl6000g2b-firmware",
"iwl6050-firmware",
"iwl7260-firmware",
"jomolhari-fonts",
"jwhois",
"kbd",
"kbd-legacy",
"kbd-misc",
"kernel",
"kernel-modules-extra",
"kexec-tools",
"keybinder3",
"khmeros-base-fonts",
"khmeros-fonts-common",
"langtable",
"langtable-data",
"langtable-python3",
"less",
"libcanberra-gtk2",
"libcanberra-gtk3",
"libertas-usb8388-firmware",
"libproxy-mozjs",
"libsss_idmap",
"libsss_nss_idmap",
"libvirt-daemon",
"libvirt-daemon-driver-interface",
"libvirt-daemon-driver-network",
"libvirt-daemon-driver-nodedev",
"libvirt-daemon-driver-nwfilter",
"libvirt-daemon-driver-qemu",
"libvirt-daemon-driver-secret",
"libvirt-daemon-driver-storage",
"libvirt-daemon-kvm",
"libvirt-client",
"libvirt-gconfig",
"libvirt-glib",
"libvirt-gobject",
"libXxf86dga",
"lldpad",
"logrotate",
"lohit-assamese-fonts",
"lohit-bengali-fonts",
"lohit-devanagari-fonts",
"lohit-gujarati-fonts",
"lohit-gurmukhi-fonts",
"lohit-kannada-fonts",
"lohit-odia-fonts",
"lohit-tamil-fonts",
"lohit-telugu-fonts",
"lpsolve",
"lrzsz",
"lsof",
"lttng-ust",
"lvm2",
"lzop",
"m17n-db",
"m17n-lib",
"mactel-boot",
"man-db",
"man-pages",
"mcelog",
"media-player-info",
"mesa-dri-drivers",
"mesa-libxatracker",
"microcode_ctl",
"mlocate",
"ModemManager",
"mousetweaks",
"mpage",
"mtools",
"mtr",
"nautilus",
"nautilus-sendto",
"naver-nanum-fonts-common",
"naver-nanum-gothic-fonts",
"NetworkManager",
"NetworkManager-adsl",
"NetworkManager-bluetooth",
"NetworkManager-config-connectivity-fedora",
"NetworkManager-openconnect",
"NetworkManager-openvpn-gnome",
"NetworkManager-pptp-gnome",
"NetworkManager-team",
"NetworkManager-vpnc-gnome",
"NetworkManager-wifi",
"NetworkManager-wwan",
"nfs-utils",
"nss-altfiles",
"nss-mdns",
"nss-softokn-freebl",
"numad",
"opencc",
"openssh-clients",
"openssh-server",
"orca",
"PackageKit-gstreamer-plugin",
"paktype-naskh-basic-fonts",
"pam_krb5",
"paps",
"paratype-pt-sans-fonts",
"passwd",
"passwdqc",
"passwdqc-lib",
"pciutils",
"pinfo",
"plymouth",
"plymouth-plugin-label",
"plymouth-plugin-two-step",
"plymouth-system-theme",
"plymouth-theme-charge",
"policycoreutils",
"polkit",
"poppler-utils",
"procps-ng",
"psacct",
"qemu-common",
"qemu-guest-agent",
"qemu-img",
"qemu-kvm",
"qemu-system-x86",
"qgnomeplatform",
"radvd",
"rdist",
"rng-tools",
"rootfiles",
"rpm",
"rpm-ostree",
"rp-pppoe",
"rsync",
"rygel",
"samba-client",
"sane-backends-drivers-scanners",
"scl-utils",
"seabios-bin",
"seavgabios-bin",
"selinux-policy-targeted",
"setroubleshoot",
"setroubleshoot-plugins",
"setroubleshoot-server",
"setup",
"setuptool",
"sgabios-bin",
"sgpio",
"shadow-utils",
"sheepdog",
"shim",
"sil-abyssinica-fonts",
"sil-mingzat-fonts",
"sil-nuosu-fonts",
"sil-padauk-fonts",
"skkdic",
"smc-fonts-common",
"smc-meera-fonts",
"sos",
"spice-server",
"spice-vdagent",
"sssd",
"sssd-ad",
"sssd-client",
"sssd-common",
"sssd-common-pac",
"sssd-ipa",
"sssd-krb5",
"sssd-krb5-common",
"sssd-ldap",
"stix-fonts",
"sudo",
"sushi",
"symlinks",
"system-config-printer-udev",
"systemd",
"tabish-eeyek-fonts",
"tar",
"tcl",
"tcpdump",
"teamd",
"telnet",
"thai-scalable-fonts-common",
"thai-scalable-waree-fonts",
"time",
"totem",
"totem-nautilus",
"traceroute",
"tree",
"usb_modeswitch",
"usb_modeswitch-data",
"usbutils",
"usermode",
"userspace-rcu",
"util-linux",
"vconfig",
"vim-minimal",
"virglrenderer",
"vlgothic-fonts",
"wget",
"which",
"wireless-tools",
"words",
"wpa_supplicant",
"wvdial",
"xcb-util-image",
"xcb-util-keysyms",
"xcb-util-renderutil",
"xcb-util-wm",
"xdg-user-dirs-gtk",
"xdg-utils",
"xen-licenses",
"xfsprogs",
"xorg-x11-drv-ati",
"xorg-x11-drv-evdev",
"xorg-x11-drv-fbdev",
"xorg-x11-drv-intel",
"xorg-x11-drv-libinput",
"xorg-x11-drv-nouveau",
"xorg-x11-drv-openchrome",
"xorg-x11-drv-qxl",
"xorg-x11-drv-vesa",
"xorg-x11-drv-vmware",
"xorg-x11-drv-wacom",
"xorg-x11-server-Xorg",
"xorg-x11-utils",
"xorg-x11-xauth",
"xorg-x11-xinit",
"xz",
"yelp",
"zd1211-firmware",
"zip"
],
"default_target": "graphical.target",
"comment-for-packages": "Keep this in sync with fedora-atomic-host.json from fedora-atomic",
"packages-aarch64": ["grub2-efi", "ostree-grub2", "efibootmgr", "shim"],
"packages-armhfp": ["extlinux-bootloader"],
"packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],
"packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],
"packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",
"efibootmgr", "shim", "microcode_ctl"]
}

1
fedora-ostree-workstation.json Symbolic link
View file

@ -0,0 +1 @@
fedora-atomic-workstation.json

429
fedora-workstation-base.json Normal file
View file

@ -0,0 +1,429 @@
{
"ref": "fedora/rawhide/x86_64/workstation-base",
"repos": ["fedora-rawhide"],
"selinux": true,
"documentation": true,
"boot_location": "new",
"etc-group-members": ["wheel"],
"postprocess-script": "post.sh",
"ignore-removed-users": ["root"],
"ignore-removed-groups": ["root"],
"check-passwd": { "type": "file", "filename": "passwd" },
"check-groups": { "type": "file", "filename": "group" },
"packages": [
"aajohan-comfortaa-fonts",
"adobe-source-han-sans-cn-fonts",
"adobe-source-han-sans-tw-fonts",
"adwaita-qt4",
"adwaita-qt5",
"alsa-plugins-pulseaudio",
"alsa-utils",
"atmel-firmware",
"at-spi2-atk",
"at-spi2-core",
"attr",
"audit",
"authconfig",
"avahi",
"b43-fwcutter",
"b43-openfwwf",
"baobab",
"basesystem",
"bash",
"bash-completion",
"bc",
"bcache-tools",
"bind-license",
"bind-utils",
"bluez-cups",
"bridge-utils",
"btrfs-progs",
"bzip2",
"caribou",
"caribou-gtk2-module",
"caribou-gtk3-module",
"cheese",
"chrony",
"cifs-utils",
"control-center",
"coreutils",
"crda",
"cryptsetup",
"cups",
"cups-client",
"cups-filesystem",
"cups-filters",
"curl",
"dejavu-sans-fonts",
"dejavu-sans-mono-fonts",
"dejavu-serif-fonts",
"device-mapper-multipath",
"dmidecode",
"dmraid",
"dmraid-events",
"dos2unix",
"dracut-config-generic",
"dracut-network",
"ebtables",
"efibootmgr",
"eog",
"ethtool",
"fcoe-utils",
"fedora-bookmarks",
"fedora-productimg-workstation",
"fedora-release-workstation",
"fedora-user-agent-chrome",
"file-roller",
"firefox",
"firewalld",
"firewalld-filesystem",
"flatpak",
"foomatic",
"foomatic-db",
"foomatic-db-filesystem",
"foomatic-db-ppds",
"fpaste",
"fprintd-pam",
"fros",
"fros-gnome",
"gdm",
"gedit",
"glibc",
"glibc-all-langpacks",
"glib-networking",
"gnome-backgrounds",
"gnome-bluetooth",
"gnome-boxes",
"gnome-calculator",
"gnome-characters",
"gnome-classic-session",
"gnome-clocks",
"gnome-color-manager",
"gnome-contacts",
"gnome-disk-utility",
"gnome-font-viewer",
"gnome-getting-started-docs",
"gnome-initial-setup",
"gnome-logs",
"gnome-maps",
"gnome-screenshot",
"gnome-session-wayland-session",
"gnome-session-xsession",
"gnome-settings-daemon",
"gnome-shell",
"gnome-shell-extension-background-logo",
"gnome-software",
"gnome-system-monitor",
"gnome-terminal",
"gnome-themes-standard",
"gnome-user-docs",
"gnome-user-share",
"gnome-weather",
"gnu-free-fonts-common",
"gnu-free-mono-fonts",
"gnu-free-sans-fonts",
"gnu-free-serif-fonts",
"gnupg",
"gnupg2",
"google-noto-emoji-fonts",
"google-noto-sans-lisu-fonts",
"google-noto-sans-mandaic-fonts",
"google-noto-sans-meetei-mayek-fonts",
"google-noto-sans-tagalog-fonts",
"google-noto-sans-tai-tham-fonts",
"google-noto-sans-tai-viet-fonts",
"gutenprint",
"gutenprint-cups",
"gvfs-afc",
"gvfs-afp",
"gvfs-archive",
"gvfs-fuse",
"gvfs-goa",
"gvfs-gphoto2",
"gvfs-mtp",
"gvfs-smb",
"gzip",
"hfsplus-tools",
"highlight",
"hostname",
"hplip",
"hyperv-daemons",
"hyperv-daemons-license",
"hypervfcopyd",
"hypervkvpd",
"hypervvssd",
"ibus",
"ibus-gtk2",
"ibus-gtk3",
"ibus-hangul",
"ibus-kkc",
"ibus-libpinyin",
"ibus-libzhuyin",
"ibus-m17n",
"ibus-qt",
"ibus-rawcode",
"ibus-setup",
"ibus-typing-booster",
"initscripts",
"iproute",
"ipset",
"iptstate",
"iputils",
"ipw2100-firmware",
"ipw2200-firmware",
"isomd5sum",
"iw",
"iwl1000-firmware",
"iwl100-firmware",
"iwl105-firmware",
"iwl135-firmware",
"iwl2000-firmware",
"iwl2030-firmware",
"iwl3160-firmware",
"iwl3945-firmware",
"iwl4965-firmware",
"iwl5000-firmware",
"iwl5150-firmware",
"iwl6000-firmware",
"iwl6000g2a-firmware",
"iwl6000g2b-firmware",
"iwl6050-firmware",
"iwl7260-firmware",
"jomolhari-fonts",
"jwhois",
"kbd",
"kbd-legacy",
"kbd-misc",
"kernel",
"kernel-modules-extra",
"kexec-tools",
"keybinder3",
"khmeros-base-fonts",
"khmeros-fonts-common",
"langtable",
"langtable-data",
"langtable-python3",
"less",
"libcanberra-gtk2",
"libcanberra-gtk3",
"libertas-usb8388-firmware",
"libproxy-mozjs",
"libsss_idmap",
"libsss_nss_idmap",
"libvirt-daemon",
"libvirt-daemon-driver-interface",
"libvirt-daemon-driver-network",
"libvirt-daemon-driver-nodedev",
"libvirt-daemon-driver-nwfilter",
"libvirt-daemon-driver-qemu",
"libvirt-daemon-driver-secret",
"libvirt-daemon-driver-storage",
"libvirt-daemon-kvm",
"libvirt-client",
"libvirt-gconfig",
"libvirt-glib",
"libvirt-gobject",
"libXxf86dga",
"lldpad",
"logrotate",
"lohit-assamese-fonts",
"lohit-bengali-fonts",
"lohit-devanagari-fonts",
"lohit-gujarati-fonts",
"lohit-gurmukhi-fonts",
"lohit-kannada-fonts",
"lohit-odia-fonts",
"lohit-tamil-fonts",
"lohit-telugu-fonts",
"lpsolve",
"lrzsz",
"lsof",
"lttng-ust",
"lvm2",
"lzop",
"m17n-db",
"m17n-lib",
"mactel-boot",
"man-db",
"man-pages",
"mcelog",
"media-player-info",
"mesa-dri-drivers",
"mesa-libxatracker",
"microcode_ctl",
"mlocate",
"ModemManager",
"mousetweaks",
"mpage",
"mtools",
"mtr",
"nautilus",
"nautilus-sendto",
"naver-nanum-fonts-common",
"naver-nanum-gothic-fonts",
"NetworkManager",
"NetworkManager-adsl",
"NetworkManager-bluetooth",
"NetworkManager-config-connectivity-fedora",
"NetworkManager-openconnect",
"NetworkManager-openvpn-gnome",
"NetworkManager-pptp-gnome",
"NetworkManager-team",
"NetworkManager-vpnc-gnome",
"NetworkManager-wifi",
"NetworkManager-wwan",
"nfs-utils",
"nss-altfiles",
"nss-mdns",
"nss-softokn-freebl",
"numad",
"opencc",
"openssh-clients",
"openssh-server",
"orca",
"PackageKit-gstreamer-plugin",
"paktype-naskh-basic-fonts",
"pam_krb5",
"paps",
"paratype-pt-sans-fonts",
"passwd",
"passwdqc",
"passwdqc-lib",
"pciutils",
"pinfo",
"plymouth",
"plymouth-plugin-label",
"plymouth-plugin-two-step",
"plymouth-system-theme",
"plymouth-theme-charge",
"policycoreutils",
"polkit",
"poppler-utils",
"procps-ng",
"psacct",
"qemu-common",
"qemu-guest-agent",
"qemu-img",
"qemu-kvm",
"qemu-system-x86",
"qgnomeplatform",
"radvd",
"rdist",
"rng-tools",
"rootfiles",
"rp-pppoe",
"rsync",
"rygel",
"samba-client",
"sane-backends-drivers-scanners",
"scl-utils",
"seabios-bin",
"seavgabios-bin",
"selinux-policy-targeted",
"setroubleshoot",
"setroubleshoot-plugins",
"setroubleshoot-server",
"setup",
"setuptool",
"sgabios-bin",
"sgpio",
"shadow-utils",
"sheepdog",
"shim",
"sil-abyssinica-fonts",
"sil-mingzat-fonts",
"sil-nuosu-fonts",
"sil-padauk-fonts",
"skkdic",
"smc-fonts-common",
"smc-meera-fonts",
"sos",
"spice-server",
"spice-vdagent",
"sssd",
"sssd-ad",
"sssd-client",
"sssd-common",
"sssd-common-pac",
"sssd-ipa",
"sssd-krb5",
"sssd-krb5-common",
"sssd-ldap",
"stix-fonts",
"sudo",
"sushi",
"symlinks",
"system-config-printer-udev",
"systemd",
"tabish-eeyek-fonts",
"tar",
"tcl",
"tcpdump",
"teamd",
"telnet",
"thai-scalable-fonts-common",
"thai-scalable-waree-fonts",
"time",
"totem",
"totem-nautilus",
"traceroute",
"tree",
"usb_modeswitch",
"usb_modeswitch-data",
"usbutils",
"usermode",
"userspace-rcu",
"util-linux",
"vconfig",
"vim-minimal",
"virglrenderer",
"vlgothic-fonts",
"wget",
"which",
"wireless-tools",
"words",
"wpa_supplicant",
"wvdial",
"xcb-util-image",
"xcb-util-keysyms",
"xcb-util-renderutil",
"xcb-util-wm",
"xdg-user-dirs-gtk",
"xdg-utils",
"xen-licenses",
"xfsprogs",
"xorg-x11-drv-ati",
"xorg-x11-drv-evdev",
"xorg-x11-drv-fbdev",
"xorg-x11-drv-intel",
"xorg-x11-drv-libinput",
"xorg-x11-drv-nouveau",
"xorg-x11-drv-openchrome",
"xorg-x11-drv-qxl",
"xorg-x11-drv-vesa",
"xorg-x11-drv-vmware",
"xorg-x11-drv-wacom",
"xorg-x11-server-Xorg",
"xorg-x11-utils",
"xorg-x11-xauth",
"xorg-x11-xinit",
"xz",
"yelp",
"zd1211-firmware",
"zip"
],
"default_target": "graphical.target",
"comment-for-packages": "Keep this in sync with fedora-atomic-host.json from fedora-atomic",
"packages-aarch64": ["grub2-efi", "ostree-grub2", "efibootmgr", "shim"],
"packages-armhfp": ["extlinux-bootloader"],
"packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],
"packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],
"packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",
"efibootmgr", "shim", "microcode_ctl"]
}