Browse Source

Some stuff which I neglected to commit.

master
freesource 22 years ago
parent
commit
8689e00a9a
  1. 2
      BootRoot/BootRoot.pm
  2. 33
      Changes
  3. 8
      gbootroot_pkg
  4. 89
      pkg/dpkg/gbootroot/changelog
  5. 2
      pkg/dpkg/gbootroot/control
  6. 6
      pkg/rpm/filelist
  7. 6
      pkg/rpm/gbootroot-mdk.spec
  8. 6
      pkg/rpm/gbootroot.spec
  9. 2
      user-mode-linux/usr/lib/uml/config
  10. 3
      yard/templates/Example.yard

2
BootRoot/BootRoot.pm

@ -64,7 +64,7 @@ my $uml_xterm = "xterm -e";
# and to make sure modules are correct in Initrd.gz
# apply special patches
my $version = "1.4.0";
my $version = "1.4.1";
my $date = "01.14.2003";
my $gtk_perl_version = "0.7002";
my $home_rootfs = "$home/root_filesystem/";

33
Changes

@ -1,35 +1,24 @@
Updated to 2.4.19-49um and the latest uml tools 20030202.
Updated to 2.4.19-50um and the latest uml tools 20030202.
Fixed a @INC problem with rpm packages. The fhs checks usually insert
the module path (Debian std. path) into @INC via a BEGIN {}, but the
new BootRoot::Options was trying to be loaded before the fact because
it had been placed within the BEGIN{}.
*Fix glibc with uml_mconsole and genext2fs for distributions using
libc6 2.2.5 since the version previously included was being compiled
for 2.3.1. Accomplished this by making gbootroot within redhat 7.3
or stable Debian
Added a new if/elsif control structure. \ if ( condition ) \n
statement(s) \n elsif ( condition ) \n statements elsif .. \ Nice
functionality to have.
* make libc6 dep for debian >= 2.3.1. .. good idea?
Made the Example.yard and Helper.yard templates portable with the new
if/elsif control structure, and added pam.d/system-auth if it exists
on the system.
* Helper and Initrd need to take into consideration getties for mdk
and redhat.
Added format rules found in Example* to the main documentation.
* mdk is now history, but will still be supported
Compiled for >= glibc 2.2.5. Previous version was compiled >= 2.3.1
which caused some things not to work on old distributions using 2.2.
* add [ %if {} %else {} ] logic to templates this allows one template
to work properly on a variety of distributions
# don't place files with \(){} characters in the logic
# can put "#" comments within {}
\ if ( file ) { file } elsif (file) { file } else { file } \
* (later) add a debootstrap method, tried rootstrap and it is quite
buggy, all the infrastructure is in place to have this, and I need
these root_fs to run tests from anyways!
* system-auth is now another required redhat pam.d/file
Tested on Debian stable, RedHat 7.3 and Mandrake ?
1.4.0 - 01/06/2003
------------------

8
gbootroot_pkg

@ -361,6 +361,7 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
my $source = dirname($packaging_place) . "/" . $prog . "-" . $version;
chdir($packaging_place);
system "make clean";
system "make clean-sources";
foreach my $package ( @rpm_packages ) {
@ -414,7 +415,8 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
"/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Entries\n", 1,
"/usr/share/doc/gbootroot/Changes.gz\n", 1,
"/usr/share/doc/gbootroot/copyright\n", 1,
"/usr/share/doc/gbootroot/changelog.Debian.gz\n", 1
"/usr/share/doc/gbootroot/changelog.Debian.gz\n", 1,
"/usr/share/doc/gbootroot/README.gz\n", 1
);
@ -438,6 +440,9 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
if ( /Changes\.gz/ ) {
s/Changes\.gz/Changes/;
}
if ( /README\.gz/ ) {
s/README\.gz/README/;
}
else {
next;
}
@ -457,7 +462,6 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
chdir($packaging_place_orig);
system "tar cvfz $pristine_source_package $prog-$version";
system "cp $source.tar.gz $SOURCES";
# Time for the fun
system "rpm -ba $SPECS/$package";
}

89
pkg/dpkg/gbootroot/changelog

