aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/phpbbcli.php
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2017-09-09 13:39:35 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2017-09-09 13:41:04 +0200
commited7ec01feaf439f316c0203ec169850419ba0477 (patch)
treec9e292f996e9616ab582d948b2505a9e37f42863 /phpBB/install/phpbbcli.php
parent16da17a4ba4b55404dba2b3416d8c62971ba16ca (diff)
downloadforums-ed7ec01feaf439f316c0203ec169850419ba0477.tar
forums-ed7ec01feaf439f316c0203ec169850419ba0477.tar.gz
forums-ed7ec01feaf439f316c0203ec169850419ba0477.tar.bz2
forums-ed7ec01feaf439f316c0203ec169850419ba0477.tar.xz
forums-ed7ec01feaf439f316c0203ec169850419ba0477.zip
[ticket/15355] Remove version field when no update is available
PHPBB3-15355
Diffstat (limited to 'phpBB/install/phpbbcli.php')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-27 20:49:35 +0000
'>includemode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:41:21 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:41:21 +0000
commit809ea7bf3deca015520b7b324a647d6a2e2c287d (patch)
tree22227484f58331569f55b171d611cf3016bfad8d /make_boot_img
parente7e3129dfc54432e08ed55873ffc52b84f1f588c (diff)
downloaddrakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.gz
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.bz2
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.xz
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.zip
Merge from AMD64 branch, also fix all.rdz generation.
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img12
1 files changed, 10 insertions, 2 deletions
diff --git a/make_boot_img b/make_boot_img
index 6d7ac0af0..85d6db50b 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -73,13 +73,17 @@ foreach (@kernels) {
rename("$img-$main", "$img");
}
}
+if ($arch =~ /x86_64/ && $img =~ /all/) {
+ # isolinux is supposed to work on all those new hardware
+ isolinux($main, @kernels);
+}
if ($arch =~ /i.86/ && $img =~ /all/) {
isolinux($main, @kernels);
my ($img, $img_sav) = ("images/cdrom.img-$main", 'images/cdrom.img-sav');
rename($img, $img_sav);
$type = 'cdrom';
- boot_img_i386($mnt, $img, "kernel/all.kernels/$main/boot/vmlinu*", sub { $_[0] =~ s/\bautomatic=\S+\b//; "$_[0] changedisk" });
+ $::{"boot_img_$arch"}->($mnt, $img, "kernel/all.kernels/$main/boot/vmlinu*", sub { $_[0] =~ s/\bautomatic=\S+\b//; "$_[0] changedisk" });
rename($img, 'images/cdrom-changedisk.img');
rename($img_sav, $img);
}
@@ -103,6 +107,7 @@ sub initrd {
_ "$sudo mount -t ext2 $tmp $mnt -o loop";
_ "$sudo tar xjC $mnt -f $tar";
+ symlinkf "/tmp/stage2/lib64", "$mnt/lib64" if ($arch =~ /x86_64/);
install_stripped("$instdir/init", "$mnt/sbin");
install_stripped("$instdir/$install", "$mnt/sbin/stage1");
@@ -114,7 +119,7 @@ sub initrd {
_ "$sudo mknod $mnt/dev/ttyp0 c 3 0";
}
- if (member($type, qw(pcmcia all network)) && $arch !~ /ppc/ && $arch !~ /ia64/) {
+ if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64|x86_64/) {
_ "$sudo cp -a /etc/pcmcia $mnt/etc";
_ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp";
_ "tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp kernel/all.modules/$main/modules.dep";
@@ -215,6 +220,9 @@ F3 boot.msg
_ "df $mnt";
}
+# alias to x86 variant, slightly bigger with images though
+sub boot_img_x86_64 { &boot_img_i386 }
+
sub boot_img_alpha {
my ($mnt, $img) = @_;
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-27 20:49:35 +0000