spins October 2015

spins@lists.fedoraproject.org

11 participants
50 discussions

[spin-kickstarts/f23] live base: Migrate yum's yumdb over to dnf
by Kalev Lember 22 Oct '15

22 Oct '15

commit f46ca3331f91817afe67f220b0df78d84fd70207 Author: Kalev Lember <klember(a)redhat.com> Date: Thu Oct 22 13:46:48 2015 +0200 live base: Migrate yum's yumdb over to dnf As livecd-creator is still yum based, we only get yum's yumdb during live image composes. To work this around, this commit adds a %post script to fedora-live-base.ks to migrate yum's yumdb over to dnf. https://bugzilla.redhat.com/show_bug.cgi?id=1274319 fedora-live-base.ks | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) --- diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 0d38791..2a22a6d 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -275,6 +275,15 @@ chmod 755 /etc/rc.d/init.d/livesys-late # enable tmpfs for /tmp systemctl enable tmp.mount +# As livecd-creator is still yum based, we only get yum's yumdb during the +# image compose. Migrate this over to dnf so that dnf and PackageKit can keep +# track where packages came from. +if [ ! -d /var/lib/dnf ]; then + mkdir -p /var/lib/dnf + mv /var/lib/yum/yumdb /var/lib/dnf/ + rm -rf /var/lib/yum/ +fi + # make it so that we don't do writing to the overlay for things which # are just tmpdirs/caches # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475

1 0

[spin-kickstarts/f23] arm: fix up boot partitions
by Peter Robinson 21 Oct '15

21 Oct '15

commit fdc93b365951745f7aac75d08efca59a7111ccea Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Wed Oct 21 09:47:44 2015 +0100 arm: fix up boot partitions fedora-arm-base.ks | 2 +- fedora-arm-minimal.ks | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index e0a7537..a64b980 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh # configure extlinux bootloader bootloader extlinux -part /boot --size=300 --fstype ext3 +part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap part / --size=3000 --fstype ext4 diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index afd7d9b..86f4e38 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,6 @@ %include fedora-arm-base.ks +part /boot --size=300 --fstype ext4 part swap --size=256 --fstype swap part / --size=1200 --fstype ext4

1 0

[spin-kickstarts: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts
by Peter Robinson 21 Oct '15

21 Oct '15

commit fa2c69cad831d92b872656de0814991df05e6f68 Merge: 098f03f a6d3b1c Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Wed Oct 21 09:48:09 2015 +0100 Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts fedora-live-kde-base.ks | 2 + fedora-live-workstation.ks | 31 +------------------ snippets/packagekit-cached-metadata.ks | 53 ++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 30 deletions(-) ---

1 0

[spin-kickstarts: 1/2] arm: fix up boot partitions
by Peter Robinson 21 Oct '15

21 Oct '15

commit 098f03f685839f0d7f92763521abe5b829e0c15c Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Wed Oct 21 09:47:44 2015 +0100 arm: fix up boot partitions fedora-arm-base.ks | 2 +- fedora-arm-minimal.ks | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index e0a7537..a64b980 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh # configure extlinux bootloader bootloader extlinux -part /boot --size=300 --fstype ext3 +part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap part / --size=3000 --fstype ext4 diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index afd7d9b..86f4e38 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,6 @@ %include fedora-arm-base.ks +part /boot --size=300 --fstype ext4 part swap --size=256 --fstype swap part / --size=1200 --fstype ext4

1 0

[spin-kickstarts] (2 commits) ...Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts
by Peter Robinson 21 Oct '15

21 Oct '15

Summary of changes: 098f03f... arm: fix up boot partitions fa2c69c... Merge branch 'master' of ssh://git.fedorahosted.org/git/spi

1 0

[spin-kickstarts] Created tag 0.24.1
by Bruno Wolff III 20 Oct '15

20 Oct '15

The lightweight tag '0.24.1' was created pointing to: a6d3b1c... packagekit-cached-metadata.ks: Set up resolv.conf and hosts

1 0

[spin-kickstarts] Created tag 0.23.5
by Bruno Wolff III 20 Oct '15

20 Oct '15

The lightweight tag '0.23.5' was created pointing to: 0bc399c... packagekit-cached-metadata.ks: Set up resolv.conf and hosts

1 0

[spin-kickstarts] packagekit-cached-metadata.ks: Set up resolv.conf and hosts files
by Kalev Lember 20 Oct '15

20 Oct '15

commit a6d3b1c4561db37fc209fa1fc0ce45cb3935c107 Author: Kalev Lember <klember(a)redhat.com> Date: Tue Oct 20 20:23:23 2015 +0200 packagekit-cached-metadata.ks: Set up resolv.conf and hosts files Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot. snippets/packagekit-cached-metadata.ks | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) --- diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks index 163f2cb..af206b0 100644 --- a/snippets/packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -1,7 +1,20 @@ # %post script to include initial metadata for PackageKit +%post --nochroot +# Copy over files needed for networking inside the chroot +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart +done +%end + %post +# Use host machine's resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && mv $f $f.orig + test -f $f.kickstart && mv -f $f.kickstart $f +done + PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then @@ -31,4 +44,10 @@ if [ -d /var/cache/PackageKit ] ; then fi rm -rf $PK_PREFIX +# Restore original resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + rm -f $f + test -f $f.orig && mv $f.orig $f +done + %end

