CCISS

Makefile.build

@@ -3,7 +3,7 @@ INAUGURATOR_VERSION=$(shell python setup.py --version)
 KERNEL_DIR=build/kernel
 PYTHON_DIST_FILENAME=dist/inaugurator-${INAUGURATOR_VERSION}.linux-x86_64.tar.gz
 KERNEL_IMAGE_PATH=$(KERNEL_DIR)/boot/vmlinuz-$(KERNEL_VERSION)
-
+INAUGURATOR_YUM_REPO = http://yum-repo.dc1.strato/repos/inaugurator/packages/
 
 .PHONY: build
 build: build/inaugurator.vmlinuz build/inaugurator.thin.initrd.img build/inaugurator.fat.initrd.img ${PYTHON_DIST_FILENAME}
@@ -21,7 +21,7 @@ extract_kernel_rpm: $(KERNEL_DIR)/kernel-$(KERNEL_VERSION).rpm
 $(KERNEL_DIR)/kernel-$(KERNEL_VERSION).rpm: /usr/bin/yumdownloader
 	-@mkdir build
 	-@mkdir $(KERNEL_DIR)
-	yumdownloader --downloadonly kernel-$(KERNEL_VERSION) --destdir $(KERNEL_DIR)
+	yumdownloader --downloadonly --resolve kernel-$(KERNEL_VERSION) --destdir $(KERNEL_DIR)
 
 build/inaugurator.%.initrd.img: build/inaugurator.%.initrd.dir
 	( cd $< ; find . | cpio -o -H newc ) | gzip -9 > $@.tmp
@@ -98,6 +98,7 @@ build/inaugurator.thin.initrd.dir: ${PYTHON_DIST_FILENAME} build/osmosis/dist/os
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh ahci
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh isofs
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh ata_piix
+	$(MAKE) cciss
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh cciss
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh ipmi_msghandler
 	DEST=$@.tmp KERNEL_UNAME_R=$(KERNEL_VERSION) sh/relative_copy_driver.sh ipmi_si
@@ -157,7 +158,13 @@ build_container: build/build-inaugurator.dockerfile setup.py
 	rpm -ivhF $<
 
 /tmp/busybox.rpm:
-	curl -o $@ http://yum-repo.dc1.strato/repos/busybox/busybox-1.30.1-2.fc31.x86_64.rpm
+	curl -o $@ $(INAUGURATOR_YUM_REPO)/busybox-1.30.1-2.fc31.x86_64.rpm
+
+cciss: /tmp/cciss.rpm
+	rpm -ivhF $<
+
+/tmp/cciss.rpm:
+	curl -o $@ $(INAUGURATOR_YUM_REPO)/kmod-cciss-3.6.26-8.el7_8.elrepo.x86_64.rpm
 
 /usr/bin/ipmitool:
 	sudo yum install -y ipmitool