diff options
author | Olivier Blin <oblin@mandriva.com> | 2007-05-09 13:12:15 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2007-05-09 13:12:15 +0000 |
commit | 01b47be3701dced43e6f4f53da2278c9d5902e52 (patch) | |
tree | 115c5f1282b968d2a92c186c04c7c8af8eb5765c | |
parent | 6e8ff6c92bf645e060a59dbb82d043e9fcfb7a39 (diff) | |
download | drakx-backup-do-not-use-01b47be3701dced43e6f4f53da2278c9d5902e52.tar drakx-backup-do-not-use-01b47be3701dced43e6f4f53da2278c9d5902e52.tar.gz drakx-backup-do-not-use-01b47be3701dced43e6f4f53da2278c9d5902e52.tar.bz2 drakx-backup-do-not-use-01b47be3701dced43e6f4f53da2278c9d5902e52.tar.xz drakx-backup-do-not-use-01b47be3701dced43e6f4f53da2278c9d5902e52.zip |
build pcmcia header only on i386/x86_64 (patch from Pixel, #30668)
-rw-r--r-- | mdk-stage1/Makefile | 6 | ||||
-rw-r--r-- | mdk-stage1/NEWS | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 44f988ffa..41fee42c9 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -133,12 +133,12 @@ STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1_ALLSRC)) BINS = init stage1 dhcp-client rescue-gui -DIRS += pci-resource pcmcia-resource usb-resource slang newt ppp/pppd rp-pppoe/src +DIRS += pci-resource usb-resource slang newt ppp/pppd rp-pppoe/src ifeq (i386, $(ARCH)) -DIRS += pcmcia sysfs +DIRS += pcmcia pcmcia-resource sysfs endif ifeq (x86_64, $(ARCH)) -DIRS += pcmcia sysfs +DIRS += pcmcia pcmcia-resource sysfs endif diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 106f0d36a..bf95bc01c 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,4 +1,5 @@ 1.8: +- build pcmcia header only on i386/x86_64 (#30668) - use api.mandriva.com to retrieve mirror list (#29346) 1.7: |