Merge remote-tracking branch 'origin/pr/263'

* origin/pr/263:
  kernel: integrate dummy-psu and dummy-backlight

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "dummy-psu"]
+	path = dummy-psu
+	url = https://github.com/QubesOS/qubes-dummy-psu
+[submodule "dummy-backlight"]
+	path = dummy-backlight
+	url = https://github.com/QubesOS/qubes-dummy-backlight

Makefile

@@ -55,6 +55,7 @@ verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
 
 get-sources: $(SRC_FILE) $(SIGN_FILE) $(SPI_SRC_FILE)
+	git submodule update --init --recursive
 
 $(SRC_FILE):
 	@wget -q -N $(URL)

Makefile.builder

@@ -1,4 +1,14 @@
 ifeq ($(PACKAGE_SET),dom0)
 RPM_SPEC_FILES := kernel.spec
 NO_ARCHIVE := 1
+
+INCLUDED_SOURCES = dummy-psu dummy-backlight
+SOURCE_COPY_IN := $(INCLUDED_SOURCES)
+
+$(INCLUDED_SOURCES): PACKAGE=$@
+$(INCLUDED_SOURCES): VERSION=$(shell git -C $(ORIG_SRC)/$(PACKAGE) rev-parse --short HEAD)
+$(INCLUDED_SOURCES):
+	$(BUILDER_DIR)/scripts/create-archive $(CHROOT_DIR)/$(DIST_SRC)/$(PACKAGE) $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)/
+	mv $(CHROOT_DIR)/$(DIST_SRC)/$(PACKAGE)/$(PACKAGE)-$(VERSION).tar.gz $(CHROOT_DIR)/$(DIST_SRC)
+	sed -i "s#@$(PACKAGE)@#$(PACKAGE)-$(VERSION).tar.gz#" $(CHROOT_DIR)/$(DIST_SRC)/kernel.spec.in
 endif

kernel.spec.in

@@ -109,6 +109,8 @@ Source0:        linux-%{upstream_version}.tar.xz
 %else
 Source0:        linux-%{upstream_version}.tar.gz
 %endif
+Source1:        @dummy-psu@
+Source2:        @dummy-backlight@
 Source6:        macbook12-spi-driver-ddfbc7733542b8474a0e8f593aba91e06542be4f.tar.gz
 Source16:       guards
 Source17:       apply-patches
@@ -201,6 +203,13 @@ make clean $MAKE_ARGS
 
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
+rm -rf %_builddir/dummy-psu
+tar -x -C %_builddir -zf %{SOURCE1}
+
+rm -rf %_builddir/dummy-backlight
+tar -x -C %_builddir -zf %{SOURCE2}
+
 rm -rf %_builddir/u2mfn
 u2mfn_ver=`dkms status u2mfn|tail -n 1|cut -f 2 -d ' '|tr -d ':,:'`
 if [ -n "$u2mfn_ver" ]; then
@@ -217,6 +226,16 @@ cd %kernel_build_dir
 
 make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
 
+# Build dummy-psu module
+if [ -d "%_builddir/dummy-psu" ]; then
+    make -C %kernel_build_dir M=%_builddir/dummy-psu modules
+fi
+
+# Build dummy-backlight module
+if [ -d "%_builddir/dummy-backlight" ]; then
+    make -C %kernel_build_dir M=%_builddir/dummy-backlight modules
+fi
+
 # Build u2mfn module
 if [ -d "%_builddir/u2mfn" ]; then
     make -C %kernel_build_dir M=%_builddir/u2mfn modules
@@ -280,6 +299,12 @@ dd if=/dev/zero of=%buildroot/boot/initramfs-%kernelrelease.img \
 gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease.gz
 
 make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+if [ -d "%_builddir/dummy-psu" ]; then
+    make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/dummy-psu
+fi
+if [ -d "%_builddir/dummy-backlight" ]; then
+    make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/dummy-backlight
+fi
 if [ -d "%_builddir/u2mfn" ]; then
     make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/u2mfn
 fi