From 123a4b9f48445243382b252cc68c8e56320aa670 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sat, 9 Aug 2014 11:32:37 -0400 Subject: [PATCH] Fix errors with new eudev --- config/dependencies | 2 +- config/packages-list | 2 +- stage1/packages-update | 2 +- stage1/pkg/eudev | 57 ++++++++------------------------------ stage2/hv-install-2 | 2 +- stage2/packages-update | 2 +- stage2/pkg/{udev => eudev} | 25 +++++++++-------- 7 files changed, 30 insertions(+), 62 deletions(-) rename stage2/pkg/{udev => eudev} (52%) diff --git a/config/dependencies b/config/dependencies index 5a9e1d2..8f4cfe3 100644 --- a/config/dependencies +++ b/config/dependencies @@ -27,7 +27,7 @@ ${GNASH}: ${AGG} ${CAIRO} ${GSTREAMER} ${FFMPEG} ${SDL} ${FIREFOX} ${FIREFOX}: ${SQLITE} ${LIBNOTIFY} ${YASM} ${NSPR} ${NSS} -${FUSE}: ${UDEV} +${FUSE}: ${EUDEV} ${JASPER}: ${LIBJPEG} ${XORG} ${MESALIB} ${GHOSTSCRIPT}: ${LIBJPEG} ${LIBPNG} ${JASPER} ${GTK} ${XORG} diff --git a/config/packages-list b/config/packages-list index 5d523ed..b4fbfa3 100644 --- a/config/packages-list +++ b/config/packages-list @@ -397,7 +397,7 @@ TK="tk8.5.9-src" TRANSMISSION="transmission-2.60" TUNCTL="tunctl-1.5" -EUDEV="eudev-1.2" +EUDEV="eudev-1.7" UNRAR="unrar-4.2.4" UNZIP="unzip-6.0" UPSTART="upstart-0.6.3" diff --git a/stage1/packages-update b/stage1/packages-update index 8fefe3a..2920824 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -52,6 +52,6 @@ fpkg -m sf ${E2FSPROGS} fpkg ${SYSVINIT} "http://download.savannah.gnu.org/releases/sysvinit" fpkg -e "tar.xz" -s "linux/utils/kernel/kmod" ${KMOD} ${KERNEL_URL} -fpkg ${EUDEV} "ftp://mirror.ovh.net/gentoo-distfiles/distfiles" +fpkg -e "tar.gz" ${EUDEV} "http://dev.gentoo.org/~blueness/eudev" exit $? diff --git a/stage1/pkg/eudev b/stage1/pkg/eudev index b36838f..5335593 100644 --- a/stage1/pkg/eudev +++ b/stage1/pkg/eudev @@ -2,65 +2,30 @@ hvconfig_pre() { - export BLKID_CFLAGS="-I/tools/include" - export BLKID_LIBS="-L/tools/lib -lblkid" - export KMOD_CFLAGS="-I/tools/include/" - export KMOD_LIBS="-L/tools/lib -lkmod" + # --disable-keymap: to remove gperf dependency CONFIGURE_OPTS="\ - --prefix=/usr \ + --prefix=${LFS} \ + --with-sysroot=${LFS} \ --build=${CLFS_HOST} \ --host=${CLFS_TARGET} \ - --with-rootprefix= \ - --enable-split-usr \ - --sysconfdir=/etc \ - --libexecdir=/lib \ - --bindir=/sbin \ - --sbindir=/sbin \ - --libdir=/lib \ + --bindir=${LFS}/sbin \ + --datarootdir=${LFS}/usr/share \ + --includedir=${LFS}/usr/include \ --disable-introspection \ --disable-gtk-doc-html \ --disable-gudev \ --disable-keymap \ --with-firmware-path=/lib/firmware \ --enable-libkmod" - - cd ${LFS_TMP}/${PACKAGE} - -} - -hvbuild() -{ - make - make DESTDIR=${LFS} install } hvbuild_post() { - install -dv ${LFS}/lib/{firmware,udev/devices} - - # Static UDEV devices - if [ ! -c ${LFS}/lib/udev/devices/kmsg ]; then - mknod -m0666 ${LFS}/lib/udev/devices/kmsg c 1 11 - fi - - if [ ! -h ${LFS}/lib/udev/devices/fd ]; then - ln -sfv /proc/self/fd ${LFS}/lib/udev/devices/fd - fi - - if [ ! -h ${LFS}/lib/udev/devices/stdin ]; then - ln -sfv /proc/self/fd/0 ${LFS}/lib/udev/devices/stdin - fi - - if [ ! -h ${LFS}/lib/udev/devices/stdout ]; then - ln -sfv /proc/self/fd/1 ${LFS}/lib/udev/devices/stdout - fi - - if [ ! -h ${LFS}/lib/udev/devices/stderr ]; then - ln -sfv /proc/self/fd/2 ${LFS}/lib/udev/devices/stderr - fi + install -dv ${LFS}/lib/{firmware,udev/devices/{pts,shm}} - if [ ! -h ${LFS}/lib/udev/devices/core ]; then - ln -sfv /proc/kcore ${LFS}/lib/udev/devices/core - fi + # Move udev pkgconfig file to /usr + install -dv ${LFS}/usr/lib/pkgconfig + mv ${LFS}/lib/pkgconfig/libudev.pc ${LFS}/usr/lib/pkgconfig + rmdir --ignore-fail-on-non-empty ${LFS}/lib/pkgconfig } diff --git a/stage2/hv-install-2 b/stage2/hv-install-2 index 2c731a3..e0a0bd2 100755 --- a/stage2/hv-install-2 +++ b/stage2/hv-install-2 @@ -40,7 +40,7 @@ ipkg -m noac ${SYSKLOGD} ipkg -m noac ${SYSVINIT} FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin" ipkg ${TEXINFO} -ipkg ${UDEV} +ipkg ${EUDEV} ipkg ${GRUB} --disable-werror ipkg -m acnb ${DHCP} diff --git a/stage2/packages-update b/stage2/packages-update index d0ed09f..a2582fb 100755 --- a/stage2/packages-update +++ b/stage2/packages-update @@ -48,7 +48,7 @@ lpkg 1 ${PATCH_PACKAGE} lpkg 1 ${SYSVINIT} lpkg 1 ${TAR_PACKAGE} lpkg 1 ${TEXINFO} -lpkg 1 ${UDEV} +lpkg 1 ${EUDEV} lpkg 1 ${XZ_UTILS} # These packages are only for stage2 diff --git a/stage2/pkg/udev b/stage2/pkg/eudev similarity index 52% rename from stage2/pkg/udev rename to stage2/pkg/eudev index 4ad5210..d3cdeb9 100644 --- a/stage2/pkg/udev +++ b/stage2/pkg/eudev @@ -2,16 +2,22 @@ hvconfig_pre() { - # --disable-keymap: to remove gperf dependency - CONFIGURE_OPTS="\ - ${CONFIGURE_OPTS} \ - --exec-prefix="" \ + --prefix=/usr \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ --libexecdir=/lib \ - --with-usb-ids-path=no \ - --with-pci-ids-path=no \ - --disable-keymap \ - --disable-introspection" + --with-rootlibdir=/lib \ + --enable-split-usr \ + --enable-libkmod \ + --enable-rule_generator \ + --enable-keymap \ + --disable-introspection \ + --disable-gtk-doc-html \ + --disable-gudev \ + --with-firmware-path=/lib/firmware" } hvbuild_post() @@ -23,9 +29,6 @@ hvbuild_post() install -v -m644 ${SCRDIR}/misc/udev/11-sd-card-automount.rules \ /etc/udev/rules.d/ - mv /lib/pkgconfig/{gudev-*.pc,libudev.pc} /usr/lib/pkgconfig - rmdir /lib/pkgconfig - sed -i -e "s/\(SYMLINK+=\"cdrom\)\"/\1 dvd\"/" \ /lib/udev/rules.d/60-cdrom_id.rules } -- 2.20.1