From de775393f1c6a517d54a9991be2d02c268592c0d Mon Sep 17 00:00:00 2001 From: gobo72 Date: Sun, 1 Jan 2012 03:54:22 +0000 Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20udev-173?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/packages-list | 14 +++++++------- stage1/hv-install-2 | 7 ++++++- stage1/pkg/udev | 5 ++++- stage1/pkg/util-linux | 31 ++++++------------------------- stage2/packages-update | 2 +- 5 files changed, 24 insertions(+), 35 deletions(-) diff --git a/config/packages-list b/config/packages-list index 0766f08..1fcb725 100644 --- a/config/packages-list +++ b/config/packages-list @@ -167,7 +167,7 @@ ICON_NAMING_UTILS="icon-naming-utils-0.8.90" IMAGE_MAGICK="ImageMagick-6.6.8-1" IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" -INETUTILS="inetutils-1.7" +INETUTILS="inetutils-1.8" INKSCAPE="inkscape-0.48.1" INTLTOOL="intltool-0.40.6" IPROUTE2="iproute2-3.1.0" @@ -186,7 +186,7 @@ KVM="kvm-84" LADSPA="ladspa_sdk" LAME="lame-3.99.3" LCMS="lcms-1.18a" -LESS="less-443" +LESS="less-444" LESSTIF="lesstif-0.95.2" LFS_BOOTSCRIPTS="lfs-bootscripts-20070813" LIBA52="a52dec-0.7.4" @@ -228,7 +228,7 @@ LIBSPF2="libspf2-1.2.5" LIBSPECTRE="libspectre-0.2.6" LIBTASN1="libtasn1-2.8" LIBTHEORA="libtheora-1.1.1" -LIBTOOL="libtool-2.4" +LIBTOOL="libtool-2.4.2" LIBVORBIS="libvorbis-1.3.2" VORBIS_TOOLS="vorbis-tools-1.2.0" LIBVPX="libvpx-v0.9.7" @@ -245,12 +245,12 @@ LYNX="lynx2.8.7rel.2" MAKE_PACKAGE="make-3.82" MAN_DB="man-db-2.6.0.2" -MANPAGES="man-pages-3.32" +MANPAGES="man-pages-3.35" MFOUR="m4-1.4.16" MILTER_GREYLIST="milter-greylist-4.0" MILTER_SPF="smf-spf-2.0.1" MOC="moc-2.4.4" -MODULE_INIT_TOOLS="module-init-tools-3.12" +MODULE_INIT_TOOLS="module-init-tools-3.16" MPC="mpc-0.9" MPFR="mpfr-3.1.0" MUTT="mutt-1.5.21" @@ -368,13 +368,13 @@ TIFF="tiff-3.9.4" TK="tk8.5.8-src" TRANSMISSION="transmission-2.33" -UDEV="udev-168" +UDEV="udev-173" UML_UTILITIES="uml_utilities_20070815" UNRAR="unrar-3.7.8" UNZIP="unzip-5.52" UPSTART="upstart-0.6.3" USBUTILS="usbutils-0.86" -UTIL_LINUX="util-linux-2.19.1" +UTIL_LINUX="util-linux-2.20.1" UW_IMAP="imap-2007e" VAMP="vamp-plugin-sdk-2.2.1" diff --git a/stage1/hv-install-2 b/stage1/hv-install-2 index c804216..1b30a39 100755 --- a/stage1/hv-install-2 +++ b/stage1/hv-install-2 @@ -59,7 +59,12 @@ rscr once "Creating directory structure" create-directories rscr once "Creating symbolic links" create-symlinks ipkg ${NANO} "--enable-color --enable-multibuffer" -ipkg ${UTIL_LINUX} +PKG_CONFIG=true \ + ipkg ${UTIL_LINUX} "\ + --exec-prefix=/tools \ + --enable-login-utils \ + --disable-makeinstall-chown" + ipkg ${E2FSPROGS} ipkg -m noac ${SYSVINIT} ipkg ${MODULE_INIT_TOOLS} diff --git a/stage1/pkg/udev b/stage1/pkg/udev index d120b14..7a485fd 100644 --- a/stage1/pkg/udev +++ b/stage1/pkg/udev @@ -11,7 +11,10 @@ hvconfig_pre() --libexecdir=/lib/udev \ --libdir=/usr/lib \ --disable-extras \ - --disable-introspection" + --disable-introspection \ + --disable-hwdb \ + --disable-keymap \ + --disable-gudev" cd ${LFS_TMP}/${PACKAGE} install -dv ${LFS}/lib/{firmware,udev/devices/{pts,shm}} diff --git a/stage1/pkg/util-linux b/stage1/pkg/util-linux index 079a343..1ff721f 100644 --- a/stage1/pkg/util-linux +++ b/stage1/pkg/util-linux @@ -1,29 +1,10 @@ #!/bin/bash -hvconfig_pre() +# The following cache entries set the values for tests that do not run while +# cross-compiling: +hvconfig_cache() { - CONFIGURE_OPTS="\ - --build=${CLFS_HOST} \ - --host=${CLFS_TARGET} \ - --enable-login-utils \ - --disable-makeinstall-chown" -} - -hvbuild() -{ - ${HVMAKE} - ${HVMAKE} DESTDIR=${LFS} install -} - -hvbuild_post() -{ - # Copy Libraries and includes to /tools: - rm -fv ${LFS}/usr/lib/lib{blkid,uuid}.la - cp -v ${LFS}/usr/lib/lib{blkid,uuid}* /tools/lib - cp -v ${LFS}/lib/lib{blkid,uuid}* /tools/lib - ln -sfvT libblkid.so.1.1.0 /tools/lib/libblkid.so - ln -sfvT libuuid.so.1.3.0 /tools/lib/libuuid.so - install -dv /tools/include/{blkid,uuid} - cp -av ${LFS}/usr/include/blkid/* /tools/include/blkid/ - cp -av ${LFS}/usr/include/uuid/* /tools/include/uuid/ +cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +scanf_cv_type_modifier=as +EOF } diff --git a/stage2/packages-update b/stage2/packages-update index 6a37424..73c2aeb 100755 --- a/stage2/packages-update +++ b/stage2/packages-update @@ -88,7 +88,7 @@ fpkg -m hv ${SHADOW} fpkg -e "tar.gz" ${SYSKLOGD} \ "http://www.infodrom.org/projects/sysklogd/download" fpkg -m gnu ${GRUB} -fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history" +fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/$(get_pkg_ver ${DHCP})" fpkg -e "tar.gz" ${ACPID} "http://www.tedfelix.com/linux" -- 2.20.1