summaryrefslogtreecommitdiffstats
path: root/make_boot_img
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-05-23 06:42:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-05-23 06:42:49 +0000
commit21ce6a9b6268d76406d033470f4f6fa06e9012f1 (patch)
tree37ff6f04457a010eaade7766c97fad206c3cbe6c /make_boot_img
parent74abd5d458c87d244ccd965aaa8acf5627a10591 (diff)
downloaddrakx-21ce6a9b6268d76406d033470f4f6fa06e9012f1.tar
drakx-21ce6a9b6268d76406d033470f4f6fa06e9012f1.tar.gz
drakx-21ce6a9b6268d76406d033470f4f6fa06e9012f1.tar.bz2
drakx-21ce6a9b6268d76406d033470f4f6fa06e9012f1.tar.xz
drakx-21ce6a9b6268d76406d033470f4f6fa06e9012f1.zip
- create kernel/RPMS/ to copy rpms before expanding them in kernel/all.kernels
- remove old compatability code - add some doc in update_kernel
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img10
1 files changed, 3 insertions, 7 deletions
diff --git a/make_boot_img b/make_boot_img
index 702fd27bf..a1e46bbf7 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -5,10 +5,6 @@ use MDK::Common;
Config->import;
my ($arch) = $Config{archname} =~ /(.*?)-/;
-# move stuff to new "kernel" directory
--d 'kernel' or die "directory kernel is missing\n";
-rename 'all.kernels', 'kernel/all.kernels';
-
my $default_append = "ramdisk_size=128000";
# full acpi support for x86_64, enough acpi support for x86 ht, no acpi for others
my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "" : "acpi=off";
@@ -36,9 +32,9 @@ sub mke2fs {
_ "$sudo mkdir -p $tmp_mnt $tmp_mnt_initrd";
mkdir "images";
-my $main = chomp_(cat_('kernel/all.kernels/.main'));
-my $main_BOOT = chomp_(cat_('kernel/all.kernels/.main-BOOT'));
-my @kernels = grep { /^2/ } grep { !/xbox/ } all('kernel/all.kernels');
+my $main = chomp_(cat_('kernel/RPMS/.main'));
+my $main_BOOT = chomp_(cat_('kernel/RPMS/.main-BOOT'));
+my @kernels = grep { !/xbox/ } all('kernel/all.kernels');
my @kernels_BOOT = grep { /BOOT/ } @kernels;
my @all_images = (