bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 09:03:23 -05:00
Code Issues Projects Releases Wiki Activity

Had to add user-mode-linux/usr/lib/uml to the path to allow --home to

Browse Source 
find port-helper, or otherwise root_fs complain.  Have no idea why
this change exists with port-helper because wasn't the case before.
Also, added path for user-mode-linux/usr/bin to find the other tools.

Also, improves all in Makefile
This commit is contained in:
freesource 2002-12-16 16:57:14 +00:00
parent 405d19a98e
commit 8f31699e79
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Changes
View File

@ -1,6 +1,19 @@
1.4.0 - 12/12/2002 1.4.0 - 12/12/2002
------------------ ------------------
Had to add user-mode-linux/usr/lib/uml to the path to allow --home to
find port-helper, or otherwise root_fs complain. Have no idea why
this change exists with port-helper because wasn't the case before.
Also, added path for user-mode-linux/usr/bin to find the other tools.
When root_fs_helper was running with the newer Expect.pm, and
consequentially the newer uml kernel it became necessary to get out
when the kernel shuts down with a last function right when it says
"Power down."
Checks for the proper version for newer libc6 linkers. Hopefully,
should work properly with libc6 > 2.3.1, too.
1.3.6 - 03/10/2002 1.3.6 - 03/10/2002
------------------ ------------------

14
Makefile.pkg
View File

@ -2,7 +2,7 @@
# buildroot, UML, and gbootroot. # buildroot, UML, and gbootroot.
VERSION=2.4.19 VERSION=2.4.19
PATCH_VERSION=35 PATCH_VERSION=38
UTIL_VER=20021103 UTIL_VER=20021103
BASE_DIR=${shell pwd} BASE_DIR=${shell pwd}
@ -48,7 +48,7 @@ TOOLS = $(UTIL_DIR)/mconsole $(UTIL_DIR)/port-helper $(UTIL_DIR)/moo $(UTIL_DIR)
##BUSYBOX_SITE=http://busybox.lineo.com ##BUSYBOX_SITE=http://busybox.lineo.com
all: world all: world
world: kernel target world: sources initrd
sources: $(BASE_DIR) sources: $(BASE_DIR)
@if [ ! -e $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \ @if [ ! -e $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \
@ -77,7 +77,7 @@ sources: $(BASE_DIR)
fi; fi;
kernel: kernel:
@if [ ! -f $(KERNEL_DIR)/.config ] ; then \ @if [ ! -f $(KERNEL_DIR)/.config ] ; then \
cp $(KCONFIG) $(KERNEL_DIR)/.config; \ cp $(KCONFIG) $(KERNEL_DIR)/.config; \
(cd $(KERNEL_DIR); make oldconfig); \ (cd $(KERNEL_DIR); make oldconfig); \
@ -92,7 +92,7 @@ kernel:
root_fs_helper: root_fs_helper: genext2fs
@if [ ! -f $(ROOT_FS_DIR)/root_fs_helper ] ; then \ @if [ ! -f $(ROOT_FS_DIR)/root_fs_helper ] ; then \
perl -I . ./gbootroot --home . --template Helper.yard --root-filename root_fs_helper --filesystem-command "genext2fs -z -r0" --genext2fs-dir genext2fs/ ; \ perl -I . ./gbootroot --home . --template Helper.yard --root-filename root_fs_helper --filesystem-command "genext2fs -z -r0" --genext2fs-dir genext2fs/ ; \
@ -103,7 +103,7 @@ root_fs_helper:
cp -fa $(TMP)/root_fs_helper_cramfs $(ROOT_FS_DIR)/root_fs_helper; \ cp -fa $(TMP)/root_fs_helper_cramfs $(ROOT_FS_DIR)/root_fs_helper; \
fi; fi;
initrd: root_fs_helper initrd: modules root_fs_helper
@if [ ! -f $(ROOT_FS_DIR)/Initrd.gz ] ; then \ @if [ ! -f $(ROOT_FS_DIR)/Initrd.gz ] ; then \
perl -I. ./gbootroot --home . --template Initrd.yard --root-filename Initrd --uml-exclusively on --expect-program ./expect_uml --uml-kernel user-mode-linux/usr/bin/linuxbr --root-fs-helper root_filesystem/root_fs_helper --filesystem-size 4096; \ perl -I. ./gbootroot --home . --template Initrd.yard --root-filename Initrd --uml-exclusively on --expect-program ./expect_uml --uml-kernel user-mode-linux/usr/bin/linuxbr --root-fs-helper root_filesystem/root_fs_helper --filesystem-size 4096; \
@ -111,7 +111,7 @@ initrd: root_fs_helper
fi; fi;
modules: modules: kernel
cd linux-$(VERSION) ; \ cd linux-$(VERSION) ; \
mkdir ../modules-2.4 ; \ mkdir ../modules-2.4 ; \
make modules ARCH=um ; \ make modules ARCH=um ; \
@ -142,7 +142,7 @@ tools:
for d in $(TOOLS) ; do $(MAKE) -C $$d all ; done for d in $(TOOLS) ; do $(MAKE) -C $$d all ; done
for d in $(TOOLS) ; do $(MAKE) -C $$d install DESTDIR=$(BASE_DIR)/user-mode-linux; done for d in $(TOOLS) ; do $(MAKE) -C $$d install DESTDIR=$(BASE_DIR)/user-mode-linux; done
genext2fs: genext2fs: tools
@if [ ! -f $(GENEXT2_DIR)/genext2fs ] ; then \ @if [ ! -f $(GENEXT2_DIR)/genext2fs ] ; then \
$(MAKE) -C $(GENEXT2_DIR); \ $(MAKE) -C $(GENEXT2_DIR); \
fi; fi;

13
gbootroot
View File

@ -232,6 +232,19 @@ BEGIN {
} }
my $pwd = `pwd`; chomp $pwd;
my $tools = grep(/$pwd\/user-mode-linux\/usr\/bin/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/bin:" . $ENV{'PATH'};
}
$tools = grep(/$pwd\/user-mode-linux\/usr\/lib\/uml/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
}
use BootRoot::Options; use BootRoot::Options;
option(); option();