From b5dd85f8099879b701b3bbdb8e7e50ab415fe789 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 20:28:31 +0100 Subject: images: Convert image generation to dracut. This converts the initrd generation from a home grown system to dracut. It uses the upstream modules where possible plus two specially written dracut modules: mgainstaller and mgakadeploy. The initrds are identical for all builds and there are lots of bits that are incomplete and unnecesary. e.g. copying the kernels to a folder and then not using them, and also the module-descriptions file is not included in the initrd itself which it should be. We can probably customise the initrd better for different use cases, e.g. perhaps network stuff is not needed for HD based installs? We may also need to install the mdraid and lvm modules for some HD support. This is the first attempt so I expect various bits need fixing --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 18956e2cf..131c604f9 100644 --- a/images/Makefile +++ b/images/Makefile @@ -26,7 +26,7 @@ tar: $(info $(PRODUCT)-$(VERSION).tar.xz is ready) clean: - rm -rf images isolinux all.kernels modules.description + rm -rf images isolinux all.kernels modules.description build find . -name "*~" -o -name ".#*" | xargs rm -f install: -- cgit v1.2.1 From 9ed019141f6a9aa6739028b248d5b7baa30f8f9b Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 29 Oct 2013 22:21:25 +0100 Subject: 1.94 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 131c604f9..07168eb99 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.93 +VERSION=1.94 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 4fcf71c999dc5970a7ecce93ea51a9a4f4058b4f Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 30 Oct 2013 20:36:51 +0000 Subject: images: Clear out some stuff that no longer used. Now that initrds are generated via dracut, there is no need to prepare kernel modules. This sadly removes support for passing in a kernel rpm file, but such is life. --- images/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 07168eb99..c25e965bd 100644 --- a/images/Makefile +++ b/images/Makefile @@ -8,7 +8,7 @@ IMAGES_DEST = $(ROOTDEST)/install/images all: images -images: all.kernels +images: all.kernels/.list DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img rm -rf images/alternatives if [ `ls images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then \ @@ -16,7 +16,7 @@ images: all.kernels fi cd images ; md5sum *.{img,iso}* > MD5SUM -all.kernels: update_kernel ../kernel/list_modules.pm +all.kernels/.list: update_kernel ./update_kernel $(KERNELS) dist: tar -- cgit v1.2.1 From 08224de522b278761c73d50a0bc8010abc18e855 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 30 Oct 2013 20:39:00 +0000 Subject: images: Add a short circuit rule to make boot.iso for testing --- images/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index c25e965bd..29c20e904 100644 --- a/images/Makefile +++ b/images/Makefile @@ -8,6 +8,11 @@ IMAGES_DEST = $(ROOTDEST)/install/images all: images +boot.iso: images/boot.iso + +images/boot.iso: all.kernels/.list make_boot_img + DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img images/boot.iso + images: all.kernels/.list DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img rm -rf images/alternatives @@ -37,3 +42,5 @@ install: rm -rf $(ROOTDEST)/isolinux cp -af isolinux $(ROOTDEST) endif + +.PHONY: boot.iso install clean dist tar images -- cgit v1.2.1 From 4cada761d6b112291f021dd9dffb4fd5c97ac99b Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 11:49:59 +0000 Subject: 1.95 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 29c20e904..7aa589a19 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.94 +VERSION=1.95 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 9d8b9a7114fb75e354667245937aa18561ed5d95 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 2 Nov 2013 20:38:12 +0159 Subject: switch to 2.00 to mark the big changes to dracut intrd and syslinux --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 7aa589a19..3d54152f8 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.95 +VERSION=2.00 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 68a6562894f4d85e94721cc51264c80670c65615 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 5 Nov 2013 12:33:10 +0000 Subject: images: 2.1 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 3d54152f8..386792f2a 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.00 +VERSION=2.1 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 6298fe9b2ec4be3c8845a0ab39c90ad76ea7a49e Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Wed, 13 Nov 2013 14:45:44 +0100 Subject: 2.2 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 386792f2a..1cd48e38e 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.1 +VERSION=2.2 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 0bd4b8c6da4c1886d554ac0d6b0dc2617fc33f27 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 07:17:25 +0100 Subject: 2.3 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 1cd48e38e..f80c4f732 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.2 +VERSION=2.3 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1 From 4ff405c965bf8d1c7ee6eabfd2d2a6a96a4346b3 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Sun, 15 Dec 2013 21:50:01 +0100 Subject: 2.4 --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index f80c4f732..142cfd577 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.3 +VERSION=2.4 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) -- cgit v1.2.1