Fc29

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "qubes-release"]
+ path = qubes-release
+ url = https://github.com/QubesOS/qubes-qubes-release

.travis.yml

@@ -9,9 +9,9 @@ after_script:
  - tail -n 100 ~/qubes-builder/build-logs/installer-qubes-os-iso-*.log
  - ls -l ~/qubes-builder/iso
 env:
- - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-full.ks USE_QUBES_REPO_VERSION=4.0 RPM_BUILD_DEFINES=--nocheck
- - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unsigned.ks USE_QUBES_REPO_VERSION=4.0 EXPECT_FAILURE=./expected-failure
- - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unknown-key.ks USE_QUBES_REPO_VERSION=4.0 EXPECT_FAILURE=./expected-failure
+ - DIST_DOM0=fc29 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-full.ks USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 RPM_BUILD_DEFINES=--nocheck
+ - DIST_DOM0=fc29 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unsigned.ks USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 EXPECT_FAILURE=./expected-failure
+ - DIST_DOM0=fc29 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unknown-key.ks USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 EXPECT_FAILURE=./expected-failure
 
 # don't build tags which are meant for code signing only
 branches:

Makefile

@@ -30,6 +30,7 @@ else
  ISO_VERSION := $(shell date +%Y%m%d)
 endif
 PUNGI_OPTS += --ver="$(ISO_VERSION)"
+PUNGI_OPTS += --rootfs-size=4
 
 INSTALLER_KICKSTART ?= $(PWD)/conf/qubes-kickstart.cfg
 LIVE_KICKSTART ?= $(PWD)/conf/liveusb.ks
@@ -81,6 +82,9 @@ clean-repos:
 clean:
  sudo rm -fr build/*
 
+get-sources:
+ git submodule update --init --recursive
+
 ifeq ($(ISO_LIVEUSB),1)
 get-sources:
  $(MAKE) -C livecd-tools get-sources

Makefile.builder

@@ -1,14 +1,3 @@
-RPM_SPEC_FILES.dom0 := \
- pykickstart/pykickstart.spec \
- blivet/python-blivet.spec \
- lorax/lorax.spec \
- lorax-templates-qubes/lorax-templates-qubes.spec \
- pungi/pungi.spec \
- anaconda/anaconda.spec \
- qubes-anaconda-addon/qubes-anaconda-addon.spec \
- qubes-release/qubes-release.spec \
- qubes-release/qubes-dom0-dist-upgrade.spec
-
 ifeq ($(ISO_LIVEUSB),1)
 RPM_SPEC_FILES.dom0 += \
  livecd-tools/livecd-tools.spec \