Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/installer

2011-07-17 14:44:09 +02:00 · 2011-07-17 14:44:09 +02:00 · 09593833d6
commit 09593833d6
parent 777ecee640 bf57b2a3f5
11 changed files with 175 additions and 5 deletions
--- a/3rd-party-packages/.gitignore
+++ b/3rd-party-packages/.gitignore
@ -0,0 +1,2 @@
+rpm/
+*.src.rpm
--- a/3rd-party-packages/Makefile
+++ b/3rd-party-packages/Makefile
@ -0,0 +1,7 @@
+rpms:
+	./nvidia_build.sh
+	rpm --addsign rpm/x86_64/kmod-nvidia-*.rpm
+
+clean:
+	rm *.src.rpm
+	rm -rf rpm/
--- a/3rd-party-packages/nvidia_build.sh
+++ b/3rd-party-packages/nvidia_build.sh
@ -0,0 +1,126 @@
+#!/bin/sh
+
+
+cd $(dirname $0)
+CACHEDIR=$(mktemp -d ${TMPDIR:-/tmp}/yumcache.XXXXXX)
+
+releasever=13
+basearch=x86_64
+
+yumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
+
+trap "rm -f $yumconf; rm -rf $CACHEDIR" EXIT
+
+# Done this way to easier replace some values (just modify variable)
+cat > $yumconf <<EOF
+[main]
+cachedir=$CACHEDIR
+keepcache=0
+gpgcheck=1
+plugins=0
+reposdir=
+tsflags=nodocs
+
+[rpmfusion-free]
+name=RPM Fusion for Fedora $releasever - Nonfree
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-free-fedora-$releasever-primary
+
+[rpmfusion-free-updates]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-free-fedora-$releasever-primary
+
+[rpmfusion-free-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-free-fedora-$releasever-primary
+
+
+[rpmfusion-free-updates-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-free-fedora-$releasever-primary
+
+[rpmfusion-nonfree]
+name=RPM Fusion for Fedora $releasever - Nonfree
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-nonfree-fedora-$releasever-primary
+
+[rpmfusion-nonfree-updates]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-nonfree-fedora-$releasever-primary
+
+[rpmfusion-nonfree-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Source
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-nonfree-fedora-$releasever-primary
+
+
+[rpmfusion-nonfree-updates-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file://$PWD/../keys/rpmfusion-nonfree-fedora-$releasever-primary
+EOF
+
+mkdir -p rpm/$basearch
+yumdownloader -c $yumconf --destdir=rpm/$basearch --resolve -x 'kmod-nvidia-*' xorg-x11-drv-nvidia livna-config-display
+
+yumdownloader -c $yumconf --source nvidia-kmod
+
+if rpm -K *.rpm rpm/$basearch/*.rpm | grep -v pgp; then
+	echo "ERROR: Unverified/Invalid packages found! Aborting"
+	exit 1
+fi
+
+if [ $1 ]; then
+	KERNEL_VER=$1
+else
+	# Try to find kernel version
+	KERNEL_PKG=`ls ../yum/qubes-dom0/rpm/ |grep kernel-[0-9]`
+	if [ "$KERNEL_PKG" ]; then
+		KERNEL_VER=$(echo $KERNEL_PKG | sed -e 's/kernel-//g;s/\.rpm//g')
+	else
+		echo "ERROR: Cannot find version of kernel for Qubes Dom0, provide it as parameter"
+		exit 1
+	fi
+fi
+
+if ! rpm -q kernel-devel-$KERNEL_VER; then
+	echo "ERROR: Install kernel-devel package first!"
+	exit 1
+fi
+
+rpmbuild -D "kernels $KERNEL_VER" --rebuild nvidia-kmod-*.src.rpm 
+# Unfortunately --define _rpmdir doesn't work with --rebuild
+RPMDIR=`rpm -E '%_rpmdir'`
+mv $RPMDIR/$basearch/kmod-nvidia-$KERNEL_VER*rpm rpm/$basearch/
--- a/anaconda/anaconda.spec
+++ b/anaconda/anaconda.spec
@ -4,7 +4,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 13.42
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1000
 License: GPLv2+
 Group:   Applications/System
--- a/anaconda/booty/x86.py
+++ b/anaconda/booty/x86.py
@ -356,7 +356,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
                f.write('\tmodule %s ro%s' %(kernelFile, realroot))
                if self.args.get():
                    f.write(' %s' % self.args.get())
-                f.write(' max_loop=255 rdblacklist=aesni-intel')
+                f.write(' max_loop=255 rdloaddriver=pciback')
                f.write('\n')
                if initrd:
                    f.write('\tmodule %s%s\n' % (cfPath, initrd))
--- a/anaconda/installclasses/qubes.py
+++ b/anaconda/installclasses/qubes.py
@ -97,6 +97,10 @@ class InstallClass(BaseInstallClass):
            if not file in whitelisted:
                subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath,
                    '/sbin/chkconfig', '--level', '5', file, 'off'])
+        # Fix default initramfs (anaconda generates own one...)
+        for kernel in anaconda.backend.kernelVersionList(anaconda.rootPath):
+            subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath,
+                        '/usr/lib/qubes/regenerate_initramfs.sh', kernel[0]])

    def getBackend(self):
        if flags.livecdInstall:
--- a/anaconda/scripts/mk-images.x86
+++ b/anaconda/scripts/mk-images.x86
@ -100,7 +100,7 @@ makeBootImages() {

 	# insert XEN boot options
 	sed -i 's/kernel vmlinuz/kernel mboot.c32/' $MBD_BOOTTREE/isolinux.cfg
-	sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\" rdblacklist=aesni-intel\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg
+	sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\" rdloaddriver=pciback\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg

 	# copy in memtest if present
 	if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then
--- a/firstboot/modules/qubes_setup.py
+++ b/firstboot/modules/qubes_setup.py
@ -171,6 +171,7 @@ class moduleClass(Module):
            '/mnt/template-root'])
        # Copy timezone setting from Dom0 to template
        subprocess.check_call(['cp', '/etc/localtime', '/mnt/template-root/etc'])
+        subprocess.check_call(['cp', '/etc/ntp.conf', '/mnt/template-root/etc'])
        subprocess.check_call(['/bin/umount', '/mnt/template-root'])

    def do_create_appvms(self):
--- a/keys/rpmfusion-nonfree-fedora-13-primary
+++ b/keys/rpmfusion-nonfree-fedora-13-primary
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEr/7bcBEADR9g8j2q5iI+NUJ6ZHS5yht56nPP4I9US/HcPs6PsozMtT0H3j
+eLA+nH6DSn9rVUTS84anaUB6uSf/yzd5yUibnw4XZ6ZE7MaEjM/GIRymRqkV7sIX
+ZTDU88mv3KIHbjC611iROfkH7l8Dl3aWRWOp1XY/G8LIxVC5ExzSFHRI02VXo6nM
+UpnxEoysyvcVsm+gmnnRYDnwN7edYt0M4vHeRcedKu8uhzqw2dBwiSzZssCIZR7/
+qejEJQwSZuEjf7hN7iGIhjQcfrNCxHdcGk8/1tZL2XnDZe/Uxe28nfUTe5wGfufY
+Y70sr3Bnx0eJc/nsGH7RHSBSII2NNXZPmvCSMx0wfNUxq37kok8XkUwL+crV/YIw
+7lcUWTEDY1Y3VAto1uF5EXdrWrSjhmArVMOxiGDYCUyyaBZw84tlI0wq/PKeHYuy
+nDK6JNGa+ZN9Hr/houp7wqxoXOv6SfnAvTGKH0QAsSSAiPQQzDDZReT+rDw+PKmD
+Y+TYVMDoh/hafSFmGOAjShoIl/1PBwy+U0ncMelMvwB0kMR95ygheFe29hDYJH06
+hiX6H9kBTZtvImsKwEwOiPozA1UZdknvyP+2cHcoOClg+uZFeq7aFJ/E5Fw72RO9
+iy8YFeQoN84QAQpOm1rl3GGnGFRLPEGGi92KPXUvvHvaP+cqjGPnFtBhbQARAQAB
+tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMykg
+PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA
+IAUCSv/ttwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJECvvL9IkJbKEGksQ
+AIAK65TxLFj+F4JjRFyd1YvhEUbJKoTpgZ9r4Sz7hcVDOdvnesHugcERvzGrDgd4
+XrmKd0bojBHPTQYROUQ6tu85KdYABZOQTOuB6vKxXVbZgvfNqJzuqsMUklma6uGo
+L0Cy9W6H3YmzmtaupuxCW5HBvWzN3OjXH7KQmW4enH8+2qy1p1mDSHyFuBJoF6UE
+8Jf0q9dsjYArTrTbGFl6n8vrdGCbKHXhGW9J8gsyOIXo8yZzYEkytujjydtr3R/9
+A8LpLeHNiPGU/hnNPHVYZPnYcT7XLy8uhwTgBvhglCVlp9ouZjhPomfqw/qNmjWh
+zDY7lYtEIKeywweOGw9Ft/WCgFlB7X3V4OLK3P2c9HGoAQ1WAohU5Y8gpqyrSt0d
+fs7PrlHoZbYG7bEPc3x9VXAcnMc+FGYP7X1J/lNXWNvqaBrBp8dB73FcNHJOGfa8
+x25V8Tnq1aqCwUS+BQQCSdz637PZrx6KjcTRRLuiEU1KiNeCgFJP6jyffzkbpLPl
+PtNTrD76qoQfNPZqQKlDTwcIii6Yo87SWOvXBZvokrArPxWTFs9fcuHXBS2axHg3
+cLRUC03TASCDSz6WtygouphUBAtDgSC71DLlCbIN8EmXN6C0sSB5Ywnzdsy7yIT2
+2yrVZna0hI/wBR+AqW8jszgJ5JVdEDftqSAKBUxXKela
+=3/KO
+-----END PGP PUBLIC KEY BLOCK-----
--- a/qubes-logos/qubes-logos.spec
+++ b/qubes-logos/qubes-logos.spec
@ -19,7 +19,7 @@ Conflicts: redhat-artwork <= 5.0.5
 BuildRequires: kde-filesystem
 Requires: plymouth-plugin-script
 # For plymouth-set-default-theme
-Requires: plymouth
+Requires: plymouth-scripts



--- a/revisor/revisor.spec
+++ b/revisor/revisor.spec
@ -19,7 +19,7 @@
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            http://fedorahosted.org/revisor