#93 WIP: Add rpm-ostree jigdo spec
Closed 4 years ago by walters. Opened 4 years ago by walters.
walters/fedora-atomic jigdo-spec  into  f27

file modified
+1 -1
@@ -10,7 +10,7 @@ 

  tree_name   = docker-host

  tree_file   = %(os_name)s-%(tree_name)s.json

  arch        = x86_64

- release     = f23

+ release     = f28

  ref         = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s

  yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/

  # lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides

@@ -0,0 +1,21 @@ 

+ # Suppress most build root processing since we are just carrying binary data

+ %global __os_install_post /usr/lib/rpm/brp-compress %{nil}

+ Name: fedora-atomic-host

+ Version:	%{ostree_version}

+ Release:	1%{?dist}

+ Summary:	Image (rpm-ostree jigdo) for Fedora Atomic Host

+ License:	MIT

+ 

+ %description

+ %{summary}

+ 

+ %prep

+ 

+ %build

+ 

+ %install

+ mkdir -p %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}

+ for x in *; do mv ${x} %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}; done

+ 

+ %files

+ %{_prefix}/lib/ostree-jigdo/%{name}

file modified
+8 -4
@@ -7,8 +7,8 @@ 

  

      "documentation": false,

  

-     "automatic_version_prefix": "25",

-     "mutate-os-release": "25",

+     "automatic_version_prefix": "28",

+     "mutate-os-release": "28",

  

      "initramfs-args": ["--no-hostonly", "--add", "iscsi"],

  
@@ -88,6 +88,7 @@ 

           "curl",

           "iptables-services", "iptables",

           "NetworkManager",

+          "dnsmasq",

           "hostname", "initscripts", "iproute", "iputils", "less",

           "sos",

           "openssh-clients", "openssh-server", "passwd",
@@ -114,6 +115,8 @@ 

           "docker",

           "python-docker-py",

           "iscsi-initiator-utils",

+          "glusterfs", "glusterfs-fuse",

+          "ceph-common",

           "oddjob-mkhomedir",

           "oci-register-machine",

           "oci-systemd-hook",
@@ -130,8 +133,9 @@ 

  

      "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],

  

-     "packages-x86_64": ["grub2", "grub2-efi", "ostree-grub2",

-                          "efibootmgr", "shim", "atomic-devmode"],

+     "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",

+                          "efibootmgr", "shim", "atomic-devmode",

+                          "microcode_ctl"],

  

      "default_target": "multi-user.target",

  

file modified
-3
@@ -4,6 +4,3 @@ 

  

  # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295

  echo 'Storage=persistent' >> /etc/systemd/journald.conf

- 

- # Work around https://github.com/systemd/systemd/issues/4082

- find /usr/lib/systemd/system/ -type f -exec sed -i -e '/^PrivateTmp=/d' -e '/^Protect\(Home\|System\)=/d' {} \;

2 new commits added

  • local repos
  • wip local only
4 years ago

rebased onto c5b79f7

4 years ago

rebased onto 11b0a0d

4 years ago

Pull-Request has been closed by walters

4 years ago