diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-02-15 06:13:06 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-02-15 06:13:06 +0000 |
| commit | 309e58a7192b9dcbb38367626bc43e524f79dc93 (patch) | |
| tree | 02d95c56c534f2df985015fb2ae38ca68e910aee | |
| parent | 9ae2821d58e757284038c409e0b831d7e9f234c6 (diff) | |
| download | drakx-backup-do-not-use-309e58a7192b9dcbb38367626bc43e524f79dc93.tar drakx-backup-do-not-use-309e58a7192b9dcbb38367626bc43e524f79dc93.tar.gz drakx-backup-do-not-use-309e58a7192b9dcbb38367626bc43e524f79dc93.tar.bz2 drakx-backup-do-not-use-309e58a7192b9dcbb38367626bc43e524f79dc93.tar.xz drakx-backup-do-not-use-309e58a7192b9dcbb38367626bc43e524f79dc93.zip | |
(recompress_modules) kill it as we do not need anymore to recompress
modules as XZ (since kernel now compress them with XZ)
(remove_unneeded_modules) search for .xz extension instead of .gz
| -rw-r--r-- | images/NEWS | 3 | ||||
| -rwxr-xr-x | images/update_kernel | 1 | ||||
| -rw-r--r-- | kernel/modules.pl | 10 |
3 files changed, 4 insertions, 10 deletions
diff --git a/images/NEWS b/images/NEWS index eb8e17784..f798f3374 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,6 @@ +- do not recompress modules as XZ since kernel now compress + them with XZ + Version 1.64 - 9 February 2012 by Anne Nicolas - fix isolinux.bin copy due to syslinux 4 diff --git a/images/update_kernel b/images/update_kernel index 867041cb9..934f5195e 100755 --- a/images/update_kernel +++ b/images/update_kernel @@ -74,7 +74,6 @@ sub extract_installed_rpm { sys('perl', '../kernel/modules.pl', 'remove_unneeded_modules', $kern_ver); sys('perl', '../kernel/modules.pl', 'get_firmwares', $kern_ver); - sys('perl', '../kernel/modules.pl', 'recompress_modules', $kern_ver); sys('perl', '../kernel/modules.pl', 'make_modules_per_image', $kern_ver); rm_rf("$local_dir/modules"); diff --git a/kernel/modules.pl b/kernel/modules.pl index a939f7605..b64c92fa2 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -59,20 +59,12 @@ sub remove_unneeded_modules { my @all = modules(); my @all_with_deps = map { dependencies_closure($_) } @all; - my %wanted_modules = map { (list_modules::modname2filename($_) . ".ko.gz" => 1) } @all_with_deps; + my %wanted_modules = map { (list_modules::modname2filename($_) . ".ko.xz" => 1) } @all_with_deps; foreach (all("all.kernels/$kern_ver/modules")) { $wanted_modules{$_} or unlink "all.kernels/$kern_ver/modules/$_"; } } -sub recompress_modules { - my ($kern_ver) = @_; - - my $dir = "all.kernels/$kern_ver/modules"; - - system("cd $dir ; xzme *.ko.gz") == 0 or die "xzme failed\n"; -} - sub make_modules_per_image { my ($kern_ver) = @_; |