From 241e22a783848b384fa2c2db00723ecd339f4744 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Wed, 26 May 2010 18:55:40 +0000 Subject: [PATCH] Reorder to have -lcrypto after -larchive. Our linker doesn't seem to like the current ordering :( --- release/amd64/boot_crunch.conf | 4 ++-- release/i386/boot_crunch.conf | 4 ++-- release/ia64/boot_crunch.conf | 4 ++-- release/pc98/boot_crunch.conf | 4 ++-- release/powerpc/boot_crunch.conf | 4 ++-- release/sparc64/boot_crunch.conf | 4 ++-- release/sun4v/boot_crunch.conf | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf index 01a71e0b6729..0e315c722673 100644 --- a/release/amd64/boot_crunch.conf +++ b/release/amd64/boot_crunch.conf @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail +libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf index 01a71e0b6729..0e315c722673 100644 --- a/release/i386/boot_crunch.conf +++ b/release/i386/boot_crunch.conf @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail +libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail diff --git a/release/ia64/boot_crunch.conf b/release/ia64/boot_crunch.conf index 381ee1df370a..1168ee676e46 100644 --- a/release/ia64/boot_crunch.conf +++ b/release/ia64/boot_crunch.conf @@ -44,6 +44,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo -libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail +libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf index b17a79937a54..5f1498f454a8 100644 --- a/release/pc98/boot_crunch.conf +++ b/release/pc98/boot_crunch.conf @@ -38,6 +38,6 @@ progs arp progs ppp progs sysinstall -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -llzma -ljail +libs -larchive -lcrypto -lbz2 -llzma -ljail diff --git a/release/powerpc/boot_crunch.conf b/release/powerpc/boot_crunch.conf index 6b34356f61cf..bad439f3b151 100644 --- a/release/powerpc/boot_crunch.conf +++ b/release/powerpc/boot_crunch.conf @@ -44,6 +44,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail +libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail diff --git a/release/sparc64/boot_crunch.conf b/release/sparc64/boot_crunch.conf index b14c9275cb47..cd93c802dc10 100644 --- a/release/sparc64/boot_crunch.conf +++ b/release/sparc64/boot_crunch.conf @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -llzma -lusb -ljail +libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail diff --git a/release/sun4v/boot_crunch.conf b/release/sun4v/boot_crunch.conf index b14c9275cb47..cd93c802dc10 100644 --- a/release/sun4v/boot_crunch.conf +++ b/release/sun4v/boot_crunch.conf @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -llzma -lusb -ljail +libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail