Author: jcrouse Date: 2007-06-20 23:30:06 +0200 (Wed, 20 Jun 2007) New Revision: 12
Modified: buildrom-devel/buildrom/packages/etherboot/etherboot.mk buildrom-devel/buildrom/packages/filo/filo.mk buildrom-devel/buildrom/scripts/Makefile.generic buildrom-devel/buildrom/scripts/Makefile.kernel Log: Fix the targets a bit so that they do the right thing with payloads.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: buildrom-devel/buildrom/packages/etherboot/etherboot.mk =================================================================== --- buildrom-devel/buildrom/packages/etherboot/etherboot.mk 2007-06-20 21:29:35 UTC (rev 11) +++ buildrom-devel/buildrom/packages/etherboot/etherboot.mk 2007-06-20 21:30:06 UTC (rev 12) @@ -53,7 +53,7 @@
etherboot: $(ETHERBOOT_STAMP_DIR) $(ETHERBOOT_LOG_DIR) $(ETHERBOOT_OUTPUT) @ mkdir -p $(OUTPUT_DIR) - @ cp $(ETHERBOOT_OUTPUT) $(PAYLOAD_TARGET) + @ cp $(ETHERBOOT_OUTPUT) $(PAYLOAD_ELF)
etherboot-clean: @ echo "Cleaning etherboot..."
Modified: buildrom-devel/buildrom/packages/filo/filo.mk =================================================================== --- buildrom-devel/buildrom/packages/filo/filo.mk 2007-06-20 21:29:35 UTC (rev 11) +++ buildrom-devel/buildrom/packages/filo/filo.mk 2007-06-20 21:30:06 UTC (rev 12) @@ -50,7 +50,7 @@
filo: $(FILO_STAMP_DIR) $(FILO_LOG_DIR) $(FILO_SRC_DIR)/filo.elf @ mkdir -p $(OUTPUT_DIR) - @ cp $(FILO_SRC_DIR)/filo.elf $(PAYLOAD_TARGET) + @ cp $(FILO_SRC_DIR)/filo.elf $(PAYLOAD_ELF)
filo-clean: @ echo "Cleaning filo..."
Modified: buildrom-devel/buildrom/scripts/Makefile.generic =================================================================== --- buildrom-devel/buildrom/scripts/Makefile.generic 2007-06-20 21:29:35 UTC (rev 11) +++ buildrom-devel/buildrom/scripts/Makefile.generic 2007-06-20 21:30:06 UTC (rev 12) @@ -4,4 +4,4 @@ $(PAYLOAD_ELF): $(PAYLOAD-y) $(PAYLOAD_COMPRESSED): $(PAYLOAD_ELF) @ echo "Compressing the ELF payload with lzma..." - @ $(STAGING_DIR)/bin/lzma e $< 2> /dev/null $@ + @ $(STAGING_DIR)/bin/lzma e $< $@ 2> /dev/null
Modified: buildrom-devel/buildrom/scripts/Makefile.kernel =================================================================== --- buildrom-devel/buildrom/scripts/Makefile.kernel 2007-06-20 21:29:35 UTC (rev 11) +++ buildrom-devel/buildrom/scripts/Makefile.kernel 2007-06-20 21:30:06 UTC (rev 12) @@ -9,5 +9,5 @@
$(OUTPUT_DIR)/kernel-payload.elf.lzma: $(OUTPUT_DIR)/kernel-payload.elf @ echo "Compressing the ELF payload with lzma..." - @ $(STAGING_DIR)/bin/lzma e $< 2> /dev/null $@ + @ $(STAGING_DIR)/bin/lzma e $< $@ 2> /dev/null @ $(BIN_DIR)/checkrom.sh $@