diff --git a/Makefile b/Makefile index ca8011b..c1f57d1 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,5 @@ -# Get the version name first by seeing if HEAD is tagged -version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1) -# And if it wasn't use a git hash -ifeq ($(version),) - version := $(shell git log -1 --abbrev=8 --pretty=git%h) -endif +# Get a version name based off the nearest tag (include lightweight tags) +version := $(shell git describe --tags) DESTDIR := /usr diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks index 3569bee..4c7beeb 100644 --- a/custom/qa-test-day.ks +++ b/custom/qa-test-day.ks @@ -135,29 +135,14 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/ # Remove anaconda welcome screen (if it exists), it would display instead of ours rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop -# Change Firefox start page to open Test Day wiki and IRC chat -# (and a few more properties) -mkdir /tmp/firefox -unzip /usr/lib*/firefox/browser/omni.ja -d /tmp/firefox - -cat << FOE > /tmp/firefox/chrome/en-US/locale/branding/browserconfig.properties -browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day -FOE - -cat << FOE >> /tmp/firefox/defaults/preferences/firefox-branding.js +PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences` +cat << FOE >> $PREFDIR/test-day.js pref("startup.homepage_welcome_url",""); pref("startup.homepage_override_url",""); pref("browser.rights.3.shown", true); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day"); FOE -# We need to re-zip the whole archive (instead of just updating files), because -# the original archive is "Firefox optimized" and updating doesn't work -# https://bugzilla.mozilla.org/show_bug.cgi?id=605524 -OMNIJA=`ls /usr/lib*/firefox/browser/omni.ja` -rm -f $OMNIJA -(cd /tmp/firefox; zip -r -0 $OMNIJA *) -rm -rf /tmp/firefox - # Adjust launchers in dash using a vendor override. (Adding a profile would # be another way to do this.) cat << FOE >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index f3ee21f..58ea91f 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -30,6 +30,9 @@ initial-setup #lets resize / on first boot dracut-modules-growroot +# remove this in %post +dracut-config-generic + # install uboot images uboot-beagle uboot-beaglebone @@ -51,5 +54,8 @@ echo "Disabling tmpfs for /tmp." systemctl mask tmp.mount /usr/sbin/a-b-c + +yum -y remove dracut-config-generic + %end diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks new file mode 100644 index 0000000..15e6b70 --- /dev/null +++ b/fedora-cloud-base.ks @@ -0,0 +1,236 @@ +# This is a basic Fedora 20 spin designed to work in OpenStack and other +# private cloud environments. It's configured with cloud-init so it will +# take advantage of ec2-compatible metadata services for provisioning ssh +# keys. Cloud-init creates a user account named "fedora" with passwordless +# sudo access. The root password is empty and locked by default. +# +# Note that unlike the standard F20 install, this image has /tmp on disk +# rather than in tmpfs, since memory is usually at a premium. +# +# This kickstart file is designed to be used with appliance-creator and +# may need slight modification for use with actual anaconda or other tools. +# We intend to target anaconda-in-a-vm style image building for F20. + +lang en_US.UTF-8 +keyboard us +timezone --utc Etc/UTC + +auth --useshadow --enablemd5 +selinux --enforcing +rootpw --lock --iscrypted locked + +# this is actually not used, but a static firewall +# matching these rules is generated below. +firewall --service=ssh + +bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux + +network --bootproto=dhcp --device=eth0 --onboot=on +services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final + + +zerombr +clearpart --all +part / --size 2048 --fstype ext4 + +%include fedora-repo.ks + + +reboot + +# Package list. +%packages +@core +grubby + +# cloud-init does magical things with EC2 metadata, including provisioning +# a user account with ssh keys. +cloud-init + +# this is used by openstack's cloud orchestration framework (and it's small) +heat-cfntools + +# need this for growpart, because parted doesn't yet support resizepart +# https://bugzilla.redhat.com/show_bug.cgi?id=966993 +cloud-utils-growpart + +# We need this image to be portable; also, rescue mode isn't useful here. +dracut-config-generic +-dracut-config-rescue + +syslinux-extlinux + +# Needed initially, but removed below. +firewalld + +# Basic firewall. If you're going to rely on your cloud service's +# security groups you can remove this. +iptables-services + +# cherry-pick a few things from @standard +tar +rsync + +# Some things from @core we can do without in a minimal install +-biosdevname +-plymouth +-NetworkManager +-iprutils +-kbd + +%end + + + +%post --erroronfail + +# Create grub.conf for EC2. This used to be done by appliance creator but +# anaconda doesn't do it. And, in case appliance-creator is used, we're +# overriding it here so that both cases get the exact same file. +# Note that the console line is different -- that's because EC2 provides +# different virtual hardware, and this is a convenient way to act differently +echo -n "Creating grub.conf for pvgrub" +rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) +mkdir /boot/grub +echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf +for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do + echo "title Fedora ($kv)" >> /boot/grub/grub.conf + echo -e "\troot (hd0)" >> /boot/grub/grub.conf + echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf + echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf + echo +done + + +#link grub.conf to menu.lst for ec2 to work +echo -n "Linking menu.lst to old-style grub.conf for pv-grub" +ln -sf grub.conf /boot/grub/menu.lst +ln -sf /boot/grub/grub.conf /etc/grub.conf + +# older versions of livecd-tools do not follow "rootpw --lock" line above +# https://bugzilla.redhat.com/show_bug.cgi?id=964299 +passwd -l root + +# Kickstart specifies timeout in seconds; syslinux uses 10ths. +# 0 means wait forever, so instead we'll go with 1. +sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf + +# setup systemd to boot to the right runlevel +echo -n "Setting default runlevel to multiuser text mode" +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +# If you want to remove rsyslog and just use journald, remove this! +echo -n "Disabling persistent journal" +rmdir /var/log/journal/ +echo . + +# this is installed by default but we don't need it in virt +echo "Removing linux-firmware package." +yum -C -y remove linux-firmware + +# Remove firewalld; was supposed to be optional in F18+, but is required to +# be present for install/image building. +echo "Removing firewalld." +yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1" + +# Non-firewalld-firewall +echo -n "Writing static firewall" +cat < /etc/sysconfig/iptables +# Simple static firewall loaded by iptables.service. Replace +# this with your own custom rules, run lokkit, or switch to +# shorewall or firewalld as your needs dictate. +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT +-A INPUT -p icmp -j ACCEPT +-A INPUT -i lo -j ACCEPT +-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT +#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT +#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT +-A INPUT -j REJECT --reject-with icmp-host-prohibited +-A FORWARD -j REJECT --reject-with icmp-host-prohibited +COMMIT +EOF +echo . + +# Another one needed at install time but not after that, and it pulls +# in some unneeded deps (like, newt and slang) +echo "Removing authconfig." +yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1" + +echo -n "Getty fixes" +# although we want console output going to the serial console, we don't +# actually have the opportunity to login there. FIX. +# we don't really need to auto-spawn _any_ gettys. +sed -i '/^#NAutoVTs=.*/ a\ +NAutoVTs=0' /etc/systemd/logind.conf + +echo -n "Network fixes" +# initscripts don't like this file to be missing. +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +NOZEROCONF=yes +EOF + +# For cloud images, 'eth0' _is_ the predictable device name, since +# we don't want to be tied to specific virtual (!) hardware +rm -f /etc/udev/rules.d/70* +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules + +# simple eth0 config, again not hard-coded to the build hardware +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE="eth0" +BOOTPROTO="dhcp" +ONBOOT="yes" +TYPE="Ethernet" +EOF + +# generic localhost names +cat > /etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF +echo . + + +# Because memory is scarce resource in most cloud/virt environments, +# and because this impedes forensics, we are differing from the Fedora +# default of having /tmp on tmpfs. +echo "Disabling tmpfs for /tmp." +systemctl mask tmp.mount + +# make sure firstboot doesn't start +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# Uncomment this if you want to use cloud init but suppress the creation +# of an "ec2-user" account. This will, in the absence of further config, +# cause the ssh key from a metadata source to be put in the root account. +#cat < /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg +#users: [] +#disable_root: 0 +#EOF + +echo "Removing random-seed so it's not the same in every image." +rm -f /var/lib/random-seed + +echo "Cleaning old yum repodata." +yum history new +yum clean all +truncate -c -s 0 /var/log/yum.log + +echo "Fixing SELinux contexts." +/usr/sbin/fixfiles -R -a restore + +echo "Zeroing out empty space." +# This forces the filesystem to reclaim space from deleted files +dd bs=1M if=/dev/zero of=/var/tmp/zeros || : +rm -f /var/tmp/zeros +echo "(Don't worry -- that out-of-space error was expected.)" + +%end + diff --git a/fedora-i386-cloud.ks b/fedora-i386-cloud.ks new file mode 100644 index 0000000..88adce9 --- /dev/null +++ b/fedora-i386-cloud.ks @@ -0,0 +1,20 @@ +%include fedora-cloud-base.ks + +# Package list. +%packages +kernel-PAE + +%end +%post +if [ ! -e /etc/sysconfig/kernel ]; then +echo "Creating /etc/sysconfig/kernel." +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel-PAE +EOF +fi +%end diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index 0ec1eeb..f1a767f 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -144,6 +144,7 @@ kde-l10n-* libreoffice-langpack-* man-pages-* mythes-* +-gimp-help-* # Removals -PackageKit-zif diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 322bbe5..a87bc62 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -280,7 +280,7 @@ systemctl enable tmp.mount # work around for poor key import UI in PackageKit rm -f /var/lib/rpm/__db* -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks index 6fdc2ea..c8e14ce 100644 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@ -4,7 +4,7 @@ # - A Spin targeted towards professional designers # Website: http://fedoraproject.org/wiki/Design_Suite # Maintainers: -# - Luya Tshimbalanga +# - Luya Tshimbalanga # - Previous maintainer Sebastian Dziallas %include fedora-live-desktop.ks @@ -27,6 +27,8 @@ font-manager gimp gimp-*-plugin gimp-data-extras +gimp-gap +gimp-paint-studio gimp-high-pass-filter gimp-normalmap gimp-paint-studio @@ -120,13 +122,17 @@ Categories=Graphics;Documentation; FOE chmod a+x /usr/share/applications/inkscape-course.desktop +<<<<<<< HEAD # Add link to the list of design tutorials +======= +# Add link to lists of tutorials +>>>>>>> c125e408da3ede29132ba87e7ea883e7a650fd1b cat >> /usr/share/applications/list-design-tutorials.desktop << FOE [Desktop Entry] Name=List of design tutorials -GenericName=Design tutorials -Comment=List of websites using open source design software -Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials +GenericName=List of design tutorials +Comment=Reference of design related tutorials +Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials Type=Application Icon=applications-graphics Categories=Graphics;Documentation; diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam-kde.ks index 6ddd76b..30a3796 100644 --- a/fedora-live-jam-kde.ks +++ b/fedora-live-jam-kde.ks @@ -33,6 +33,7 @@ alsa-plugins-samplerate alsa-plugins-upmix alsa-plugins-vdownmix a2jmidid +aj-snapshot #jack jack-audio-connection-kit @@ -75,7 +76,7 @@ sooperlooper #recodring and DAW audacity -ardour +ardour3 rosegarden4 seq24 muse @@ -121,6 +122,11 @@ lv2-synthv1 lv2-drumkv1 lv2-triceratops lv2-newtonator +lv2-x42-plugins +lv2-fomp-plugins +lv2-sorcer +lv2-fabla +lv2-artyfx-plugins #dssi nekobee-dssi diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 2637bd4..f1861df 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -28,7 +28,6 @@ calligra fuse liveusb-creator #pavucontrol # pavucontrol has duplicate functionality with kmix -#kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) krusader # file manager, more power-user-oriented than Dolphin (~4 megs) # kdeedu apps diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index b67457e..5a25a46 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -38,7 +38,6 @@ calligra-stage # ~3 megs #twinkle # (~10 megs) fuse liveusb-creator -#kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) # only include kdegames-minimal -kdegames diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks index 61faa07..d1a77f5 100644 --- a/fedora-livecd-soas.ks +++ b/fedora-livecd-soas.ks @@ -26,8 +26,8 @@ rm -f /var/lib/rpm/__db* # Get proper release naming in the control panel cat >> /boot/olpc_build << EOF -Sugar on a Stick 10 (Unknown) -Fedora release 20 (Rawhide) +Sugar on a Stick 10 +Fedora release 20 (Heisenbug) EOF # Add our activities to the favorites @@ -51,6 +51,7 @@ org.laptop.StopWatchActivity org.laptop.community.Finance org.laptop.community.TypingTurtle org.laptop.sugar.Jukebox +org.eq.FotoToon org.gnome.Labyrinth com.laptop.Ruler org.sugarlabs.AbacusActivity diff --git a/fedora-x86_64-cloud.ks b/fedora-x86_64-cloud.ks new file mode 100644 index 0000000..c127a4f --- /dev/null +++ b/fedora-x86_64-cloud.ks @@ -0,0 +1,18 @@ +%include fedora-cloud-base.ks + +%packages +kernel +%end + +%post +if [ ! -e /etc/sysconfig/kernel ]; then +echo "Creating /etc/sysconfig/kernel." +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel +EOF +fi