Use the higher tag when there are more than one

If two or more tags of the right format point point to HEAD, we probably want the later of the two.
2025-12-10 17:10:31 +08:00 · 2013-08-20 21:44:29 -05:00
19 changed files with 17 additions and 38 deletions
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
+version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
 # And if it wasn't use a git hash
 ifeq ($(version),)
  version := $(shell git log -1 --abbrev=8 --pretty=git%h)
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -4,9 +4,6 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

-# configure extlinux bootloader
-bootloader extlinux
-
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig

@@ -25,7 +22,6 @@ kernel-lpae

 chrony
 arm-boot-config
-extlinux-bootloader
 initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
--- a/fedora-arm-desktop-vfat.ks
+++ b/fedora-arm-desktop-vfat.ks
@@ -3,8 +3,6 @@
 %include fedora-desktop-packages.ks
 %include fedora-arm-vfat-partitioning.ks

-part / --size=4000 --fstype ext4
-
 %packages
 -initial-setup

--- a/fedora-arm-desktop.ks
+++ b/fedora-arm-desktop.ks
@@ -3,8 +3,6 @@
 %include fedora-desktop-packages.ks
 %include fedora-arm-partitioning.ks

-part / --size=4000 --fstype ext4
-
 %packages
 -initial-setup

--- a/fedora-arm-kde-vfat.ks
+++ b/fedora-arm-kde-vfat.ks
@@ -3,8 +3,6 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-vfat-partitioning.ks

-part / --size=4000 --fstype ext4
-
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -3,7 +3,7 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-partitioning.ks

-part / --size=4000 --fstype ext4
+part / --size=3400 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate-vfat.ks
+++ b/fedora-arm-mate-vfat.ks
@@ -3,7 +3,7 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-vfat-partitioning.ks

-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -3,7 +3,7 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-partitioning.ks

-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-minimal-vfat.ks
+++ b/fedora-arm-minimal-vfat.ks
@@ -1,9 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-vfat-partitioning.ks

-part swap --size=128 --fstype swap
-part / --size=1400 --fstype ext4
-
 %post

 # setup systemd to boot to the right runlevel
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,9 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-partitioning.ks

-part swap --size=128 --fstype swap
-part / --size=1400 --fstype ext4
-
 %post

 # setup systemd to boot to the right runlevel
--- a/fedora-arm-partitioning.ks
+++ b/fedora-arm-partitioning.ks
@@ -1,3 +1,4 @@
+bootloader --location=none
 part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
--- a/fedora-arm-vfat-partitioning.ks
+++ b/fedora-arm-vfat-partitioning.ks
@@ -1,3 +1,4 @@
+bootloader --location=none
 part /boot/uboot --size=20 --fstype vfat
 part swap --size=512 --fstype swap
 part / --size=3400 --fstype ext4
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch

 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -205,10 +205,6 @@ systemctl stop atd.service 2> /dev/null || :
 # Mark things as configured
 touch /.liveimg-configured

-# add static hostname to work around xauth bug
-# https://bugzilla.redhat.com/show_bug.cgi?id=679486
-echo "localhost" > /etc/hostname
-
 EOF

 # bah, hal starts way too late
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -102,7 +102,7 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
 favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
 #Enable categories in Gnome Shell
-app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+app-folder-categories=['Utilities','Others','System Settings','Sundry','Graphics','Games','Office','Multimedia','Network','Internet']
 FOE

 # Add link to the Inkscape Course
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -2,7 +2,7 @@
 #
 # Description:
 # - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default 1 GiB version
+#   see fedora-livecd-kde.ks for the default CD-sized version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
+# - Fedora Livecd Spin with the K Desktop Environment (KDE)
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -10,9 +10,6 @@
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks

-# DVD payload
-part / --size=4096
-

 %packages
 # unwanted packages from @kde-desktop
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,3 +1,3 @@
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-$releasever&arch=$basearch
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-#%include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-non-rawhide.ks