* powerpc fixes
@ 2008-01-30 23:26 Jordi Mallach
2008-01-31 10:55 ` Robert Millan
0 siblings, 1 reply; 5+ messages in thread
From: Jordi Mallach @ 2008-01-30 23:26 UTC (permalink / raw)
To: grub-devel
The following patches fix the powerpc build for the latest Debian
package. Sorry for not diffing this against HEAD.
However, the resulting binaries don't work as expected:
18111:jordi@horta:/boot/grub$ sudo grub-install "(hd0)"
grub-probe: error: /dev/stdin:1: Bad device name
grub-probe: error: /dev/stdin:1: Bad device name
/boot/grub must be a mount point.
grub-mkdevicemap generated this when I called it by hand:
(/pci@f4000000/ata-6@d/disk@0) /dev/hda
diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk
--- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000
+++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000
@@ -240,6 +240,7 @@
# For grub-emu
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
@@ -251,7 +252,7 @@
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/fshelp.c \
\
io/gzio.c \
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
@@ -268,11 +269,11 @@
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/biosdisk.c util/getroot.c \
util/powerpc/ieee1275/misc.c grub_script.tab.c grub_emu_init.c
-CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d grub_emu-commands_search.d grub_emu-commands_terminal.d grub_emu-commands_test.d grub_emu-commands_ls.d grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d grub_emu-commands_ieee1275_halt.d grub_emu-commands_ieee1275_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_execute.d grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-util_console.d grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_biosdisk.d grub_emu-util_getroot.d grub_emu-util_powerpc_ieee1275_misc.d grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d grub_emu-commands_search.d grub_emu-commands_terminal.d grub_emu-commands_test.d grub_emu-commands_ls.d grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d grub_emu-commands_ieee1275_halt.d grub_emu-commands_ieee1275_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_execute.d grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-util_console.d grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_biosdisk.d grub_emu-util_getroot.d grub_emu-util_powerpc_ieee1275_misc.d grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_biosdisk.o grub_emu-util_getroot.o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -390,6 +391,10 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_xfs.d
+grub_emu-fs_fshelp.o: fs/fshelp.c $(fs/fshelp.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-fs_fshelp.d
+
grub_emu-io_gzio.o: io/gzio.c $(io/gzio.c_DEPENDENCIES)
$(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-io_gzio.d
diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.rmk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.rmk
--- grub2-1.95+20080128/conf/powerpc-ieee1275.rmk 2008-01-27 22:44:02.000000000 +0000
+++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.rmk 2008-01-30 21:29:31.000000000 +0000
@@ -58,6 +58,7 @@
# For grub-emu
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
@@ -69,7 +70,7 @@
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/fshelp.c \
\
io/gzio.c \
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
diff -Nuar grub2-1.95+20080128/include/grub/powerpc/libgcc.h buildd/grub2-1.95+20080128/include/grub/powerpc/libgcc.h
--- grub2-1.95+20080128/include/grub/powerpc/libgcc.h 2008-01-10 07:27:08.000000000 +0000
+++ buildd/grub2-1.95+20080128/include/grub/powerpc/libgcc.h 2008-01-30 22:39:43.000000000 +0000
@@ -25,21 +25,14 @@
void EXPORT_FUNC (__fixunsdfsi) (void);
void EXPORT_FUNC (__floatsidf) (void);
void EXPORT_FUNC (__floatsisf) (void);
+void EXPORT_FUNC (__floatundisf) (void);
void EXPORT_FUNC (__lshrdi3) (void);
-void EXPORT_FUNC (__make_dp) (void);
-void EXPORT_FUNC (__make_fp) (void);
void EXPORT_FUNC (__muldf3) (void);
void EXPORT_FUNC (__mulsf3) (void);
-void EXPORT_FUNC (__pack_d) (void);
-void EXPORT_FUNC (__pack_f) (void);
void EXPORT_FUNC (__subdf3) (void);
void EXPORT_FUNC (__subsf3) (void);
-void EXPORT_FUNC (__thenan_df) (void);
-void EXPORT_FUNC (__thenan_sf) (void);
void EXPORT_FUNC (__trampoline_setup) (void);
void EXPORT_FUNC (__truncdfsf2) (void);
void EXPORT_FUNC (__ucmpdi2) (void);
-void EXPORT_FUNC (__unpack_d) (void);
-void EXPORT_FUNC (__unpack_f) (void);
void EXPORT_FUNC (__floatdisf) (void);
void EXPORT_FUNC (__cmpdi2) (void);
--
Jordi Mallach Pérez -- Debian developer http://www.debian.org/
jordi@sindominio.net jordi@debian.org http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: powerpc fixes
2008-01-30 23:26 powerpc fixes Jordi Mallach
@ 2008-01-31 10:55 ` Robert Millan
2008-01-31 19:12 ` Robert Millan
0 siblings, 1 reply; 5+ messages in thread
From: Robert Millan @ 2008-01-31 10:55 UTC (permalink / raw)
To: The development of GRUB 2
On Thu, Jan 31, 2008 at 12:26:46AM +0100, Jordi Mallach wrote:
> The following patches fix the powerpc build for the latest Debian
> package. Sorry for not diffing this against HEAD.
>
> However, the resulting binaries don't work as expected:
>
> 18111:jordi@horta:/boot/grub$ sudo grub-install "(hd0)"
> grub-probe: error: /dev/stdin:1: Bad device name
> grub-probe: error: /dev/stdin:1: Bad device name
> /boot/grub must be a mount point.
>
> grub-mkdevicemap generated this when I called it by hand:
> (/pci@f4000000/ata-6@d/disk@0) /dev/hda
Are you using the latest ofpathname?
> diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk
> --- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000
> +++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000
Please skip *.mk files in patches ;-)
> @@ -69,7 +70,7 @@
> fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
> fs/hfsplus.c fs/iso9660.c fs/jfs.c fs/minix.c \
> fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
> - fs/ufs.c fs/xfs.c \
> + fs/ufs.c fs/xfs.c fs/fshelp.c \
> \
> io/gzio.c \
> kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
This won't apply cleanly to HEAD.
> diff -Nuar grub2-1.95+20080128/include/grub/powerpc/libgcc.h buildd/grub2-1.95+20080128/include/grub/powerpc/libgcc.h
> --- grub2-1.95+20080128/include/grub/powerpc/libgcc.h 2008-01-10 07:27:08.000000000 +0000
> +++ buildd/grub2-1.95+20080128/include/grub/powerpc/libgcc.h 2008-01-30 22:39:43.000000000 +0000
> @@ -25,21 +25,14 @@
> void EXPORT_FUNC (__fixunsdfsi) (void);
> void EXPORT_FUNC (__floatsidf) (void);
> void EXPORT_FUNC (__floatsisf) (void);
> +void EXPORT_FUNC (__floatundisf) (void);
> void EXPORT_FUNC (__lshrdi3) (void);
> -void EXPORT_FUNC (__make_dp) (void);
> -void EXPORT_FUNC (__make_fp) (void);
> void EXPORT_FUNC (__muldf3) (void);
> void EXPORT_FUNC (__mulsf3) (void);
> -void EXPORT_FUNC (__pack_d) (void);
> -void EXPORT_FUNC (__pack_f) (void);
> void EXPORT_FUNC (__subdf3) (void);
> void EXPORT_FUNC (__subsf3) (void);
> -void EXPORT_FUNC (__thenan_df) (void);
> -void EXPORT_FUNC (__thenan_sf) (void);
> void EXPORT_FUNC (__trampoline_setup) (void);
> void EXPORT_FUNC (__truncdfsf2) (void);
> void EXPORT_FUNC (__ucmpdi2) (void);
> -void EXPORT_FUNC (__unpack_d) (void);
> -void EXPORT_FUNC (__unpack_f) (void);
> void EXPORT_FUNC (__floatdisf) (void);
> void EXPORT_FUNC (__cmpdi2) (void);
This part (as discussed in the other thread) is wrong. We need to extract
symbol list dynamicaly (if we don't want to break arbitrary versions of gcc).
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: powerpc fixes
2008-01-31 10:55 ` Robert Millan
@ 2008-01-31 19:12 ` Robert Millan
2008-01-31 21:05 ` Robert Millan
0 siblings, 1 reply; 5+ messages in thread
From: Robert Millan @ 2008-01-31 19:12 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
On Thu, Jan 31, 2008 at 11:55:22AM +0100, Robert Millan wrote:
> > diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk
> > --- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000
> > +++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000
This should handle the .rmk part of the problem. It does also cleanup
some things and get rid of unused variables.
Please can you test?
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
[-- Attachment #2: fixdeps.diff --]
[-- Type: text/x-diff, Size: 8348 bytes --]
2008-01-31 Robert Millan <rmh@aybabtu.com>
* conf/i386-efi.rmk (normal/execute.c_DEPENDENCIES): Move to the
top.
(normal/command.c_DEPENDENCIES): New variable.
(grub-emu_DEPENDENCIES, normal_mod_DEPENDENCIES): Remove variables.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-linuxbios.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
(grub_emu_SOURCES): Add `fs/fshelp.c'.
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-efi.rmk ./conf/i386-efi.rmk
--- ../grub2/conf/i386-efi.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-efi.rmk 2008-01-31 16:56:45.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin
COMMON_CFLAGS = -fno-builtin -m32
COMMON_LDFLAGS = -melf_i386 -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Utilities.
bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-mkdevicemap
@@ -29,8 +33,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -99,7 +101,6 @@ kernel_syms.lst: $(addprefix include/gru
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-ieee1275.rmk ./conf/i386-ieee1275.rmk
--- ../grub2/conf/i386-ieee1275.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-ieee1275.rmk 2008-01-31 16:55:57.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui
COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3
COMMON_LDFLAGS = -nostdlib -static -lgcc
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
pkglib_PROGRAMS = kernel.elf
@@ -54,8 +58,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -93,7 +95,6 @@ pkglib_MODULES = normal.mod halt.mod reb
multiboot.mod _multiboot.mod serial.mod
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-linuxbios.rmk ./conf/i386-linuxbios.rmk
--- ../grub2/conf/i386-linuxbios.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-linuxbios.rmk 2008-01-31 16:57:11.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui
COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3
COMMON_LDFLAGS = -nostdlib -static -lgcc
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
pkglib_PROGRAMS = kernel.elf
@@ -53,8 +57,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -103,7 +105,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-pc.rmk ./conf/i386-pc.rmk
--- ../grub2/conf/i386-pc.rmk 2008-01-30 16:32:56.000000000 +0100
+++ ./conf/i386-pc.rmk 2008-01-31 16:56:51.000000000 +0100
@@ -89,8 +89,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -166,7 +164,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/powerpc-ieee1275.rmk ./conf/powerpc-ieee1275.rmk
--- ../grub2/conf/powerpc-ieee1275.rmk 2008-01-30 16:32:56.000000000 +0100
+++ ./conf/powerpc-ieee1275.rmk 2008-01-31 17:02:45.000000000 +0100
@@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY_
COMMON_CFLAGS = -ffreestanding -msoft-float
COMMON_LDFLAGS += -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst
@@ -41,8 +45,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
commands/search.c commands/terminal.c commands/test.c \
@@ -59,7 +61,7 @@ grub_emu_SOURCES = commands/boot.c comma
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
kern/err.c kern/file.c kern/fs.c kern/loader.c kern/main.c \
kern/misc.c kern/parser.c kern/partition.c kern/rescue.c \
- kern/term.c \
+ kern/term.c fs/fshelp.c \
normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
@@ -114,7 +116,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/sparc64-ieee1275.rmk ./conf/sparc64-ieee1275.rmk
--- ../grub2/conf/sparc64-ieee1275.rmk 2007-12-25 10:09:43.000000000 +0100
+++ ./conf/sparc64-ieee1275.rmk 2008-01-31 16:57:39.000000000 +0100
@@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc
COMMON_CFLAGS = -ggdb -ffreestanding -m64 -mno-app-regs
COMMON_LDFLAGS = -melf64_sparc -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst
@@ -151,7 +155,6 @@ sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
#linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: powerpc fixes
2008-01-31 19:12 ` Robert Millan
@ 2008-01-31 21:05 ` Robert Millan
2008-02-01 15:44 ` Robert Millan
0 siblings, 1 reply; 5+ messages in thread
From: Robert Millan @ 2008-01-31 21:05 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1: Type: text/plain, Size: 773 bytes --]
On Thu, Jan 31, 2008 at 08:12:15PM +0100, Robert Millan wrote:
> On Thu, Jan 31, 2008 at 11:55:22AM +0100, Robert Millan wrote:
> > > diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk
> > > --- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000
> > > +++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000
>
> This should handle the .rmk part of the problem. It does also cleanup
> some things and get rid of unused variables.
>
> Please can you test?
New patch, hopefuly working for everyone now.
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
[-- Attachment #2: fixdeps.diff --]
[-- Type: text/x-diff, Size: 10510 bytes --]
2008-01-31 Robert Millan <rmh@aybabtu.com>
* conf/i386-efi.rmk (normal/execute.c_DEPENDENCIES): Move to the
top.
(normal/command.c_DEPENDENCIES): New variable.
(grub-emu_DEPENDENCIES, normal_mod_DEPENDENCIES): Remove variables.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-linuxbios.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
(grub_emu_SOURCES): Add `fs/fshelp.c'.
* genmk.rb: Add `$(#{src}_DEPENDENCIES)' in targets that require it.
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-efi.rmk ./conf/i386-efi.rmk
--- ../grub2/conf/i386-efi.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-efi.rmk 2008-01-31 16:56:45.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin
COMMON_CFLAGS = -fno-builtin -m32
COMMON_LDFLAGS = -melf_i386 -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Utilities.
bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-mkdevicemap
@@ -29,8 +33,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -99,7 +101,6 @@ kernel_syms.lst: $(addprefix include/gru
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-ieee1275.rmk ./conf/i386-ieee1275.rmk
--- ../grub2/conf/i386-ieee1275.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-ieee1275.rmk 2008-01-31 16:55:57.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui
COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3
COMMON_LDFLAGS = -nostdlib -static -lgcc
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
pkglib_PROGRAMS = kernel.elf
@@ -54,8 +58,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -93,7 +95,6 @@ pkglib_MODULES = normal.mod halt.mod reb
multiboot.mod _multiboot.mod serial.mod
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-linuxbios.rmk ./conf/i386-linuxbios.rmk
--- ../grub2/conf/i386-linuxbios.rmk 2008-01-30 16:32:55.000000000 +0100
+++ ./conf/i386-linuxbios.rmk 2008-01-31 16:57:11.000000000 +0100
@@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui
COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3
COMMON_LDFLAGS = -nostdlib -static -lgcc
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
pkglib_PROGRAMS = kernel.elf
@@ -53,8 +57,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -103,7 +105,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-pc.rmk ./conf/i386-pc.rmk
--- ../grub2/conf/i386-pc.rmk 2008-01-30 16:32:56.000000000 +0100
+++ ./conf/i386-pc.rmk 2008-01-31 16:56:51.000000000 +0100
@@ -89,8 +89,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/terminal.c commands/ls.c commands/test.c \
@@ -166,7 +164,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/powerpc-ieee1275.rmk ./conf/powerpc-ieee1275.rmk
--- ../grub2/conf/powerpc-ieee1275.rmk 2008-01-30 16:32:56.000000000 +0100
+++ ./conf/powerpc-ieee1275.rmk 2008-01-31 17:02:45.000000000 +0100
@@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY_
COMMON_CFLAGS = -ffreestanding -msoft-float
COMMON_LDFLAGS += -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst
@@ -41,8 +45,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd
# For grub-emu
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-normal/execute.c_DEPENDENCIES = grub_script.tab.h
-grub-emu_DEPENDENCIES = grub_script.tab.c
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
commands/search.c commands/terminal.c commands/test.c \
@@ -59,7 +61,7 @@ grub_emu_SOURCES = commands/boot.c comma
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
kern/err.c kern/file.c kern/fs.c kern/loader.c kern/main.c \
kern/misc.c kern/parser.c kern/partition.c kern/rescue.c \
- kern/term.c \
+ kern/term.c fs/fshelp.c \
normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
@@ -114,7 +116,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/sparc64-ieee1275.rmk ./conf/sparc64-ieee1275.rmk
--- ../grub2/conf/sparc64-ieee1275.rmk 2007-12-25 10:09:43.000000000 +0100
+++ ./conf/sparc64-ieee1275.rmk 2008-01-31 16:57:39.000000000 +0100
@@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc
COMMON_CFLAGS = -ggdb -ffreestanding -m64 -mno-app-regs
COMMON_LDFLAGS = -melf64_sparc -nostdlib
+# Used by various components. These rules need to precede them.
+normal/execute.c_DEPENDENCIES = grub_script.tab.h
+normal/command.c_DEPENDENCIES = grub_script.tab.h
+
# Images.
MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst
@@ -151,7 +155,6 @@ sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
#linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/genmk.rb ./genmk.rb
--- ../grub2/genmk.rb 2008-01-25 23:33:56.000000000 +0100
+++ ./genmk.rb 2008-01-31 22:00:28.000000000 +0100
@@ -70,7 +70,7 @@ MOSTLYCLEANFILES += #{deps_str}
extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
dir = File.dirname(src)
- "#{obj}: #{src}
+ "#{obj}: #{src} $(#{src}_DEPENDENCIES)
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
-include #{dep}
@@ -146,7 +146,7 @@ endif
extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
dir = File.dirname(src)
- "#{obj}: #{src}
+ "#{obj}: #{src} $(#{src}_DEPENDENCIES)
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
-include #{dep}
@@ -154,12 +154,12 @@ CLEANFILES += #{command} #{fs}
COMMANDFILES += #{command}
FSFILES += #{fs}
-#{command}: #{src} gencmdlist.sh
+#{command}: #{src} $(#{src}_DEPENDENCIES) gencmdlist.sh
set -e; \
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
| sh $(srcdir)/gencmdlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-#{fs}: #{src} genfslist.sh
+#{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh
set -e; \
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
| sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
@@ -237,7 +237,7 @@ MOSTLYCLEANFILES += #{deps_str}
dep = deps[i]
dir = File.dirname(src)
- "#{obj}: #{src}
+ "#{obj}: #{src} $(#{src}_DEPENDENCIES)
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -MD -c -o $@ $<
-include #{dep}
@@ -264,7 +264,7 @@ class Script
"CLEANFILES += #{@name}
-#{@name}: #{src} config.status
+#{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
./config.status --file=#{name}:#{src}
chmod +x $@
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: powerpc fixes
2008-01-31 21:05 ` Robert Millan
@ 2008-02-01 15:44 ` Robert Millan
0 siblings, 0 replies; 5+ messages in thread
From: Robert Millan @ 2008-02-01 15:44 UTC (permalink / raw)
To: The development of GRUB 2
On Thu, Jan 31, 2008 at 10:05:39PM +0100, Robert Millan wrote:
> On Thu, Jan 31, 2008 at 08:12:15PM +0100, Robert Millan wrote:
> > On Thu, Jan 31, 2008 at 11:55:22AM +0100, Robert Millan wrote:
> > > > diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk
> > > > --- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000
> > > > +++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000
> >
> > This should handle the .rmk part of the problem. It does also cleanup
> > some things and get rid of unused variables.
> >
> > Please can you test?
>
> New patch, hopefuly working for everyone now.
Committed.
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-02-01 15:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-30 23:26 powerpc fixes Jordi Mallach
2008-01-31 10:55 ` Robert Millan
2008-01-31 19:12 ` Robert Millan
2008-01-31 21:05 ` Robert Millan
2008-02-01 15:44 ` Robert Millan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.