Changeset 627


Ignore:
Timestamp:
01/22/15 12:37:34 (6 years ago)
Author:
dennis
Message:

Trying to use eudev (udev 217)

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r582 r627  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for SALI 1.6.2.
     3# Generated by GNU Autoconf 2.69 for SALI 1.7.0.
    44#
    55# Report bugs to <sali@surfsara.nl>.
     
    580580PACKAGE_NAME='SALI'
    581581PACKAGE_TARNAME='sali'
    582 PACKAGE_VERSION='1.6.2'
    583 PACKAGE_STRING='SALI 1.6.2'
     582PACKAGE_VERSION='1.7.0'
     583PACKAGE_STRING='SALI 1.7.0'
    584584PACKAGE_BUGREPORT='sali@surfsara.nl'
    585585PACKAGE_URL=''
     
    12041204  # This message is too long to be a string in the A/UX 3.1 sh.
    12051205  cat <<_ACEOF
    1206 \`configure' configures SALI 1.6.2 to adapt to many kinds of systems.
     1206\`configure' configures SALI 1.7.0 to adapt to many kinds of systems.
    12071207
    12081208Usage: $0 [OPTION]... [VAR=VALUE]...
     
    12651265if test -n "$ac_init_help"; then
    12661266  case $ac_init_help in
    1267      short | recursive ) echo "Configuration of SALI 1.6.2:";;
     1267     short | recursive ) echo "Configuration of SALI 1.7.0:";;
    12681268   esac
    12691269  cat <<\_ACEOF
     
    13471347if $ac_init_version; then
    13481348  cat <<\_ACEOF
    1349 SALI configure 1.6.2
     1349SALI configure 1.7.0
    13501350generated by GNU Autoconf 2.69
    13511351
     
    14771477running configure, to aid debugging if configure makes a mistake.
    14781478
    1479 It was created by SALI $as_me 1.6.2, which was
     1479It was created by SALI $as_me 1.7.0, which was
    14801480generated by GNU Autoconf 2.69.  Invocation command line was
    14811481
     
    32483248
    32493249
    3250 ac_config_files="$ac_config_files Makefile initrd/sali/bin/sali_functions bootdisk/sali_create_bootdisk server/setup.py"
     3250ac_config_files="$ac_config_files Makefile initrd/sali/bin/sali_functions bootdisk/sali_create_bootdisk"
    32513251
    32523252
     
    37933793# values after options handling.
    37943794ac_log="
    3795 This file was extended by SALI $as_me 1.6.2, which was
     3795This file was extended by SALI $as_me 1.7.0, which was
    37963796generated by GNU Autoconf 2.69.  Invocation command line was
    37973797
     
    38463846ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    38473847ac_cs_version="\\
    3848 SALI config.status 1.6.2
     3848SALI config.status 1.7.0
    38493849configured by $0, generated by GNU Autoconf 2.69,
    38503850  with options \\"\$ac_cs_config\\"
     
    39603960    "initrd/sali/bin/sali_functions") CONFIG_FILES="$CONFIG_FILES initrd/sali/bin/sali_functions" ;;
    39613961    "bootdisk/sali_create_bootdisk") CONFIG_FILES="$CONFIG_FILES bootdisk/sali_create_bootdisk" ;;
    3962     "server/setup.py") CONFIG_FILES="$CONFIG_FILES server/setup.py" ;;
    39633962
    39643963  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • trunk/configure.ac

    r574 r627  
    7777        initrd/sali/bin/sali_functions
    7878        bootdisk/sali_create_bootdisk
    79     server/setup.py
    8079])
    8180
  • trunk/initrd/make.d/udev.rul

    r573 r627  
    33#
    44
    5 UDEV_VERSION    = 182
    6 UDEV_TARBALL    = udev-$(UDEV_VERSION).tar.bz2
    7 UDEV_DIR        = $(SRC_DIR)/udev-$(UDEV_VERSION)
     5UDEV_VERSION    = 2.1.1
     6UDEV_TARBALL    = eudev-$(UDEV_VERSION).tar.gz
     7UDEV_DIR        = $(SRC_DIR)/eudev-$(UDEV_VERSION)
    88
    99#### http://www.kernel.org/pub/linux/utils/kernel/hotplug/ ####
    1010UDEV_URL        = ftp://ftp.surfsara.nl/pub/sali/sources/
    11 UDEV_INFO       = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
     11UDEV_INFO       = http://wiki.gentoo.org/wiki/Project:Eudev
    1212
    1313UDEV_CONFIGURE_DEFAULT  = --prefix=/usr --sysconfdir=/etc --sbindir=/sbin --libdir=/lib --with-rootlibdir=/lib --libexecdir=/lib --disable-introspection
     
    2020
    2121$(UDEV_DIR).build:  $(UDEV_DIR).get
    22         cd $(UDEV_DIR) && CFLAGS="-I$(INITRD_BUILD_DIR)/usr/include -L$(INITRD_BUILD_DIR)/usr/lib" \
     22        cd $(UDEV_DIR) && CPPFLAGS="-I$(INITRD_BUILD_DIR)/usr/include -I$(LINUX_DIR)/include -L$(INITRD_BUILD_DIR)/usr/lib" \
    2323        ./configure $(UDEV_CONFIGURE) && make
    2424        touch $@
     
    3535        rm -rf $(UDEV_DIR)
    3636        $(GETSOURCE) $(UDEV_URL)/$(UDEV_TARBALL) $(SRC_DIR)
    37         cd $(SRC_DIR) && tar -xvjf $(UDEV_TARBALL)
     37        cd $(SRC_DIR) && tar -xvzf $(UDEV_TARBALL)
    3838        touch $@
    3939
  • trunk/kernel/patches/linux.x86_64.config

    r623 r627  
    11#
    22# Automatically generated file; DO NOT EDIT.
    3 # Linux/x86 3.14.28-sali_v1.6.7 Kernel Configuration
     3# Linux/x86 3.14.28-sali_v1.7.0 Kernel Configuration
    44#
    55CONFIG_64BIT=y
     
    7070CONFIG_POSIX_MQUEUE=y
    7171CONFIG_POSIX_MQUEUE_SYSCTL=y
    72 # CONFIG_FHANDLE is not set
     72CONFIG_FHANDLE=y
    7373# CONFIG_AUDIT is not set
    7474
     
    23222322CONFIG_FS_MBCACHE=m
    23232323# CONFIG_REISERFS_FS is not set
    2324 CONFIG_JFS_FS=m
    2325 CONFIG_JFS_POSIX_ACL=y
    2326 # CONFIG_JFS_SECURITY is not set
    2327 # CONFIG_JFS_DEBUG is not set
    2328 # CONFIG_JFS_STATISTICS is not set
     2324# CONFIG_JFS_FS is not set
    23292325CONFIG_XFS_FS=m
    23302326# CONFIG_XFS_QUOTA is not set
     
    23342330# CONFIG_XFS_DEBUG is not set
    23352331# CONFIG_GFS2_FS is not set
    2336 # CONFIG_BTRFS_FS is not set
     2332CONFIG_BTRFS_FS=m
     2333CONFIG_BTRFS_FS_POSIX_ACL=y
     2334# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
     2335# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
     2336# CONFIG_BTRFS_DEBUG is not set
     2337# CONFIG_BTRFS_ASSERT is not set
    23372338# CONFIG_NILFS2_FS is not set
    23382339CONFIG_FS_POSIX_ACL=y
    2339 CONFIG_EXPORTFS=m
     2340CONFIG_EXPORTFS=y
    23402341CONFIG_FILE_LOCKING=y
    23412342CONFIG_FSNOTIFY=y
Note: See TracChangeset for help on using the changeset viewer.