From f6a6692c931788d209a44a23cb01f9a18a7175dc Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Jun 19 2018 15:07:31 +0000 Subject: productimg packages are no longer used --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 --- a/.gitignore +++ /dev/null diff --git a/anaconda-gtk.css b/anaconda-gtk.css deleted file mode 100644 index 3928ad5..0000000 --- a/anaconda-gtk.css +++ /dev/null @@ -1,63 +0,0 @@ -@define-color fedora #2f4265; - -/* logo and sidebar classes for Fedora */ - -/* The sidebar consists of three parts: a background, a logo, and a product logo, - * rendered in that order. The product logo is empty by default and is intended - * to be overridden by a stylesheet in product.img. - */ -.logo-sidebar { - background-image: url('/usr/share/anaconda/pixmaps/sidebar-bg.png'); - background-color: @fedora; - background-repeat: no-repeat; -} - -/* Add a logo to the sidebar */ -.logo { - background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo.png'); - background-position: 50% 20px; - background-repeat: no-repeat; - background-color: transparent; -} - -/* This is a placeholder to be filled by a product-specific logo. */ -.product-logo { - background-image: none; - background-color: transparent; -} - -AnacondaSpokeWindow #nav-box { - background-color: @fedora; - background-image: url('/usr/share/anaconda/pixmaps/topbar-bg.png'); - background-repeat: no-repeat; - color: white; -} - -/* Remove the box-shadow from buttons in the nav-box because it adds a white stripe - * below the buttons and makes them look dumb */ -AnacondaSpokeWindow #nav-box GtkButton { - box-shadow: none; -} - - -/* Change the sidebar background color */ -.logo-sidebar { - background-color: #006eb4; -} - -AnacondaSpokeWindow #nav-box { - background-color: #006eb4; -} - -/* Move the Fedora logo to the bottom */ -.logo { - background-position: 50% 90%; -} - -/* Add the product logo at the top */ -.product-logo { - background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo_flavor.png'); - background-position: 12px 10.5em; - background-repeat: no-repeat; -} - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5604096 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +productimg packages are no longer used diff --git a/fedora-productimg-atomic.spec b/fedora-productimg-atomic.spec deleted file mode 100644 index 0dd84a4..0000000 --- a/fedora-productimg-atomic.spec +++ /dev/null @@ -1,118 +0,0 @@ -%global loraxtarget %{_datadir}/lorax/product -%global loraxanacondadir %{loraxtarget}/usr/share/anaconda -%global pixmapsource %{_datadir}/anaconda/pixmaps/atomic - -Name: fedora-productimg-atomic -Version: 28 -Release: 2%{?dist} -Summary: Installer branding and configuration for Fedora Atomic - -# Copyright and related rights waived via CC0 -# http://creativecommons.org/publicdomain/zero/1.0/ -License: CC0 - -Source0: anaconda-gtk.css -Source1: installclass_atomic.py - -BuildArch: noarch - -BuildRequires: cpio, findutils, xz - -Provides: lorax-product-atomic - -%description -This package contains differentiated branding and configuration for Fedora -Atomic for use in a product.img file for Anaconda, the Fedora installer. It -is not useful on an installed system. - -%prep - -%build - -%install -install -m 755 -d %{buildroot}%{loraxtarget}/run/install/product/pyanaconda/installclasses -install -m 644 %{SOURCE1} %{buildroot}%{loraxtarget}/run/install/product/pyanaconda/installclasses -install -m 755 -d %{buildroot}%{loraxanacondadir}/pixmaps -install -m 644 %{SOURCE0} %{buildroot}%{loraxanacondadir} - -ln -sf %{pixmapsource}/sidebar-bg.png %{buildroot}%{loraxanacondadir}/pixmaps -ln -sf %{pixmapsource}/topbar-bg.png %{buildroot}%{loraxanacondadir}/pixmaps - -# note filename change with this one -ln -sf %{pixmapsource}/sidebar-logo.png %{buildroot}%{loraxanacondadir}/pixmaps/sidebar-logo_flavor.png - - -%files -%dir %{loraxtarget}/run/install/product/pyanaconda/installclasses -%{loraxtarget}/run/install/product/pyanaconda/installclasses/*.py* -%dir %{_datadir}/lorax/product/usr/share/anaconda -%{_datadir}/lorax/product/usr/share/anaconda/anaconda-gtk.css -%dir %{_datadir}/lorax/product/usr/share -%dir %{_datadir}/lorax/product/usr -%dir %{loraxanacondadir}/pixmaps -%{loraxanacondadir}/pixmaps/*.png - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 19 2018 Dusty Mabe - 28-1 -- Include Atomic images instead of Cloud images -- https://pagure.io/atomic-wg/issue/385 - -* Mon Nov 27 2017 Colin Walters - 27-1 -- Use Anaconda platform storage APIs -- https://bugzilla.redhat.com/show_bug.cgi?id=1513028 - -* Wed Jul 26 2017 Fedora Release Engineering - 26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 10 2017 Jonathan Lebon - 26-1 -- Introspect Atomic Host payload to determine supported locales -- https://bugzilla.redhat.com/show_bug.cgi?id=1468619 - -* Tue Jun 06 2017 Colin Walters - 25-3 -- New upstream version - -* Fri Feb 10 2017 Fedora Release Engineering - 25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Apr 21 2016 Stephen Gallagher - 25-1 -- Update blivet usage for 2.x API. - -* Wed Feb 03 2016 Fedora Release Engineering - 23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 10 2015 Colin Walters - 23-6 -- Import code from upstream tag v2015.1 -- Adapt to Anaconda/blivet API changes again (rvykydal) - -* Wed Jun 17 2015 Fedora Release Engineering - 23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Feb 22 2015 Colin Walters - 23-3 -- Adapt to Anaconda/blivet API change - -* Tue Feb 17 2015 Colin Walters - 23-2 -- First build for F23 - -* Tue Nov 25 2014 Colin Walters - 22-1 -- Forked for atomic - -* Thu Nov 20 2014 Matthew Miller 22-4 -- provides lorax-product-cloud - -* Thu Nov 20 2014 Matthew Miller 22-3 -- merge changes in from f21 - -* Fri Nov 7 2014 Matthew Miller 22-1 -- bump to 22 for rawhide - -* Thu Nov 6 2014 Matthew Miller 21-2 -- conflict with the other fedora-productimg packages - -* Thu Nov 6 2014 Matthew Miller 21-1 -- change license to CC0 - -* Thu Nov 6 2014 Matthew Miller 21-0 -- Initial creation for Fedora 21 diff --git a/installclass_atomic.py b/installclass_atomic.py deleted file mode 100644 index 62f3b68..0000000 --- a/installclass_atomic.py +++ /dev/null @@ -1,144 +0,0 @@ -# -# installclass_atomic.py -# -# Atomic-specific partitioning defaults -# -# Copyright (C) 2014 Red Hat, Inc. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -import os -import shutil -from pyanaconda.installclasses.fedora import FedoraBaseInstallClass -from pyanaconda.constants import * -from pyanaconda.product import * -from pyanaconda import network -from pyanaconda import nm -from pyanaconda import iutil -import types -from pyanaconda.kickstart import getAvailableDiskSpace -from pyanaconda.storage.partspec import PartSpec -from pyanaconda.storage.autopart import swap_suggestion -from pyanaconda.platform import platform -from blivet.size import Size - -import logging -log = logging.getLogger("anaconda") - -class AtomicInstallClass(FedoraBaseInstallClass): - name = "Atomic Host" - sortPriority = 11000 - hidden = False - defaultFS = "xfs" - - def __init__(self): - self.localemap = {} # loaded lazily - FedoraBaseInstallClass.__init__(self) - - # This is intended right now to match Fedora Server; if changing this, - # please discuss on https://lists.projectatomic.io/projectatomic-archives/atomic-devel/ - def setDefaultPartitioning(self, storage): - autorequests = [PartSpec(mountpoint="/", fstype=storage.default_fstype, - size=Size("3GiB"), max_size=Size("15GiB"), - grow=True, lv=True)] - - bootreqs = platform.set_default_partitioning() - if bootreqs: - autorequests.extend(bootreqs) - - disk_space = getAvailableDiskSpace(storage) - swp = swap_suggestion(disk_space=disk_space) - autorequests.append(PartSpec(fstype="swap", size=swp, grow=False, - lv=True, encrypted=True)) - - for autoreq in autorequests: - if autoreq.fstype is None: - if autoreq.mountpoint == "/boot": - autoreq.fstype = storage.default_boot_fstype - else: - autoreq.fstype = storage.default_fstype - - storage.autopart_requests = autorequests - - def filterSupportedLangs(self, ksdata, langs): - self._initialize_localemap(ksdata.ostreesetup.ref, - ksdata.ostreesetup.url) - for lang in langs: - if lang in self.localemap: - yield lang - - def filterSupportedLocales(self, ksdata, lang, locales): - self._initialize_localemap(ksdata.ostreesetup.ref, - ksdata.ostreesetup.url) - supported = [] - if lang in self.localemap: - for locale in locales: - stripped = self._strip_codeset_and_modifier(locale) - if stripped in self.localemap[lang]: - supported.append(locale) - return supported - - def _initialize_localemap(self, ref, repo): - - if self.localemap: - return - - # fallback to just en_US in case of errors - self.localemap = { "en": ["en_US"] } - - # Let's only handle local embedded repos for now. Anyway, it'd probably - # not be very common to only override ostreesetup through kickstart and - # still want the interactive installer. Though to be nice, let's handle - # that case. - if not repo.startswith("file://"): - log.info("ostree repo is not local; defaulting to en_US") - return - - # convert to regular UNIX path - repo = repo[len("file://"):] - - iutil.mkdirChain(os.path.join(repo, "tmp/usr/lib")) - rc = iutil.execWithRedirect("/usr/bin/ostree", - ["checkout", "--repo", repo, ref, - "--subpath", "/usr/lib/locale/locale-archive", - "%s/tmp/usr/lib/locale" % repo]) - if rc != 0: - log.error("failed to check out locale-archive; check program.log") - return - - for line in iutil.execReadlines("/usr/bin/localedef", - ["--prefix", os.path.join(repo, "tmp"), - "--list-archive"]): - line = self._strip_codeset_and_modifier(line) - if '_' in line: - (lang, territory) = line.split('_', 1) - else: - lang = line - if lang not in self.localemap: - self.localemap[lang] = [line] - else: - self.localemap[lang].append(line) - - # nuke the checkout for good measure - shutil.rmtree(os.path.join(repo, "tmp/usr")) - - @staticmethod - def _strip_codeset_and_modifier(locale): - if '@' in locale: - locale = locale[:locale.find('@')] - if '.' in locale: - locale = locale[:locale.find('.')] - return locale - diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 --- a/sources +++ /dev/null