@ -1,3 +1,92 @@
gbootroot (1.4.1-1) unstable; urgency=low
* Updated to 2.4.19-49um and the latest uml tools 20030202.
* Updated to 2.4.19-46um and the latest uml tools 20021103.
* Added nesting level 1 to the uml to allow gbootroot to have full
functionality under another uml running on the host kernel. This
means the uml will use more memory, but its negligible.
* Wrote and added a C program skas-or-tt to automatically add the
proper mode={skas,tt} to the commandline. This means compilation
will be optimized, and things won't lock up when using gbootroot
within a uml running on top of a host kernel without the skas patch.
* The MTD Emulator doesn't work as nicely as before. Blkmtd seems
mostly broken, and mtdram needs more careful tweaking for total
size, though mtdram definitely still works. This is due to changes
in uml which will have to be addressed since the code for the mtd
modules didn't change.
* 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 the new port-helper because that wasn't
the case before. Also, added path for user-mode-linux/usr/bin to
find the other tools.
* The Makefile has been altered quite a bit, and wgets necessary
sources, unconventional but very nice in keeping up with jdike's
latest patch. You can now live quite happily out of the source
directory.
* Added the templates for Initrd and root_fs_helper and the
corresponding replacements that are also used by the source package.
* Updated the documentation, and the README found in the source
packages is now available in the normal packages.
* The biggest change is the command-line interface with the yard root
method. Now distribute your template and let others easily recreate
your root_fs without entering the gui by running "gbootroot --
template your_template" and this is a nice way to manage a
distribution you are developing. This also means that source
packages are completely automated now, and vastly improved, which is
quite awesome.
* 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" or "bd.*module cleaned up."
* Checks for the proper version for newer libc6 linkers. Hopefully,
should work properly with libc6 > 2.3.1, too.
-- Jonathan Rosenbaum <freesource@users.sourceforge.net> Tue, 4 Feb 2003 21:20:52 -0500
gbootroot (1.4.0-1) unstable; urgency=low
* Updated to 2.4.19-46um and the latest uml tools 20021103.
* Added nesting level 1 to the uml to allow gbootroot to have full
functionality under another uml running on the host kernel. This
means the uml will use more memory, but its negligible.
* Wrote and added a C program skas-or-tt to automatically add the
proper mode={skas,tt} to the commandline. This means compilation
will be optimized, and things won't lock up when using gbootroot
within a uml running on top of a host kernel without the skas patch.
* The MTD Emulator doesn't work as nicely as before. Blkmtd seems
mostly broken, and mtdram needs more careful tweaking for total
size, though mtdram definitely still works. This is due to changes
in uml which will have to be addressed since the code for the mtd
modules didn't change.
* 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 the new port-helper because that wasn't
the case before. Also, added path for user-mode-linux/usr/bin to
find the other tools.
* The Makefile has been altered quite a bit, and wgets necessary
sources, unconventional but very nice in keeping up with jdike's
latest patch. You can now live quite happily out of the source
directory.
* Added the templates for Initrd and root_fs_helper and the
corresponding replacements that are also used by the source package.
* Updated the documentation, and the README found in the source
packages is now available in the normal packages.
* The biggest change is the command-line interface with the yard root
method. Now distribute your template and let others easily recreate
your root_fs without entering the gui by running "gbootroot --
template your_template" and this is a nice way to manage a
distribution you are developing. This also means that source
packages are completely automated now, and vastly improved, which is
quite awesome.
* 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" or "bd.*module cleaned up."
* Checks for the proper version for newer libc6 linkers. Hopefully,
should work properly with libc6 > 2.3.1, too.
-- Jonathan Rosenbaum <freesource@users.sourceforge.net> Tue, 14 Jan 2003 02:00:15 -0500
gbootroot (1.3.6-1) unstable; urgency=low
* Updated to 2.4.18-2um and the latest uml tools 20020212, including

2
pkg/dpkg/gbootroot/control

@ -10,7 +10,7 @@ Architecture: i386
Depends: ${perl:Depends}, perl-modules, libgtk-perl (>= 0.7002), libc6 (>= 2.1.2), libexpect-perl, ash, file, binutils, bzip2
Recommends: dswim, lilo
Suggests: make-debian-x11
Conflicts: gbootroot-nest1
Conflicts: uml-utilities
Description: Boot/Root Filesystem Distribution testing and creation.
BootRoot makes the construction and development of distributions fun and
simple with its Root Methods (Yard) and user-mode-linux test bed. Finish

6
pkg/rpm/filelist

