summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 05:27:40 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 05:27:40 +0000
commit2a9751ba6ee602d371a02db2f773faac499e7c49 (patch)
treee8ad6082809557513a0ff3ead3fb64a7e0b8e34f
parent75ddc035b763c3d328ddd5e3145d9e0eabdfd30c (diff)
downloaddrakx-2a9751ba6ee602d371a02db2f773faac499e7c49.tar
drakx-2a9751ba6ee602d371a02db2f773faac499e7c49.tar.gz
drakx-2a9751ba6ee602d371a02db2f773faac499e7c49.tar.bz2
drakx-2a9751ba6ee602d371a02db2f773faac499e7c49.tar.xz
drakx-2a9751ba6ee602d371a02db2f773faac499e7c49.zip
Handle PCMCIA on x86-64 too. Fix libs glob for live tree. Don't ship with
"cdcom" modules archives in netinstallable trees.
-rw-r--r--perl-install/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 153506491..a92f60d2b 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -12,6 +12,14 @@ OTHERS = $(OTHERDIRS) $(OTHERFILES)
OTHERDIRS = tools/ddcprobe tools/serial_probe
OTHERFILES = tools/rpcinfo-flushed.c
+USE_PCMCIA := n
+ifeq ($(ARCH),i386)
+USE_PCMCIA := y
+endif
+ifeq ($(ARCH),x86_64)
+USE_PCMCIA := y
+endif
+
.PHONY: all $(DIRS) install clean stage2 full_stage2
all: list_modules.pm TAGS $(DIRS)
@@ -96,7 +104,7 @@ get_needed_files: $(DIRS) mo_files
find auto -follow -name "*.so" >> /tmp/list
for i in $(LOCALFILES) `cat /tmp/list` ; do \
- ldd $$i 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/lib/.*?/,/lib/,' | sort | uniq >> /tmp/list; \
+ ldd $$i 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/(lib(64)?)/.*?/,/\1/,' | sort | uniq >> /tmp/list; \
done
perl -Mlang -I. -e 'print "$$_\n" foreach lang::console_font_files()' >> /tmp/list
@@ -181,6 +189,7 @@ endif
clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS*
for i in ../kernel/modules.description ../kernel/all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done
+ rm -f $(DEST)/lib/modules.cz-cdcom.*
$(MAKE) -C share/po install SUDO= NAME=libDrakX LOCALEDIR=$(DEST)/usr/share/locale_special
@@ -188,7 +197,7 @@ endif
# ga and sl are disabled because too few messages are translated
rm -rf $(DEST)/usr/share/locale_special/{ar,fa,ga,sl}
-ifeq (i386,$(ARCH))
+ifeq (y,$(USE_PCMCIA))
cp -a /etc/pcmcia $(DEST)/etc
../tools/patch_pcmcia_config.pl $(DEST)/etc/pcmcia/config ../kernel/all.modules/`cat ../kernel/all.kernels/.main`/modules.dep
endif