vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge back Debian changes.

Browse source
This commit is contained in:
gord 1999-11-08 17:19:38 +00:00
parent ee4e0d44b3
commit a3d2f9bee9
14 changed files with 169 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
1999-11-03 Gordon Matzigkeit <gord@fig.org>
* debian/rules: Add variables for cross-compilation.
* debian/control (Standards-Version): Update to version 3.1.0.
* debian/rules (build): Install manpages into /usr/share/man, and
info into /usr/share/info in accordance with FHS.
(binary-arch): Likewise, and put docs into /usr/share/doc.
* debian/postinst: Use /usr/share/info, and manage compatibility
/usr/doc/grub -> /usr/share/doc/grub symlink.
* debian/prerm: Likewise.
* stage2/Makefile.am (CLEANFILES): Change to
$(nodist_pkgdata_DATA) so that the raw binary files are deleted.
* stage1/Makefile.am (CLEANFILES): Likewise.
1999-11-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-11-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* grub/asmstub.c (grub_putchar) [HAVE_LIBCURSES]: Do not call * grub/asmstub.c (grub_putchar) [HAVE_LIBCURSES]: Do not call

7
TODO
View file

@ -26,6 +26,9 @@ Priorities:
* Support embedding a Stage 1.5 in the "bootloader" area of a FFS * Support embedding a Stage 1.5 in the "bootloader" area of a FFS
partition. !!! partition. !!!
* Support embedding a Stage 1.5 in the EXT2_BOOT_LOADER_INO of an ext2fs
partition. Maybe we can just make a hard link to an existing file? !
* Complete the netboot support. ! * Complete the netboot support. !
* Add automatic configuration support. * Add automatic configuration support.
@ -38,6 +41,10 @@ Priorities:
* Fix the completion so that it works for BSD partitions as well. !! * Fix the completion so that it works for BSD partitions as well. !!
* Add BSD syntax support, using results of ioprobe to map drives.
(0x1f0-0x1f77 = primary IDE, 0x170-0x176 = secondary,
0x1e8-0x1ef = tertiary, 0x168-0x16f = quaternary).
* Add more filesystems support (XFS, NTFS, etc.) * Add more filesystems support (XFS, NTFS, etc.)
* Add remote console support (serial, parallel and net). * Add remote console support (serial, parallel and net).

1
configure vendored
View file

@ -2847,4 +2847,3 @@ EOF
chmod +x $CONFIG_STATUS chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1

13
debian/changelog vendored
View file

