From c8b361905dedbe2961b4e3c1670d5028eec12807 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 8 Jul 1999 17:52:56 +0000 Subject: *** empty log message *** --- perl-install/Makefile | 4 +++- perl-install/c/Makefile.PL | 4 ++-- perl-install/install2.pm | 7 ++++--- perl-install/my_gtk.pm | 2 ++ perl-install/partition_table.pm | 8 ++++---- perl-install/pkgs.pm | 2 +- perl-install/run_program.pm | 4 ++-- perl-install/share/diskdrake.rc | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) (limited to 'perl-install') diff --git a/perl-install/Makefile b/perl-install/Makefile index d71fdb961..1e8321b0b 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -63,11 +63,12 @@ full_tar: get_needed_files: $(SO_FILES) export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2.pm < /dev/null + perl -pi -e 's|/usr/local/|/usr/|' /tmp/list install -d $(DEST)/bin install -d $(DEST)/usr/bin for i in $(BINS) `grep "\.so" /tmp/list`; do \ - install -s $$i $(DEST)/usr/bin; \ + install -s $$i $(DEST)/lib; \ ldd $$i | sed -e 's/.*=> //' -e 's/ .*//' >> /tmp/list; \ done for i in `sort /tmp/list | uniq`; do \ @@ -98,6 +99,7 @@ as_root: full_stage2: rm -rf $(DEST)/[^M]* + ln -sf .. $(DEST)/Mandrake/instimage @#mkdir -p $(DEST)/Mandrake/base @#ln -s .. $(DEST)/Mandrake/instimage $(MAKE) get_needed_files diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index 355087a52..0562ec1a3 100644 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -4,8 +4,8 @@ use ExtUtils::MakeMaker; WriteMakefile( 'NAME' => 'c', 'VERSION_FROM' => 'c.pm', # finds $VERSION - 'LIBS' => ['-lrpm -ldb1 -lz'], # e.g., '-lm' + 'LIBS' => ['-lrpm -ldb1 -lz -L/usr/X11R6/lib -lX11 -lgdk'], # e.g., '-lm' # 'OBJECT' => 'c.o librpm.a', 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => '-Wall', # e.g., '-I/usr/include/other' + 'INC' => '-Wall `gtk-config --cflags`', # e.g., '-I/usr/include/other' ); diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 611addef3..4ca092c94 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -83,17 +83,17 @@ my @serverPartitioning = ( ); my $default = { - display => "129.104.42.9:0", +# display => "192.168.1.8:0", user => { name => 'foo', password => 'foo', shell => '/bin/bash', realname => 'really, it is foo' }, rootPassword => 'toto', lang => 'us', isUpgrade => 0, installClass => 'Server', - bootloader => { onmbr => 0, linear => 0 }, + bootloader => { onmbr => 1, linear => 0 }, mkbootdisk => 0, comps => [ qw() ], packages => [ qw() ], - partitionning => { clearall => 1, eraseBadPartitions => 1, autoformat => 1 }, + partitionning => { clearall => 0, eraseBadPartitions => 1, autoformat => 1 }, partitions => [ { mntpoint => "/boot", size => 16 << 11, type => 0x83 }, { mntpoint => "/", size => 300 << 11, type => 0x83 }, @@ -210,6 +210,7 @@ sub main { $o->{prefix} = $testing ? "/tmp/test-perl-install" : "/mnt"; mkdir $o->{prefix}, 0755; $o->{method} = install_methods->new('cdrom'); + $o = install_steps_graphical->new($o); $o->{lang} = $o->chooseLanguage; diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 7d92617ad..82ed7040c 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -11,6 +11,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK); @EXPORT_OK = map { @$_ } values %EXPORT_TAGS; use Gtk; +use c; 1; @@ -200,6 +201,7 @@ sub _create_window($$) { my ($o, $title) = @_; $o->{window} = new Gtk::Window; $o->{window}->set_title($title); + $o->{window}->signal_connect("expose_event" => sub { c::XSetInputFocus($o->{window}->window->XWINDOW) }) if $my_gtk::force_focus; $o->{window}->signal_connect("delete_event" => sub { $o->{retval} = undef; Gtk->main_quit }); $o->{window} } diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index a7d06fb21..d4c8b2484 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -15,7 +15,7 @@ use common qw(:common :system); use partition_table_raw; -@important_types = ("Linux native", "Linux swap", "DOS FAT16"); +@important_types = ("Linux native", "Linux swap", "DOS FAT16", "Win98 FAT32"); my %types = ( 0 => "Empty", @@ -29,9 +29,9 @@ my %types = ( 8 => "AIX", 9 => "AIX bootable", 10 => "OS/2 Boot Manager", - 0xb => "Win98 FAT32", - 0xc => "Win98 FAT32 0xb", - 0xe => "Win98 FAT32 0xc", + 0xb => "Win98 FAT32 0xb", + 0xc => "Win98 FAT32", + 0xe => "Win98 FAT32 0xd", 0x12 => "Compaq setup", 0x40 => "Venix 80286", 0x51 => "Novell?", diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 6031735e1..a65b3eb90 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -141,7 +141,7 @@ sub psFromHeaderListDesc { sub psFromHeaderListFile { my ($file) = @_; local *F; - sysopen F, $file, 0 or die "error opening header file: $!"; + sysopen F, $file, 0 or die "error opening header file $file: $!"; psFromHeaderListDesc(\*F, 0); } diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index e4f2a7ef8..db191691a 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -19,8 +19,8 @@ sub rooted($$@) { { open STDIN, "/dev/null" or die "can't open /dev/null as stdin"; - open STDERR, ">> /dev/tty5" or open STDERR, ">> /tmp/exec.log" or die "runProgramRoot can't log :("; - open STDOUT, ">> /dev/tty5" or open STDOUT, ">> /tmp/exec.log" or die "runProgramRoot can't log :("; + open STDERR, ">> /dev/tty7" or open STDERR, ">> /tmp/exec.log" or die "runProgramRoot can't log :("; + open STDOUT, ">> /dev/tty7" or open STDOUT, ">> /tmp/exec.log" or die "runProgramRoot can't log :("; $root and chroot $root; chdir "/"; diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc index ffbf762b1..13804f8ca 100644 --- a/perl-install/share/diskdrake.rc +++ b/perl-install/share/diskdrake.rc @@ -35,5 +35,5 @@ style "white" = "font" widget "*PART_*" binding "bind" widget "*Linux*" style "red" widget "*Linux swap" style "green" -widget "*DOS*" style "blue" +widget "*FAT*" style "blue" widget "*Empty*" style "white" -- cgit v1.2.1