diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:31:28 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:31:28 +0000 |
| commit | 64a1907acbbf957d75647205555b8071525fd8dc (patch) | |
| tree | 5c3df690ce1dda95e5c1571f0b516acbebe66811 /Makefile | |
| parent | e2c958e78632824ce44e71e4ad310404bad821d9 (diff) | |
| download | drakx-64a1907acbbf957d75647205555b8071525fd8dc.tar drakx-64a1907acbbf957d75647205555b8071525fd8dc.tar.gz drakx-64a1907acbbf957d75647205555b8071525fd8dc.tar.bz2 drakx-64a1907acbbf957d75647205555b8071525fd8dc.tar.xz drakx-64a1907acbbf957d75647205555b8071525fd8dc.zip | |
- Add x86-64 support with all.img for now as other boot images are way
too big at the moment
- Use isolinux on x86-64 too and stop deliberate call to boot_img_i386()
- Fix Makefile when BOOT_IMG only contains all.img
- "Macroize" references to ramdis_size
- Add symlink for /lib64 on lib64 architectures since that's not already
in stage1-data/stage1.tar.bz2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -19,9 +19,15 @@ endif ifeq (ia64,$(ARCH)) BOOT_IMG = all.img endif +ifeq (x86_64,$(ARCH)) + BOOT_IMG = all.img +endif FBOOT_IMG = $(BOOT_IMG:%=images/%) -FBOOT_RDZ = $(FBOOT_IMG:%.img=%.rdz) images/all.rdz +FBOOT_RDZ = $(FBOOT_IMG:%.img=%.rdz) +ifneq (all.img,$(findstring all.img,$(BOOT_IMG))) +FBOOT_RDZ += images/all.rdz +endif .PHONY: dirs install @@ -65,6 +71,12 @@ install_only: cp -f images/cdrom-changedisk.img $(ROOTDEST)/images endif + ifeq (x86_64,$(ARCH)) + rm -rf $(ROOTDEST)/isolinux + cp -af isolinux $(ROOTDEST) + cp -f images/cdrom-changedisk.img $(ROOTDEST)/images + endif + install live_update $(ROOTDEST)/live_update make -C perl-install full_stage2 make -C perl-install/share/advertising install |