From 5864e67ba0c22a0a551eeac4eff11440463b4cc1 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sat, 27 Dec 2014 17:19:30 -0500 Subject: [PATCH] Remove configure options from custom scripts Move them to main install script. --- stage2/hv-install-1 | 5 ++++- stage2/hv-install-2 | 17 +++++++++++++---- stage2/pkg/coreutils | 7 ------- stage2/pkg/findutils | 7 ------- stage2/pkg/gzip | 5 ----- stage2/pkg/inetutils | 12 ------------ stage2/pkg/kbd | 5 ----- stage3/hv-install-1 | 12 ++++++++---- stage3/pkg/flac | 5 +---- stage3/pkg/fontconfig | 9 --------- stage3/pkg/reiserfsprogs | 6 ------ stage3/pkg/xinetd | 5 ----- stage4/hv-install-1 | 2 +- stage4/pkg/glib | 5 ----- stage5/hv-install-1 | 4 +++- stage5/pkg/GConf | 7 ------- 16 files changed, 30 insertions(+), 83 deletions(-) diff --git a/stage2/hv-install-1 b/stage2/hv-install-1 index 9329e56..253e6d9 100755 --- a/stage2/hv-install-1 +++ b/stage2/hv-install-1 @@ -46,7 +46,10 @@ ipkg ${E2FSPROGS} ipkg -s "icu" ${ICU} ipkg -m noac ${GPTFDISK} -FORCE_UNSAFE_CONFIGURE=1 ipkg -m acnb ${COREUTILS} +FORCE_UNSAFE_CONFIGURE=1 ipkg -m acnb ${COREUTILS} "\ + --libexecdir=/usr/lib \ + --enable-no-install-program=kill,uptime" + ipkg -m noac ${IANA} ipkg ${MFOUR} ipkg -m noac ${PROCPS} diff --git a/stage2/hv-install-2 b/stage2/hv-install-2 index 6a25ace..c148a8f 100755 --- a/stage2/hv-install-2 +++ b/stage2/hv-install-2 @@ -6,18 +6,27 @@ init_log_file ipkg ${BC} "--with-readline" ipkg ${GDBM} -ipkg ${INETUTILS} +ipkg ${INETUTILS} "\ + --libexecdir=/usr/sbin \ + --localstatedir=/var \ + --disable-ifconfig \ + --disable-logger \ + --disable-syslogd \ + --disable-whois \ + --disable-servers" ipkg -m noac ${BZIP2} ipkg ${DIFFUTILS} ipkg ${FILE_PKG} ipkg ${GAWK} "--libexecdir=/usr/lib" -ipkg ${FINDUTILS} +ipkg ${FINDUTILS} "\ + --libexecdir=/usr/lib/findutils \ + --localstatedir=/var/lib/locate" ipkg ${GETTEXT} ipkg ${GPERF} ipkg ${GREP} "--bindir=/bin --without-included-regex" ipkg ${GROFF} -ipkg ${GZIP} -ipkg ${KBD} +ipkg ${GZIP} "--bindir=/bin" +ipkg ${KBD} "--datadir=/lib/kbd" ipkg ${LESS} ipkg ${MAKE_PACKAGE} ipkg ${XZ_UTILS} diff --git a/stage2/pkg/coreutils b/stage2/pkg/coreutils index 8992716..644dfa3 100644 --- a/stage2/pkg/coreutils +++ b/stage2/pkg/coreutils @@ -1,12 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --libexecdir=/usr/lib \ - --enable-no-install-program=kill,uptime" -} - hvbuild_post() { # Move some programs to their proper FHS locations: diff --git a/stage2/pkg/findutils b/stage2/pkg/findutils index 715d4d4..e64d8ff 100644 --- a/stage2/pkg/findutils +++ b/stage2/pkg/findutils @@ -1,12 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --libexecdir=/usr/lib/findutils \ - --localstatedir=/var/lib/locate" -} - hvbuild_post() { # Some of the scripts in the LFS-Bootscripts package depend on find. As diff --git a/stage2/pkg/gzip b/stage2/pkg/gzip index 3043737..406482d 100644 --- a/stage2/pkg/gzip +++ b/stage2/pkg/gzip @@ -1,10 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" --bindir=/bin" -} - hvbuild_post() { # Move some programs that do not need to be on the root filesystem: diff --git a/stage2/pkg/inetutils b/stage2/pkg/inetutils index 0fc02e9..875fbf7 100644 --- a/stage2/pkg/inetutils +++ b/stage2/pkg/inetutils @@ -1,17 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --libexecdir=/usr/sbin \ - --localstatedir=/var \ - --disable-ifconfig \ - --disable-logger \ - --disable-syslogd \ - --disable-whois \ - --disable-servers" -} - hvbuild_post() { # Move some programs to their FHS-compliant place: diff --git a/stage2/pkg/kbd b/stage2/pkg/kbd index 2df1e1e..5e589b6 100644 --- a/stage2/pkg/kbd +++ b/stage2/pkg/kbd @@ -1,10 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" --datadir=/lib/kbd" -} - hvbuild_post() { # Some of the scripts in the LFS-Bootscripts package depend on kbd_mode, diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index 3769565..842a424 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -8,7 +8,7 @@ init_log_file ipkg -m noac ${BASHCOMPLETION} ipkg ${WHICH} -ipkg -m acnb ${REISERFSPROGS} +ipkg -m acnb ${REISERFSPROGS} "--sbindir=/sbin" ipkg -m acnb ${POPT} ipkg -m acnb ${LIBTIRPC} "--disable-static --disable-gssapi" ipkg ${PAM} @@ -53,7 +53,7 @@ LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} " \ --disable-nfsv41 \ --sbindir=/sbin \ --disable-gss" -ipkg ${XINETD} +ipkg ${XINETD} "--with-loadavg" if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then ipkg ${DDCLIENT} fi @@ -143,7 +143,11 @@ ipkg ${GIFLIB} "--disable-static" ipkg -m acnb ${LIBMNG} "--disable-static" ipkg ${FREETYPE} "--disable-static" -ipkg ${FONTCONFIG} +ipkg ${FONTCONFIG} "\ + --localstatedir=/var \ + --disable-docs \ + --without-add-fonts \ + --with-docdir=/usr/share/doc/${FONTCONFIG}" ipkg -m noac ${CKERMIT} @@ -196,7 +200,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the # Audio file formats ipkg ${LIBOGG} ipkg ${LIBVORBIS} - ipkg -m acnb ${FLAC} + ipkg -m acnb ${FLAC} "--disable-thorough-test" ipkg ${LIBSNDFILE} ipkg -m acnb ${VAMP} diff --git a/stage3/pkg/flac b/stage3/pkg/flac index 9b07f46..1db4587 100644 --- a/stage3/pkg/flac +++ b/stage3/pkg/flac @@ -3,8 +3,5 @@ hvconfig_pre() { sed -e "s!#include !&\n#include !" -i \ - ${LFS_TMP}/${PACKAGE}/examples/cpp/encode/file/main.cpp - - CONFIGURE_OPTS+=" \ - --disable-thorough-test" + ${SRC_DIR}/examples/cpp/encode/file/main.cpp } diff --git a/stage3/pkg/fontconfig b/stage3/pkg/fontconfig index 44efe34..8e48f42 100644 --- a/stage3/pkg/fontconfig +++ b/stage3/pkg/fontconfig @@ -1,14 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --localstatedir=/var \ - --disable-docs \ - --without-add-fonts \ - --with-docdir=/usr/share/doc/${PACKAGE}" -} - hvbuild_post() { # Updating font information cache. diff --git a/stage3/pkg/reiserfsprogs b/stage3/pkg/reiserfsprogs index 489c975..9234aa3 100644 --- a/stage3/pkg/reiserfsprogs +++ b/stage3/pkg/reiserfsprogs @@ -1,11 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --sbindir=/sbin" -} - hvbuild_post() { ln -sf reiserfsck /sbin/fsck.reiserfs diff --git a/stage3/pkg/xinetd b/stage3/pkg/xinetd index f871392..bcb914b 100644 --- a/stage3/pkg/xinetd +++ b/stage3/pkg/xinetd @@ -1,10 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" --with-loadavg" -} - hvbuild_post() { cat > /etc/xinetd.conf << "EOF" diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 index 860d655..e3c1212 100755 --- a/stage4/hv-install-1 +++ b/stage4/hv-install-1 @@ -69,7 +69,7 @@ install_xorg_modules font ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg ipkg ${PIXMAN} ipkg ${DBUS} -ipkg ${GLIB} +ipkg ${GLIB} "--with-pcre=system" ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests" ipkg -m acnb ${DBUS_GLIB} \ --disable-tests \ diff --git a/stage4/pkg/glib b/stage4/pkg/glib index 4849c91..8ccd955 100644 --- a/stage4/pkg/glib +++ b/stage4/pkg/glib @@ -1,10 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" --with-pcre=system" -} - hvbuild_post() { chmod -v 755 /usr/bin/gtester-report diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index 1f0f5a8..2f006e4 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -64,7 +64,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${ISO_CODES} ipkg ${LIBXKLAVIER} ipkg ${LIBGLADE} - ipkg -m acnb ${GCONF} + ipkg -m acnb ${GCONF} "\ + --disable-orbit \ + --disable-static" ipkg -c -m noac ${CERTDATA} ipkg ${P11KIT} ipkg ${GCR} "--without-gtk" # Needs Gtk3 diff --git a/stage5/pkg/GConf b/stage5/pkg/GConf index 0e16848..c0e897d 100644 --- a/stage5/pkg/GConf +++ b/stage5/pkg/GConf @@ -1,12 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - CONFIGURE_OPTS+=" \ - --disable-orbit \ - --disable-static" -} - hvbuild_post() { install -v -m755 -d /etc/gconf/gconf.xml.system -- 2.20.1