@ -1,5 +1,18 @@
grub (0.5.94) unstable; urgency=low grub (0.5.94) unstable; urgency=low
--
grub (0.5.93.1) unstable; urgency=low
* Update to Standards-Version: 3.0.1, mainly for FHS support.
* Fix definition of ext2_dir_entry. (closes:bug#49017)
* Fix rules for cross-compiling. (closes:bug#49034)
* Update synopsis for grub(8). (closes:bug#48991)
* Don't clear the line when hitting enter in the GRUB shell.
(closes:bug#48989)
-- Gordon Matzigkeit <gord@debian.org> Fri, 5 Nov 1999 22:31:30 -0600
grub (0.5.93) unstable; urgency=low grub (0.5.93) unstable; urgency=low
* Updated example configurations. (closes:bug#42136) * Updated example configurations. (closes:bug#42136)

2
debian/control vendored
View file

@ -2,7 +2,7 @@ Source: grub
Section: base Section: base
Priority: extra Priority: extra
Maintainer: GNU GRUB Maintainers <bug-grub@gnu.org> Maintainer: GNU GRUB Maintainers <bug-grub@gnu.org>
Standards-Version: 2.5.0.0 Standards-Version: 3.0.1
Package: grub Package: grub
Architecture: i386 hurd-i386 Architecture: i386 hurd-i386

18
debian/postinst vendored
View file

@ -1,6 +1,20 @@
#! /bin/sh #! /bin/sh
set -e set -e
# Provide a backward-compatibility symlink to the doc directory.
package=grub
case "$1" in
install | upgrade)
if [ -d /usr/doc ]; then
if [ ! -e /usr/doc/$package -a -d /usr/share/doc/$package ]; then
ln -s /usr/share/doc/$package /usr/doc/$package
fi
fi
;;
esac
# Install our info pages.
install-info --quiet --section Kernel Kernel \ install-info --quiet --section Kernel Kernel \
/usr/info/grub.info.gz /usr/share/info/grub.info.gz
install-info --quiet --section Kernel Kernel \ install-info --quiet --section Kernel Kernel \
/usr/info/multiboot.info.gz /usr/share/info/multiboot.info.gz

17
debian/prerm vendored
View file

@ -1,3 +1,16 @@
#! /bin/sh #! /bin/sh
install-info --quiet --remove /usr/info/grub.info.gz set -e
install-info --quiet --remove /usr/info/multiboot.info.gz
# Delete our backward-compatibility symlink.
package=grub
case "$1" in
remove | upgrade)
if [ -d /usr/doc -a -L /usr/doc/$package ]; then
rm -f /usr/doc/$package
fi
;;
esac
# Install our info pages.
install-info --quiet --remove /usr/share/info/grub.info.gz
install-info --quiet --remove /usr/share/info/multiboot.info.gz

36
debian/rules vendored
View file

@ -4,13 +4,26 @@
package:=grub package:=grub
# For cross-compilation.
DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH))
ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),)
DEB_BUILD_GNU_SYSTEM := gnu
else
DEB_BUILD_GNU_SYSTEM := linux
endif
DEB_BUILD_GNU_TYPE := $(DEB_BUILD_GNU_CPU)-$(DEB_BUILD_GNU_SYSTEM)
DEB_HOST_GNU_TYPE := $(DEB_BUILD_GNU_TYPE)
INSTALL = install -c INSTALL = install -c
INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DATA = $(INSTALL) -m 644
INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_PROGRAM = $(INSTALL) -m 755
build: build:
$(checkdir) $(checkdir)
./configure --prefix=/usr ./configure --prefix=/usr \
$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--mandir='$${datadir}/man' --infodir='$${datadir}/info'
make make
echo timestamp > build echo timestamp > build
@ -31,25 +44,26 @@ binary-arch: checkroot build
$(checkdir) $(checkdir)
-rm -rf debian/tmp -rm -rf debian/tmp
## make dirs ## make dirs
install -d debian/tmp debian/tmp/usr/doc/grub debian/tmp/DEBIAN install -d debian/tmp debian/tmp/usr/share/doc/grub debian/tmp/DEBIAN
## install files ## install files
dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir
gzip -f9 debian/tmp/usr/info/* debian/tmp/usr/man/man8/* gzip -f9 debian/tmp/usr/share/info/* debian/tmp/usr/share/man/*/*
strip -s debian/tmp/usr/sbin/* strip -s debian/tmp/usr/sbin/*
$(INSTALL_DATA) TODO BUGS NEWS docs/menu.lst debian/tmp/usr/doc/grub/ $(INSTALL_DATA) TODO BUGS NEWS docs/menu.lst \
debian/tmp/usr/share/doc/grub/
$(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/grub/changelog $(INSTALL_DATA) ChangeLog debian/tmp/usr/share/doc/grub/changelog
gzip -f9 debian/tmp/usr/doc/grub/changelog gzip -f9 debian/tmp/usr/share/doc/grub/changelog
$(INSTALL_DATA) debian/changelog debian/tmp/usr/doc/grub/changelog.Debian $(INSTALL_DATA) debian/changelog debian/tmp/usr/share/doc/grub/changelog.Debian
gzip -f9 debian/tmp/usr/doc/grub/changelog.Debian gzip -f9 debian/tmp/usr/share/doc/grub/changelog.Debian
$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/grub/ $(INSTALL_DATA) debian/copyright debian/tmp/usr/share/doc/grub/
$(INSTALL_DATA) debian/README.debian debian/tmp/usr/doc/grub/ $(INSTALL_DATA) debian/README.debian debian/tmp/usr/share/doc/grub/
# Install control files. # Install control files.
$(INSTALL_PROGRAM) debian/postinst debian/prerm debian/tmp/DEBIAN $(INSTALL_PROGRAM) debian/postinst debian/prerm debian/tmp/DEBIAN
dpkg-shlibdeps debian/tmp/usr/sbin/grub dpkg-shlibdeps debian/tmp/usr/*bin/*
dpkg-gencontrol dpkg-gencontrol
chown -R root.root debian/tmp chown -R root.root debian/tmp
chmod -R go=rX debian/tmp chmod -R go=rX debian/tmp

3
stage1/Makefile.am
View file

@ -1,6 +1,9 @@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
nodist_pkgdata_DATA = stage1 nodist_pkgdata_DATA = stage1
BUILT_SOURCES = stage2_size.h
CLEANFILES = $(nodist_pkgdata_DATA) $(BUILT_SOURCES)
# We can't use builtins or standard includes. # We can't use builtins or standard includes.
AM_CFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc AM_CFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00

3
stage1/Makefile.in
View file

@ -83,6 +83,9 @@ install_sh = @install_sh@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
nodist_pkgdata_DATA = stage1 nodist_pkgdata_DATA = stage1
BUILT_SOURCES = stage2_size.h
CLEANFILES = $(nodist_pkgdata_DATA) $(BUILT_SOURCES)
# We can't use builtins or standard includes. # We can't use builtins or standard includes.
AM_CFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc AM_CFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00

1
stage2/Makefile.am
View file

@ -23,6 +23,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \ nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
minix_stage1_5 minix_stage1_5
CLEANFILES = $(nodist_pkgdata_DATA)
noinst_DATA = pre_stage2 start noinst_DATA = pre_stage2 start
noinst_PROGRAMS = pre_stage2.exec start.exec \ noinst_PROGRAMS = pre_stage2.exec start.exec \
e2fs_stage1_5.exec fat_stage1_5.exec \ e2fs_stage1_5.exec fat_stage1_5.exec \

1
stage2/Makefile.in
View file

@ -110,6 +110,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \ nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
minix_stage1_5 minix_stage1_5
CLEANFILES = $(nodist_pkgdata_DATA)
noinst_DATA = pre_stage2 start noinst_DATA = pre_stage2 start
noinst_PROGRAMS = pre_stage2.exec start.exec \ noinst_PROGRAMS = pre_stage2.exec start.exec \
e2fs_stage1_5.exec fat_stage1_5.exec \ e2fs_stage1_5.exec fat_stage1_5.exec \

4
util/mbchk.c
View file

@ -197,7 +197,7 @@ main (int argc, char *argv[])
break; break;
case 'v': case 'v':
printf ("mbchk (GNU GRUB) " VERSION "\n"); printf ("mbchk (GNU GRUB " VERSION ")\n");
exit (0); exit (0);
break; break;
@ -240,5 +240,3 @@ main (int argc, char *argv[])
return 0; return 0;
} }