diff --git a/Makefile b/Makefile index b74ed09..b8eebc6 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,9 @@ QBSLOGOS_VERSION := $(call spec_version,qubes-logos/qubes-logos.spec) QBSRELEASE_VERSION := $(call spec_version,qubes-release/qubes-release.spec) REVISOR_VERSION := $(call spec_version,revisor/revisor.spec) -REVISOR_OPTS := --install-dvd +PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages ifdef QUBES_RELEASE - REVISOR_OPTS += --product-version="$(QUBES_RELEASE)" + PUNGI_OPTS += --isfinal --ver="$(QUBES_RELEASE)" endif help: @@ -116,11 +116,9 @@ update-repo-unstable: ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/ iso: - cp rpm_verify /usr/local/bin/ - ln -sf `pwd` /tmp/qubes-installer - revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 $(REVISOR_OPTS) -d99 - isohybrid build/ISO/qubes-x86_64/iso/*.iso - rpm_verify build/work/revisor-install/*/qubes-x86_64/x86_64/os/Packages/*.rpm + # TODO? cp rpm_verify /usr/local/bin/ + pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg + # TODO rpm_verify build/work/revisor-install/*/qubes-x86_64/x86_64/os/Packages/*.rpm clean-repos: @echo "--> Removing old rpms from the installer repos..." diff --git a/build-deps-iso.list b/build-deps-iso.list index fb9eece..6410b20 100644 --- a/build-deps-iso.list +++ b/build-deps-iso.list @@ -1,12 +1,2 @@ -revisor -revisor-cli -revisor-cobbler -revisor-comps -revisor-gui -revisor-isolinux -revisor-mock -revisor-reuseinstaller -revisor-unity -revisor-unity-scripts anaconda -syslinux +pungi diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index e4e9c6a..f725c74 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -1,35 +1,81 @@ + + core + Core + false + false + + audit + basesystem + bash + biosdevname + coreutils + cronie + curl + dhclient + e2fsprogs + filesystem + glibc + hostname + initscripts + iproute + iprutils + iputils + kbd + less + man-db + ncurses + parted + passwd + plymouth + procps-ng + rootfiles + rpm + rsyslog + selinux-policy-targeted + setup + shadow-utils + sudo + systemd + util-linux + vim-minimal + yum + NetworkManager + sendmail + + base Base true + false at authconfig bzip2 cronie - cryptsetup-luks dbus device-mapper-multipath diffutils dmraid dump ed - eject + util-linux gnupg2 irqbalance linux-firmware logrotate lsof - man + man-db man-pages mcelog mdadm microcode_ctl mlocate nano + ntp ntsysv numactl parted @@ -41,11 +87,12 @@ prelink qubes-release-notes quota - readahead + systemd rsyslog smartmontools sudo symlinks + tar time tmpwatch tree @@ -58,10 +105,54 @@ zip + + anaconda-tools + Anaconda tools + Anaconda-Werkzeuge + Anaconda eszközök + Anaconda ツール + Anaconda-verktøy + Anaconda gereedschappen + Narzędzia dla instalatora Anaconda + Засоби Anaconda + Anaconda 工具 + + false + false + + authconfig + btrfs-progs + chkconfig + cryptsetup + device-mapper-multipath + dmraid + dosfstools + dracut-network + e2fsprogs + efibootmgr + firewalld + gfs2-utils + grub2 + grub2-efi + hfsplus-tools + iscsi-initiator-utils + lvm2 + mactel-boot + mdadm + ntfsprogs + reiserfs-utils + shim + system-config-firewall-base + tboot + uboot-tools + xfsprogs + + base-x X Window System true + false desktop-backgrounds-basic firstboot @@ -77,7 +168,7 @@ kde-desktop-qubes - KDE Software Compilation + KDE Desktop Environment true kcm_touchpad @@ -89,12 +180,88 @@ xsettings-kde + + xfce-desktop-qubes + Xfce (EXPERIMENTAL) + A lightweight desktop environment that works well on low end machines. + true + true + + abrt-desktop + desktop-backgrounds-compat + xfce4-panel + xfce4-session + xfce4-settings + xfconf + xfdesktop + xfwm4 + ConsoleKit + firstboot + + lightdm-gtk + gtk-xfce-engine + gvfs + openssh-askpass + Terminal + xfce4-about + xfce4-appfinder + xfce4-power-manager + xfce4-session-engines + xfwm4-theme-nodoka + xscreensaver-base + yumex + ConsoleKit-x11 + blueman + xdg-user-dirs-gtk + adwaita-cursor-theme + adwaita-gtk2-theme + adwaita-gtk3-theme + greybird-gtk2-theme + greybird-gtk3-theme + greybird-xfce4-notifyd-theme + greybird-xfwm4-theme + albatross-gtk2-theme + albatross-gtk3-theme + albatross-xfwm4-theme + bluebird-gtk2-theme + bluebird-gtk3-theme + bluebird-xfwm4-theme + xfce4-datetime-plugin + xfce4-places-plugin + xfce4-quicklauncher-plugin + xfce4-screenshooter-plugin + xfwm4-themes + + + + xfce-extra-plugins + Extra plugins for the Xfce panel + true + true + + xfce4-battery-plugin + xfce4-cpugraph-plugin + xfce4-diskperf-plugin + xfce4-eyes-plugin + xfce4-fsguard-plugin + xfce4-genmon-plugin + xfce4-mount-plugin + xfce4-sensors-plugin + xfce4-systemload-plugin + xfce4-taskmanager + xfce4-time-out-plugin + xfce4-timer-plugin + xfce4-verve-plugin + xfce4-xkb-plugin + + qubes Qubes Environment true + false - kernel-qubes-dom0 + kernel qubes-core-dom0 qubes-gui-dom0 qubes-logos @@ -105,4 +272,21 @@ qubes-gpg-split-dom0 + + + qubes + 1 + Qubes Install + Qubes standard installation. + + base + base-x + qubes + kde-desktop-qubes + + + xfce-desktop-qubes + xfce-extra-plugins + + diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf deleted file mode 100644 index 29982a8..0000000 --- a/conf/qubes-install.conf +++ /dev/null @@ -1,49 +0,0 @@ -# Revisor base config file - -[revisor] -media_installation_dvd = 1 -media_installation_cd = 0 -media_installation_tree = 0 -media_utility_rescue = 0 -media_live_optical = 0 -media_live_thumb = 0 - -# Set these to the absolute minimum -dependency_resolve_allow_conflicts = 0 -mode_respin = 1 - -kickstart_manifest = 1 -kickstart_file = /tmp/qubes-installer/conf/qubes-kickstart.cfg -kickstart_include = 0 -kickstart_default = 1 - -copy_local = 1 - -answer_yes = 1 -getsource = 0 - -bugurl = http://wiki.qubes-os.org/ - -include_bootiso = 0 - -# Defaults for all models in this file -product_name = Qubes -product_path = Packages -iso_basename = Qubes -iso_label = Qubes -version = test-build -version_from = F13 -comps_filter = 0 -revisor_comps = 1 -comps = /tmp/qubes-installer/conf/comps-qubes.xml - -destination_directory = /tmp/qubes-installer/build/ISO -working_directory = /tmp/qubes-installer/build/work/ - -## Models - -[qubes-x86_64] -description = Qubes for x86_64 -main = /tmp/qubes-installer/conf/qubes-x86_64.conf -iso_basename = Qubes -architecture = x86_64 diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg index 75dd248..04fe788 100644 --- a/conf/qubes-kickstart.cfg +++ b/conf/qubes-kickstart.cfg @@ -3,8 +3,14 @@ # Package manifest for the compose. Uses repo group metadata to translate groups. # (@base is added by default unless you add --nobase to %packages) # (default groups for the configured repos are added by --default) + +repo --name=fedora --ignoregroups=true --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-18&arch=x86_64 +repo --name=installer --baseurl=file:///tmp/qubes-installer/yum/installer/ +repo --name=qubes-dom0 --baseurl=file:///tmp/qubes-installer/yum/qubes-dom0/ +repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/ %packages @base-x --nodefaults @kde-desktop-qubes @qubes +@anaconda-tools %end diff --git a/conf/qubes-x86_64.conf b/conf/qubes-x86_64.conf deleted file mode 100644 index 3c72b3c..0000000 --- a/conf/qubes-x86_64.conf +++ /dev/null @@ -1,52 +0,0 @@ -[main] -exclude=*.i?86 -cachedir=-yumcache -reposdir= -keepcache=1 -debuglevel=1 -logfile=-yum.log -pkgpolicy=newest -distroverpkg=qubes-release -tolerant=1 -exactarch=1 -obsoletes=1 -gpgcheck=1 -plugins=1 -metadata_expire=1800 -installroot=/tmp/qubes-installer/build/work/revisor -failovermethod=priority - -[fedora] -name=Fedora 13 - x86_64 -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/x86_64/os/ -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64 -enabled=1 -gpgcheck=1 -gpgkey=file:///tmp/qubes-installer/keys/fedora-13.asc -enablegroups=0 -cost=10 - - -[installer] -name=Qubes Local Repository -baseurl=file:///tmp/qubes-installer/yum/installer/ -enabled=1 -gpgcheck=0 -gpgkey=file:///tmp/qubes-installer/keys/qubes-release-1-signing-key.asc -cost=1 - -[qubes-dom0] -name=Qubes Local Repository -baseurl=file:///tmp/qubes-installer/yum/qubes-dom0/ -enabled=1 -gpgcheck=0 -gpgkey=file:///tmp/qubes-installer/keys/qubes-release-1-signing-key.asc -cost=1 - -[dom0-updates] -name=Qubes Dom0 Updates Local Repository -baseurl=file:///tmp/qubes-installer/yum/dom0-updates/ -enabled=1 -gpgcheck=0 -gpgkey=file:///tmp/qubes-installer/keys/qubes-release-1-signing-key.asc -cost=1