1 0

[spin-kickstarts] packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org
by Kalev Lember 20 Oct '15

20 Oct '15

commit d293e561f4fda68698fc5537789d9f4ae31dbedc Author: Kalev Lember <klember(a)redhat.com> Date: Tue Oct 20 20:18:58 2015 +0200 packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org It turns out that koji builders can't access kojipkgs.fedoraproject.org over https, but plain http works just fine. snippets/packagekit-cached-metadata.ks | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks index 140d5e5..163f2cb 100644 --- a/snippets/packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -6,22 +6,22 @@ PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$release…' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$release…' \ $PK_PREFIX/etc/yum.repos.d/fedora.repo fi if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-release…' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-release…' \ $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo fi if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing…' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing…' \ $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo fi if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$b…' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$b…' \ $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo fi rpm --root=$PK_PREFIX --initdb

1 0

[spin-kickstarts] Move packagekit-cached-metadata.ks to snippets/
by Kalev Lember 20 Oct '15

20 Oct '15

commit 2459d8254be561f0167398e5d1e10ccb8a3f0cb8 Author: Kalev Lember <klember(a)redhat.com> Date: Tue Oct 20 20:17:29 2015 +0200 Move packagekit-cached-metadata.ks to snippets/ ... and make it a top-level script wrapped in %post ... %end. fedora-live-kde-base.ks | 3 +-- fedora-live-workstation.ks | 3 +-- .../packagekit-cached-metadata.ks | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) --- diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 1d5ed5c..3e1d26a 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -4,6 +4,7 @@ %include fedora-live-base.ks %include fedora-kde-packages.ks +%include snippets/packagekit-cached-metadata.ks %post @@ -19,8 +20,6 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF -%include fedora-packagekit-cached-metadata.ks - # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks index cc8ef57..376ee72 100644 --- a/fedora-live-workstation.ks +++ b/fedora-live-workstation.ks @@ -4,6 +4,7 @@ %include fedora-live-base.ks %include fedora-workstation-packages.ks +%include snippets/packagekit-cached-metadata.ks part / --size 6144 @@ -12,8 +13,6 @@ part / --size 6144 # This is a huge file and things work ok without it rm -f /usr/share/icons/HighContrast/icon-theme.cache -%include fedora-packagekit-cached-metadata.ks - cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks similarity index 96% rename from fedora-packagekit-cached-metadata.ks rename to snippets/packagekit-cached-metadata.ks index d2ef0f1..140d5e5 100644 --- a/fedora-packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -1,4 +1,7 @@ -# Copy initial metadata for PackageKit +# %post script to include initial metadata for PackageKit + +%post + PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then @@ -28,3 +31,4 @@ if [ -d /var/cache/PackageKit ] ; then fi rm -rf $PK_PREFIX +%end

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

spins October 2015