On Thu, Sep 23, 2010 at 02:08:20PM +0100, Colin Watson wrote:
> Once again, the required patches to grub-extras modules are attached.
No, really! Here they are.
--
Colin Watson [cjwat...@ubuntu.com]
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-09-21 17:58:53 +0000
@@ -0,0 +1,3 @@
+**/.deps-core
+**/.dirstamp
+Makefile.core.am
=== added file 'Makefile.core.def'
--- Makefile.core.def 1970-01-01 00:00:00 +0000
+++ Makefile.core.def 2010-09-22 08:26:06 +0000
@@ -0,0 +1,8 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+ name = '915resolution';
+ i386_pc = contrib/915resolution/915resolution.c;
+ cflags = -Wno-error;
+ enable = i386_pc;
+};
=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk 2009-11-29 21:11:48 +0000
+++ conf/common.rmk 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# -*- makefile -*-
--include $(GRUB_CONTRIB)/915resolution/conf/$(target_cpu)-$(platform).mk
=== removed file 'conf/i386-pc.rmk'
--- conf/i386-pc.rmk 2009-10-26 20:15:26 +0000
+++ conf/i386-pc.rmk 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# -*- makefile -*-
-
-pkglib_MODULES += 915resolution.mod
-915resolution_mod_SOURCES = $(GRUB_CONTRIB)/915resolution/915resolution.c
-915resolution_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-915resolution_mod_LDFLAGS = $(COMMON_LDFLAGS)
=== modified file '.bzrignore'
--- .bzrignore 2009-12-22 00:12:41 +0000
+++ .bzrignore 2010-09-21 18:31:40 +0000
@@ -1 +1,3 @@
-conf/common.mk
+**/.deps-core
+**/.dirstamp
+Makefile.core.am
=== added file 'Makefile.common'
--- Makefile.common 1970-01-01 00:00:00 +0000
+++ Makefile.common 2010-09-21 17:44:16 +0000
@@ -0,0 +1,2 @@
+GPXE_CPPFLAGS = '-DFILE_LICENCE(x)=' -Icontrib/gpxe/src/include -Icontrib/gpxe/include_wrap
+GPXE_CFLAGS = -Wno-pointer-arith -Wno-error
=== added file 'Makefile.core.def'
--- Makefile.core.def 1970-01-01 00:00:00 +0000
+++ Makefile.core.def 2010-09-22 08:27:07 +0000
@@ -0,0 +1,431 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+ name = gpxe;
+ common = contrib/gpxe/wrap/wrap.c;
+ common = contrib/gpxe/wrap/pci.c;
+ common = contrib/gpxe/wrap/nic.c;
+ common = contrib/gpxe/src/net/80211/net80211.c;
+ common = contrib/gpxe/src/net/80211/rc80211.c;
+ common = contrib/gpxe/src/net/arp.c;
+ common = contrib/gpxe/src/net/dhcpopts.c;
+ common = contrib/gpxe/src/net/dhcppkt.c;
+ common = contrib/gpxe/src/net/ethernet.c;
+ common = contrib/gpxe/src/net/fakedhcp.c;
+ common = contrib/gpxe/src/net/icmp.c;
+ common = contrib/gpxe/src/net/iobpad.c;
+ common = contrib/gpxe/src/net/ipv4.c;
+ common = contrib/gpxe/src/net/netdevice.c;
+ common = contrib/gpxe/src/net/netdev_settings.c;
+ common = contrib/gpxe/src/net/nullnet.c;
+ common = contrib/gpxe/src/net/rarp.c;
+ common = contrib/gpxe/src/net/retry.c;
+ common = contrib/gpxe/src/net/tcp/http.c;
+ common = contrib/gpxe/src/net/tcp.c;
+ common = contrib/gpxe/src/net/tcpip.c;
+ common = contrib/gpxe/src/net/udp/dhcp.c;
+ common = contrib/gpxe/src/net/udp/dns.c;
+ common = contrib/gpxe/src/net/udp/slam.c;
+ common = contrib/gpxe/src/net/udp/tftp.c;
+ common = contrib/gpxe/src/net/udp.c;
+ common = contrib/gpxe/src/core/base64.c;
+ common = contrib/gpxe/src/core/nvo.c;
+ common = contrib/gpxe/src/core/uri.c;
+ common = contrib/gpxe/src/core/uuid.c;
+ common = contrib/gpxe/src/core/random.c;
+ common = contrib/gpxe/src/core/open.c;
+ common = contrib/gpxe/src/core/cwuri.c;
+ common = contrib/gpxe/src/core/linebuf.c;
+ common = contrib/gpxe/src/core/xfer.c;
+ common = contrib/gpxe/src/core/settings.c;
+ common = contrib/gpxe/src/core/iobuf.c;
+ common = contrib/gpxe/src/core/refcnt.c;
+ common = contrib/gpxe/src/core/bitmap.c;
+ common = contrib/gpxe/src/core/process.c;
+ common = contrib/gpxe/src/core/job.c;
+ common = contrib/gpxe/src/core/resolv.c;
+ common = contrib/gpxe/src/core/interface.c;
+ common = contrib/gpxe/src/core/basename.c;
+ common = contrib/gpxe/src/core/misc.c;
+ common = contrib/gpxe/src/hci/strerror.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_infiniband;
+ common = contrib/gpxe/src/net/infiniband/ib_cm.c;
+ common = contrib/gpxe/src/net/infiniband/ib_cmrc.c;
+ common = contrib/gpxe/src/net/infiniband/ib_mcast.c;
+ common = contrib/gpxe/src/net/infiniband/ib_mi.c;
+ common = contrib/gpxe/src/net/infiniband/ib_packet.c;
+ common = contrib/gpxe/src/net/infiniband/ib_pathrec.c;
+ common = contrib/gpxe/src/net/infiniband/ib_sma.c;
+ common = contrib/gpxe/src/net/infiniband/ib_smc.c;
+ common = contrib/gpxe/src/net/infiniband/ib_srp.c;
+ common = contrib/gpxe/src/net/infiniband.c;
+ common = contrib/gpxe/src/drivers/net/ipoib.c;
+ common = contrib/gpxe/src/drivers/block/scsi.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_3c529;
+ common = contrib/gpxe/src/drivers/net/3c529.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_3c595;
+ common = contrib/gpxe/src/drivers/net/3c595.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_3c5x9;
+ common = contrib/gpxe/src/drivers/net/3c5x9.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_3c90x;
+ common = contrib/gpxe/src/drivers/net/3c90x.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_davicom;
+ common = contrib/gpxe/src/drivers/net/davicom.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_depca;
+ common = contrib/gpxe/src/drivers/net/depca.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_dmfe;
+ common = contrib/gpxe/src/drivers/net/dmfe.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_eepro100;
+ common = contrib/gpxe/src/drivers/net/eepro100.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_eepro;
+ common = contrib/gpxe/src/drivers/net/eepro.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_epic100;
+ common = contrib/gpxe/src/drivers/net/epic100.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_ipoib;
+ common = contrib/gpxe/src/drivers/net/ipoib.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_legacy;
+ common = contrib/gpxe/src/drivers/net/legacy.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_natsemi;
+ common = contrib/gpxe/src/drivers/net/natsemi.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_ne2k_isa;
+ common = contrib/gpxe/src/drivers/net/ne2k_isa.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_ns83820;
+ common = contrib/gpxe/src/drivers/net/ns83820.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_ns8390;
+ common = contrib/gpxe/src/drivers/net/ns8390.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_pnic;
+ common = contrib/gpxe/src/drivers/net/pnic.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_rtl8139;
+ common = contrib/gpxe/src/drivers/net/rtl8139.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_sis900;
+ common = contrib/gpxe/src/drivers/net/sis900.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_smc9000;
+ common = contrib/gpxe/src/drivers/net/smc9000.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_tulip;
+ common = contrib/gpxe/src/drivers/net/tulip.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_w89c840;
+ common = contrib/gpxe/src/drivers/net/w89c840.c;
+ /* Fails to preprocess without -Os! */
+ cppflags = '$(GPXE_CPPFLAGS) -Os';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_nvs;
+ common = contrib/gpxe/src/drivers/nvs/nvs.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_spi;
+ common = contrib/gpxe/src/drivers/nvs/spi.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_threewire;
+ common = contrib/gpxe/src/drivers/nvs/threewire.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_bitbash;
+ common = contrib/gpxe/src/drivers/bitbash/bitbash.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_i2c_bit;
+ common = contrib/gpxe/src/drivers/bitbash/i2c_bit.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_spi_bit;
+ common = contrib/gpxe/src/drivers/bitbash/spi_bit.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+#if 0
+
+/* Following ones require MII support which is GPLv2. */
+
+module = {
+ name = gpxe_amd8111e;
+ common = contrib/gpxe/src/drivers/net/amd8111e.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_atl1e;
+ common = contrib/gpxe/src/drivers/net/atl1e.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_b44;
+ common = contrib/gpxe/src/drivers/net/b44.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_bnx2;
+ common = contrib/gpxe/src/drivers/net/bnx2.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_etherfabric;
+ common = contrib/gpxe/src/drivers/net/etherfabric.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_forcedeth;
+ common = contrib/gpxe/src/drivers/net/forcedeth.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_pcnet32;
+ common = contrib/gpxe/src/drivers/net/pcnet32.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_mtd80x;
+ common = contrib/gpxe/src/drivers/net/mtd80x.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_r8169;
+ common = contrib/gpxe/src/drivers/net/r8169.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_sundance;
+ common = contrib/gpxe/src/drivers/net/sundance.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_tlan;
+ common = contrib/gpxe/src/drivers/net/tlan.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+/* Following is wireless (disabled for now). */
+
+module = {
+ name = gpxe_prism2;
+ common = contrib/gpxe/src/drivers/net/prism2.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_prism2_plx;
+ common = contrib/gpxe/src/drivers/net/prism2_plx.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_ath5k;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_attach.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_caps.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_desc.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_dma.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_eeprom.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_gpio.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_initvals.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_pcu.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_phy.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_qcu.c;
+ common = contrib/gpxe/src/drivers/net/ath5k/ath5k_reset.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+/* Following require ISA/ISAPNP. Disable for now. */
+
+module = {
+ name = gpxe_3c509;
+ common = contrib/gpxe/src/drivers/net/3c509.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = gpxe_3c515;
+ common = contrib/gpxe/src/drivers/net/3c515.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+/* Following uses crypto. Disable for now. */
+
+module = {
+ name = https;
+ common = contrib/gpxe/src/net/tcp/https.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = tls;
+ common = contrib/gpxe/src/net/tls.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = aoe;
+ common = contrib/gpxe/src/net/aoe.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+module = {
+ name = iscsi;
+ common = contrib/gpxe/src/net/tcp/iscsi.c;
+ cppflags = '$(GPXE_CPPFLAGS)';
+ cflags = '$(GPXE_CFLAGS)';
+};
+
+#endif
=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk 2009-12-30 18:10:26 +0000
+++ conf/common.rmk 1970-01-01 00:00:00 +0000
@@ -1,323 +0,0 @@
-# -*- makefile -*-
-
-GPXE_CFLAGS=$(COMMON_CFLAGS) '-DFILE_LICENCE(x)=' -I$(GRUB_CONTRIB)/gpxe/src/include -I$(GRUB_CONTRIB)/gpxe/include_wrap -Wno-pointer-arith -Wno-error
-
-# For gpxe.mod
-pkglib_MODULES += gpxe.mod
-gpxe_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/wrap/wrap.c \
- $(GRUB_CONTRIB)/gpxe/wrap/pci.c \
- $(GRUB_CONTRIB)/gpxe/wrap/nic.c \
- $(GRUB_CONTRIB)/gpxe/src/net/80211/net80211.c \
- $(GRUB_CONTRIB)/gpxe/src/net/80211/rc80211.c \
- $(GRUB_CONTRIB)/gpxe/src/net/arp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/dhcpopts.c \
- $(GRUB_CONTRIB)/gpxe/src/net/dhcppkt.c \
- $(GRUB_CONTRIB)/gpxe/src/net/ethernet.c \
- $(GRUB_CONTRIB)/gpxe/src/net/fakedhcp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/icmp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/iobpad.c \
- $(GRUB_CONTRIB)/gpxe/src/net/ipv4.c \
- $(GRUB_CONTRIB)/gpxe/src/net/netdevice.c \
- $(GRUB_CONTRIB)/gpxe/src/net/netdev_settings.c \
- $(GRUB_CONTRIB)/gpxe/src/net/nullnet.c \
- $(GRUB_CONTRIB)/gpxe/src/net/rarp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/retry.c \
- $(GRUB_CONTRIB)/gpxe/src/net/tcp/http.c \
- $(GRUB_CONTRIB)/gpxe/src/net/tcp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/tcpip.c \
- $(GRUB_CONTRIB)/gpxe/src/net/udp/dhcp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/udp/dns.c \
- $(GRUB_CONTRIB)/gpxe/src/net/udp/slam.c \
- $(GRUB_CONTRIB)/gpxe/src/net/udp/tftp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/udp.c \
- $(GRUB_CONTRIB)/gpxe/src/core/base64.c \
- $(GRUB_CONTRIB)/gpxe/src/core/nvo.c \
- $(GRUB_CONTRIB)/gpxe/src/core/uri.c \
- $(GRUB_CONTRIB)/gpxe/src/core/uuid.c \
- $(GRUB_CONTRIB)/gpxe/src/core/random.c \
- $(GRUB_CONTRIB)/gpxe/src/core/open.c \
- $(GRUB_CONTRIB)/gpxe/src/core/cwuri.c \
- $(GRUB_CONTRIB)/gpxe/src/core/linebuf.c \
- $(GRUB_CONTRIB)/gpxe/src/core/xfer.c \
- $(GRUB_CONTRIB)/gpxe/src/core/settings.c \
- $(GRUB_CONTRIB)/gpxe/src/core/iobuf.c \
- $(GRUB_CONTRIB)/gpxe/src/core/refcnt.c \
- $(GRUB_CONTRIB)/gpxe/src/core/bitmap.c \
- $(GRUB_CONTRIB)/gpxe/src/core/process.c \
- $(GRUB_CONTRIB)/gpxe/src/core/job.c \
- $(GRUB_CONTRIB)/gpxe/src/core/resolv.c \
- $(GRUB_CONTRIB)/gpxe/src/core/interface.c \
- $(GRUB_CONTRIB)/gpxe/src/core/basename.c \
- $(GRUB_CONTRIB)/gpxe/src/core/misc.c \
- $(GRUB_CONTRIB)/gpxe/src/hci/strerror.c
-gpxe_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_infiniband.mod
-gpxe_infiniband_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_cm.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_cmrc.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_mcast.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_mi.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_packet.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_pathrec.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_sma.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_smc.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband/ib_srp.c \
- $(GRUB_CONTRIB)/gpxe/src/net/infiniband.c \
- $(GRUB_CONTRIB)/gpxe/src/drivers/net/ipoib.c \
- $(GRUB_CONTRIB)/gpxe/src/drivers/block/scsi.c
-gpxe_infiniband_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_infiniband_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_3c529.mod
-gpxe_3c529_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c529.c
-gpxe_3c529_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_3c529_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_3c595.mod
-gpxe_3c595_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c595.c
-gpxe_3c595_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_3c595_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_3c5x9.mod
-gpxe_3c5x9_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c5x9.c
-gpxe_3c5x9_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_3c5x9_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_3c90x.mod
-gpxe_3c90x_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c90x.c
-gpxe_3c90x_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_3c90x_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_davicom.mod
-gpxe_davicom_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/davicom.c
-gpxe_davicom_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_davicom_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_depca.mod
-gpxe_depca_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/depca.c
-gpxe_depca_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_depca_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_dmfe.mod
-gpxe_dmfe_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/dmfe.c
-gpxe_dmfe_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_dmfe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_eepro100.mod
-gpxe_eepro100_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/eepro100.c
-gpxe_eepro100_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_eepro100_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_eepro.mod
-gpxe_eepro_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/eepro.c
-gpxe_eepro_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_eepro_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_epic100.mod
-gpxe_epic100_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/epic100.c
-gpxe_epic100_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_epic100_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_ipoib.mod
-gpxe_ipoib_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/ipoib.c
-gpxe_ipoib_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_ipoib_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_legacy.mod
-gpxe_legacy_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/legacy.c
-gpxe_legacy_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_legacy_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_natsemi.mod
-gpxe_natsemi_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/natsemi.c
-gpxe_natsemi_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_natsemi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_ne2k_isa.mod
-gpxe_ne2k_isa_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/ne2k_isa.c
-gpxe_ne2k_isa_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_ne2k_isa_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_ns83820.mod
-gpxe_ns83820_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/ns83820.c
-gpxe_ns83820_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_ns83820_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_ns8390.mod
-gpxe_ns8390_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/ns8390.c
-gpxe_ns8390_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_ns8390_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_pnic.mod
-gpxe_pnic_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/pnic.c
-gpxe_pnic_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_pnic_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_rtl8139.mod
-gpxe_rtl8139_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/rtl8139.c
-gpxe_rtl8139_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_rtl8139_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_sis900.mod
-gpxe_sis900_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/sis900.c
-gpxe_sis900_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_sis900_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_smc9000.mod
-gpxe_smc9000_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/smc9000.c
-gpxe_smc9000_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_smc9000_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_tulip.mod
-gpxe_tulip_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/tulip.c
-gpxe_tulip_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_tulip_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_w89c840.mod
-gpxe_w89c840_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/w89c840.c
-gpxe_w89c840_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_w89c840_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_nvs.mod
-gpxe_nvs_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/nvs/nvs.c
-gpxe_nvs_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_nvs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_spi.mod
-gpxe_spi_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/nvs/spi.c
-gpxe_spi_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_spi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_threewire.mod
-gpxe_threewire_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/nvs/threewire.c
-gpxe_threewire_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_threewire_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_bitbash.mod
-gpxe_bitbash_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/bitbash/bitbash.c
-gpxe_bitbash_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_bitbash_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_i2c_bit.mod
-gpxe_i2c_bit_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/bitbash/i2c_bit.c
-gpxe_i2c_bit_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_i2c_bit_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += gpxe_spi_bit.mod
-gpxe_spi_bit_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/bitbash/spi_bit.c
-gpxe_spi_bit_mod_CFLAGS = $(GPXE_CFLAGS)
-gpxe_spi_bit_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#Following ones require MII support which is GPLv2.
-
-#pkglib_MODULES += gpxe_amd8111e.mod
-#gpxe_amd8111e_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/amd8111e.c
-#gpxe_amd8111e_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_amd8111e_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_atl1e.mod
-#gpxe_atl1e_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/atl1e.c
-#gpxe_atl1e_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_atl1e_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_b44.mod
-#gpxe_b44_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/b44.c
-#gpxe_b44_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_b44_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_bnx2.mod
-#gpxe_bnx2_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/bnx2.c
-#gpxe_bnx2_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_bnx2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_etherfabric.mod
-#gpxe_etherfabric_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/etherfabric.c
-#gpxe_etherfabric_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_etherfabric_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_forcedeth.mod
-#gpxe_forcedeth_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/forcedeth.c
-#gpxe_forcedeth_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_forcedeth_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_pcnet32.mod
-#gpxe_pcnet32_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/pcnet32.c
-#gpxe_pcnet32_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_pcnet32_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_mtd80x.mod
-#gpxe_mtd80x_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/mtd80x.c
-#gpxe_mtd80x_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_mtd80x_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_r8169.mod
-#gpxe_r8169_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/r8169.c
-#gpxe_r8169_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_r8169_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_sundance.mod
-#gpxe_sundance_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/sundance.c
-#gpxe_sundance_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_sundance_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_tlan.mod
-#gpxe_tlan_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/tlan.c
-#gpxe_tlan_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_tlan_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#Following is wireless (disabled for now)
-
-#pkglib_MODULES += gpxe_prism2.mod
-#gpxe_prism2_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/prism2.c
-#gpxe_prism2_mod_CFLAGS = $(GPXE_CFLAGS)
-# gpxe_prism2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_prism2_pci.mod
-#gpxe_prism2_pci_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/prism2_pci.c
-#gpxe_prism2_pci_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_prism2_pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_prism2_plx.mod
-#gpxe_prism2_plx_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/prism2_plx.c
-#gpxe_prism2_plx_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_prism2_plx_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_ath5k.mod
-#gpxe_ath5k_mod_SOURCES += $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_attach.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_caps.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_desc.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_dma.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_eeprom.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_gpio.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_initvals.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_pcu.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_phy.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_qcu.c $(GRUB_CONTRIB)/gpxe/src/drivers/net/ath5k/ath5k_reset.c
-#gpxe_ath5k_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_ath5k_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#Following requires ISA/ISAPNP. Disable for now
-
-#pkglib_MODULES += gpxe_3c509.mod
-#gpxe_3c509_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c509.c
-#gpxe_3c509_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_3c509_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += gpxe_3c515.mod
-#gpxe_3c515_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/drivers/net/3c515.c
-#gpxe_3c515_mod_CFLAGS = $(GPXE_CFLAGS)
-#gpxe_3c515_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#Following uses crypto. Disable for now.
-
-#pkglib_MODULES += https.mod
-#https_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/net/tcp/https.c
-#https_mod_CFLAGS = $(GPXE_CFLAGS)
-#https_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += tls.mod
-#tls_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/net/tls.c
-#tls_mod_CFLAGS = $(GPXE_CFLAGS)
-#tls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += aoe.mod
-#aoe_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/net/aoe.c
-#aoe_mod_CFLAGS = $(GPXE_CFLAGS)
-#aoe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-#pkglib_MODULES += iscsi.mod
-#iscsi_mod_SOURCES = $(GRUB_CONTRIB)/gpxe/src/net/tcp/iscsi.c
-#iscsi_mod_CFLAGS = $(GPXE_CFLAGS)
-#iscsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-09-21 18:01:09 +0000
@@ -0,0 +1,3 @@
+**/.deps-core
+**/.dirstamp
+Makefile.core.am
=== added file 'Makefile.core.def'
--- Makefile.core.def 1970-01-01 00:00:00 +0000
+++ Makefile.core.def 2010-09-22 08:27:22 +0000
@@ -0,0 +1,36 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+ name = lua;
+ common = contrib/lua/lapi.c;
+ common = contrib/lua/lcode.c;
+ common = contrib/lua/ldebug.c;
+ common = contrib/lua/ldo.c;
+ common = contrib/lua/ldump.c;
+ common = contrib/lua/lfunc.c;
+ common = contrib/lua/lgc.c;
+ common = contrib/lua/llex.c;
+ common = contrib/lua/lmem.c;
+ common = contrib/lua/lobject.c;
+ common = contrib/lua/lopcodes.c;
+ common = contrib/lua/lparser.c;
+ common = contrib/lua/lstate.c;
+ common = contrib/lua/lstring.c;
+ common = contrib/lua/ltable.c;
+ common = contrib/lua/ltm.c;
+ common = contrib/lua/lundump.c;
+ common = contrib/lua/lvm.c;
+ common = contrib/lua/lzio.c;
+ common = contrib/lua/lauxlib.c;
+ common = contrib/lua/lbaselib.c;
+ common = contrib/lua/linit.c;
+ common = contrib/lua/ltablib.c;
+ common = contrib/lua/lstrlib.c;
+ common = contrib/lua/grub_main.c;
+ common = contrib/lua/grub_lib.c;
+ cflags = -Wno-error;
+};
+
+/* Extra libraries for lua
+ script/lua/lmathlib.c script/lua/loslib.c script/lua/liolib.c
+ script/lua/ldblib.c script/lua/loadlib.c */
=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk 2009-10-26 20:15:26 +0000
+++ conf/common.rmk 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# -*- makefile -*-
-
-pkglib_MODULES += lua.mod
-lua_mod_SOURCES = $(GRUB_CONTRIB)/lua/lapi.c $(GRUB_CONTRIB)/lua/lcode.c $(GRUB_CONTRIB)/lua/ldebug.c \
- $(GRUB_CONTRIB)/lua/ldo.c $(GRUB_CONTRIB)/lua/ldump.c $(GRUB_CONTRIB)/lua/lfunc.c \
- $(GRUB_CONTRIB)/lua/lgc.c $(GRUB_CONTRIB)/lua/llex.c $(GRUB_CONTRIB)/lua/lmem.c \
- $(GRUB_CONTRIB)/lua/lobject.c $(GRUB_CONTRIB)/lua/lopcodes.c $(GRUB_CONTRIB)/lua/lparser.c \
- $(GRUB_CONTRIB)/lua/lstate.c $(GRUB_CONTRIB)/lua/lstring.c $(GRUB_CONTRIB)/lua/ltable.c \
- $(GRUB_CONTRIB)/lua/ltm.c $(GRUB_CONTRIB)/lua/lundump.c $(GRUB_CONTRIB)/lua/lvm.c \
- $(GRUB_CONTRIB)/lua/lzio.c $(GRUB_CONTRIB)/lua/lauxlib.c $(GRUB_CONTRIB)/lua/lbaselib.c \
- $(GRUB_CONTRIB)/lua/linit.c $(GRUB_CONTRIB)/lua/ltablib.c $(GRUB_CONTRIB)/lua/lstrlib.c \
- $(GRUB_CONTRIB)/lua/grub_main.c $(GRUB_CONTRIB)/lua/grub_lib.c
-lua_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-lua_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Extra libraries for lua
-# script/lua/lmathlib.c script/lua/loslib.c script/lua/liolib.c
-# script/lua/ldblib.c script/lua/loadlib.c
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-09-21 18:01:28 +0000
@@ -0,0 +1,3 @@
+**/.deps-core
+**/.dirstamp
+Makefile.core.am
=== added file 'Makefile.core.common'
--- Makefile.core.common 1970-01-01 00:00:00 +0000
+++ Makefile.core.common 2010-09-23 12:13:53 +0000
@@ -0,0 +1,27 @@
+# Compatibility symlink.
+noinst_PROGRAMS += g2hdr.bin
+g2hdr.bin: g2hdr.img
+ rm -f $@
+ $(LN_S) $< $@
+CLEANFILES += g2hdr.bin
+
+grldr.mbr: grldr.img
+ head -c 8192 $< > $@
+CLEANFILES += grldr.mbr
+
+bin2h: contrib/ntldr-img/bin2h.c
+ $(CC) $^ -o $@
+CLEANFILES += bin2h
+
+grub_mbr.h: grldr.mbr bin2h
+ ./bin2h grub_mbr 8192 < $< > $@
+CLEANFILES += grub_mbr.h
+
+grubinst: contrib/ntldr-img/grubinst.c contrib/ntldr-img/utils.c grub_mbr.h
+ $(CC) -I. -Icontrib/ntldr-img -DLINUX -o $@ contrib/ntldr-img/grubinst.c contrib/ntldr-img/utils.c
+CLEANFILES += grubinst
+
+noinst_PROGRAMS += g2ldr.mbr
+g2ldr.mbr: grubinst
+ ./grubinst --grub2 -o $@
+CLEANFILES += g2ldr.mbr
=== added file 'Makefile.core.def'
--- Makefile.core.def 1970-01-01 00:00:00 +0000
+++ Makefile.core.def 2010-09-22 12:12:29 +0000
@@ -0,0 +1,21 @@
+AutoGen definitions Makefile.tpl;
+
+image = {
+ name = g2hdr;
+ i386_pc = contrib/ntldr-img/g2hdr.S;
+ i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+ i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x0';
+ objcopyflags = '-O binary';
+ enable = i386_pc;
+};
+
+image = {
+ name = grldr;
+ i386_pc = contrib/ntldr-img/grldrstart.S;
+ i386_pc = contrib/ntldr-img/ntfsbs.S;
+ i386_pc_ccasflags = -DGRLDR_MBR;
+ i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+ i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7c00';
+ objcopyflags = '-O binary';
+ enable = i386_pc;
+};
=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk 2009-11-29 21:12:28 +0000
+++ conf/common.rmk 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# -*- makefile -*-
--include $(GRUB_CONTRIB)/ntldr-img/conf/$(target_cpu)-$(platform).mk
=== removed file 'conf/i386-pc.rmk'
--- conf/i386-pc.rmk 2009-11-30 02:37:58 +0000
+++ conf/i386-pc.rmk 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# -*- makefile -*-
-
-pkglib_IMAGES += g2ldr.mbr g2hdr.bin grldr.img
-
-all: g2ldr.mbr g2hdr.bin
-
-DISTCLEANFILES += g2ldr.mbr g2hdr.bin
-
-g2hdr_bin_SOURCES = $(GRUB_CONTRIB)/ntldr-img/g2hdr.S
-g2hdr_bin_ASFLAGS = $(COMMON_ASFLAGS)
-g2hdr_bin_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x0
-g2hdr_bin_FORMAT = binary
-
-grldr_img_SOURCES = $(GRUB_CONTRIB)/ntldr-img/grldrstart.S $(GRUB_CONTRIB)/ntldr-img/ntfsbs.S
-grldr_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRLDR_MBR
-grldr_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7c00
-grldr_img_FORMAT = binary
-
-grldr.mbr: grldr.img
- head -c 8192 $< > $@
-DISTCLEANFILES += grldr.mbr
-
-bin2h: $(GRUB_CONTRIB)/ntldr-img/bin2h.c
- $(CC) $^ -o $@
-DISTCLEANFILES += bin2h
-
-grub_mbr.h: grldr.mbr bin2h
- ./bin2h grub_mbr 8192 < $< > $@
-DISTCLEANFILES += grub_mbr.h
-
-grubinst: $(GRUB_CONTRIB)/ntldr-img/grubinst.c $(GRUB_CONTRIB)/ntldr-img/utils.c grub_mbr.h
- $(CC) -I. -I$(GRUB_CONTRIB)/ntldr-img -DLINUX -o $@ $(GRUB_CONTRIB)/ntldr-img/grubinst.c $(GRUB_CONTRIB)/ntldr-img/utils.c
-DISTCLEANFILES += grubinst
-
-g2ldr.mbr: grubinst
- ./grubinst --grub2 -o $@
-DISTCLEANFILES += g2ldr.mbr
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-09-23 12:56:33 +0000
@@ -0,0 +1,5 @@
+**/.deps-core
+**/.deps-util
+**/.dirstamp
+Makefile.core.am
+Makefile.util.am
=== added file 'Makefile.common'
--- Makefile.common 1970-01-01 00:00:00 +0000
+++ Makefile.common 2010-09-21 17:44:33 +0000
@@ -0,0 +1,2 @@
+ZFS_CPPFLAGS = -Icontrib/zfs/include
+ZFS_CFLAGS = -Wno-error
=== added file 'Makefile.core.def'
--- Makefile.core.def 1970-01-01 00:00:00 +0000
+++ Makefile.core.def 2010-09-22 08:25:58 +0000
@@ -0,0 +1,18 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+ name = zfs;
+ common = contrib/zfs/zfs.c;
+ common = contrib/zfs/zfs_lzjb.c;
+ common = contrib/zfs/zfs_sha256.c;
+ common = contrib/zfs/zfs_fletcher.c;
+ cppflags = '$(ZFS_CPPFLAGS)';
+ cflags = '$(ZFS_CFLAGS)';
+};
+
+module = {
+ name = zfsinfo;
+ common = contrib/zfs/zfsinfo.c;
+ cppflags = '$(ZFS_CPPFLAGS)';
+ cflags = '$(ZFS_CFLAGS)';
+};
=== added file 'Makefile.util.def'
--- Makefile.util.def 1970-01-01 00:00:00 +0000
+++ Makefile.util.def 2010-09-22 21:06:18 +0000
@@ -0,0 +1,11 @@
+AutoGen definitions Makefile.tpl;
+
+library = {
+ name = libgrub.a;
+ common = contrib/zfs/zfs.c;
+ common = contrib/zfs/zfs_lzjb.c;
+ common = contrib/zfs/zfs_sha256.c;
+ common = contrib/zfs/zfs_fletcher.c;
+ cppflags = '$(ZFS_CPPFLAGS)';
+ cflags = '$(ZFS_CFLAGS)';
+};
=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk 2009-10-26 20:15:26 +0000
+++ conf/common.rmk 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS += -I$(GRUB_CONTRIB)/zfs/include
-
-pkglib_MODULES += zfs.mod
-zfs_mod_SOURCES = $(GRUB_CONTRIB)/zfs/zfs.c $(GRUB_CONTRIB)/zfs/zfs_lzjb.c $(GRUB_CONTRIB)/zfs/zfs_sha256.c $(GRUB_CONTRIB)/zfs/zfs_fletcher.c
-zfs_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-zfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += zfsinfo.mod
-zfsinfo_mod_SOURCES = $(GRUB_CONTRIB)/zfs/zfsinfo.c
-zfsinfo_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-zfsinfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