@ -14,6 +14,7 @@
%attr(- root root) /usr/lib/bootroot/expect_uml
%attr(- root root) /usr/lib/bootroot/yard_chrooted_tests
%attr(- root root) /usr/lib/bootroot/genext2fs
%attr(- root root) /usr/lib/bootroot/skas-or-tt
%attr(- root root) /usr/lib/bootroot/root_filesystem/Initrd.gz
%attr(- root root) /usr/lib/bootroot/root_filesystem/root_fs_helper
%attr(- root root) /usr/X11R6/include/X11/pixmaps/gbootroot.xpm
@ -41,7 +42,8 @@
%attr(- root root) /usr/share/doc/gbootroot/html/images/gBS.jpg
%attr(- root root) /usr/share/doc/gbootroot/html/images/yard_box.jpg
%attr(- root root) /usr/share/doc/gbootroot/html/bootroot.html
%attr(- root root) /usr/share/doc/gbootroot/Changes
%attr(- root root) /usr/share/doc/gbootroot/html/boot_root.4
%attr(- root root) /usr/share/doc/gbootroot/README
%attr(- root root) /usr/share/gbootroot/yard/Replacements/CVS/Root
%attr(- root root) /usr/share/gbootroot/yard/Replacements/CVS/Repository
%attr(- root root) /usr/share/gbootroot/yard/Replacements/CVS/Entries
@ -159,6 +161,8 @@
%attr(- root root) /usr/share/gbootroot/genext2fs/Makefile
%attr(- root root) /usr/share/gbootroot/genext2fs/device_table.txt
%attr(- root root) /usr/share/gbootroot/genext2fs/genext2fs.c
%attr(- root root) /usr/share/gbootroot/skas-or-tt/Makefile
%attr(- root root) /usr/share/gbootroot/skas-or-tt/skas-or-tt.c
%attr(- root root) /usr/share/perl5/BootRoot/lsMode.pm
%attr(- root root) /usr/share/perl5/BootRoot/Options.pm
%attr(- root root) /usr/share/perl5/BootRoot/UML.pm

6
pkg/rpm/gbootroot-mdk.spec

@ -18,7 +18,7 @@
%define version 1.4.0
%define release 1mdk
%define kversion 2.4.19
%define patch_version 40
%define patch_version 46
%define util_ver 20021103
%define kernel_source linux-%{kversion}.tar.bz2
%define patch_1 uml-patch-%{kversion}-%{patch_version}.bz2
@ -81,7 +81,9 @@ as mdk.
%prep
%setup -n gbootroot-%{version}
#chown -R root:root .
mkdir /tmp/gbootroot
if [ ! -e /tmp/gbootroot ] ; then
mkdir /tmp/gbootroot;
fi;
install -d $HOME/gbootroot/RPMS/i386
install -d $HOME/gbootroot/BUILD
install -d $HOME/gbootroot/SOURCES

6
pkg/rpm/gbootroot.spec

@ -18,7 +18,7 @@
%define version 1.4.0
%define release 1
%define kversion 2.4.19
%define patch_version 40
%define patch_version 46
%define util_ver 20021103
%define kernel_source linux-%{kversion}.tar.bz2
%define patch_1 uml-patch-%{kversion}-%{patch_version}.bz2
@ -79,7 +79,9 @@ as mdk.
%prep
%setup -n gbootroot-%{version}
#chown -R root:root .
mkdir /tmp/gbootroot
if [ ! -e /tmp/gbootroot ] ; then
mkdir /tmp/gbootroot;
fi;
install -d $HOME/gbootroot/RPMS/i386
install -d $HOME/gbootroot/BUILD
install -d $HOME/gbootroot/SOURCES

2
user-mode-linux/usr/lib/uml/config

@ -32,7 +32,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_HOST_2G_2G is not set
# CONFIG_UML_SMP is not set
# CONFIG_SMP is not set
CONFIG_NEST_LEVEL=0
CONFIG_NEST_LEVEL=1
CONFIG_KERNEL_HALF_GIGS=1
CONFIG_HIGHMEM=y
CONFIG_PROC_MM=y

3
yard/templates/Example.yard

@ -1,4 +1,4 @@
# $Id: Example.yard,v 1.19 2003/02/07 19:07:06 freesource Exp $
# $Id: Example.yard,v 1.20 2003/02/07 19:12:29 freesource Exp $
# Example.yard
#
# Creates a minimalistic multi-user runlevel root filesystem with getty.
@ -337,6 +337,7 @@ rmdir
less
dircolors
grep
egrep
tail
mknod
ps

Loading…
Cancel
Save