2003-01-03 Yoshinori K. Okuji <okuji@enbug.org>
* include/i386/pc/util/biosdisk.h: New file. * util/i386/pc/biosdisk.c: Likewise. * util/i386/pc/pupa-setup.c: Likewise. * Makefile.in (INCLUDE_DISTFILES): Added include/pupa/i386/pc/util/biosdisk.h. (UTIL_DISTFILES): Added biosdisk.c and pupa-setup.c under the directory util/i386/pc. (install-local): Added a rule for sbin_UTILITIES. (uninstall): Likewise. * util/i386/pc/pupa-mkimage.c (usage): Fix a typo in the doc. * util/misc.c (xrealloc): New function. (pupa_malloc): Likewise. (pupa_free): Likewise. (pupa_realloc): Likewise. (pupa_stop): Likewise. (pupa_putchar): Likewise. * kern/disk.c (pupa_disk_read): Prevent L from underflowing. * include/pupa/util/misc.h (xrealloc): Declared. * include/pupa/i386/pc/boot.h (PUPA_BOOT_MACHINE_BPB_START): New macro. (PUPA_BOOT_MACHINE_BPBEND): Renamed to ... (PUPA_BOOT_MACHINE_BPB_END): ... this. * include/pupa/fs.h [PUPA_UTIL] (pupa_fat_init): Declared. [PUPA_UTIL] (pupa_fat_fini): Likewise. * fs/fat.c [PUPA_UTIL] (pupa_fat_init): Defined. Maybe a better way should be implemented. [PUPA_UTIL] (pupa_fat_fini): Likewise. * disk/i386/pc/biosdisk.c (pupa_biosdisk_call_hook): Increase the size of NAME for safety. (pupa_biosdisk_iterate): Search hard disks to 0x90 instead of 0x88. * conf/i386-pc.rmk (sbin_UTILITIES): New variable. (pupa_setup_SOURCES): Likewise. * genmk.rb (Utility#rule): Add $(BUILD_CFLAGS) into the rules.
This commit is contained in:
parent
08b70fe8eb
commit
1cc73a62da
17 changed files with 1809 additions and 18 deletions
18
Makefile.in
18
Makefile.in
|
@ -93,7 +93,8 @@ INCLUDE_DISTFILES = $(addprefix include/pupa/,boot.h device.h disk.h \
|
|||
$(addprefix include/pupa/util/,misc.h resolve.h) \
|
||||
include/pupa/i386/types.h \
|
||||
$(addprefix include/pupa/i386/pc/,biosdisk.h boot.h \
|
||||
console.h init.h kernel.h loader.h memory.h partition.h)
|
||||
console.h init.h kernel.h loader.h memory.h partition.h) \
|
||||
$(addprefix include/pupa/i386/pc/util/,biosdisk.h)
|
||||
|
||||
KERN_DISTFILES = $(addprefix kern/,device.c disk.c dl.c err.c file.c \
|
||||
fs.c loader.c main.c misc.c mm.c rescue.c term.c) \
|
||||
|
@ -105,7 +106,8 @@ LOADER_DISTFILES = $(addprefix loader/i386/pc/,chainloader.c)
|
|||
TERM_DISTFILES = $(addprefix term/i386/pc/,console.c)
|
||||
|
||||
UTIL_DISTFILES = $(addprefix util/,genmoddep.c misc.c resolve.c) \
|
||||
util/i386/pc/pupa-mkimage.c
|
||||
$(addprefix util/i386/pc/,biosdisk.c pupa-mkimage.c \
|
||||
pupa-setup.c)
|
||||
|
||||
DISTFILES = $(COMMON_DISTFILES) $(BOOT_DISTFILES) $(CONF_DISTFILES) \
|
||||
$(DISK_DISTFILES) $(FS_DISTFILES) $(INCLUDE_DISTFILES) \
|
||||
|
@ -154,6 +156,12 @@ install-local: all
|
|||
dest="`echo $$file | sed 's,.*/,,'`"; \
|
||||
$(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
|
||||
done
|
||||
$(mkinstalldirs) $(DESTDIR)$(sbindir)
|
||||
@list='$(sbin_UTILITIES)'; for file in $$list; do \
|
||||
if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
|
||||
dest="`echo $$file | sed 's,.*/,,'`"; \
|
||||
$(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
|
||||
done
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
|
||||
|
@ -163,10 +171,14 @@ uninstall:
|
|||
dest="`echo $$file | sed 's,.*/,,'`"; \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
|
||||
done
|
||||
@list = '$(bin_UTILITIES)'; for file in $$list; do \
|
||||
@list='$(bin_UTILITIES)'; for file in $$list; do \
|
||||
dest="`echo $$file | sed 's,.*/,,'`"; \
|
||||
rm -f $(DESTDIR)$(bindir)/$$dest; \
|
||||
done
|
||||
@list='$(sbin_UTILITIES)'; for file in $$list; do \
|
||||
dest="`echo $$file | sed 's,.*/,,'`"; \
|
||||
rm -f $(DESTDIR)$(sbindir)/$$dest; \
|
||||
done
|
||||
|
||||
clean:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue