summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2012-05-31 11:12:47 +0000
committerAnne Nicolas <ennael@mageia.org>2012-05-31 11:12:47 +0000
commit522f3f33bdb0e21df02aeb8adba84d89e2d63873 (patch)
treea0c303f58705f94cf06596d019736b006030ea04
parentc033bbd849fc48fe9699c05e78f4799dc1c1e757 (diff)
parent230a1313cec8798ea39f018ebf6b3058692a6f39 (diff)
downloaddrakx-522f3f33bdb0e21df02aeb8adba84d89e2d63873.tar
drakx-522f3f33bdb0e21df02aeb8adba84d89e2d63873.tar.gz
drakx-522f3f33bdb0e21df02aeb8adba84d89e2d63873.tar.bz2
drakx-522f3f33bdb0e21df02aeb8adba84d89e2d63873.tar.xz
drakx-522f3f33bdb0e21df02aeb8adba84d89e2d63873.zip
Really create 2 branch
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS6
-rwxr-xr-ximages/make_boot_img2
3 files changed, 8 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile
index e75671831..8ee7d1dc8 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.74
+VERSION=1.75
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/3.*)
diff --git a/images/NEWS b/images/NEWS
index 99bd44eb1..bbed45d11 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,8 @@
-Version 1.74 - 5 April 2012 by Thierry Vignaud
+Version 1.75 - 17 May 2012 by Thomas Backlund
+
+- add modules.order and modules.builtin in initrd
+
+Version 1.74 - 13 May 2012 by Thierry Vignaud
- include "fuse" module (mga#5685)
diff --git a/images/make_boot_img b/images/make_boot_img
index 935d44e1e..a31a01b6f 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -202,6 +202,8 @@ fi
my $modz = "all.kernels$I/$ext";
mkdir_p("$tmp_initrd/modules/$ext");
__ "tar xC $tmp_initrd/modules/$ext -f $modz/${type}_modules.tar";
+ _ "cp -f $modz/modules.$_ $tmp_initrd/modules/$ext" foreach qw(order builtin);
+ substInFile { s,.*/,, } "$tmp_initrd/modules/$ext/modules.order";
_ "depmod -b $tmp_initrd $ext";
# depmod keeps only available modules in modules.alias, but we want them all
_ "cp -f $modz/modules.alias $modz/modules.description $tmp_initrd/modules/$ext";