--- udev-166.orig/ltmain.sh +++ udev-166/ltmain.sh @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6b +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" package_revision=1.3017 @@ -5033,7 +5033,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5344,19 +5347,19 @@ # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5893,6 +5896,7 @@ if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -6206,6 +6210,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) --- udev-166.orig/gtk-doc.make +++ udev-166/gtk-doc.make @@ -30,10 +30,9 @@ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -70,20 +69,37 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp:: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + cp -a $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \ + cp -a $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \ + if test "x$(content_files)" != "x" ; then \ + for file in $(content_files) ; do \ + test -f $(abs_srcdir)/$$file || \ + cp -a $(abs_srcdir)/$$file $(abs_builddir)/; \ + done \ + fi \ + fi + + +setup.stamp: setup-build.stamp + @true + + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ test -f $$i || touch $$i ; \ done \ @@ -97,8 +113,7 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -112,11 +127,11 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -126,26 +141,24 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @rm -rf html + @mkdir html @mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options=--path="$(abs_srcdir)"; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf + @rm -rf $(DOC_MODULE).pdf @mkpdf_imgdirs=""; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ @@ -156,7 +169,7 @@ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## @@ -166,12 +179,14 @@ rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(DOC_MAIN_SGML_FILE) $(DOC_MODULE)*; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + rm -rf xml html install-data-local: @installfiles=`echo $(srcdir)/html/*`; \ --- udev-166.orig/NEWS +++ udev-166/NEWS @@ -1,3 +1,7 @@ +udev 167 +======== +Bugfixes. + udev 166 ======== Bugfixes. --- udev-166.orig/configure +++ udev-166/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for udev 166. +# Generated by GNU Autoconf 2.67 for udev 167. # # Report bugs to . # @@ -91,7 +91,6 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -217,18 +216,11 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -709,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='udev' PACKAGE_TARNAME='udev' -PACKAGE_VERSION='166' -PACKAGE_STRING='udev 166' +PACKAGE_VERSION='167' +PACKAGE_STRING='udev 167' PACKAGE_BUGREPORT='linux-hotplug@vger.kernel.org' PACKAGE_URL='' @@ -1359,7 +1351,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1497,7 +1489,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures udev 166 to adapt to many kinds of systems. +\`configure' configures udev 167 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1567,7 +1559,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of udev 166:";; + short | recursive ) echo "Configuration of udev 167:";; esac cat <<\_ACEOF @@ -1703,8 +1695,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -udev configure 166 -generated by GNU Autoconf 2.68 +udev configure 167 +generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1750,7 +1742,7 @@ ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1787,7 +1779,7 @@ ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1800,10 +1792,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1870,7 +1862,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1879,7 +1871,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_mongrel @@ -1920,7 +1912,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1934,7 +1926,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1952,7 +1944,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_compile @@ -1997,7 +1989,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2010,7 +2002,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2065,15 +2057,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by udev $as_me 166, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by udev $as_me 167, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2331,7 +2323,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2469,7 +2461,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2556,11 +2548,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2646,7 +2638,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2686,7 +2678,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2739,7 +2731,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2790,7 +2782,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2830,7 +2822,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2888,7 +2880,7 @@ # Define the identity of the package. PACKAGE='udev' - VERSION='166' + VERSION='167' cat >>confdefs.h <<_ACEOF @@ -3043,7 +3035,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3083,7 +3075,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3136,7 +3128,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3176,7 +3168,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3235,7 +3227,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3279,7 +3271,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3334,7 +3326,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3449,7 +3441,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3492,7 +3484,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3551,7 +3543,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3562,7 +3554,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3603,7 +3595,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3613,7 +3605,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3650,7 +3642,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3728,7 +3720,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3827,7 +3819,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3963,7 +3955,7 @@ CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4079,7 +4071,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4091,7 +4083,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4154,7 +4146,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4221,7 +4213,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4350,7 +4342,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : +if test "x$ac_cv_header_minix_config_h" = x""yes; then : MINIX=yes else MINIX= @@ -4372,7 +4364,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4418,7 +4410,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : +if test "${ac_cv_sys_largefile_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -4469,7 +4461,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : $as_echo_n "(cached) " >&6 else while :; do @@ -4538,7 +4530,7 @@ if test $ac_cv_sys_file_offset_bits = unknown; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : +if test "${ac_cv_sys_large_files+set}" = set; then : $as_echo_n "(cached) " >&6 else while :; do @@ -4639,7 +4631,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -4655,7 +4647,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4673,7 +4665,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -4688,7 +4680,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4706,7 +4698,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4788,7 +4780,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : +if test "${ac_cv_path_FGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4919,7 +4911,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4959,7 +4951,7 @@ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4986,7 +4978,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5046,7 +5038,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5090,7 +5082,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5153,18 +5145,18 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : +if test "${lt_cv_nm_interface+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5161: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5153: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5164: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5156: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5167: output\"" >&5) + (eval echo "\"\$as_me:5159: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5188,7 +5180,7 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5380,7 +5372,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : +if test "${lt_cv_ld_reload_flag+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -5416,7 +5408,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5456,7 +5448,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5515,7 +5507,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5630,11 +5622,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5731,7 +5723,7 @@ set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5771,7 +5763,7 @@ set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5836,7 +5828,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5876,7 +5868,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5935,7 +5927,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5975,7 +5967,7 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6092,7 +6084,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -6369,7 +6361,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6372 "configure"' > conftest.$ac_ext + echo '#line 6364 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6463,7 +6455,7 @@ CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : +if test "${lt_cv_cc_needs_belf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6539,7 +6531,7 @@ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6579,7 +6571,7 @@ set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6631,7 +6623,7 @@ set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6671,7 +6663,7 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6723,7 +6715,7 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : +if test "${ac_cv_prog_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6763,7 +6755,7 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6815,7 +6807,7 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6855,7 +6847,7 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6907,7 +6899,7 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6947,7 +6939,7 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7022,7 +7014,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7051,7 +7043,7 @@ $as_echo "$lt_cv_apple_cc_single_mod" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -7120,7 +7112,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -7274,7 +7266,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : +if test "${lt_cv_objdir+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7382,7 +7374,7 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7448,7 +7440,7 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7585,7 +7577,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7601,11 +7593,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7604: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7596: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7608: \$? = $ac_status" >&5 + echo "$as_me:7600: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7770,7 +7762,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -7924,7 +7916,7 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -7940,11 +7932,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7943: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7935: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7947: \$? = $ac_status" >&5 + echo "$as_me:7939: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7983,7 +7975,7 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -8026,7 +8018,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8045,11 +8037,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8040: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8052: \$? = $ac_status" >&5 + echo "$as_me:8044: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8081,7 +8073,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8100,11 +8092,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8103: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8095: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8107: \$? = $ac_status" >&5 + echo "$as_me:8099: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8219,6 +8211,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -8240,6 +8235,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -8331,7 +8327,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -8401,7 +8397,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -8576,6 +8572,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -8902,7 +8899,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9792,7 +9789,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -9847,6 +9844,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -10209,7 +10218,7 @@ # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10243,7 +10252,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10257,12 +10266,12 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10296,16 +10305,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10339,12 +10348,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10378,12 +10387,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10417,7 +10426,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10458,7 +10467,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : +if test "${lt_cv_dlopen_self+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10467,7 +10476,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10470 "configure" +#line 10479 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10554,7 +10563,7 @@ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : +if test "${lt_cv_dlopen_self_static+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10563,7 +10572,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10566 "configure" +#line 10575 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10796,7 +10805,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -10844,7 +10853,7 @@ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -10887,7 +10896,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -10957,7 +10966,7 @@ set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_CHECK in @@ -10999,7 +11008,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_REBASE+:} false; then : +if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_REBASE in @@ -11043,7 +11052,7 @@ set dummy gtkdoc-mkpdf; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : +if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_MKPDF in @@ -11183,7 +11192,7 @@ set dummy xsltproc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : +if test "${ac_cv_path_XSLTPROC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XSLTPROC in @@ -11222,7 +11231,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 $as_echo_n "checking for library containing clock_gettime... " >&6; } -if ${ac_cv_search_clock_gettime+:} false; then : +if test "${ac_cv_search_clock_gettime+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -11256,11 +11265,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_clock_gettime+:} false; then : + if test "${ac_cv_search_clock_gettime+set}" = set; then : break fi done -if ${ac_cv_search_clock_gettime+:} false; then : +if test "${ac_cv_search_clock_gettime+set}" = set; then : else ac_cv_search_clock_gettime=no @@ -11302,7 +11311,7 @@ LIBS_save=$LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprevcon in -lselinux" >&5 $as_echo_n "checking for getprevcon in -lselinux... " >&6; } -if ${ac_cv_lib_selinux_getprevcon+:} false; then : +if test "${ac_cv_lib_selinux_getprevcon+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11336,7 +11345,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_getprevcon" >&5 $as_echo "$ac_cv_lib_selinux_getprevcon" >&6; } -if test "x$ac_cv_lib_selinux_getprevcon" = xyes; then : +if test "x$ac_cv_lib_selinux_getprevcon" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSELINUX 1 _ACEOF @@ -11444,7 +11453,7 @@ set dummy gperf; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GPERF+:} false; then : +if test "${ac_cv_path_GPERF+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GPERF in @@ -11565,7 +11574,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -11578,7 +11587,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_init in -lacl" >&5 $as_echo_n "checking for acl_init in -lacl... " >&6; } -if ${ac_cv_lib_acl_acl_init+:} false; then : +if test "${ac_cv_lib_acl_acl_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11612,14 +11621,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_init" >&5 $as_echo "$ac_cv_lib_acl_acl_init" >&6; } -if test "x$ac_cv_lib_acl_acl_init" = xyes; then : +if test "x$ac_cv_lib_acl_acl_init" = x""yes; then : : else as_fn_error $? "libacl not found" "$LINENO" 5 fi ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default" -if test "x$ac_cv_header_acl_libacl_h" = xyes; then : +if test "x$ac_cv_header_acl_libacl_h" = x""yes; then : : else as_fn_error $? "libacl header not found" "$LINENO" 5 @@ -11708,7 +11717,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS @@ -11800,7 +11809,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else USBUTILS_CFLAGS=$pkg_cv_USBUTILS_CFLAGS USBUTILS_LIBS=$pkg_cv_USBUTILS_LIBS @@ -11814,7 +11823,7 @@ if test "x$cross_compiling" = "xno" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/pci.ids" >&5 $as_echo_n "checking for /usr/share/pci.ids... " >&6; } -if ${ac_cv_file__usr_share_pci_ids+:} false; then : +if test "${ac_cv_file__usr_share_pci_ids+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && @@ -11827,7 +11836,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_pci_ids" >&5 $as_echo "$ac_cv_file__usr_share_pci_ids" >&6; } -if test "x$ac_cv_file__usr_share_pci_ids" = xyes; then : +if test "x$ac_cv_file__usr_share_pci_ids" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE__USR_SHARE_PCI_IDS 1 @@ -11837,7 +11846,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/hwdata/pci.ids" >&5 $as_echo_n "checking for /usr/share/hwdata/pci.ids... " >&6; } -if ${ac_cv_file__usr_share_hwdata_pci_ids+:} false; then : +if test "${ac_cv_file__usr_share_hwdata_pci_ids+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && @@ -11850,7 +11859,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_hwdata_pci_ids" >&5 $as_echo "$ac_cv_file__usr_share_hwdata_pci_ids" >&6; } -if test "x$ac_cv_file__usr_share_hwdata_pci_ids" = xyes; then : +if test "x$ac_cv_file__usr_share_hwdata_pci_ids" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE__USR_SHARE_HWDATA_PCI_IDS 1 @@ -11860,7 +11869,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/misc/pci.ids" >&5 $as_echo_n "checking for /usr/share/misc/pci.ids... " >&6; } -if ${ac_cv_file__usr_share_misc_pci_ids+:} false; then : +if test "${ac_cv_file__usr_share_misc_pci_ids+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && @@ -11873,7 +11882,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_misc_pci_ids" >&5 $as_echo "$ac_cv_file__usr_share_misc_pci_ids" >&6; } -if test "x$ac_cv_file__usr_share_misc_pci_ids" = xyes; then : +if test "x$ac_cv_file__usr_share_misc_pci_ids" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE__USR_SHARE_MISC_PCI_IDS 1 @@ -11901,7 +11910,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_input_h" = xyes; then : +if test "x$ac_cv_header_linux_input_h" = x""yes; then : : else as_fn_error $? "kernel headers not found" "$LINENO" 5 @@ -12009,7 +12018,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else INTROSPECTION_CFLAGS=$pkg_cv_INTROSPECTION_CFLAGS INTROSPECTION_LIBS=$pkg_cv_INTROSPECTION_LIBS @@ -12109,21 +12118,10 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then + test "x$cache_file" != "x/dev/null" && { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -12207,7 +12205,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -12308,7 +12306,6 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12615,8 +12612,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by udev $as_me 166, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by udev $as_me 167, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12681,8 +12678,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -udev config.status 166 -configured by $0, generated by GNU Autoconf 2.68, +udev config.status 167 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -13080,7 +13077,7 @@ "extras/gudev/docs/Makefile") CONFIG_FILES="$CONFIG_FILES extras/gudev/docs/Makefile" ;; "extras/gudev/docs/version.xml") CONFIG_FILES="$CONFIG_FILES extras/gudev/docs/version.xml" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -13103,10 +13100,9 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -13114,13 +13110,12 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -13142,7 +13137,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -13170,7 +13165,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -13218,7 +13213,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -13250,7 +13245,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -13284,7 +13279,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || +cat >"$tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -13296,8 +13291,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -13398,7 +13393,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -13417,7 +13412,7 @@ for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -13426,7 +13421,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -13452,8 +13447,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -13589,22 +13584,21 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -13615,20 +13609,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ + mv "$tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. @@ -13786,6 +13780,7 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --- udev-166.orig/configure.ac +++ udev-166/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([udev], [166], [linux-hotplug@vger.kernel.org]) +AC_INIT([udev], [167], [linux-hotplug@vger.kernel.org]) AC_PREREQ(2.60) AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- udev-166.orig/Makefile.in +++ udev-166/Makefile.in @@ -47,23 +47,41 @@ @WITH_SYSTEMD_TRUE@am__append_2 = systemd-install-hook sbin_PROGRAMS = udev/udevd$(EXEEXT) udev/udevadm$(EXEEXT) check_PROGRAMS = libudev/test-libudev$(EXEEXT) udev/test-udev$(EXEEXT) -libexec_PROGRAMS = extras/firmware/firmware$(EXEEXT) \ - extras/ata_id/ata_id$(EXEEXT) \ - extras/cdrom_id/cdrom_id$(EXEEXT) \ - extras/collect/collect$(EXEEXT) extras/edd_id/edd_id$(EXEEXT) \ - extras/floppy/create_floppy_devices$(EXEEXT) \ - extras/input_id/input_id$(EXEEXT) \ - extras/path_id/path_id$(EXEEXT) \ - extras/fstab_import/fstab_import$(EXEEXT) \ - extras/scsi_id/scsi_id$(EXEEXT) extras/usb_id/usb_id$(EXEEXT) \ - extras/v4l_id/v4l_id$(EXEEXT) $(am__EXEEXT_1) +@ENABLE_EXTRAS_TRUE@am__append_3 = extras/firmware/50-firmware.rules \ +@ENABLE_EXTRAS_TRUE@ extras/cdrom_id/60-cdrom_id.rules \ +@ENABLE_EXTRAS_TRUE@ extras/edd_id/61-persistent-storage-edd.rules \ +@ENABLE_EXTRAS_TRUE@ extras/floppy/60-floppy.rules \ +@ENABLE_EXTRAS_TRUE@ extras/fstab_import/79-fstab_import.rules \ +@ENABLE_EXTRAS_TRUE@ extras/v4l_id/60-persistent-v4l.rules +@ENABLE_EXTRAS_TRUE@libexec_PROGRAMS = \ +@ENABLE_EXTRAS_TRUE@ extras/firmware/firmware$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/ata_id/ata_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/cdrom_id/cdrom_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/collect/collect$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/edd_id/edd_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/floppy/create_floppy_devices$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/input_id/input_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/path_id/path_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/fstab_import/fstab_import$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/usb_id/usb_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/v4l_id/v4l_id$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/hid2hci/hid2hci$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/udev-acl/udev-acl$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/usb-db/usb-db$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/usb-db/pci-db$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/mobile-action-modeswitch/mobile-action-modeswitch$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/mtd_probe/mtd_probe$(EXEEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/keymap/keymap$(EXEEXT) +@ENABLE_EXTRAS_TRUE@am__append_4 = extras/scsi_id/scsi_id.8 # ------------------------------------------------------------------------------ # conditional extras (need glib, libusb, libacl, ...) # ------------------------------------------------------------------------------ -@ENABLE_EXTRAS_TRUE@am__append_3 = \ +@ENABLE_EXTRAS_TRUE@am__append_5 = \ @ENABLE_EXTRAS_TRUE@ rules/rules.d/75-net-description.rules \ @ENABLE_EXTRAS_TRUE@ rules/rules.d/75-tty-description.rules \ +@ENABLE_EXTRAS_TRUE@ rules/rules.d/78-graphics-card.rules \ @ENABLE_EXTRAS_TRUE@ rules/rules.d/78-sound-card.rules \ @ENABLE_EXTRAS_TRUE@ extras/hid2hci/70-hid2hci.rules \ @ENABLE_EXTRAS_TRUE@ extras/udev-acl/70-acl.rules \ @@ -71,31 +89,25 @@ @ENABLE_EXTRAS_TRUE@ extras/mtd_probe/75-probe_mtd.rules \ @ENABLE_EXTRAS_TRUE@ extras/keymap/95-keymap.rules \ @ENABLE_EXTRAS_TRUE@ extras/keymap/95-keyboard-force-release.rules -@ENABLE_EXTRAS_TRUE@am__append_4 = extras/gudev/docs -@ENABLE_EXTRAS_TRUE@am__append_5 = extras/gudev/libgudev-1.0.la -@ENABLE_EXTRAS_TRUE@am__append_6 = extras/gudev/gudev-1.0.pc -@ENABLE_EXTRAS_TRUE@am__append_7 = extras/gudev/COPYING \ +@ENABLE_EXTRAS_TRUE@am__append_6 = extras/gudev/docs +@ENABLE_EXTRAS_TRUE@am__append_7 = extras/gudev/libgudev-1.0.la +@ENABLE_EXTRAS_TRUE@am__append_8 = extras/gudev/gudev-1.0.pc +@ENABLE_EXTRAS_TRUE@am__append_9 = extras/gudev/COPYING \ @ENABLE_EXTRAS_TRUE@ extras/gudev/gudevmarshal.list \ @ENABLE_EXTRAS_TRUE@ extras/gudev/gudevenumtypes.h.template \ @ENABLE_EXTRAS_TRUE@ extras/gudev/gudevenumtypes.c.template \ @ENABLE_EXTRAS_TRUE@ extras/keymap/check-keymaps.sh -@ENABLE_EXTRAS_TRUE@@ENABLE_INTROSPECTION_TRUE@am__append_8 = $(gir_DATA) $(typelibs_DATA) -@ENABLE_EXTRAS_TRUE@am__append_9 = libgudev-install-move-hook \ +@ENABLE_EXTRAS_TRUE@@ENABLE_INTROSPECTION_TRUE@am__append_10 = $(gir_DATA) $(typelibs_DATA) +@ENABLE_EXTRAS_TRUE@am__append_11 = libgudev-install-move-hook \ @ENABLE_EXTRAS_TRUE@ udevacl-install-hook -@ENABLE_EXTRAS_TRUE@am__append_10 = libgudev-uninstall-move-hook -@ENABLE_EXTRAS_TRUE@am__append_11 = extras/hid2hci/hid2hci \ -@ENABLE_EXTRAS_TRUE@ extras/udev-acl/udev-acl \ -@ENABLE_EXTRAS_TRUE@ extras/usb-db/usb-db extras/usb-db/pci-db \ -@ENABLE_EXTRAS_TRUE@ extras/mobile-action-modeswitch/mobile-action-modeswitch \ -@ENABLE_EXTRAS_TRUE@ extras/mtd_probe/mtd_probe \ -@ENABLE_EXTRAS_TRUE@ extras/keymap/keymap -@ENABLE_EXTRAS_TRUE@am__append_12 = extras/keymap/findkeyboards \ +@ENABLE_EXTRAS_TRUE@am__append_12 = libgudev-uninstall-move-hook +@ENABLE_EXTRAS_TRUE@am__append_13 = extras/keymap/findkeyboards \ @ENABLE_EXTRAS_TRUE@ extras/keymap/keyboard-force-release.sh -@ENABLE_EXTRAS_TRUE@am__append_13 = \ +@ENABLE_EXTRAS_TRUE@am__append_14 = \ @ENABLE_EXTRAS_TRUE@ extras/keymap/keys.txt \ @ENABLE_EXTRAS_TRUE@ extras/keymap/keys-from-name.gperf -@ENABLE_EXTRAS_TRUE@am__append_14 = keymaps-distcheck-hook +@ENABLE_EXTRAS_TRUE@am__append_15 = keymaps-distcheck-hook subdir = . DIST_COMMON = README $(am__configure_deps) $(am__dist_doc_DATA_DIST) \ $(am__dist_libexec_SCRIPTS_DIST) \ @@ -224,56 +236,68 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libudev_libudev_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@ENABLE_EXTRAS_TRUE@am__EXEEXT_1 = extras/hid2hci/hid2hci$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/udev-acl/udev-acl$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/usb-db/usb-db$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/usb-db/pci-db$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/mobile-action-modeswitch/mobile-action-modeswitch$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/mtd_probe/mtd_probe$(EXEEXT) \ -@ENABLE_EXTRAS_TRUE@ extras/keymap/keymap$(EXEEXT) PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS) -am_extras_ata_id_ata_id_OBJECTS = extras/ata_id/ata_id.$(OBJEXT) +am__extras_ata_id_ata_id_SOURCES_DIST = extras/ata_id/ata_id.c +@ENABLE_EXTRAS_TRUE@am_extras_ata_id_ata_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/ata_id/ata_id.$(OBJEXT) extras_ata_id_ata_id_OBJECTS = $(am_extras_ata_id_ata_id_OBJECTS) -extras_ata_id_ata_id_DEPENDENCIES = libudev/libudev-private.la -am_extras_cdrom_id_cdrom_id_OBJECTS = \ - extras/cdrom_id/cdrom_id.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_ata_id_ata_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_cdrom_id_cdrom_id_SOURCES_DIST = \ + extras/cdrom_id/cdrom_id.c +@ENABLE_EXTRAS_TRUE@am_extras_cdrom_id_cdrom_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/cdrom_id/cdrom_id.$(OBJEXT) extras_cdrom_id_cdrom_id_OBJECTS = \ $(am_extras_cdrom_id_cdrom_id_OBJECTS) -extras_cdrom_id_cdrom_id_DEPENDENCIES = libudev/libudev-private.la -am_extras_collect_collect_OBJECTS = extras/collect/collect.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_cdrom_id_cdrom_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_collect_collect_SOURCES_DIST = extras/collect/collect.c +@ENABLE_EXTRAS_TRUE@am_extras_collect_collect_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/collect/collect.$(OBJEXT) extras_collect_collect_OBJECTS = $(am_extras_collect_collect_OBJECTS) -extras_collect_collect_DEPENDENCIES = libudev/libudev-private.la -am_extras_edd_id_edd_id_OBJECTS = extras/edd_id/edd_id.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_collect_collect_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_edd_id_edd_id_SOURCES_DIST = extras/edd_id/edd_id.c +@ENABLE_EXTRAS_TRUE@am_extras_edd_id_edd_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/edd_id/edd_id.$(OBJEXT) extras_edd_id_edd_id_OBJECTS = $(am_extras_edd_id_edd_id_OBJECTS) -extras_edd_id_edd_id_DEPENDENCIES = libudev/libudev-private.la -am_extras_firmware_firmware_OBJECTS = \ - extras/firmware/extras_firmware_firmware-firmware.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_edd_id_edd_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_firmware_firmware_SOURCES_DIST = \ + extras/firmware/firmware.c +@ENABLE_EXTRAS_TRUE@am_extras_firmware_firmware_OBJECTS = extras/firmware/extras_firmware_firmware-firmware.$(OBJEXT) extras_firmware_firmware_OBJECTS = \ $(am_extras_firmware_firmware_OBJECTS) -extras_firmware_firmware_DEPENDENCIES = libudev/libudev-private.la -am_extras_floppy_create_floppy_devices_OBJECTS = \ - extras/floppy/create_floppy_devices.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_firmware_firmware_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_floppy_create_floppy_devices_SOURCES_DIST = \ + extras/floppy/create_floppy_devices.c +@ENABLE_EXTRAS_TRUE@am_extras_floppy_create_floppy_devices_OBJECTS = extras/floppy/create_floppy_devices.$(OBJEXT) extras_floppy_create_floppy_devices_OBJECTS = \ $(am_extras_floppy_create_floppy_devices_OBJECTS) -extras_floppy_create_floppy_devices_DEPENDENCIES = \ - libudev/libudev-private.la -am_extras_fstab_import_fstab_import_OBJECTS = \ - extras/fstab_import/fstab_import.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_floppy_create_floppy_devices_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_fstab_import_fstab_import_SOURCES_DIST = \ + extras/fstab_import/fstab_import.c +@ENABLE_EXTRAS_TRUE@am_extras_fstab_import_fstab_import_OBJECTS = extras/fstab_import/fstab_import.$(OBJEXT) extras_fstab_import_fstab_import_OBJECTS = \ $(am_extras_fstab_import_fstab_import_OBJECTS) -extras_fstab_import_fstab_import_DEPENDENCIES = \ - libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_fstab_import_fstab_import_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la am__extras_hid2hci_hid2hci_SOURCES_DIST = extras/hid2hci/hid2hci.c @ENABLE_EXTRAS_TRUE@am_extras_hid2hci_hid2hci_OBJECTS = extras/hid2hci/extras_hid2hci_hid2hci-hid2hci.$(OBJEXT) extras_hid2hci_hid2hci_OBJECTS = $(am_extras_hid2hci_hid2hci_OBJECTS) @ENABLE_EXTRAS_TRUE@extras_hid2hci_hid2hci_DEPENDENCIES = \ @ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la \ @ENABLE_EXTRAS_TRUE@ $(am__DEPENDENCIES_1) -am_extras_input_id_input_id_OBJECTS = \ - extras/input_id/input_id.$(OBJEXT) +am__extras_input_id_input_id_SOURCES_DIST = \ + extras/input_id/input_id.c +@ENABLE_EXTRAS_TRUE@am_extras_input_id_input_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/input_id/input_id.$(OBJEXT) extras_input_id_input_id_OBJECTS = \ $(am_extras_input_id_input_id_OBJECTS) -extras_input_id_input_id_DEPENDENCIES = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_input_id_input_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la am__extras_keymap_keymap_SOURCES_DIST = extras/keymap/keymap.c @ENABLE_EXTRAS_TRUE@am_extras_keymap_keymap_OBJECTS = extras/keymap/extras_keymap_keymap-keymap.$(OBJEXT) nodist_extras_keymap_keymap_OBJECTS = @@ -301,13 +325,21 @@ extras_mtd_probe_mtd_probe_OBJECTS = \ $(am_extras_mtd_probe_mtd_probe_OBJECTS) extras_mtd_probe_mtd_probe_LDADD = $(LDADD) -am_extras_path_id_path_id_OBJECTS = extras/path_id/path_id.$(OBJEXT) +am__extras_path_id_path_id_SOURCES_DIST = extras/path_id/path_id.c +@ENABLE_EXTRAS_TRUE@am_extras_path_id_path_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/path_id/path_id.$(OBJEXT) extras_path_id_path_id_OBJECTS = $(am_extras_path_id_path_id_OBJECTS) -extras_path_id_path_id_DEPENDENCIES = libudev/libudev-private.la -am_extras_scsi_id_scsi_id_OBJECTS = extras/scsi_id/scsi_id.$(OBJEXT) \ - extras/scsi_id/scsi_serial.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_path_id_path_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_scsi_id_scsi_id_SOURCES_DIST = extras/scsi_id/scsi_id.c \ + extras/scsi_id/scsi_serial.c extras/scsi_id/scsi.h \ + extras/scsi_id/scsi_id.h +@ENABLE_EXTRAS_TRUE@am_extras_scsi_id_scsi_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_id.$(OBJEXT) \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_serial.$(OBJEXT) extras_scsi_id_scsi_id_OBJECTS = $(am_extras_scsi_id_scsi_id_OBJECTS) -extras_scsi_id_scsi_id_DEPENDENCIES = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_scsi_id_scsi_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la am__extras_udev_acl_udev_acl_SOURCES_DIST = \ extras/udev-acl/udev-acl.c @ENABLE_EXTRAS_TRUE@am_extras_udev_acl_udev_acl_OBJECTS = extras/udev-acl/extras_udev_acl_udev_acl-udev-acl.$(OBJEXT) @@ -326,12 +358,18 @@ extras_usb_db_usb_db_OBJECTS = $(am_extras_usb_db_usb_db_OBJECTS) @ENABLE_EXTRAS_TRUE@extras_usb_db_usb_db_DEPENDENCIES = \ @ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la -am_extras_usb_id_usb_id_OBJECTS = extras/usb_id/usb_id.$(OBJEXT) +am__extras_usb_id_usb_id_SOURCES_DIST = extras/usb_id/usb_id.c +@ENABLE_EXTRAS_TRUE@am_extras_usb_id_usb_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/usb_id/usb_id.$(OBJEXT) extras_usb_id_usb_id_OBJECTS = $(am_extras_usb_id_usb_id_OBJECTS) -extras_usb_id_usb_id_DEPENDENCIES = libudev/libudev-private.la -am_extras_v4l_id_v4l_id_OBJECTS = extras/v4l_id/v4l_id.$(OBJEXT) +@ENABLE_EXTRAS_TRUE@extras_usb_id_usb_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la +am__extras_v4l_id_v4l_id_SOURCES_DIST = extras/v4l_id/v4l_id.c +@ENABLE_EXTRAS_TRUE@am_extras_v4l_id_v4l_id_OBJECTS = \ +@ENABLE_EXTRAS_TRUE@ extras/v4l_id/v4l_id.$(OBJEXT) extras_v4l_id_v4l_id_OBJECTS = $(am_extras_v4l_id_v4l_id_OBJECTS) -extras_v4l_id_v4l_id_DEPENDENCIES = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_v4l_id_v4l_id_DEPENDENCIES = \ +@ENABLE_EXTRAS_TRUE@ libudev/libudev-private.la am_libudev_test_libudev_OBJECTS = libudev/test-libudev.$(OBJEXT) libudev_test_libudev_OBJECTS = $(am_libudev_test_libudev_OBJECTS) libudev_test_libudev_DEPENDENCIES = libudev/libudev.la @@ -409,25 +447,26 @@ DIST_SOURCES = $(am__extras_gudev_libgudev_1_0_la_SOURCES_DIST) \ $(am__dist_extras_gudev_libgudev_1_0_la_SOURCES_DIST) \ $(am__libudev_libudev_private_la_SOURCES_DIST) \ - $(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \ - $(extras_cdrom_id_cdrom_id_SOURCES) \ - $(extras_collect_collect_SOURCES) \ - $(extras_edd_id_edd_id_SOURCES) \ - $(extras_firmware_firmware_SOURCES) \ - $(extras_floppy_create_floppy_devices_SOURCES) \ - $(extras_fstab_import_fstab_import_SOURCES) \ + $(libudev_libudev_la_SOURCES) \ + $(am__extras_ata_id_ata_id_SOURCES_DIST) \ + $(am__extras_cdrom_id_cdrom_id_SOURCES_DIST) \ + $(am__extras_collect_collect_SOURCES_DIST) \ + $(am__extras_edd_id_edd_id_SOURCES_DIST) \ + $(am__extras_firmware_firmware_SOURCES_DIST) \ + $(am__extras_floppy_create_floppy_devices_SOURCES_DIST) \ + $(am__extras_fstab_import_fstab_import_SOURCES_DIST) \ $(am__extras_hid2hci_hid2hci_SOURCES_DIST) \ - $(extras_input_id_input_id_SOURCES) \ + $(am__extras_input_id_input_id_SOURCES_DIST) \ $(am__extras_keymap_keymap_SOURCES_DIST) \ $(am__extras_mobile_action_modeswitch_mobile_action_modeswitch_SOURCES_DIST) \ $(am__extras_mtd_probe_mtd_probe_SOURCES_DIST) \ - $(extras_path_id_path_id_SOURCES) \ - $(extras_scsi_id_scsi_id_SOURCES) \ + $(am__extras_path_id_path_id_SOURCES_DIST) \ + $(am__extras_scsi_id_scsi_id_SOURCES_DIST) \ $(am__extras_udev_acl_udev_acl_SOURCES_DIST) \ $(am__extras_usb_db_pci_db_SOURCES_DIST) \ $(am__extras_usb_db_usb_db_SOURCES_DIST) \ - $(extras_usb_id_usb_id_SOURCES) \ - $(extras_v4l_id_v4l_id_SOURCES) \ + $(am__extras_usb_id_usb_id_SOURCES_DIST) \ + $(am__extras_v4l_id_v4l_id_SOURCES_DIST) \ $(libudev_test_libudev_SOURCES) $(udev_test_udev_SOURCES) \ $(udev_udevadm_SOURCES) $(udev_udevd_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -517,6 +556,7 @@ extras/qemu/42-qemu-usb.rules \ rules/rules.d/75-net-description.rules \ rules/rules.d/75-tty-description.rules \ + rules/rules.d/78-graphics-card.rules \ rules/rules.d/78-sound-card.rules \ extras/hid2hci/70-hid2hci.rules extras/udev-acl/70-acl.rules \ extras/mobile-action-modeswitch/61-mobile-action.rules \ @@ -720,10 +760,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = . libudev/docs $(am__append_4) +SUBDIRS = . libudev/docs $(am__append_6) EXTRA_DIST = autogen.sh libudev/exported_symbols libudev/COPYING \ rules/arch rules/misc udev/udev.xml udev/udevadm.xml \ - udev/udevd.xml $(am__append_7) $(TESTS) \ + udev/udevd.xml $(am__append_9) $(TESTS) \ test/rule-syntax-check.py ACLOCAL_AMFLAGS = -I m4 AM_MAKEFLAGS = --no-print-directory @@ -740,12 +780,12 @@ --enable-gtk-doc \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -CLEANFILES = $(am__append_8) $(am__append_13) udev-$(VERSION).tar.gz \ +CLEANFILES = $(am__append_10) $(am__append_14) udev-$(VERSION).tar.gz \ udev-$(VERSION).tar.bz2 $(BUILT_SOURCES) -INSTALL_EXEC_HOOKS = libudev-install-move-hook $(am__append_9) +INSTALL_EXEC_HOOKS = libudev-install-move-hook $(am__append_11) INSTALL_DATA_HOOKS = udev-confdirs $(am__append_2) -UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook $(am__append_10) -DISTCHECK_HOOKS = $(am__append_14) +UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook $(am__append_12) +DISTCHECK_HOOKS = $(am__append_15) # ------------------------------------------------------------------------------ # libudev @@ -754,7 +794,7 @@ LIBUDEV_REVISION = 0 LIBUDEV_AGE = 10 include_HEADERS = libudev/libudev.h -lib_LTLIBRARIES = libudev/libudev.la $(am__append_5) +lib_LTLIBRARIES = libudev/libudev.la $(am__append_7) libudev_libudev_la_SOURCES = \ libudev/libudev-private.h \ libudev/libudev.c \ @@ -778,7 +818,7 @@ libudev/libudev-queue-private.c $(am__append_1) @WITH_SELINUX_TRUE@libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libudev/libudev.pc $(am__append_6) +pkgconfig_DATA = libudev/libudev.pc $(am__append_8) udevrulesdir = $(libexecdir)/rules.d # ------------------------------------------------------------------------------ @@ -794,13 +834,7 @@ rules/rules.d/95-udev-late.rules \ extras/rule_generator/75-cd-aliases-generator.rules \ extras/rule_generator/75-persistent-net-generator.rules \ - extras/firmware/50-firmware.rules \ - extras/cdrom_id/60-cdrom_id.rules \ - extras/edd_id/61-persistent-storage-edd.rules \ - extras/floppy/60-floppy.rules \ - extras/fstab_import/79-fstab_import.rules \ - extras/v4l_id/60-persistent-v4l.rules \ - extras/qemu/42-qemu-usb.rules $(am__append_3) + $(am__append_3) extras/qemu/42-qemu-usb.rules $(am__append_5) udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = udev.conf sharepkgconfigdir = $(datadir)/pkgconfig @@ -840,7 +874,7 @@ # udev man pages # ------------------------------------------------------------------------------ dist_man_MANS = udev/udev.7 udev/udevadm.8 udev/udevd.8 \ - extras/scsi_id/scsi_id.8 + $(am__append_4) dist_noinst_DATA = \ udev/udev.html \ udev/udevadm.html \ @@ -863,87 +897,87 @@ # rule_generator - persistent network and optical device rule generator # ------------------------------------------------------------------------------ dist_libexec_SCRIPTS = extras/rule_generator/write_cd_rules \ - extras/rule_generator/write_net_rules $(am__append_12) + extras/rule_generator/write_net_rules $(am__append_13) udevhomedir = $(libexecdir) dist_udevhome_DATA = extras/rule_generator/rule_generator.functions # ------------------------------------------------------------------------------ # firmware - firmware loading # ------------------------------------------------------------------------------ -extras_firmware_firmware_SOURCES = extras/firmware/firmware.c -extras_firmware_firmware_LDADD = libudev/libudev-private.la -extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)" +@ENABLE_EXTRAS_TRUE@extras_firmware_firmware_SOURCES = extras/firmware/firmware.c +@ENABLE_EXTRAS_TRUE@extras_firmware_firmware_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)" # ------------------------------------------------------------------------------ # ata_id - ATA identify # ------------------------------------------------------------------------------ -extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c -extras_ata_id_ata_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c +@ENABLE_EXTRAS_TRUE@extras_ata_id_ata_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # cdrom_id - optical drive/media capability # ------------------------------------------------------------------------------ -extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c -extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c +@ENABLE_EXTRAS_TRUE@extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # collect - trigger action when a collection of devices appeared # ------------------------------------------------------------------------------ -extras_collect_collect_SOURCES = extras/collect/collect.c -extras_collect_collect_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_collect_collect_SOURCES = extras/collect/collect.c +@ENABLE_EXTRAS_TRUE@extras_collect_collect_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # edd_id - BIOS EDD block device match # ------------------------------------------------------------------------------ -extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c -extras_edd_id_edd_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c +@ENABLE_EXTRAS_TRUE@extras_edd_id_edd_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...) # ------------------------------------------------------------------------------ -extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c -extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c +@ENABLE_EXTRAS_TRUE@extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # input_id - import input device class # ------------------------------------------------------------------------------ -extras_input_id_input_id_SOURCES = extras/input_id/input_id.c -extras_input_id_input_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_input_id_input_id_SOURCES = extras/input_id/input_id.c +@ENABLE_EXTRAS_TRUE@extras_input_id_input_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # path_id - compose identifier of persistent elements of the parent buses # ------------------------------------------------------------------------------ -extras_path_id_path_id_SOURCES = extras/path_id/path_id.c -extras_path_id_path_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_path_id_path_id_SOURCES = extras/path_id/path_id.c +@ENABLE_EXTRAS_TRUE@extras_path_id_path_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # fstab_import - import /etc/fstab entry for block device # ------------------------------------------------------------------------------ -extras_fstab_import_fstab_import_SOURCES = extras/fstab_import/fstab_import.c -extras_fstab_import_fstab_import_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_fstab_import_fstab_import_SOURCES = extras/fstab_import/fstab_import.c +@ENABLE_EXTRAS_TRUE@extras_fstab_import_fstab_import_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # scsi_id - SCSI inquiry to get various serial numbers # ------------------------------------------------------------------------------ -extras_scsi_id_scsi_id_SOURCES = \ - extras/scsi_id/scsi_id.c \ - extras/scsi_id/scsi_serial.c \ - extras/scsi_id/scsi.h \ - extras/scsi_id/scsi_id.h +@ENABLE_EXTRAS_TRUE@extras_scsi_id_scsi_id_SOURCES = \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_id.c \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_serial.c \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi.h \ +@ENABLE_EXTRAS_TRUE@ extras/scsi_id/scsi_id.h -extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # usb_id - USB device property import # ------------------------------------------------------------------------------ -extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c -extras_usb_id_usb_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c +@ENABLE_EXTRAS_TRUE@extras_usb_id_usb_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # v4l_id - video4linux capabilities # ------------------------------------------------------------------------------ -extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c -extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la +@ENABLE_EXTRAS_TRUE@extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c +@ENABLE_EXTRAS_TRUE@extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la # ------------------------------------------------------------------------------ # GUdev - libudev gobject interface --- udev-166.orig/Makefile.am +++ udev-166/Makefile.am @@ -221,6 +221,7 @@ extras/rule_generator/75-cd-aliases-generator.rules \ extras/rule_generator/75-persistent-net-generator.rules +if ENABLE_EXTRAS # ------------------------------------------------------------------------------ # firmware - firmware loading # ------------------------------------------------------------------------------ @@ -317,6 +318,8 @@ libexec_PROGRAMS += extras/v4l_id/v4l_id dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules +endif # ENABLE_EXTRAS + # ------------------------------------------------------------------------------ # qemu -- qemu/kvm guest tweaks # ------------------------------------------------------------------------------ @@ -329,6 +332,7 @@ dist_udevrules_DATA += \ rules/rules.d/75-net-description.rules \ rules/rules.d/75-tty-description.rules \ + rules/rules.d/78-graphics-card.rules \ rules/rules.d/78-sound-card.rules # ------------------------------------------------------------------------------ --- udev-166.orig/config.guess +++ udev-166/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,16 +140,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_MACHINE}" in - i?86) - test -z "$VENDOR" && VENDOR=pc - ;; - *) - test -z "$VENDOR" && VENDOR=unknown - ;; -esac -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -213,19 +204,19 @@ exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in @@ -290,13 +281,13 @@ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-${VENDOR}-sysv4 + echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-amigaos + echo ${UNAME_MACHINE}-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-morphos + echo ${UNAME_MACHINE}-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -311,7 +302,7 @@ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-${VENDOR}-riscos + echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp @@ -419,7 +410,7 @@ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-${VENDOR}-mint${UNAME_RELEASE} + echo m68k-unknown-mint${UNAME_RELEASE} exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} @@ -730,9 +721,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-${VENDOR}-osf1mk + echo ${UNAME_MACHINE}-unknown-osf1mk else - echo ${UNAME_MACHINE}-${VENDOR}-osf1 + echo ${UNAME_MACHINE}-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -792,19 +783,19 @@ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) - echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi${UNAME_RELEASE} exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) case ${UNAME_MACHINE} in pc98) - echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) - echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -826,10 +817,10 @@ echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-${VENDOR}-interix${UNAME_RELEASE} + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-${VENDOR}-interix${UNAME_RELEASE} + echo ia64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -848,21 +839,21 @@ echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-${VENDOR}-cygwin + echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) - echo powerpcle-${VENDOR}-cygwin + echo powerpcle-unknown-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -879,20 +870,20 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -901,7 +892,7 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-${VENDOR}-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -912,16 +903,16 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -940,51 +931,51 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-${VENDOR}-linux-gnu + echo or32-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-${VENDOR}-linux-gnu + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux-gnu + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;; - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;; - *) echo hppa-${VENDOR}-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux-gnu + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-${VENDOR}-linux-gnu + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-${VENDOR}-linux-gnu + echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1006,16 +997,16 @@ echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-${VENDOR}-stop + echo ${UNAME_MACHINE}-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-atheos + echo ${UNAME_MACHINE}-unknown-atheos exit ;; i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-${VENDOR}-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp @@ -1035,7 +1026,7 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -1074,7 +1065,7 @@ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1111,19 +1102,19 @@ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-${VENDOR}-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos${UNAME_RELEASE} exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} @@ -1173,7 +1164,7 @@ if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-${VENDOR}-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1264,13 +1255,13 @@ else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-${VENDOR}-plan9 + echo ${UNAME_MACHINE}-unknown-plan9 exit ;; *:TOPS-10:*:*) - echo pdp10-${VENDOR}-tops10 + echo pdp10-unknown-tops10 exit ;; *:TENEX:*:*) - echo pdp10-${VENDOR}-tenex + echo pdp10-unknown-tenex exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 @@ -1279,16 +1270,16 @@ echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) - echo pdp10-${VENDOR}-tops20 + echo pdp10-unknown-tops20 exit ;; *:ITS:*:*) - echo pdp10-${VENDOR}-its + echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` --- udev-166.orig/aclocal.m4 +++ udev-166/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) --- udev-166.orig/config.sub +++ udev-166/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -380,7 +381,8 @@ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ @@ -1085,6 +1087,11 @@ basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1435,6 +1442,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) --- udev-166.orig/m4/libtool.m4 +++ udev-166/m4/libtool.m4 @@ -684,6 +684,7 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # _LT_COPYING @@ -2444,7 +2445,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -2484,6 +2485,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3071,11 +3084,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3692,7 +3705,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3756,7 +3769,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3976,7 +3989,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4181,6 +4194,9 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4245,6 +4261,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4266,6 +4285,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4357,7 +4377,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4427,7 +4447,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4602,6 +4622,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4840,7 +4861,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5840,7 +5861,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler --- udev-166.orig/rules/rules.d/80-drivers.rules +++ udev-166/rules/rules.d/80-drivers.rules @@ -9,5 +9,6 @@ SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block" SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -bv sg" SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev" +SUBSYSTEM=="graphics", RUN+="/sbin/modprobe -bv fbcon" LABEL="drivers_end" --- udev-166.orig/rules/rules.d/78-graphics-card.rules +++ udev-166/rules/rules.d/78-graphics-card.rules @@ -0,0 +1,26 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add", GOTO="graphics_end" + +# Tag the drm device for KMS-supporting drivers as the primary device for +# the display; for non-KMS drivers tag the framebuffer device instead. + +SUBSYSTEM!="drm", GOTO="drm_end" +KERNEL!="card[0-9]*", GOTO="drm_end" +ENV{DEVTYPE}!="drm_minor", GOTO="drm_end" + +DRIVERS=="i915", ENV{PRIMARY_DEVICE_FOR_DISPLAY}="1" +DRIVERS=="radeon", ENV{PRIMARY_DEVICE_FOR_DISPLAY}="1" +DRIVERS=="nouveau", ENV{PRIMARY_DEVICE_FOR_DISPLAY}="1" + +LABEL="drm_end" + +SUBSYSTEM!="graphics", GOTO="graphics_end" + +DRIVERS=="i915", GOTO="graphics_end" +DRIVERS=="radeon", GOTO="graphics_end" +DRIVERS=="nouveau", GOTO="graphics_end" + +KERNEL=="fb[0-9]*", ENV{PRIMARY_DEVICE_FOR_DISPLAY}="1" + +LABEL="graphics_end" --- udev-166.orig/rules/rules.d/60-persistent-input.rules +++ udev-166/rules/rules.d/60-persistent-input.rules @@ -21,7 +21,9 @@ # by-id links KERNEL=="mouse*|js*", ENV{ID_BUS}=="?*", ENV{.INPUT_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{.INPUT_CLASS}" +KERNEL=="mouse*|js*", ENV{ID_BUS}=="?*", ENV{.INPUT_CLASS}=="?*", ATTRS{bInterfaceNumber}=="?*", ATTRS{bInterfaceNumber}!="00", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$attr{bInterfaceNumber}-$env{.INPUT_CLASS}" KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{.INPUT_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{.INPUT_CLASS}" +KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{.INPUT_CLASS}=="?*", ATTRS{bInterfaceNumber}=="?*", ATTRS{bInterfaceNumber}!="00", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$attr{bInterfaceNumber}-event-$env{.INPUT_CLASS}" # allow empty class for USB devices, by appending the interface number SUBSYSTEMS=="usb", ENV{ID_BUS}=="?*", KERNEL=="event*", ENV{.INPUT_CLASS}=="", ATTRS{bInterfaceNumber}=="?*", \ SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-if$attr{bInterfaceNumber}" --- udev-166.orig/extras/v4l_id/v4l_id.c +++ udev-166/extras/v4l_id/v4l_id.c @@ -28,7 +28,6 @@ #include #include #include -#include #include int main (int argc, char *argv[]) @@ -39,7 +38,6 @@ }; int fd; char *device; - struct video_capability v1cap; struct v4l2_capability v2cap; while (1) { @@ -82,19 +80,6 @@ if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) printf("radio:"); printf("\n"); - } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { - printf("ID_V4L_VERSION=1\n"); - printf("ID_V4L_PRODUCT=%s\n", v1cap.name); - printf("ID_V4L_CAPABILITIES=:"); - if ((v1cap.type & VID_TYPE_CAPTURE) > 0) - printf("capture:"); - if ((v1cap.type & VID_TYPE_OVERLAY) > 0) - printf("video_overlay:"); - if (v1cap.audios > 0) - printf("audio:"); - if ((v1cap.type & VID_TYPE_TUNER) > 0) - printf("tuner:"); - printf("\n"); } close (fd); --- udev-166.orig/extras/gudev/seed-example.js +++ udev-166/extras/gudev/seed-example.js @@ -0,0 +1,72 @@ +#!/usr/bin/env seed + +// seed example + +const GLib = imports.gi.GLib; +const GUdev = imports.gi.GUdev; + +function print_device (device) { + print (" subsystem: " + device.get_subsystem ()); + print (" devtype: " + device.get_devtype ()); + print (" name: " + device.get_name ()); + print (" number: " + device.get_number ()); + print (" sysfs_path: " + device.get_sysfs_path ()); + print (" driver: " + device.get_driver ()); + print (" action: " + device.get_action ()); + print (" seqnum: " + device.get_seqnum ()); + print (" device type: " + device.get_device_type ()); + print (" device number: " + device.get_device_number ()); + print (" device file: " + device.get_device_file ()); + print (" device file symlinks: " + device.get_device_file_symlinks ()); + print (" foo: " + device.get_sysfs_attr_as_strv ("stat")); + var keys = device.get_property_keys (); + for (var n = 0; n < keys.length; n++) { + print (" " + keys[n] + "=" + device.get_property (keys[n])); + } +} + +function on_uevent (client, action, device) { + print ("action " + action + " on device " + device.get_sysfs_path()); + print_device (device); + print (""); +} + +var client = new GUdev.Client ({subsystems: ["block", "usb/usb_interface"]}); +client.signal.connect ("uevent", on_uevent); + +var block_devices = client.query_by_subsystem ("block"); +for (var n = 0; n < block_devices.length; n++) { + print ("block device: " + block_devices[n].get_device_file ()); +} + +var d; + +d = client.query_by_device_number (GUdev.DeviceType.BLOCK, 0x0810); +if (d == null) { + print ("query_by_device_number 0x810 -> null"); +} else { + print ("query_by_device_number 0x810 -> " + d.get_device_file ()); + dd = d.get_parent_with_subsystem ("usb", null); + print_device (dd); + print ("--------------------------------------------------------------------------"); + while (d != null) { + print_device (d); + print (""); + d = d.get_parent (); + } +} + +d = client.query_by_sysfs_path ("/sys/block/sda/sda1"); +print ("query_by_sysfs_path (\"/sys/block/sda1\") -> " + d.get_device_file ()); + +d = client.query_by_subsystem_and_name ("block", "sda2"); +print ("query_by_subsystem_and_name (\"block\", \"sda2\") -> " + d.get_device_file ()); + +d = client.query_by_device_file ("/dev/sda"); +print ("query_by_device_file (\"/dev/sda\") -> " + d.get_device_file ()); + +d = client.query_by_device_file ("/dev/block/8:0"); +print ("query_by_device_file (\"/dev/block/8:0\") -> " + d.get_device_file ()); + +var mainloop = GLib.main_loop_new (); +GLib.main_loop_run (mainloop); --- udev-166.orig/extras/gudev/gjs-example.js +++ udev-166/extras/gudev/gjs-example.js @@ -0,0 +1,75 @@ +#!/usr/bin/env gjs-console + +// This currently depends on the following patches to gjs +// +// http://bugzilla.gnome.org/show_bug.cgi?id=584558 +// http://bugzilla.gnome.org/show_bug.cgi?id=584560 +// http://bugzilla.gnome.org/show_bug.cgi?id=584568 + +const GUdev = imports.gi.GUdev; +const Mainloop = imports.mainloop; + +function print_device (device) { + print (" subsystem: " + device.get_subsystem ()); + print (" devtype: " + device.get_devtype ()); + print (" name: " + device.get_name ()); + print (" number: " + device.get_number ()); + print (" sysfs_path: " + device.get_sysfs_path ()); + print (" driver: " + device.get_driver ()); + print (" action: " + device.get_action ()); + print (" seqnum: " + device.get_seqnum ()); + print (" device type: " + device.get_device_type ()); + print (" device number: " + device.get_device_number ()); + print (" device file: " + device.get_device_file ()); + print (" device file symlinks: " + device.get_device_file_symlinks ()); + print (" foo: " + device.get_sysfs_attr_as_strv ("stat")); + var keys = device.get_property_keys (); + for (var n = 0; n < keys.length; n++) { + print (" " + keys[n] + "=" + device.get_property (keys[n])); + } +} + +function on_uevent (client, action, device) { + print ("action " + action + " on device " + device.get_sysfs_path()); + print_device (device); + print (""); +} + +var client = new GUdev.Client ({subsystems: ["block", "usb/usb_interface"]}); +client.connect ("uevent", on_uevent); + +var block_devices = client.query_by_subsystem ("block"); +for (var n = 0; n < block_devices.length; n++) { + print ("block device: " + block_devices[n].get_device_file ()); +} + +var d; + +d = client.query_by_device_number (GUdev.DeviceType.BLOCK, 0x0810); +if (d == null) { + print ("query_by_device_number 0x810 -> null"); +} else { + print ("query_by_device_number 0x810 -> " + d.get_device_file ()); + var dd = d.get_parent_with_subsystem ("usb", null); + print_device (dd); + print ("--------------------------------------------------------------------------"); + while (d != null) { + print_device (d); + print (""); + d = d.get_parent (); + } +} + +d = client.query_by_sysfs_path ("/sys/block/sda/sda1"); +print ("query_by_sysfs_path (\"/sys/block/sda1\") -> " + d.get_device_file ()); + +d = client.query_by_subsystem_and_name ("block", "sda2"); +print ("query_by_subsystem_and_name (\"block\", \"sda2\") -> " + d.get_device_file ()); + +d = client.query_by_device_file ("/dev/sda"); +print ("query_by_device_file (\"/dev/sda\") -> " + d.get_device_file ()); + +d = client.query_by_device_file ("/dev/block/8:0"); +print ("query_by_device_file (\"/dev/block/8:0\") -> " + d.get_device_file ()); + +Mainloop.run('udev-example'); --- udev-166.orig/extras/gudev/seed-example-enum.js +++ udev-166/extras/gudev/seed-example-enum.js @@ -0,0 +1,38 @@ +#!/usr/bin/env seed + +const GLib = imports.gi.GLib; +const GUdev = imports.gi.GUdev; + +function print_device(device) { + print(" initialized: " + device.get_is_initialized()); + print(" usec since initialized: " + device.get_usec_since_initialized()); + print(" subsystem: " + device.get_subsystem()); + print(" devtype: " + device.get_devtype()); + print(" name: " + device.get_name()); + print(" number: " + device.get_number()); + print(" sysfs_path: " + device.get_sysfs_path()); + print(" driver: " + device.get_driver()); + print(" action: " + device.get_action()); + print(" seqnum: " + device.get_seqnum()); + print(" device type: " + device.get_device_type()); + print(" device number: " + device.get_device_number()); + print(" device file: " + device.get_device_file()); + print(" device file symlinks: " + device.get_device_file_symlinks()); + print(" tags: " + device.get_tags()); + var keys = device.get_property_keys(); + for (var n = 0; n < keys.length; n++) { + print(" " + keys[n] + "=" + device.get_property(keys[n])); + } +} + +var client = new GUdev.Client({subsystems: []}); +var enumerator = new GUdev.Enumerator({client: client}); +enumerator.add_match_subsystem('b*') + +var devices = enumerator.execute(); + +for (var n=0; n < devices.length; n++) { + var device = devices[n]; + print_device(device); + print(""); +} --- udev-166.orig/extras/gudev/docs/Makefile.in +++ udev-166/extras/gudev/docs/Makefile.in @@ -313,10 +313,9 @@ EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ version.xml.in -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -537,20 +536,35 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp:: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + cp -a $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \ + cp -a $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \ + if test "x$(content_files)" != "x" ; then \ + for file in $(content_files) ; do \ + test -f $(abs_srcdir)/$$file || \ + cp -a $(abs_srcdir)/$$file $(abs_builddir)/; \ + done \ + fi \ + fi + +setup.stamp: setup-build.stamp + @true + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ test -f $$i || touch $$i ; \ done \ @@ -564,8 +578,7 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -579,11 +592,11 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -593,26 +606,24 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @rm -rf html + @mkdir html @mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options=--path="$(abs_srcdir)"; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf + @rm -rf $(DOC_MODULE).pdf @mkpdf_imgdirs=""; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ @@ -623,7 +634,7 @@ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## @@ -633,12 +644,14 @@ rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(DOC_MAIN_SGML_FILE) $(DOC_MODULE)*; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + rm -rf xml html install-data-local: @installfiles=`echo $(srcdir)/html/*`; \ --- udev-166.orig/extras/scsi_id/README +++ udev-166/extras/scsi_id/README @@ -0,0 +1,4 @@ +scsi_id - generate a SCSI unique identifier for a given SCSI device + +Please send questions, comments or patches to or +. --- udev-166.orig/extras/scsi_id/scsi_id.config +++ udev-166/extras/scsi_id/scsi_id.config @@ -0,0 +1,17 @@ +# +# scsi_id configuration +# +# lower or upper case has no effect on the left side. Quotes (") are +# required for spaces in values. Model is the same as the SCSI +# INQUIRY product identification field. Per the SCSI INQUIRY, the vendor +# is limited to 8 bytes, model to 16 bytes. +# +# The first matching line found is used. Short matches match longer ones, +# if you do not want such a match space fill the extra bytes. If no model +# is specified, only the vendor string need match. +# +# options= +# vendor=string[,model=string],options= + +# some libata drives require vpd page 0x80 +vendor="ATA",options=-p 0x80 --- udev-166.orig/extras/cdrom_id/60-cdrom_id.rules +++ udev-166/extras/cdrom_id/60-cdrom_id.rules @@ -2,7 +2,7 @@ ACTION=="remove", GOTO="cdrom_end" SUBSYSTEM!="block", GOTO="cdrom_end" -KERNEL!="sr[0-9]*|xvd*", GOTO="cdrom_end" +KERNEL!="sr[0-9]*|hd[a-z]|xvd*", GOTO="cdrom_end" ENV{DEVTYPE}!="disk", GOTO="cdrom_end" KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" --- udev-166.orig/libudev/docs/Makefile.in +++ udev-166/libudev/docs/Makefile.in @@ -305,10 +305,9 @@ EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ version.xml.in -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -529,20 +528,35 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp:: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + cp -a $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \ + cp -a $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \ + if test "x$(content_files)" != "x" ; then \ + for file in $(content_files) ; do \ + test -f $(abs_srcdir)/$$file || \ + cp -a $(abs_srcdir)/$$file $(abs_builddir)/; \ + done \ + fi \ + fi + +setup.stamp: setup-build.stamp + @true + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ test -f $$i || touch $$i ; \ done \ @@ -556,8 +570,7 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -571,11 +584,11 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -585,26 +598,24 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @rm -rf html + @mkdir html @mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options=--path="$(abs_srcdir)"; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf + @rm -rf $(DOC_MODULE).pdf @mkpdf_imgdirs=""; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ @@ -615,7 +626,7 @@ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## @@ -625,12 +636,14 @@ rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(DOC_MAIN_SGML_FILE) $(DOC_MODULE)*; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + rm -rf xml html install-data-local: @installfiles=`echo $(srcdir)/html/*`; \ --- udev-166.orig/debian/gir1.2-gudev-1.0.install +++ udev-166/debian/gir1.2-gudev-1.0.install @@ -0,0 +1 @@ +usr/lib/girepository-1.0/ --- udev-166.orig/debian/README-lib-rules.d +++ udev-166/debian/README-lib-rules.d @@ -0,0 +1,40 @@ +The files in this directory are read by udev(7) and used when events +are performed by the kernel. The udev daemon watches this directory +with inotify so that changes to these files are automatically picked +up, for this reason they must be files and not symlinks to another +location as in the case in Debian. + +These are not conffiles. If you want to override the behaviour, you +can do one of two things: + + 1) Write your own rules in /etc/udev/rules.d that assign the name, + symlinks, permissions, etc. that you want. Pick a number higher + than the rules you want to override, and yours will be used. + + 2) Copy the file to /etc/udev/rules.d and edit it there; you + should generally only do this if you want to prevent a program + from being run. + + +Files should be named xx-descriptive-name.rules, the xx should be +chosen first according to the following sequence points: + + < 60 rules shipped in packages; these can be overriden by later or + default rules unless := is used in assignment. + + these cannot access persistent information such as that from + blkid + + < 70 rules that run helpers such as blkid to populate the udev db + + < 90 rules that run other programs (often using information in the + udev db) + + >=90 rules that should run last + +Common locations for package rules: + + 40-xx general rules, setting names and permissions + 65-xx rules to populate the udev db + 85-xx rules to run programs + --- udev-166.orig/debian/udev.initramfs-nfs +++ udev-166/debian/udev.initramfs-nfs @@ -0,0 +1,27 @@ +#!/bin/sh -e +# initramfs nfs-top script for udev + +PREREQ="" + +# Output pre-requisites +prereqs() +{ + echo "$PREREQ" +} + +case "$1" in + prereqs) + prereqs + exit 0 + ;; +esac + + +# Each call to udevsettle can take up to three minutes +if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "TIMEOUT 360" + trap "/sbin/usplash_write 'TIMEOUT 15'" 0 +fi + +# We need to wait for the network card drivers to be loaded +/sbin/udevadm settle --- udev-166.orig/debian/udev.base-installer +++ udev-166/debian/udev.base-installer @@ -0,0 +1,9 @@ +#!/bin/sh -e + +RULESDIR=etc/udev/rules.d + +mkdir -p /target/$RULESDIR +cp /$RULESDIR/70-persistent-cd.rules \ + /$RULESDIR/70-persistent-net.rules \ + /target/$RULESDIR 2>/dev/null || true + --- udev-166.orig/debian/libgudev-1.0-0.install +++ udev-166/debian/libgudev-1.0-0.install @@ -0,0 +1 @@ +/lib/libgudev*.so.* usr/lib --- udev-166.orig/debian/udev.initramfs-hook +++ udev-166/debian/udev.initramfs-hook @@ -0,0 +1,56 @@ +#!/bin/sh -e +# initramfs hook for udev + +MINKVER="2.6.24" +PREREQ="" + +# Output pre-requisites +prereqs() +{ + echo "$PREREQ" +} + +case "$1" in + prereqs) + prereqs + exit 0 + ;; +esac + + +. /usr/share/initramfs-tools/hook-functions + +# We use pkill +copy_exec /usr/bin/pkill /sbin + +# Copy across the udev binaries +copy_exec /sbin/udevd /sbin +if [ -x /sbin/udevadm.upgrade ]; then + copy_exec /sbin/udevadm.upgrade /sbin/udevadm +else + copy_exec /sbin/udevadm /sbin +fi + +# Copy udev configuration +mkdir -p ${DESTDIR}/etc/udev +cp -p /etc/udev/udev.conf ${DESTDIR}/etc/udev + +# Only copy across relevant rules +mkdir -p ${DESTDIR}/lib/udev/rules.d +for rules in 50-udev-default.rules 50-firmware.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules; do + cp -p /lib/udev/rules.d/$rules ${DESTDIR}/lib/udev/rules.d +done + +# Copy across helpers the rules need +mkdir -p ${DESTDIR}/lib/udev +# 50-udev-default.rules +# 50-firmware.rules +copy_exec /lib/udev/firmware /lib/udev +# 60-persistent-storage.rules +copy_exec /lib/udev/ata_id /lib/udev +copy_exec /lib/udev/usb_id /lib/udev +copy_exec /sbin/blkid /lib/udev +copy_exec /lib/udev/scsi_id /lib/udev +copy_exec /lib/udev/path_id /lib/udev +# 61-persistent-storage-edd.rules +copy_exec /lib/udev/edd_id /lib/udev --- udev-166.orig/debian/udev.udevmonitor.upstart +++ udev-166/debian/udev.udevmonitor.upstart @@ -0,0 +1,13 @@ +# udevmonitor - log initial device creation +# +# The set of devices created in the "cold plug" pass is generally +# useful for debugging, so we monitor this and create a log file +# from that. + +description "log initial device creation" + +start on (startup + and starting udevtrigger) +stop on stopped udevtrigger + +exec /sbin/udevadm monitor -e >/dev/.udev.log --- udev-166.orig/debian/udev.initramfs-bottom +++ udev-166/debian/udev.initramfs-bottom @@ -0,0 +1,24 @@ +#!/bin/sh -e +# initramfs init-bottom script for udev + +PREREQ="" + +# Output pre-requisites +prereqs() +{ + echo "$PREREQ" +} + +case "$1" in + prereqs) + prereqs + exit 0 + ;; +esac + + +# Stop udevd, we'll miss a few events while we run init, but we catch up +pkill udevd + +# Move /dev to the real filesystem +mount -n -o move /dev ${rootmnt}/dev --- udev-166.orig/debian/udev.postinst +++ udev-166/debian/udev.postinst @@ -0,0 +1,165 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour + + +# Remove a no-longer used conffile +rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-obsolete ]; then + echo "Removing obsolete conffile $CONFFILE" + rm -f "$CONFFILE".dpkg-obsolete + fi +} + +# Remove a conffile directory if it's not empty +rm_confdir() +{ + CONFDIR="$1" + + if [ -d "$CONFDIR" ]; then + rmdir "$CONFDIR" 2>/dev/null \ + || echo "Unable to remove $CONFDIR, not empty" + fi +} + +# Move a conffile without triggering a dpkg question +mv_conffile() { + OLDCONFFILE="$1" + NEWCONFFILE="$2" + + if [ -e "$OLDCONFFILE".dpkg-moving ]; then + echo "Preserving user changes to $NEWCONFFILE" + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE".dpkg-moving "$NEWCONFFILE" + elif [ -e "$OLDCONFFILE".dpkg-bak ]; then + rm -f "$OLDCONFFILE".dpkg-bak + fi +} + + +# Enable udevadm again +enable_udevadm() +{ + if [ -e /sbin/udevadm.upgrade ]; then + rm -f /sbin/udevadm + dpkg-divert --package udev --rename --divert /sbin/udevadm.upgrade \ + --remove /sbin/udevadm + fi +} + +# Restart the daemon +restart_udevd() +{ + restart udev || true +} + + +# Construct the initial device tree (things udev doesn't provide) +create_devices() +{ + # in a vserver environment, mknod will fail; cf. LP: #144685 + if grep -q ^VxID /proc/self/status; then + return + fi + + rm -f /lib/udev/devices/ppp + mknod -m 600 /lib/udev/devices/ppp c 108 0 + + rm -f /lib/udev/devices/loop0 + mknod -m 600 /lib/udev/devices/loop0 b 7 0 + + rm -f /lib/udev/devices/net/tun + mknod -m 600 /lib/udev/devices/net/tun c 10 200 +} + +# Remove things from the initial device tree that are no longer required +remove_devices() +{ + rm -f /lib/udev/devices/fd + rm -f /lib/udev/devices/stdin + rm -f /lib/udev/devices/stdout + rm -f /lib/udev/devices/stderr + rm -f /lib/udev/devices/core + rm -f /lib/udev/devices/sndstat + rm -f /lib/udev/devices/console + rm -f /lib/udev/devices/null +} + +# Write the initial copy of the persistent net and cd rules +seed_persistent_rules() +{ + FILE=/etc/udev/rules.d/70-persistent-net.rules + if [ ! -e $FILE ]; then + echo "# This file maintains persistent names for network interfaces." > $FILE + echo "# See udev(7) for syntax." >> $FILE + echo "#" >> $FILE + echo "# Entries are automatically added by the 75-persistent-net-generator.rules" >> $FILE + echo "# file; however you are also free to add your own entries." >> $FILE + fi + + FILE=/etc/udev/rules.d/70-persistent-cd.rules + if [ ! -e $FILE ]; then + echo "# This file maintains persistent names for CD/DVD reader and writer devices." > $FILE + echo "# See udev(7) for syntax." >> $FILE + echo "#" >> $FILE + echo "# Entries are automatically added by the 75-cd-aliases-generator.rules" >> $FILE + echo "# file; however you are also free to add your own entries provided you" >> $FILE + echo "# add the ENV{GENERATED}="1" flag to your own rules as well." >> $FILE + fi +} + + +# Update the initramfs +update_initramfs() +{ + update-initramfs -u +} + + +case "$1" in + configure) + # Upgrade from lucid + if dpkg --compare-versions "$2" lt "161+git20100825-2"; then + remove_devices + fi + + create_devices + seed_persistent_rules + restart_udevd + enable_udevadm + + # 165 changed DB format + if dpkg --compare-versions "$2" lt-nl "165~"; then + udevadm info --convert-db + fi + + update_initramfs + ;; + + abort-upgrade|abort-deconfigure|abort-remove) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 --- udev-166.orig/debian/udev.udev-finish.upstart +++ udev-166/debian/udev.udev-finish.upstart @@ -0,0 +1,30 @@ +# udev-finish - save udev log and update rules +# +# While udev runs we not only create the log file of initial device +# creation but udev rules may be generated, we need to copy both of +# these out of /dev and onto the root filesystem. + +description "save udev log and update rules" + +start on (startup + and filesystem + and started udev + and stopped udevtrigger + and stopped udevmonitor) + +task +script + # Save udev log in /var/log/udev + if [ -e /dev/.udev.log ] + then + mv -f /dev/.udev.log /var/log/udev || : + fi + + # Copy any rules generated while the root filesystem was read-only + for file in /dev/.udev/tmp-rules--* + do + [ -e "$file" ] || continue + cat "$file" >> "/etc/udev/rules.d/${file##*tmp-rules--}" + rm -f "$file" + done +end script --- udev-166.orig/debian/README.source +++ udev-166/debian/README.source @@ -0,0 +1,8 @@ +Building this from revision control is not quite straight-forward, +sorry. + +First you need a tarball, hopefully you can get that from the archive, +if not "debian/rules tarball" will make it. + +Next you need to make a source package from that. "debian/rules package" +will do that. --- udev-166.orig/debian/watch +++ udev-166/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-(.*).tar.gz --- udev-166.orig/debian/udev.preinst +++ udev-166/debian/udev.preinst @@ -0,0 +1,91 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# Before the package is installed: +# install +# +# Before removed package is upgraded: +# install +# +# Before the package is upgraded: +# upgrade +# +# +# If postrm fails during upgrade or fails on failed upgrade: +# abort-upgrade + + +# Prepare to remove a no-longer used conffile +prep_rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak" + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + mv -f "$CONFFILE" "$CONFFILE".dpkg-obsolete + fi + fi +} + +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" = "$old_md5sum" ]; then + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + mv -f "$CONFFILE" "$CONFFILE".dpkg-moving + fi + fi +} + + +# Disable udevadm from being run during an upgrade +disable_udevadm() +{ + dpkg-divert --package udev --rename --divert /sbin/udevadm.upgrade \ + --add /sbin/udevadm + + cat <<'UDEVADM' > /sbin/udevadm +#!/bin/sh + +if [ "${0##*/}" = "udevtrigger" ] || [ "$1" = "trigger" ]; then + echo "udevadm trigger is not permitted while udev is unconfigured." 1>&2 + exit 1 +fi + +if [ "${0##*/}" = "udevsettle" ] || [ "$1" = "settle" ]; then + echo "udevadm settle is not permitted while udev is unconfigured." 1>&2 + exit 1 +fi + +exec /bin/bash -c "exec -a \"\$0\" /sbin/udevadm.upgrade \"\$@\"" "$0" "$@" +UDEVADM + chmod +x /sbin/udevadm +} + + +case "$1" in + install|upgrade) + disable_udevadm + ;; + + abort-upgrade) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 --- udev-166.orig/debian/udev-udeb.install +++ udev-166/debian/udev-udeb.install @@ -0,0 +1,35 @@ +etc/udev/rules.d +etc/udev/udev.conf +lib/udev/ata_id +lib/udev/cdrom_id +lib/udev/collect +lib/udev/create_floppy_devices +lib/udev/devices +lib/udev/edd_id +lib/udev/firmware +lib/udev/input_id +lib/udev/mtd_probe +lib/udev/path_id +lib/udev/rule_generator.functions +lib/udev/scsi_id +lib/udev/usb_id +lib/udev/write_cd_rules +lib/udev/write_net_rules +lib/udev/rules.d/42-qemu-usb.rules +lib/udev/rules.d/50-firmware.rules +lib/udev/rules.d/50-udev-default.rules +lib/udev/rules.d/60-cdrom_id.rules +lib/udev/rules.d/60-floppy.rules +lib/udev/rules.d/60-persistent-input.rules +lib/udev/rules.d/60-persistent-serial.rules +lib/udev/rules.d/60-persistent-storage.rules +lib/udev/rules.d/61-persistent-storage-edd.rules +lib/udev/rules.d/75-cd-aliases-generator.rules +lib/udev/rules.d/75-persistent-net-generator.rules +lib/udev/rules.d/75-probe_mtd.rules +lib/udev/rules.d/80-drivers.rules + +sbin/udevadm +sbin/udevd +../../rules/arch/40-ia64.rules lib/udev/rules.d +../../rules/arch/40-ppc.rules lib/udev/rules.d --- udev-166.orig/debian/libudev0.copyright +++ udev-166/debian/libudev0.copyright @@ -0,0 +1,19 @@ +This is the Ubuntu package of libudev, the interface to udev. + +Copyright © 2008-2009 Key Sievers +Copyright © 2009 Alan Jenkins + +Licence: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +On Ubuntu systems, the complete text of the GNU Lesser General Public +License can be found in ‘/usr/share/common-licenses/LGPL-2.1’. --- udev-166.orig/debian/libgudev-1.0-dev.install +++ udev-166/debian/libgudev-1.0-dev.install @@ -0,0 +1,7 @@ +usr/include/gudev-1.0 +usr/lib/pkgconfig/gudev-1.0.pc +usr/lib/libgudev*.so usr/lib +usr/lib/libgudev*.a usr/lib +usr/lib/libgudev*.la usr/lib +usr/share/gir-1.0/ +usr/share/gtk-doc/html/gudev --- udev-166.orig/debian/udev.upstart +++ udev-166/debian/udev.upstart @@ -0,0 +1,14 @@ +# udev - device node and kernel event manager +# +# The udev daemon receives events from the kernel about changes in the +# /sys filesystem and manages the /dev filesystem. + +description "device node and kernel event manager" + +start on virtual-filesystems +stop on runlevel [06] + +expect fork +respawn + +exec udevd --daemon --- udev-166.orig/debian/libudev-dev.install +++ udev-166/debian/libudev-dev.install @@ -0,0 +1,6 @@ +usr/include/libudev.h +usr/lib/libudev.a +usr/lib/libudev.so +usr/lib/libudev.la +usr/lib/pkgconfig/libudev.pc +usr/share/gtk-doc/html/libudev --- udev-166.orig/debian/udev.initramfs-top +++ udev-166/debian/udev.initramfs-top @@ -0,0 +1,30 @@ +#!/bin/sh -e +# initramfs init-top script for udev + +PREREQ="all_generic_ide blacklist" + +# Output pre-requisites +prereqs() +{ + echo "$PREREQ" +} + +case "$1" in + prereqs) + prereqs + exit 0 + ;; +esac + + +# It's all over netlink now +echo "" > /proc/sys/kernel/hotplug + +# Start the udev daemon to process events +/sbin/udevd --daemon --resolve-names=never + +# Iterate sysfs and fire off everything; if we include a rule for it then +# it'll get handled; otherwise it'll get handled later when we do this again +# in the main boot sequence. +( /sbin/udevadm trigger --action=add --subsystem-match=block; \ + /sbin/udevadm trigger --action=add --subsystem-nomatch=block; ) & --- udev-166.orig/debian/compat +++ udev-166/debian/compat @@ -0,0 +1 @@ +7 --- udev-166.orig/debian/udev.install +++ udev-166/debian/udev.install @@ -0,0 +1,14 @@ +usr/share/man/*/* +etc/udev/rules.d +etc/udev/udev.conf +lib/udev/* +lib/udev/rules.d/* +sbin/udevadm +sbin/udevd +usr/lib/ConsoleKit +usr/share/doc/udev +usr/share/pkgconfig/udev.pc +../../rules/arch/40-ia64.rules lib/udev/rules.d +../../rules/arch/40-ppc.rules lib/udev/rules.d +../local/udev.py usr/share/apport/package-hooks +../local/hotplug.functions lib/udev/ --- udev-166.orig/debian/libudev0.symbols +++ udev-166/debian/libudev0.symbols @@ -0,0 +1,83 @@ +libudev.so.0 libudev0 #MINVER# + udev_device_get_action@Base 147 + udev_device_get_devlinks_list_entry@Base 147 + udev_device_get_devnode@Base 147 + udev_device_get_devnum@Base 147 + udev_device_get_devpath@Base 147 + udev_device_get_devtype@Base 147 + udev_device_get_driver@Base 147 + udev_device_get_is_initialized@Base 165 + udev_device_get_parent@Base 147 + udev_device_get_parent_with_subsystem_devtype@Base 147 + udev_device_get_properties_list_entry@Base 147 + udev_device_get_property_value@Base 147 + udev_device_get_seqnum@Base 147 + udev_device_get_subsystem@Base 147 + udev_device_get_sysattr_value@Base 147 + udev_device_get_sysname@Base 147 + udev_device_get_sysnum@Base 147 + udev_device_get_syspath@Base 147 + udev_device_get_tags_list_entry@Base 161 + udev_device_get_udev@Base 147 + udev_device_get_usec_since_initialized@Base 165 + udev_device_new_from_devnum@Base 147 + udev_device_new_from_environment@Base 161 + udev_device_new_from_subsystem_sysname@Base 147 + udev_device_new_from_syspath@Base 147 + udev_device_ref@Base 147 + udev_device_unref@Base 147 + udev_enumerate_add_match_is_initialized@Base 165 + udev_enumerate_add_match_property@Base 147 + udev_enumerate_add_match_subsystem@Base 147 + udev_enumerate_add_match_sysattr@Base 147 + udev_enumerate_add_match_sysname@Base 147 + udev_enumerate_add_match_tag@Base 161 + udev_enumerate_add_nomatch_subsystem@Base 147 + udev_enumerate_add_nomatch_sysattr@Base 147 + udev_enumerate_add_syspath@Base 147 + udev_enumerate_get_list_entry@Base 147 + udev_enumerate_get_udev@Base 147 + udev_enumerate_new@Base 147 + udev_enumerate_ref@Base 147 + udev_enumerate_scan_devices@Base 147 + udev_enumerate_scan_subsystems@Base 147 + udev_enumerate_unref@Base 147 + udev_get_dev_path@Base 147 + udev_get_log_priority@Base 147 + udev_get_sys_path@Base 147 + udev_get_userdata@Base 147 + udev_list_entry_get_by_name@Base 147 + udev_list_entry_get_name@Base 147 + udev_list_entry_get_next@Base 147 + udev_list_entry_get_value@Base 147 + udev_monitor_enable_receiving@Base 147 + udev_monitor_filter_add_match_subsystem_devtype@Base 147 + udev_monitor_filter_add_match_tag@Base 161 + udev_monitor_filter_remove@Base 147 + udev_monitor_filter_update@Base 147 + udev_monitor_get_fd@Base 147 + udev_monitor_get_udev@Base 147 + udev_monitor_new_from_netlink@Base 147 + udev_monitor_new_from_socket@Base 147 + udev_monitor_receive_device@Base 147 + udev_monitor_ref@Base 147 + udev_monitor_set_receive_buffer_size@Base 151 + udev_monitor_unref@Base 147 + udev_new@Base 147 + udev_queue_get_failed_list_entry@Base 147 + udev_queue_get_kernel_seqnum@Base 147 + udev_queue_get_queue_is_empty@Base 147 + udev_queue_get_queued_list_entry@Base 147 + udev_queue_get_seqnum_is_finished@Base 147 + udev_queue_get_seqnum_sequence_is_finished@Base 147 + udev_queue_get_udev@Base 147 + udev_queue_get_udev_is_active@Base 147 + udev_queue_get_udev_seqnum@Base 147 + udev_queue_new@Base 147 + udev_queue_ref@Base 147 + udev_queue_unref@Base 147 + udev_ref@Base 147 + udev_set_log_fn@Base 147 + udev_set_log_priority@Base 147 + udev_set_userdata@Base 147 + udev_unref@Base 147 --- udev-166.orig/debian/rules +++ udev-166/debian/rules @@ -0,0 +1,210 @@ +#!/usr/bin/make -f +# debian/rules for the udev package. +# Copyright © 2009 Canonical Ltd. +# Author: Scott James Remnant + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +CFLAGS = -Wall -g -fstack-protector -fPIE +LDFLAGS = -Wl,-z,relro -Wl,-z,now -pie + +# Disable optimisations if noopt found in $DEB_BUILD_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + LDFLAGS += -Wl,-O0 +else + CFLAGS += -Os + LDFLAGS += -Wl,-O1 +endif + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +VERSION = $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/.*: //p') +UPSTREAM = $(shell echo $(VERSION) | sed -e 's/-[^-]*$$//') + +DPKG_GENSYMBOLS_CHECK_LEVEL=4 +export DPKG_GENSYMBOLS_CHECK_LEVEL + +# Configure the package +build-deb/config.status: configure + [ -d build-deb ] || mkdir build-deb + # work around gtk-doc not being able to work in a separate build tree + # by copying the entire lot + cp -a `find -maxdepth 1 ! -name 'build*' ! -name 'debian' ! -name '.*'` build-deb + cd build-deb && ./configure \ + $(confflags) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --with-rootlibdir=/lib \ + --libexecdir=/lib/udev \ + --mandir=\$${datadir}/man \ + --infodir=\$${infodir}/info \ + --with-selinux \ + --enable-static \ + --enable-gtk-doc + +# Build the package +build-deb: build-deb/build-stamp +build-deb/build-stamp: build-deb/config.status + dh_testdir + + $(MAKE) -C build-deb + touch $@ + +# Install files into the deb +install-deb: DH_OPTIONS=-Nudev-udeb +install-deb: build-deb + dh_testdir + dh_testroot + dh_prep + dh_installdirs -v + + $(MAKE) -C build-deb DESTDIR="$(CURDIR)/debian/tmp" install + + # we install gudev into /usr/lib/, fix link + T=`readlink debian/tmp/usr/lib/libgudev-1.0.so`; \ + rm debian/tmp/usr/lib/libgudev-1.0.so; \ + ln -s /usr/lib/`basename $$T` debian/tmp/usr/lib/libgudev-1.0.so + + # Documentation + install -m 644 -o root -g root debian/README-etc-rules.d \ + debian/udev/etc/udev/rules.d/README + install -m 644 -o root -g root debian/README-lib-rules.d \ + debian/udev/lib/udev/rules.d/README + + # Hook into initramfs-tools + install -m 755 -o root -g root debian/udev.initramfs-hook \ + debian/udev/usr/share/initramfs-tools/hooks/udev + install -m 755 -o root -g root debian/udev.initramfs-top \ + debian/udev/usr/share/initramfs-tools/scripts/init-top/udev + install -m 755 -o root -g root debian/udev.initramfs-nfs \ + debian/udev/usr/share/initramfs-tools/scripts/nfs-top/udev + install -m 755 -o root -g root debian/udev.initramfs-bottom \ + debian/udev/usr/share/initramfs-tools/scripts/init-bottom/udev + + +# Configure the udeb +build-udeb/config.status: configure + [ -d build-udeb ] || mkdir build-udeb + cd build-udeb && ../configure \ + $(confflags) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --with-rootlibdir=/lib \ + --libexecdir=/lib/udev \ + --mandir=\$${datadir}/man \ + --infodir=\$${infodir}/info \ + --without-selinux \ + --enable-static \ + --disable-gtk-doc + +# Build the package +build-udeb: build-udeb/build-stamp +build-udeb/build-stamp: build-udeb/config.status + dh_testdir + + $(MAKE) -C build-udeb + touch $@ + + +# Install files into the udeb +install-udeb: DH_OPTIONS=-pudev-udeb +install-udeb: build-udeb + dh_testdir + dh_testroot + dh_prep -Xdebian/tmp + rm -rf debian/tmp-udeb + dh_installdirs + + $(MAKE) -C build-udeb DESTDIR="$(CURDIR)/debian/tmp-udeb" install + + # Startup script + install -m 755 -o root -g root debian/udev.installer-startup \ + debian/udev-udeb/lib/debian-installer/start-udev + + # base-installer script + install -m 755 -o root -g root debian/udev.base-installer \ + debian/udev-udeb/usr/lib/base-installer.d/05udev + + +build: build-deb build-udeb + +binary: binary-indep binary-arch + +# Build architecture-independent files here. +binary-indep: +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-a +binary-arch: build install-deb install-udeb + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installinit --no-start -- start 10 S . + dh_installinit --name=udev-finish --no-start -- start 37 S . + dh_installinit --upstart-only --name=udevtrigger --no-start + dh_installinit --upstart-only --name=udevmonitor --no-start + dh_install --sourcedir=debian/tmp -Nudev-udeb -Nlibudev0-udeb --fail-missing + DH_OPTIONS= dh_install --sourcedir=debian/tmp-udeb -pudev-udeb -plibudev0-udeb + dh_link + dh_strip + dh_compress + dh_fixperms -X/lib/udev/devices/ + DH_OPTIONS= dh_makeshlibs -plibudev0 -V 'libudev0 (>= 147)' --add-udeb=libudev0-udeb + DH_OPTIONS= dh_makeshlibs -plibgudev-1.0-0 -V 'libgudev-1.0-0 (>= 147)' + DH_OPTIONS= dh_makeshlibs -Nlibudev0 -Nlibgudev-1.0-0 + dh_shlibdeps + dh_girepository + dh_installdeb + DH_OPTIONS= dh_gencontrol -Nlibgudev-1.0-0 -Nlibgudev-1.0-dev + DH_OPTIONS= dh_gencontrol -plibgudev-1.0-0 -plibgudev-1.0-dev -- "-v1:$(VERSION)" + dh_md5sums + dh_builddeb + + +# Clean up the mess we made +clean: + dh_testdir + + rm -rf build-deb build-udeb debian/tmp-udeb + dh_clean + + +.PHONY: build-deb build-udeb build install-deb install-udeb \ + binary-indep binary-arch binary clean + + +# Madness +.PHONY: tarball +tarball: prep + ./configure --enable-gtk-doc + make all dist + cp udev-$(UPSTREAM).tar.gz ../udev_$(UPSTREAM).orig.tar.gz + @echo "Created udev_$(UPSTREAM).orig.tar.gz in parent directory" + +# run this to get a buildable tree +.PHONY: prep +prep: + gtkdocize --copy + autoreconf -vi + rm -r autom4te.cache + --- udev-166.orig/debian/control +++ udev-166/debian/control @@ -0,0 +1,91 @@ +Source: udev +Section: admin +Priority: important +Maintainer: Scott James Remnant +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7.3.15ubuntu2), pkg-config, libselinux1-dev (>= 1.28), libsepol1-dev, libglib2.0-dev (>= 2.12.0), libusb-dev (>= 1:0.1.12), libacl1-dev, gobject-introspection, libgirepository1.0-dev, gir1.2-glib-2.0, usbutils (>= 0.82), pciutils, xsltproc, docbook-xsl, gtk-doc-tools, gperf, gawk +Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/natty/udev/ubuntu +Homepage: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html + +Package: udev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, module-init-tools (>= 3.2.1-0ubuntu3), initramfs-tools (>= 0.92bubuntu63), procps, adduser, util-linux (>> 2.15~rc2) +Suggests: watershed +Description: rule-based device node and kernel event manager + udev is a collection of tools and a daemon to manage events received from + the kernel and deal with them in user-space. Primarily this involves + creating and removing device nodes in /dev when hardware is discovered or + removed from the system. + . + Events are received via kernel netlink messaged and processed according to + rules in /etc/udev/rules.d and /lib/udev/rules.d, altering the name of the + device node, creating additional symlinks or calling other tools and programs + including those to load kernel modules and initialise the device. + +Package: udev-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: rule-based device node and kernel event manager + +Package: libudev0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: udev library + libudev provides a set of functions for accessing the udev database + and querying sysfs. + +Package: libudev-dev +Priority: optional +Section: libdevel +Architecture: any +Depends: libudev0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: udev library (development files) + libudev provides a set of functions for accessing the udev database + and querying sysfs. + . + This package provides a static library and C header files. + +Package: libudev0-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: udev library + +Package: libgudev-1.0-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GObject-based wrapper library for libudev + This library makes it much simpler to use libudev from programs already using + GObject. It also makes it possible to easily use libudev from other + programming languages, such as Javascript, because of GObject introspection + support. + . + This package contains the shared libraries. + +Package: libgudev-1.0-dev +Section: libdevel +Architecture: any +Depends: libgudev-1.0-0 (= ${binary:Version}), libudev-dev, libglib2.0-dev, pkg-config, ${shlibs:Depends}, ${misc:Depends} +Description: GObject-based wrapper library for libudev -- development files + This library makes it much simpler to use libudev from programs already using + GObject. It also makes it possible to easily use libudev from other + programming languages, such as Javascript, because of GObject introspection + support. + . + This package contains the header and pkgconfig files needed for developing + applications that use libgudev1.0. + +Package: gir1.2-gudev-1.0 +Section: libs +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends}, libglib2.0-0 +Conflicts: gir1.0-gudev-1.0 +Replaces: gir1.0-gudev-1.0 +Description: libgudev-1.0 introspection data + This package contains the GObject-introspection data of libgudev-1.0 in + binary typelib format. --- udev-166.orig/debian/libgudev-1.0-0.symbols +++ udev-166/debian/libgudev-1.0-0.symbols @@ -0,0 +1,54 @@ +libgudev-1.0.so.0 libgudev-1.0-0 #MINVER# + g_udev_client_get_type@Base 147 + g_udev_client_new@Base 147 + g_udev_client_query_by_device_file@Base 147 + g_udev_client_query_by_device_number@Base 147 + g_udev_client_query_by_subsystem@Base 147 + g_udev_client_query_by_subsystem_and_name@Base 147 + g_udev_client_query_by_sysfs_path@Base 147 + g_udev_device_get_action@Base 147 + g_udev_device_get_device_file@Base 147 + g_udev_device_get_device_file_symlinks@Base 147 + g_udev_device_get_device_number@Base 147 + g_udev_device_get_device_type@Base 147 + g_udev_device_get_devtype@Base 147 + g_udev_device_get_driver@Base 147 + g_udev_device_get_is_initialized@Base 165 + g_udev_device_get_name@Base 147 + g_udev_device_get_number@Base 147 + g_udev_device_get_parent@Base 147 + g_udev_device_get_parent_with_subsystem@Base 147 + g_udev_device_get_property@Base 147 + g_udev_device_get_property_as_boolean@Base 147 + g_udev_device_get_property_as_double@Base 147 + g_udev_device_get_property_as_int@Base 147 + g_udev_device_get_property_as_strv@Base 147 + g_udev_device_get_property_as_uint64@Base 147 + g_udev_device_get_property_keys@Base 147 + g_udev_device_get_seqnum@Base 147 + g_udev_device_get_subsystem@Base 147 + g_udev_device_get_sysfs_attr@Base 147 + g_udev_device_get_sysfs_attr_as_boolean@Base 147 + g_udev_device_get_sysfs_attr_as_double@Base 147 + g_udev_device_get_sysfs_attr_as_int@Base 147 + g_udev_device_get_sysfs_attr_as_strv@Base 147 + g_udev_device_get_sysfs_attr_as_uint64@Base 147 + g_udev_device_get_sysfs_path@Base 147 + g_udev_device_get_tags@Base 165 + g_udev_device_get_type@Base 147 + g_udev_device_get_usec_since_initialized@Base 165 + g_udev_device_has_property@Base 147 + g_udev_device_type_get_type@Base 147 + g_udev_enumerator_add_match_is_initialized@Base 165 + g_udev_enumerator_add_match_name@Base 165 + g_udev_enumerator_add_match_property@Base 165 + g_udev_enumerator_add_match_subsystem@Base 165 + g_udev_enumerator_add_match_sysfs_attr@Base 165 + g_udev_enumerator_add_match_tag@Base 165 + g_udev_enumerator_add_nomatch_subsystem@Base 165 + g_udev_enumerator_add_nomatch_sysfs_attr@Base 165 + g_udev_enumerator_add_sysfs_path@Base 165 + g_udev_enumerator_execute@Base 165 + g_udev_enumerator_get_type@Base 165 + g_udev_enumerator_new@Base 165 + g_udev_marshal_VOID__STRING_OBJECT@Base 147 --- udev-166.orig/debian/udev-udeb.dirs +++ udev-166/debian/udev-udeb.dirs @@ -0,0 +1,13 @@ +/sbin +/etc/udev +/etc/udev/rules.d +/lib/firmware +/lib/udev +/lib/udev/devices +/lib/udev/devices/net +/lib/udev/devices/pts +/lib/udev/devices/shm +/lib/debian-installer +/usr/bin +/usr/lib/base-installer.d +/usr/sbin --- udev-166.orig/debian/changelog +++ udev-166/debian/changelog @@ -0,0 +1,3394 @@ +udev (166-0ubuntu3) natty; urgency=low + + * debian/udev.{postinst,postrm,preinst}: Don't use --local diversions, but + --package udev. The former break with current dpkg, as this now enforces + the current policy that maintainer scripts must use --package, not + --local. (LP: #727211) + + -- Martin Pitt Tue, 01 Mar 2011 17:22:08 +0100 + +udev (166-0ubuntu2) natty; urgency=low + + * Re-enable extras in the udeb build, and explicitly install only the + files we need (LP: #724242). + + -- Colin Watson Thu, 24 Feb 2011 12:16:40 +0000 + +udev (166-0ubuntu1) natty; urgency=low + + * New upstream release: + - 8 keymap fixes, including LP: #702426 + - Fix keymap tool to display scan codes in unexpected event order. + (LP: #702407) + - Bug fixes. + * Merge from trunk: + - Create by-id links with interface numbers for USB input devices with + multiple interfaces. Thanks a7x! (LP: #626449) + - Drop old v4l1 code, to build with current 2.6.38 kernels. + * debian/rules prep: Drop gtk-doc.make seddery, it's not necessary any more + with the full source tree copying that happens now. + + -- Martin Pitt Tue, 15 Feb 2011 18:22:47 +0100 + +udev (165-0ubuntu2) natty; urgency=low + + * debian/rules: For the build-deb/ tree, copy the entire source tree instead + of just parts. This keeps gtk-doc working (which doesn't work with + out-of-tree build) and avoids building a broken GIR. + * debian/rules: Fail build on missing or changed library symbols. + * debian/libudev0.symbols, debian/libgudev-1.0-0.symbols: Add new symbols + from version 165. + + -- Martin Pitt Thu, 27 Jan 2011 15:57:29 +0100 + +udev (165-0ubuntu1) natty; urgency=low + + * New upstream release. Switch to Ubuntu-ish version number to avoid + confusing them with Debian's. + - Allow local users ACL access to raw USB devices of mobile phones. + (LP: #316215) + - Allow local users ACL access to raw FFADO devices. (LP: #681755) + - Keymap fixes. (LP: #625770, #627890, #686662) + * debian/control, debian/gir1.2-gudev-1.0.install: Rename GIR package to + gir1.2-* to match the repository version and the recent transition. + Add conflicts/replaces to old gir1.0-gudev-1.0. + * debian/udev.postinst: Call udevadm --convert-db when upgrading from a + version earlier than 165, to update the running database. + + -- Martin Pitt Sun, 19 Dec 2010 00:15:00 +0100 + +udev (164-3) natty; urgency=low + + * debian/udev.initramfs-hook: If /sbin/udevadm.upgrade exists, copy that + into the initramfs instead of the shell script wrapper that we have during + udev upgrades. (LP: #672964) + + -- Martin Pitt Fri, 12 Nov 2010 18:35:55 +0100 + +udev (164-2) natty; urgency=low + + * debian/rules: Fix the libgudev-1.0.so symlink to point to the actual + library in /usr/lib. Fixes FTBFS of libgudev rdepends. + + -- Martin Pitt Wed, 03 Nov 2010 18:52:55 -0400 + +udev (164-1) natty; urgency=low + + * New upstream bug fix release. + * debian/libgudev-1.0-0.install: Update for new upstream install path of + libgudev to /lib. Move it back to /usr/lib/, right now libgobject is still + in /usr/lib/. + + -- Martin Pitt Tue, 26 Oct 2010 12:28:17 -0400 + +udev (163-1) natty; urgency=low + + * New upstream release. Changes since our last git snapshot: + - cdrom_id: Don't read beyond "last track" in TOC. + - cdrom_id: Fall back to CDROM_DRIVE_STATUS if all MMC commands fail. + (LP: #653568) + - keymap: Add alternate MSI vendor name + - lots of systemd updates (not relevant for us). + * debian/control: Switch Vcs-Bzr: to natty branch. + + -- Martin Pitt Mon, 11 Oct 2010 08:41:42 +0200 + +udev (162-2) maverick; urgency=low + + * Merge bug fixes from trunk: + - scsi_id: export target port group, for ALUA support + - scsi_id: Fix compiler warnings + - gudev: Deliver ::uevent signal in the thread-default main loop. This + makes it possible to actually use the library in a multi-threaded + application. + - keymap: Add Lenovo Y550 (LP: #543065) + - gudev: add a few annotations that newer gobject-introspection versions + demand + - Clarify WAIT_FOR documentation + - Fix various syntax errors in rules + - Add automatic rules syntax check + + -- Martin Pitt Tue, 21 Sep 2010 13:28:09 +0200 + +udev (162-1) maverick; urgency=low + + * New upstream release. Changes since our previous git snapshot: + - cdrom_id: Fix DVD-RW media and blank DVD detection. + - Do not create persistent name rules for kvm/qemu/vmware interfaces. + (LP: #341006) + * Add debian/watch. + + -- Martin Pitt Sun, 12 Sep 2010 20:12:37 +0200 + +udev (161+git20100827-1) maverick; urgency=low + + * Merge fixes from trunk: + - keymap: Fix Acer TravelMate 4720 (LP: #569815) + - gudev: fix crash if netlink is not available (LP: #581527) + - udev(7) manpage: Fix description of $attr (LP: #348513) + * debian/changelog: Fix bug reference in previous upload. + * debian/udev.{pre,post}inst: Remove pre-lucid upgrade code. + * debian/udev.postinst: Drop obsolete /lib/udev/devices/sndstat symlink, OSS + has gone from our kernels ages ago. (LP: #605443) + * debian/udev.postinst, create_devices(): Drop devices which are handled by + static_dev_create_links(). + * debian/udev.postinst, create_devices(): Drop devices which are handled by + devtmpfs. + * debian/rules: Work around gtk-doc not being able to work in a separate + build tree; debian/rules prep already fixes $srcdir→$builddir, so copy + the relevant source files into the build tree so that gtk-doc has + something to scan for. (LP: #519670) + * Add debian/local/hotplug.functions: Provides some helper functions which + udev callouts can use. This is being used by usb-modeswitch, alsa, and + other Debian packages. Copied from current udev sid package. (LP: #625110) + + -- Martin Pitt Mon, 30 Aug 2010 11:21:43 +0200 + +udev (161+git20100825-1) maverick; urgency=low + + * Merge fixes from trunk: + - keymap: Fix Sony VAIO VGN-SZ2HP/B (LP: #530137) + - keymap: Add HP G60 (LP: #554944) + - keymap: Add Onkyo PC (LP: #612529) + - Add support for oom_score_adj, which replaces oom_adj in kernel 2.6.36 + - udevd: remove unneeded credential passing from init_notify() + * debian/control: Update Vcs-Bzr to reworked tree. The current tree is now + branched from lp:~vcs-imports/udev/trunk (which works well now) instead of + the outdated manual lp:~scott/udev/master import. + * Add debian/source/format: Keep 1.0 for now. We don't use quilt, but bzr, + and this is not a native package. + * Add debian/source/options: Supply tar-ignore and diff-ignore options to + exclude .bzr/ and test/. This obsoletes the "debian/rules package" rule, + so remove that. + + -- Martin Pitt Thu, 26 Aug 2010 10:59:48 +0200 + +udev (161+git20100820-1) maverick; urgency=low + + * New upstream release 161, plus fixes from git head: (LP: #620977) + - udevadm trigger now defaults to change instead of add. + - modem modeswitch removed, use usb_modeswitch instead (see LP #521578) + - NAME= now ignored + - udevd creates device nodes itself on startup based on modules.udevname + - default device permission is 0600 + - lots of bug fixes + - updated keymaps (LP: #271706, #554066, #569815, #592371) + - update udev(7) to point out naming of rules files (LP: #616108) + - cdrom_id: fix media state detection of DVD-RW/DVD+RWs (LP: #581925) + - cdrom_id: fix media state detection on older hardware (LP: #502143) + * debian/libudev0.symbols: Add new symbols from upstream version. + * debian/udev.initramfs-hook: Drop 64-device-mapper.rules, it was removed + upstream. + * debian/control: Drop obsolete (pre-lucid) Breaks and Conflicts. + * debian/rules: Replace obsolete dh_clean -k with dh_prep. + * debian/control: Slightly more generously version libselinux1-dev build + dependency (thanks lintian). + * debian/control: Replace obsolete ${Source-Version} with ${binary:Version}. + * debian/control: Update Standards-Version to 3.9.1. + * debian/control: Add Homepage field. + + -- Martin Pitt Sat, 21 Aug 2010 10:07:44 +0200 + +udev (151-12) lucid; urgency=low + + * Cherrypick keymap fixes from trunk: + - Unite laptop models needing common volume-key release quirk. Many laptop + models need the same volume-key release quirk. Currently, two models + have identical force-release-maps/ keymap files (dell-studio-1557 and + fujitsu-amilo-si1848) and two more need to be added (Mitac and Coolbox + QBook). This replaces the identical force-release-maps files with one + 'common-volume-keys' file to make adding new models easier. + (LP: #565459) + - Add force-release quirk for Coolbox QBook 270-02 (LP: #420473) + - Add force-release quirk for Mitac 8050QDA (LP: #374884) + + -- Martin Pitt Mon, 19 Apr 2010 10:58:13 +0200 + +udev (151-11) lucid; urgency=low + + * Fix cdrom_id even harder to correctly detecting media. (Committed to + and cherrypicked from upstream git head): + - Rework feature/profiles buffer parsing: Previously we were ignoring many + profiles, which could lead to misdetecting the content types. + - Print more debug messages with -d. + - Do not ignore errors from scsi_cmd_run(). scsi_cmd_run() can return + positive error messages if we have CHECK_CONDITION set and get the error + code from the SCSI command result. So check the result for non-zero, not + for being negative. This fix another common cause for "phantom" media + in empty CD-ROM drives. (LP: #562978) + - Swap media state and TOC info probing. Blank CDs do not have a TOC, thus + will fail cd_media_toc() (at least with the "Do not ignore errors from + scsi_cmd_run()" fix). Thus probe the media state first, so that we can + properly detect blank media. + + -- Martin Pitt Thu, 15 Apr 2010 22:29:06 +0200 + +udev (151-10) lucid; urgency=low + + * cdrom_id: Turns out that some ioctls do not actually touch the result + buffer in some cases, so we need to zero the result buffers to avoid + interpreting random da CD properties. (LP: #559723, LP: #561585) Patch + also committed to upstream (2b861) + + -- Martin Pitt Tue, 13 Apr 2010 15:34:40 +0200 + +udev (151-9) lucid; urgency=low + + * cdrom_id: In cases where cdrom_id does not go through the entire code path + and one of the probing functions returns -1 or exits early, the remaining + variables were never initialized. This caused effects like "phantom" audio + CDs on empty drives, or bogus data like ID_CDROM_MEDIA_TRACK_COUNT=22528. + Initialize the variables right away to avoid that. (LP: #559723) Patch + committed to upstream git as well (816e6bf). + + -- Martin Pitt Tue, 13 Apr 2010 10:56:38 +0200 + +udev (151-8) lucid; urgency=low + + * Merge some fixes from GIT HEAD: + - Fix keymaps for upcoming Dell laptops. + - cdrom_id: Retry to open the device if it's EBUSY. (LP: #554433) + + -- Martin Pitt Fri, 09 Apr 2010 09:38:54 +0200 + +udev (151-7) lucid; urgency=low + + * Fix key map for Acer TravelMate 6593G and Acer Aspire 1640. (From GIT + HEAD). (LP: #536914) + * extras/cdrom_id/60-cdrom_id.rules: Probe hd[a-z] as well, to cover CD + drives on platforms (like powerpc) which still use IDE driver, like + ide-pmac. (LP: #534912) + + -- Martin Pitt Mon, 29 Mar 2010 17:28:34 +0200 + +udev (151-6) lucid; urgency=low + + * Merge some fixes from GIT HEAD: + - key release quirk for Fujitsu Amilo 1848+u (LP: #530089) + - key release quirk for Samsung Q210/P210 (LP: #530093) + - key maps for Acer TravelMate 6593G and Acer Aspire 1640 (LP: #536914) + - Decrease buffer size when advancing past NUL byte, to fix a buffer + overflow the buffer if space is tight. + - udev-acl: Correctly handle ENV{ACL_MANAGE}==0 + - input_id: Fix linking + - firmware: fix possible segfault when firmware device goes away while + loading + - Fix switching Logitech bluetooth adapters into HCI mode. (LP: #444420) + - cdrom_id: Open non-mounted optical media with O_EXCL. This should + prevent confusing drives during CD burning sessions. + + -- Martin Pitt Wed, 24 Mar 2010 18:47:51 +0100 + +udev (151-5) lucid; urgency=low + + * Merge from GIT HEAD: + - Force key release for volume keys on Dell Studio 1557. + - keymap: Add Toshiba Satellite M30X. LP: #510019. + - libudev: export udev_monitor_set_receive_buffer_size() + - udevadm monitor: increase netlink buffer size + (above two related to LP: #504883) + + -- Scott James Remnant Wed, 17 Feb 2010 15:47:18 +0000 + +udev (151-4) lucid; urgency=low + + * debian/udev.initramfs-top: add pre-requisite on blacklist. + + -- Scott James Remnant Wed, 17 Feb 2010 12:41:45 +0000 + +udev (151-3) lucid; urgency=low + + * 70-acl.rules, 50-udev-default.rules, 78-graphics-card.rules: + Adjust to also work for lbm-drm and lbm-nouveau. + + -- Robert Hooker Thu, 11 Feb 2010 09:01:40 +0100 + +udev (151-2) lucid; urgency=low + + * debian/udev.initramfs-hook: /lib/udev/firmware.sh got rewritten as a + C helper, somehow missed this in testing. + + -- Scott James Remnant Wed, 10 Feb 2010 16:41:06 +0000 + +udev (151-1) lucid; urgency=low + + * New upstream release: + - Support for systems with SYSFS_DEPRECATED=y officially dropped. + - Bug fixes. + - Rules updates. LP: #492657, #316215, #259244, #250732. + + * Merge additional fixes from GIT master: + - Rules updates. LP: #581496, #415023. + - Fix firmware error reporting. + + -- Scott James Remnant Wed, 10 Feb 2010 11:50:56 +0000 + +udev (149-5) lucid; urgency=low + + * debian/udev.initramfs-top: chances are we've already got the block + device, because the storage controller is the 90% most common one that's + built into our kernel. Therefore probe block devices first before all + others, and push probing into the background so we don't wait those + tedious tenths of a second to walk sysfs. + + -- Scott James Remnant Fri, 18 Dec 2009 02:42:09 +0000 + +udev (149-4) lucid; urgency=low + + * debian/udev.initramfs-bottom: Remove the queue cleanup, since it's a + no-op now + + -- Scott James Remnant Fri, 18 Dec 2009 02:28:06 +0000 + +udev (149-3) lucid; urgency=low + + * Set DH_OPTIONS= when calling dh_makeshlibs with special -p and -N + options, otherwise we end up with incorrect shlibs in libudev0 referring + to libgudev-1.0-0. This particularly broke udev-udeb. + * Add libudev0-udeb, for the benefit of input_id. We don't strictly need + input_id right now, but the library is quite small and it seems easier + to go with the flow as other things in the udeb might use libudev later. + + -- Colin Watson Tue, 08 Dec 2009 11:56:06 +0000 + +udev (149-2) lucid; urgency=low + + * rules/rules.d/78-graphics-card.rules: + - Tag the DRM device as the primary device for the display for KMS + supporting drivers, otherwise tag the framebuffer device. This + will get exported to Upstart, thus permitting rules such as: + + start on (graphics-device-added PRIMARY_DEVICE_FOR_DISPLAY=1 + or drm-device-added PRIMARY_DEVICE_FOR_DISPLAY=1) + + to select either /dev/fb0 or /dev/dri/card0 as appropriate. + + -- Scott James Remnant Mon, 07 Dec 2009 18:49:20 +0000 + +udev (149-1) lucid; urgency=low + + * New upstream release: + - Includes previous GIT updates. + - Bug fixes. + + -- Scott James Remnant Thu, 03 Dec 2009 14:56:46 +0000 + +udev (148~-1) lucid; urgency=low + + * Update to GIT HEAD: + - Ignore_device option removed. + - BUS, SYSFS and ID are now deprecated and result in a warning. + - IDE device support removed from default rules. + - New input_id helper, previous uses of the ID_CLASS property on + input devices should now use the new ID_INPUT_* properties. This + is a big part of the Halsectomy of X.org + + -- Scott James Remnant Wed, 02 Dec 2009 01:40:55 +0000 + +udev (147-1) lucid; urgency=low + + * Update to 147 release: + - Includes previous GIT updates. + - udev-acl now requires ConsoleKit 0.4.1 + - gudev API no longer marked as experimental + - rules updates. LP: #281335, #215035, #438114. + + * Added Build-Depends on gobject-introspection, libgirepository1.0-dev + and gir1.0-glib-2.0. + * Add gir1.0-gudev-1.0 package with introspection data. + * Added Breaks on consolekit << 0.4.1 + * Add missing copyright files for the libudev and libgudev packages + which are LGPL 2.1+ and LGPL 2+ respectively, not GPL 2+. + + * Include symbols files and update shlibs to 147. LP: #427672. + + -- Scott James Remnant Mon, 30 Nov 2009 22:37:34 +0000 + +udev (147~-6.1) karmic-proposed; urgency=low + + * udev/udev-node.c: Properly close directory handles to fix a major fd leak + which caused hotplugging to fail entirely. (LP: #463347) + * udev/udevd.c, handle_inotify(): Fix datatype for FIONREAD ioctl return + type. It must be an int, not an ssize_t; the latter causes uninitialized + values and tries to allocate a 15 digit number of bytes, unless the upper + half of the variable just happens to be zeroed. (Upstream commit + http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=4daa146b) + + -- Martin Pitt Mon, 02 Nov 2009 23:47:49 +0100 + +udev (147~-6) karmic; urgency=low + + * debian/udev.initramfs-hook: + - Include the firmware helper. LP: #381037. + + -- Scott James Remnant Thu, 15 Oct 2009 20:47:20 +0100 + +udev (147~-5) karmic; urgency=low + + * debian/udev.initramfs-top: + - Rename from udev.initramfs-bottom and move from local-premount to + init-top + - Add a pre-requisite on all_generic_ide so that gets a chance before + we load IDE devices. + * rules/rules.d/80-drivers.rules: + - load the fbcon driver when a framebuffer is created. + LP: #392039, #431812. + + -- Scott James Remnant Wed, 23 Sep 2009 14:22:52 -0700 + +udev (147~-4) karmic; urgency=low + + * Update to GIT HEAD (still pre 147 release): + - fix signal mask harder. LP: #407428, #434852. + + -- Scott James Remnant Tue, 22 Sep 2009 22:45:39 +0100 + +udev (147~-3) karmic; urgency=low + + * Update to GIT HEAD (still pre 147 release): + - includes fix from previous revision + - rename interfaces to _rename if rename fails. LP: #416782. + - drop most NAME keys since 2.6.31 supplies them. + - especially those with just "%k". LP: #430654. + - fixed SYMLINK option parsing. LP: #430654. + + * Remove 40-alsa.rules now it's not shipped upstream. + + -- Scott James Remnant Mon, 21 Sep 2009 16:02:32 -0700 + +udev (147~-2) karmic; urgency=low + + * rules/rules.d/60-persistent-storage.rules: Fix blkid invocation for + CD-ROMs, thanks to Maxim Levitsky for tracking this down! Fix committed to + GIT HEAD, and cherrypicked. (LP: #431055) + + -- Martin Pitt Sun, 20 Sep 2009 19:47:17 +0200 + +udev (147~-1) karmic; urgency=low + + FFE LP: #427356. + + * Update to GIT HEAD (pre 147 release): + - worker signal mask corrected. LP: #407428. + - database format change to avoid path length issues. LP: #377121. + - multiple devices may not claim the same /dev names, except with + symlinks + - NAME="%k" produces a warning + - symlinks to udevadm no longer resolve to the original command + - rules updates. LP: #281335, LP: #407940, #420015, #426647. + + * Build-depend on gawk, since build fails with mawk. + + * Replace init scripts with Upstart jobs. + * debian/control: + - Add missing ${misc:Depends} + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:22:11 +0100 + +udev (146-1) karmic; urgency=low + + * New upstream release: + - udevadm trigger "--retry-failed" replaced by "--type=failed" + - RUN "ignore_error" option replaced by "fail_event_on_error" + - Added HP Presario 2100 keymap. LP: #20223. + - Added more keymap coverage for Compaq Evo models. LP: #35382. + - Added Fujitsu Amilo M keymap. LP: #48547. + - Added Compal Hel80i keymap. LP: #198530. + - Added Zepto ZNote keymap. LP: #400252. + - Added Everex Stepnote XT5000T keymap. LP: #400921. + - Added rules to switch mode of Huawei E1550 GSM modem. LP: #401655. + - Various other keymap and modem updates. + + [ Martin Pitt ] + * debian/control: Add missing Breaks: casper (<< 1.174) to avoid breaking + upgrades from jaunty in wubi installations. (LP: #400138) + + -- Scott James Remnant Tue, 25 Aug 2009 13:45:17 +0100 + +udev (145-1) karmic; urgency=low + + * New upstream release: + - detach event from worker if killed. + - make sure a worker finishes its event before exiting. LP: #396957. + - handle SIGCHLD before worker messages. + - use qsort() to sort list rather than by hand (performance). + - correct mangling of scsi_id return values + + * debian/rules: Update "prep" target to not wipe uncommitted files. + * debian/libudev-dev.install: Install the restored libtool file + * debian/libgudev-1.0-dev.install: Install the restored libtool file + + -- Scott James Remnant Tue, 14 Jul 2009 17:10:38 +0100 + +udev (143-8) karmic; urgency=low + + * Disable extras for the udeb, since the necessary dependencies aren't + available. + + -- Colin Watson Wed, 01 Jul 2009 10:24:17 +0100 + +udev (143-7) karmic; urgency=low + + * debian/rules: Add "prep" target to get a buildable source tree. This cares + for autoconfiscation, and fixes gtk-docs' makefile snippet to get along + with our separate build trees. + * debian/rules: Call dh_install with --fail-missing, to avoid regressions + like the recent dropping of the ConsoleKit helper. + * debian/udev.install: Add missing ConsoleKit helper. This repairs device + ACLs. + * debian/udev.install: Add missing usr/share/doc/udev (README.keymap and + "writing udev rules") + * debian/udev.install: Install udev.pc. Not much here, but can't hurt, and + other software might rely on it. + * debian/libgudev-1.0-dev.install: Install gtk-doc documentation. + * debian/libudev-dev.install: Install gtk-doc documentation. + * debian/copyright: Fix formerly versionless reference to GPL. + * debian/control: Put libudev-dev into section "libdevel". + * debian/rules: Call dh_installdeb after dh_makeshlibs, so that the + debhelper scripts from the latter actually get active. Fixes ldconfig + calling. + + -- Martin Pitt Tue, 30 Jun 2009 19:09:38 +0200 + +udev (143-6) karmic; urgency=low + + * debian/libgudev-1.0-0.install, debian/libgudev-1.0-dev.install: + - Files are actually installed into /usr/lib already + - Fix wildcard pkgconfig inclusion + - Fix wildcard /usr/include inclusion + - Include static library + - Drop libtool .la file since it's not generated + + -- Scott James Remnant Tue, 30 Jun 2009 10:09:42 +0100 + +udev (143-5) karmic; urgency=low + + * Add missing files. + + -- Scott James Remnant Tue, 30 Jun 2009 09:47:13 +0100 + +udev (143-4) karmic; urgency=low + + * debian/udev-udeb.install: Drop /etc/scsi_id.config here too + + -- Scott James Remnant Mon, 29 Jun 2009 12:12:19 +0100 + +udev (143-3) karmic; urgency=low + + * debian/udev.{install,preinst,postinst,postrm}: /etc/scsi_id.config was + dropped upstream, remove from package and on upgrade. + + * debian/udev.postinst: Only divert udevadm back if diverted away, don't + on reconfigure, etc. LP: #366185. + + -- Scott James Remnant Mon, 29 Jun 2009 12:03:04 +0100 + +udev (143-2) karmic; urgency=low + + * Update to GIT HEAD: + - Bug fixes + - ATA devices switched the property from ID_BUS=scsi to ID_BUS=ata. + - Private properties may be set starting with "." + + -- Scott James Remnant Mon, 29 Jun 2009 10:51:09 +0100 + +udev (143-1) karmic; urgency=low + + * New upstream release: + - event processes are now re-used to improve performance + - libudev no longer has unstable API + - merged udev-extras tools and rules + + * debian/control: + - udev Conflicts and Replaces udev-extras versions up to current. + - merged Build-Depends from udev-extras + - added Build-Depends on gtk-doc-tools for documentation generation. + - copied details for libgudev-1.0-0 and libgudev-1.0-dev from udev-extras + * debian/rules: + - replace --exec-prefix with --sbindir, --libdir, --libexecdir and + --with-rootlibdir + - replace --disable-shared with --enable-static for the udeb, the + result is the same + * debian/libgudev-1.0-0.install, debian/libgudev-1.0-dev.install: + - copy from udev-extras + + -- Scott James Remnant Mon, 29 Jun 2009 10:43:40 +0100 + +udev (142-2) karmic; urgency=low + + * Add debian/local/udev.py: Apport package hook to collect hardware + information, udev DB/log, and custom udev rule file names. Install it in + debian/udev.install. + + -- Martin Pitt Fri, 15 May 2009 14:34:21 +0200 + +udev (142-1) karmic; urgency=low + + * New upstream release: + - includes previous GIT HEAD updates. + - libvolume-id also removed. + + -- Scott James Remnant Wed, 13 May 2009 11:04:31 +0100 + +udev (141-3+gitf079968) karmic; urgency=low + + * Update to GIT HEAD: + - vol_id removed, rules converted to using blkid. + + * Rebuild to hopefully fix FTBFS due to bad diff.gz + + -- Scott James Remnant Mon, 11 May 2009 11:44:04 +0100 + +udev (141-2+git4a74214) karmic; urgency=low + + * Update to GIT HEAD: + - bugfixes. LP: #369817, #368109. + - libudev allows you to subscribe to udev events, and filter those + based on system, etc. + - extras/cdrom_id/cdrom_id.c: Add a new key ID_CDROM_MEDIA=1 if there + is a CD present. Also, skip media tests if CDROM_DRIVE_STATUS != + CDS_DISC_OK. + - rules/rules.d/60-persistent-storage.rules: Only start vol_id if + ID_CDROM_MEDIA is set. This should fix the auto-closing of the tray. + (LP: #356631) + + * Remove /dev/MAKEDEV symlink on upgrade. + * Remove /dev/kmem device node, this is disabled in our kernels and + will be created anyway if the module is loaded from a kernel compiled + with it enabled. + + * The vol_id binary and libvolume-id library are no longer built by + this package. Software should use the blkid binary and libblkid + library supplied by the util-linux source package instead. + * Add Breaks on packages that were using vol_id with our blessing. + + -- Scott James Remnant Thu, 07 May 2009 12:48:24 +0100 + +udev (141-1) jaunty; urgency=low + + * New upstream release. LP: #358013. + + -- Scott James Remnant Thu, 09 Apr 2009 00:39:51 +0100 + +udev (140-2) jaunty; urgency=low + + * debian/udev.postinst: On upgrade, replace instances of ATTRS{ in + /etc/udev/rules.d/70-persistent-net.rules with ATTR{ otherwise they + won't match anymore. LP: #329106. + + -- Scott James Remnant Wed, 25 Mar 2009 17:57:20 +0000 + +udev (140-1) jaunty; urgency=low + + * New upstream release: + - includes changes from 139-2 + - udevadm settle can accept a range of events to watch for. + - vol_id: ntfs uuid setting fix. LP: #337015. + + -- Scott James Remnant Fri, 13 Mar 2009 12:40:16 +0000 + +udev (139-2) jaunty; urgency=low + + * Patch udevadm settle to communicate with udevd to make sure that there + aren't any pending inotify events that haven't been turned into uevents. + + -- Scott James Remnant Tue, 10 Mar 2009 13:09:46 +0000 + +udev (139-1) jaunty; urgency=low + + * New upstream release: + - includes changes from 138-2 + - also further patch to actually remove watches when the devices are + removed. LP: #334278. + + -- Scott James Remnant Thu, 26 Feb 2009 23:41:35 +0000 + +udev (138-2) jaunty; urgency=low + + * Fix inotify watch code to remove any existing watch before beginning rule + processing, and not to add the watch until the rule processing is + complete. This stops us "chasing our own tail" if one of the programs we + run writes to the block device, or at least opens it for writing. + LP: #332270 + + * Fix inotify code to respond to all events, rather than just the first in + the buffer repeatedly. Ironically this bug was causing fewer people to be + affected by #332270. + + -- Scott James Remnant Mon, 23 Feb 2009 20:28:58 +0000 + +udev (138-1) jaunty; urgency=low + + * New upstream release: + - Block device nodes watched with inotify for changes and + /dev/disk/by-{uuid,label} updated automatically. + - Loop devices now get persistent disk links too. + + * Apply NAME rules when string_escape=none. LP: #325690. + + -- Scott James Remnant Fri, 20 Feb 2009 13:37:24 +0000 + +udev (137-2) jaunty; urgency=low + + * If the kernel uevent sequence number is not available, do not restart + udev; solves an issue during upgrade in the chroot of a buildd. + + -- Scott James Remnant Tue, 27 Jan 2009 13:35:07 +0000 + +udev (137-1) jaunty; urgency=low + + * New upstream release: + - udevadm test no longer has force option. + - udevd has --resolve-names=early|late|never option. + - Group of IDE CD-ROM drives fixed. LP: #315997. + - Group of DRI subsystem fixed. LP: #317430. + - /etc/udev/rules.d not existing is not an error. LP: #315780. + - Bug where device nodes would be replaced by symlinks on rename has been + fixed. LP: #315979. + + * Use --resolve-names=never in the installer and initramfs, since we don't + have a useful name service. LP: #319199. + * Since we don't have to worry about group lookup, we may as well copy the + default rules into the initramfs as well. This actually double-solves + LP: #315979. + * Make sure the root filesystem is writable before attempting to copy + generated rules across. LP: #224870. + * Remove /dev/MAKEDEV symlink; the FHS no longer requires it when /dev + is automatically managed. + + * It is not permitted to call udevadm trigger or settle during an upgrade + without depending on udev. Attempting this will fail. + * Change /etc/init.d/udev restart to actually restart the daemon, with a + bit of detection to print a warning if we missed events while the + daemon was down. + * Refreshing /dev is now /etc/init.d/udev refresh-devices + * Restart udev daemon after upgrade. LP: #317944. + + -- Scott James Remnant Fri, 23 Jan 2009 15:15:07 +0000 + +udev (136-5) jaunty; urgency=low + + * debian/udev-udeb.dirs: Create /lib/udev/devices/{net,pts,shm} in the + udeb too, since (a) the installer-startup script gets a bit upset if + /lib/udev/devices doesn't exist or is empty, and (b) they seem like + reasonable things to have anyway. + + -- Colin Watson Tue, 20 Jan 2009 15:33:01 +0000 + +udev (136-4) jaunty; urgency=low + + * debian/udev.preinst, debian/udev.postinst, debian/udev.postrm: A couple + of conffiles from an earlier udev package are still around for several + people, make sure that we delete these too. + + * debian/compat: Update to 7. + * debian/control: Bump debhelper build-dep, and standards version. + + -- Scott James Remnant Mon, 12 Jan 2009 16:59:47 +0000 + +udev (136-3) jaunty; urgency=low + + * debian/udev.links, debian/udev-udeb.links: Create a vol_id symlink in + /sbin since this is a generally useful binary to have around. This + was probably accidentally dropped in the -2 upload because they weren't + committed to bzr. + + -- Scott James Remnant Sat, 10 Jan 2009 18:18:53 +0000 + +udev (136-2) jaunty; urgency=low + + * debian/control: Set priorities of -dev packages to optional. + * debian/rules: Take arguments off calls to dh_makeshlibs and dh_shlibdeps, + otherwise the libudev0 shlibs goes a bit wrong. + + -- Scott James Remnant Wed, 07 Jan 2009 15:40:58 +0000 + +udev (136-1) jaunty; urgency=low + + One of the biggest changes in this release is that the default rules + are no longer conffiles and are now installed into /lib/udev/rules.d + + You may still add your custom rules to /etc/udev/rules.d and these + will be processed after the default ones, and can thus override + anything they do. + + To avoid side-effects of default rules (ie. running of programs), + create the file with the same name. + + * New upstream release: + - Changed to use autoconf + - Default rules moved to /lib/udev/rules.d + - udevadm symlinks removed. + - udevadm info output for --device-id-of-file changed. + - udevadm trigger has new --type option. + - libvolume_id soname change. + - libvolume_id now able to return multiple matches for a single block + device, or no matches if conflicting metadata found. + - libudev shared library introduced. + - by-id/scsi-* and by-id/ieee-* links both created by Firewire disks. + - Optical devices no longer probed for raid signatures. (LP: #283316). + - DEVTYPE=disk/partition no longer exported by default. + - pnp support removed now that we have MODALIAS support in kernel. + - Introduced /dev/block and /dev/char (see changelog for 124-6). + - Rule matching engine changed, limits such as 5 ENV and ATTR matches + and only one match for any other key are now gone. NAME assignment + is no longer special cased (subsequent assignments will now overwrite + unless := is used). + - Substantial memory footprint reduction work. + + * debian/patches/01-cdrom-vol_id-probing.patch: + - Dropped, included in upstream release. + * debian/patches/80-extras-dvb_device_name.patch: + - Dropped, no longer compiles and won't be needed from the next kernel + onwards. Since these aren't boot critical, just do it in shell. + * debian/patches/80-extras-firmware.patch: + - Dropped, no longer compiles anyway so we may as well just use the + upstream firmware.sh which also supports crazy PackageKit stuff + * debian/patches/80-extras-ide_media.patch: + - Dropped, the ide subsystem has had MODALIAS support since hardy using + the media type. + * debian/patches/80-extras-usb_device_name.patch: + - Dropped, we no longer need to support the legacy usb_device subsystem + since we've had the newer ENVTYPE=usb_device objects since hardy. + - Bump minimum kernel version to 2.6.24 for the initramfs. + * debian/patches/80-extras-vio_type.patch: + - Dropped, we don't even build these modules. + * debian/patches/80-extras-watershed.patch: + - Dropped, we do not used it in any udev rules shipped in this package; + it can be separated out into another source package if other things + still use it (which we should try to make them not). + + * Merged our rules with Upstream default rules, this results in a number + of minor changes but achieves consistency with other distributions: + * /dev/net/tun is now mode 666, the kernel documentation says this is safe + since you still need CAP_NET_ADMIN to create tunnels. + * /dev/srN are now the definitive names of SCSI CD-ROM devices, with + /dev/scdN as deprecated symlinks to them; this is the exact opposite of + how we had things before. + * /dev/nvram is now in the kmem group, the nvram group has been dropped. + * Removable disks have moved from the floppy group to the disk group, with + floppy now largely reserved for real old-fashioned floppy devices (and + the /dev/fd* devices are now all in floppy). LP: #260982. + * CD/BD-ROM devices should now consistently be in the cdrom group. + * Tape devices should now consistently be in the tape group. + * More video devices consistently in the video group. + * Printers on printer-specific ports now in the lp group, ppdev module + loaded when necessary. + * The scanner group has been dropped, it's become increasingly difficult + to determine what is and isn't a scanner; especially with multi-function + devices - access to scanners is better handled by ACL now. + * /dev/input devices no longer group writable + * /dev/tty devices are now group writable (wall/write enabled) + * /dev/rtc restored to root group. LP: #306458. + * Various changes to the way the dialout group is assigned, should lead + to more reliable device groups thus specific rules dropped. + LP: #264792. + * Support for infiniband, iowarrior, usbdpfp, sxctl, rioctl, bsg and + etherd devices. + + * Add LSB headers to init scripts. LP: #312324. + * Correct name of CD Aliases generator in postinst. LP: #250232. + * Fixed /usr/lib/libvolume_id.so symlink. LP: #232434. + * Dropped /dev/.static/dev. LP: #253786. + + -- Scott James Remnant Wed, 07 Jan 2009 14:01:19 +0000 + +udev (124-12) jaunty; urgency=low + + * Mount /dev/pts at the end of /lib/debian-installer/start-udev, as + Debian's corresponding script does so and bterm needs it (previously it + was silently falling back to legacy PTYs, which are no longer so readily + available and are undesirable anyway). + + -- Colin Watson Mon, 29 Dec 2008 20:22:33 +0000 + +udev (124-11) jaunty; urgency=low + + * Mount /dev as a tmpfs at the start of /lib/debian-installer/start-udev, + and create the console and null devices there. + /lib/debian-installer/init-udev-devices used to do this, but that no + longer exists (LP: #300426). + + -- Colin Watson Thu, 20 Nov 2008 21:44:22 +0000 + +udev (124-10) jaunty; urgency=low + + * Cherry-pick from Debian 0.125-6: + - Move in the udeb /lib/debian-installer-startup.d/S02udev to + /lib/debian-installer/start-udev because udev will now be started + before the busybox init. Patch by Jérémy Bobbio. (Closes: #493865) + + -- Colin Watson Tue, 04 Nov 2008 23:43:32 +0000 + +udev (124-9) intrepid-proposed; urgency=low + + * Add debian/patches/01-cdrom-vol_id-probing.patch: Do not run vol_id on + optical drives if there is no medium in the drive. Doing so open()'s the + drive without O_NONBLOCK which closes the tray. Patch backported from + upstream GIT (released in version 126). (LP: #283316) + + -- Martin Pitt Mon, 03 Nov 2008 19:02:15 +0100 + +udev (124-8) intrepid; urgency=low + + * debian/rules.d/60-symlinks.rules: + - Add /dev/rtc symlink pointing to the CMOS RTC if it exists (almost + always rtc0, but we match properly by driver). LP: #252924. + + -- Scott James Remnant Fri, 24 Oct 2008 10:45:31 +0100 + +udev (124-7) intrepid; urgency=low + + * debian/rules.d/65-id-type.rules: + - Ensure that ID_TYPE is set to "disk" for block devices that are + likely disks, or "cd" for those that are likely CDs. In some cases + this has been lost in favour of $DEVTYPE, but many things (including + our installer) haven't caught up. LP: #287807. + + -- Scott James Remnant Thu, 23 Oct 2008 02:09:43 +0100 + +udev (124-6) intrepid; urgency=low + + * Backport addition of /dev/{block,char}/maj:min symlinks from latest + udev rules; this mirrors the /sys/dev/{block,char}/maj:min symlinks + found in our current kernel. + + If you have a device node, stat() it to obtain type, major and minor + and readlink /sys/dev/{block,char}/maj:min to obtain the sysfs path + of that device. + + If you have a sysfs path, read the "dev" file to obtain major and minor + (it's char unless in the block subsystem), and then readlink + /dev/{block,char}/maj:min to obtain the device node. + + -- Scott James Remnant Tue, 07 Oct 2008 14:37:44 +0100 + +udev (124-5) intrepid; urgency=low + + * re-introduce the change of 124-3, but make sure it only ignores these + errors in a vserver environment. + + -- Reinhard Tartler Tue, 23 Sep 2008 22:52:00 +0200 + +udev (124-4) intrepid; urgency=low + + * Revert the previous upload. + + This would cause a failure to install the package correctly to be ignored, + and could result in ordinary systems not booting. + + -- Scott James Remnant Tue, 23 Sep 2008 13:16:34 -0700 + +udev (124-3) intrepid; urgency=low + + * debian/udev.postinst: + - don't fail to install/upgrade in a vserver environment by ignoring + errors of mknod. LP: #144685 + + -- Reinhard Tartler Mon, 08 Sep 2008 18:04:25 +0200 + +udev (124-2) intrepid; urgency=low + + * debian/udev.initramfs-hook: + - Remove mention of pnp_modules. LP: #248378. + + -- Scott James Remnant Mon, 14 Jul 2008 13:49:09 +0100 + +udev (124-1) intrepid; urgency=low + + * New upstream release: + - udevmonitor, udevtest, udevcontrol and udevtrigger symlinks removed + - abstract namespace socket paths should be prefixed with @ + - cdrom_id replaced by a better version + - scsi_id no longer depends on sysfs + - 05-udev-early.rules removed + + * Patches from git dropped due to upstream update. + * Dropped 50-vol_id-on-entire-disk.patch, as noted in the changelog, this + was a temporary measure and should be fixed by the kernel. + + * Drop pnp_modules now that recent kernels export module aliases for these + module groups. + + -- Scott James Remnant Mon, 14 Jul 2008 11:06:43 +0100 + +udev (117-8) hardy; urgency=low + + * Remove cruft from diff.gz that prevented build. + + -- Scott James Remnant Fri, 11 Apr 2008 13:05:56 +0100 + +udev (117-7) hardy; urgency=low + + * debian/patches/50-vol_id-on-entire-disk.patch: + - Run vol_id on the entire disk again. LP: #192794. + - The reason it was disabled upstream was to avoid the cases where + removable devices don't issue "change" events and stale information is + left. + - Since this behaviour would not be a regression from gutsy, and losing + support for LVM PVs on the entire disk is a definite regression (since + it's documented to do it that way in various places) we've reverted + the upstream disabling. + - After 2.6.25 (so hopefully 8.10), the kernel will issue "change" + events and always read all volumes; so this is a very temporary patch. + * Place scsi type 0 devices in the "disk" group". + + -- Scott James Remnant Fri, 11 Apr 2008 10:20:37 +0100 + +udev (117-6) hardy; urgency=low + + * Automatically add ADDR{type}=="1" to 70-persistent-net.rules rules + where we can or at least add a useful comment where the user has written + their own rule that's broken in the same way. LP: #183968. + * Automatically comment out rules from 70-persistent-net.rules that would + match any device. + + -- Scott James Remnant Thu, 10 Apr 2008 23:49:41 +0100 + +udev (117-5) hardy; urgency=low + + * Merge the "volumeid" package back into "udev", there is no particular + gain to it being a separate binary package and it prevents the upgrade + from dapper from migrating the fstab to UUID. LP: #209347. + + * debian/patches/00-git-bad-net-rules.patch: + - Upstream patch from 118 to avoid creating persistent net rules + which will match any device. + * debian/patches/01-git-squashfs-lzma.patch: + - Upstream patch from 118 to detect LZMA-compressed squashfs. + * debian/patches/02-git-squashfs-endian.patch: + - Upstream patch from 118 to detect endianness of LZMA squashfs. + * debian/patches/03-git-vol_id-timeout-once.patch: + - Upstream patch from 118 to only timeout once for unreadable devices. + LP: #156184. + * debian/patches/04-git-multiple-floppy-devices.patch: + - Upstream patch from 118 to fix create_floppy_devices for more than + one floppy device. Possibly LP: #132546. + * debian/patches/05-git-vol_id-probe_all-readable.patch: + - Upstream patch from 118 to check whether a device is readable before + probing. Also LP: #156184. + * debian/patches/00upstream-RUN-for-remove.patch: + - Rename to 06-git-run-for-remove.patch so its in series with other + git patches (this is from 119) + * debian/patches/07-git-unlock-write_net_rules.patch: + - Upstream patch from 119 to unlock rules after invalid match, correcting + a bug introduced by 00-git-bad-net-rules.patch + * debian/patches/08-git-vol_id-uuid-buffer.patch: + - Upstream patch from 119 to correct UUID raw buffer usage. + * debian/patches/09-git-update-ext.patch: + - Upstream patch from 119 to update ext filesystem detection. + * debian/patches/10-git-match-basename.patch: + - Upstream patch from 119 to add match on the basename of an interface + so we can deal with PS3 multiple interfaces with the same MAC. + * debian/patches/11-git-persistent-change.patch: + - Upstream patch from 119 to run persistent device rules on change + events. + * debian/patches/12-git-serialise-same-devno.patch: + - Upstream patch from git to serialise multiple events with the same + device number, fixes a race with serial ttys amongst other things. + + * 20-names.rules: + - Add missing quotes for infiniband rules. LP: #192552. + - Change "rdma_ucm" to "rdma_cm" (same bug). + * 40-permissions.rules, 40-basic-permissions.rules: + - Split out the most basic permissions into a separate file that can be + used in the installer and initramfs. LP: #204108. + - Add rules to place known USB serial devices that need libusb access + in the dialout group. LP: #198757. + * 65-persistent-storage.rules, 65-persistent-storage-tape.rules, + 65-persistent-input.rules, 66-persistent-storage-edd.rules: + - Use upstream rule names for all rules. Also LP: #186686. + - Add persistent-storage-edd.rules to installer and initramfs. + * 80-programs.rules: + - Pass $root/%k to create-floppy-devices, not $tempnode. LP: #132546. + + -- Scott James Remnant Wed, 02 Apr 2008 18:59:56 +0100 + +udev (117-4ubuntu2) hardy; urgency=low + + * The persistent-storage-edd rules need to be numerically + persistent-storage+1 (as they are in the original source). Changed from + 65 to 66. LP: #186686 + + -- Ben Collins Wed, 02 Apr 2008 11:28:22 -0400 + +udev (117-4ubuntu1) hardy; urgency=low + + * change the "Breaks: libdevmapper1.02" to a Conflict to help + the apt resolver calculating the upgrade (LP: #203756) + + -- Michael Vogt Wed, 19 Mar 2008 16:27:39 +0100 + +udev (117-4) hardy; urgency=low + + * Add debian/patches/00upstream-RUN-for-remove.patch: + - Execute RUN rules for device removals even if the device is not present + any more (like for USB devices). + - This restores the behaviour of earlier versions and fixes race + conditions with hal for e. g. cryptsetup, and device naming. + - Patch taken from upstream git (see patch header). + - LP: #148003 + + -- Martin Pitt Thu, 07 Feb 2008 09:45:24 +0100 + +udev (117-3) hardy; urgency=low + + * Ship symlinks of old udevtrigger, udevsettle, udevinfo and udevmonitor + tools to udevadm in the udeb. Use of these should be replaced with + calls to udevadm itself as soon as possible. + + -- Scott James Remnant Thu, 20 Dec 2007 03:47:34 +0000 + +udev (117-2) hardy; urgency=low + + * Don't ship upstream udev rules. LP: #176537, #176546. + + -- Scott James Remnant Sat, 15 Dec 2007 15:05:57 +0000 + +udev (117-1) hardy; urgency=low + + * New upstream release: + - udev ancillary tools merged into a single udevadm binary. + - dynamic rules may be created in /dev/.udev/rules.d + - SYMLINK=="value" matches currently defined symlinks. + - RUN{ignore_error} will ignore errors from programs. + - vol_id recognises FAT partitions with 8192 sector size. LP: #147807. + + * debian/patches/10-git-linux_raid-1.0-metadata.patch: + - Dropped, included in new upstream version. + * debian/patches/80-extras-firmware.patch: + - Change to add a new extra helper rather than patch the existing one, + makes updating easier. + + * 00-init.rules: + - Rename to 05-udev-early.rules to match upstream + * 05-options.rules: + - Do not remove static devices + * 20-names.rules: + - Update to 2.6.24-style usb_device objects + * 40-permissions.rules: + - Update to 2.6.24-style usb_device objects + - Place SCSI type 4 devices into the cdrom group + * 65-persistent-storage-tape.rules: + - New upstream rules file for tape devices containing rules separated + out from 65-persistent-storage.rules + * 90-modprobe.rules: + - Fix strange syntax error introduced by mjg59 leaving a note in the + rule that wasn't in a comment. + * 99-udevmonitor.rules: + - Rename to 95-udev-late.rules to match upstream + - Run REMOVE_CMD environment if it exists. + + * debian/migrate-iftab.pl: + - Lowercase MAC addresses on migration. LP: #151786. + * debian/udev.init: + - Update all binaries to be calls to udevadm. + * debian/udev.initramfs-hook: + - Copy in udevadm rather than the symlinks to it. + - Update filenames of early rules file. + - Copy in late rules now we have udev monitor there. + * debian/udev.initramfs-nfs: + - Update all binaries to be calls to udevadm. + * debian/udev.initramfs-premount: + - Update all binaries to be calls to udevadm. + * debian/udev.installer-startup: + - Update all binaries to be calls to udevadm. + + -- Scott James Remnant Fri, 14 Dec 2007 12:15:30 +0000 + +udev (113-0ubuntu16) gutsy; urgency=low + + * Rename the finish init.d script to udev-finish, and move from S23 to + S37 so it runs after /var has actually been mounted. This would + otherwise cause a missing udev.log and non-generation of the persistent + rules. LP: #149319. + + -- Scott James Remnant Fri, 05 Oct 2007 16:21:58 +0100 + +udev (113-0ubuntu15) gutsy; urgency=low + + * Ship the UUID migration script as a separate executable, called by + volumeid's postinst; also ensure we don't call it when installing the + base system on the LiveCD (oops!) + * Migrate /etc/fstab settings to the new rules generator. LP: #125139. + + -- Scott James Remnant Wed, 03 Oct 2007 16:07:58 +0100 + +udev (113-0ubuntu14) gutsy; urgency=low + + * Fix volumeid.postinst. Missing ;; in a couple of places. + + -- Fabio M. Di Nitto Sat, 29 Sep 2007 05:57:45 +0200 + +udev (113-0ubuntu13) gutsy; urgency=low + + * don't do UUID conversion for /dev/mapper/*_crypt devices. Those are + created by partman-crypto, and are used by cryptsetup's cryptroot-hook. + Corresponds to change in partman-crypto and LP bug #144390. + + -- Reinhard Tartler Fri, 28 Sep 2007 18:25:40 +0200 + +udev (113-0ubuntu12) gutsy; urgency=low + + * If we're going to put udevmonitor in the udeb, we should include + 99-udevmonitor.rules otherwise we have a bit of a chocolate teapot. + + -- Scott James Remnant Thu, 27 Sep 2007 16:47:29 +0100 + +udev (113-0ubuntu11) gutsy; urgency=low + + * debian/patches/10-git-linux_raid-1.0-metadata.patch: + - Upstream patch to fix detection of linux_raid metadata v1.0 and + produce correct UUIDs for such raid devices. LP: #133773 + + * 20-names.rules: + - Place ucm[0-9]* and rdma_ucm into the infiniband dir. LP: #124990. + * 80-programs.rules: + - Fix calling of create_floppy_devices to just $tempnode not + $root/$tempnode, which is just plain wrong. LP: #132546. + + -- Scott James Remnant Mon, 24 Sep 2007 13:18:41 +0100 + +udev (113-0ubuntu10) gutsy; urgency=low + + * Add cdrom_id and corresponding rules to the udeb. LP: #143958. + + -- Colin Watson Sun, 23 Sep 2007 19:43:49 +0100 + +udev (113-0ubuntu9) gutsy; urgency=low + + * Make sure /lib/udev/write_net_rules is executable in the udeb. + + -- Colin Watson Tue, 18 Sep 2007 19:07:21 +0100 + +udev (113-0ubuntu8) gutsy; urgency=low + + * Clean up the tifm code, add support for memory stick + + -- Matthew Garrett Fri, 31 Aug 2007 23:14:26 +0100 + +udev (113-0ubuntu7) gutsy; urgency=low + + * Place the libvolume_id.so symlink in the libvolume-id-dev package, and + in /usr/lib. LP: #132536. + + -- Scott James Remnant Wed, 15 Aug 2007 16:09:00 +0100 + +udev (113-0ubuntu6) gutsy; urgency=low + + * Include a base-installer.d script to copy persistent rules to the target + system in d-i (in line with Debian udev 0.097-1 and Debian bug #433935). + + -- Colin Watson Fri, 20 Jul 2007 13:44:21 +0100 + +udev (113-0ubuntu5) gutsy; urgency=low + + * Reupload. + + -- Scott James Remnant Fri, 13 Jul 2007 14:12:12 +0100 + +udev (113-0ubuntu4) gutsy; urgency=low + + * Adjusted volumeid postinst; we now support mounting software RAID (md), + devmapper (dm) and LVM devices by UUID. + * s/KERNEl/KERNEL/ in 20-names.rules. LP: #125336. + + -- Scott James Remnant Fri, 13 Jul 2007 12:37:36 +0100 + +udev (113-0ubuntu3) gutsy; urgency=low + + * Minor fix s/$k/$tempnode/. + + -- Scott James Remnant Wed, 11 Jul 2007 16:48:45 +0100 + +udev (113-0ubuntu2) gutsy; urgency=low + + * Set group of nvram to nvram. LP: #108460. + * Move udevmonitor to /sbin. LP: #119091. + * Update shlibs of libvolumeid. LP: #121074. + * Added rules for infiniband nodes. LP: #124990. + * Don't seed the initial persistent rules, instead wait for the first + boot. LP: #123559. + + -- Scott James Remnant Tue, 10 Jul 2007 17:30:28 +0100 + +udev (113-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - control characters in labels are hex-encoded rather than removed. + - existance of sysfs files can be tested with TEST + + * debian/patches/01-lib-udev.patch: + - Dropped, merged upstream. + * debian/patches/10-suppress-syslog.patch: + - Dropped, --verbose no longer sends messages to syslog so the additional + option is unneeded. + * debian/patches/40-no_replace.patch: + - Dropped, merged upstream and renamed to string_escape=none. + * debian/patches/50-result-whitespace.patch: + - Dropped, merged upstream. + * debian/patches/55-run-program.patch: + - Dropped, merged upstream. + * debian/patches/60-mknod-symlink-races.patch: + - Dropped, merged upstream and improved so that it can't end up in an + infinite loop; and symlinks will only replace a block device with the + correct major/minor. + * debian/patches/91-skip-whole-disk.patch: + - Dropped, merged upstream. + + * Rule updates: + - Place auer, cpad, dabusb, hiddev & legousbtower devices under /dev/usb. + - Move /dev/usblp* to /dev/usb/lp*, and retain compatibility symlink + (justification: devices.txt) + - Place raw I/O devices under /dev/raw. + - Set group of vcs devices to root. + - Use create_floppy_devices callout to make special floppy device nodes. + + -- Scott James Remnant Tue, 10 Jul 2007 13:35:43 +0100 + +udev (111-0ubuntu6) gutsy; urgency=low + + * debian/patches/80-extras-vio_type.patch: + - set logging_init to vio_type + - use sysfs_init/_cleanup to get sysfs_path + - add sparc vio support + - dont report errors if we can't read devspec on sparc + + * debian/rules.d/90-modprobe.rules: + - add support for sunvnet and sunvdc + + -- Fabio M. Di Nitto Wed, 04 Jul 2007 09:45:56 +0200 + +udev (111-0ubuntu5) gutsy; urgency=low + + * Add network device rule generation code to udev-udeb. + + -- Colin Watson Sun, 17 Jun 2007 11:10:20 +0100 + +udev (111-0ubuntu4) gutsy; urgency=low + + * adduser added as a dependency (LP: #118164) + + -- Nathan Handler Thu, 31 May 2007 19:04:49 -0500 + +udev (111-0ubuntu3) gutsy; urgency=low + + * 40-no_replace.patch: updated to include corresponding documentation + for the "OPTIONS" section of the udev manpage. + + -- Kees Cook Sun, 27 May 2007 10:54:52 -0700 + +udev (111-0ubuntu2) gutsy; urgency=low + + * Needs to be "cd /sys/class/net || return 0" not just "|| return" + + -- Scott James Remnant Wed, 23 May 2007 20:30:54 +0100 + +udev (111-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - many bug fixes, + - ACTION!="add|change" now works as expected. + + * Enable the upstream rule_generator extra, and include the rules for both + CD aliases and network devices. These generate rules files for each new + piece of unique hardware discovered, giving a consistent name thereafter. + + ie. if you add a new network card, it is assigned the next eth* number, + and will have that number every single time you boot. Likewise a new + CD writer would get the next free cdrw* symlink, and keep that symlink + forever. + * Drop hard-coded cdrom/cdrw/dvd/dvdrw symlinks. + * Install additional udev.finish script at rcS.d/S23, so it runs after + mtab and updates the existing rules files. + + * 80-extras-iftab_helper.patch: Drop this patch since we're now using the + upstream persistent net rule generator rather than requiring users to + hand-maintain /etc/iftab. + * 70-rename-netif-increment.patch: Drop this patch, was an obscure iftab + feature that we're deprecating. + * 25-iftab.rules; Drop rules file that calls the iftab_helper. + + * 60-mknod-symlink-races.patch: New patch that repeats the call to mknod() + or symlink() as long as it fails because something already exists, and + we haven't failed to remove anything first. + + * 90-persistent-dm-md.patch: Drop this patch, instead we maintain persistent + symlinks for devmapper and mdadm devices in a separate rules file + shipped with those packages. + + * 40-permissions.rules: place mmc and pcmcia block devices in the plugdev + group, EPSON scsi devices in the scanner group and scsi media changer + devices in the tape group. + * 90-modprobe.rules: load the osst module for Onstream ADR* tape devices, + load the ch module for SCSI media changer devices. + + -- Scott James Remnant Wed, 23 May 2007 13:44:22 +0100 + +udev (108-0ubuntu4) feisty; urgency=low + + * Avoid SUBSYSTEMS!= since that doesn't actually appear to work, instead + use the start/end trick. LP: #75753. + + -- Scott James Remnant Tue, 10 Apr 2007 12:17:42 +0100 + +udev (108-0ubuntu3) feisty; urgency=low + + * 40-no_replace.patch: add "no_replace" to OPTIONS that applies for the + rule it appears in, preventing replacing of untrusted characters when + obtaining results from PROGRAM rules, and when setting NAME and + SYMLINK. LP: #92162. + * Create scanner and nvram groups in postinst if they don't already + exist. LP: #38203. + + -- Scott James Remnant Wed, 4 Apr 2007 10:23:44 +0100 + +udev (108-0ubuntu2) feisty; urgency=low + + * Add breaks on devmapper less than the current version, since the + rendezvousing will fail to work correctly without it. + * Update 90-extras-iftab_helper.patch to correct bug when called with a + network device with no associated hardware. LP: #74077. + + -- Scott James Remnant Tue, 3 Apr 2007 16:09:04 +0100 + +udev (108-0ubuntu1) feisty; urgency=low + + * New upstream release: + - many bug fixes, + - DRIVER== will now only match devices that have a real driver. + - SYMLINKs may now have per-device priorities specified with + OPTIONS="link_priority=100", removal of a device means that the symlink + will be changed to point at the device with the next highest priority. + - dasd_id removed from the tree + + * 10-suppress-syslog.patch: patch from Ian Jackson to add an option to + udevd to suppress the logging of messages with syslog. + * 80-extras-watershed.patch: take Ian's watershed utility that he added + directly to the upstream source, and split off into a proper patch of + its own. + * 90-persistent-dm-md.patch: create persistent storage links for devmapper + and mdadm devices, running these rules whenever a change event occurs + LP: #75681. + * 90-skip-whole-disk.patch: renumber to 91-skip-whole-disk.patch + + * Move the rule to name devmapper devices using dmsetup into the dmsetup + package, and from there to a correct 25-dmsetup.rules name. This + shouldn't have been mixed in with the persistent symlinks code. + + * Change the permission-applying rules to use ATTRS instead of ATTR. + LP: #75753. + * Move 50-cdrom_id.rules to 30-cdrom_id.rules. LP: #75753. + * Fixed /dev/pilot rule to use ATTRS instead of ATTR. LP: #89687. + + * Drop the rules that used grepmap to parse modules.ccwmap and + modules.inputmap, since these modules now use modules.alias + * Drop dependency on grepmap. + + * Decrease minimum kernel version to 2.6.17, after some testing we can + confirm that the rules we ship with work there. + + * Update the standard prep_/undo_/rm_/mv_/conffile functions to take + into account current dpkg behaviour wrt obsolete conffiles. The conffile + is now moved out of the way in preinst and the moved conffile either + deleted or moved into its new location in postinst; in postrm we move + the conffile back to its original name. + + This means that the conffile is not present with its original name when + dpkg configures the new versiom, so is not left in the conffile list as + obsolete. + * Purge backups of modified obsolete conffiles when the package is purged. + + -- Scott James Remnant Mon, 2 Apr 2007 18:31:47 +0100 + +udev (103-0ubuntu14) feisty; urgency=low + + * Ensure that tifm_sd is autoloaded on card insertion + + -- Matthew Garrett Sun, 25 Mar 2007 18:43:07 +0100 + +udev (103-0ubuntu13) feisty; urgency=low + + * Include firmware helper in the initramfs. + + -- Kyle McMartin Fri, 23 Feb 2007 22:45:18 -0500 + +udev (103-0ubuntu12) feisty; urgency=low + + * Tolerate failure of usplash_write, by adding ||: to the relevant + calls. This will prevent /etc/init.d/udev from failing to start udev + in the cases where usplash_write fails in an unexpected way (eg, as + evidenced in LP #83878, where libx86 was missing and ld.so caused + usplash_write to exit nonzero). + + -- Ian Jackson Thu, 8 Feb 2007 18:03:16 +0000 + +udev (103-0ubuntu11) feisty; urgency=low + + UdevDeviceMapper: + * Abolish rendezvous stuff which is full of deadlocks. + + -- Ian Jackson Wed, 7 Feb 2007 16:35:58 +0000 + +udev (103-0ubuntu10) feisty; urgency=low + + * Fix syntax of Breaks field against differently-rendezvousing + libdevmapper. + + -- Ian Jackson Wed, 7 Feb 2007 15:06:11 +0000 + +udev (103-0ubuntu9) feisty; urgency=low + + UdevDeviceMapper fixes: + * Lock and rendezvous is based on major/minor not name, + and rendezvous flag file is /lib/udev/.udev-device-mapper-rendezvous2. + * Rendezvous on all dm-* add and change events. + + -- Ian Jackson Wed, 7 Feb 2007 14:57:28 +0000 + +udev (103-0ubuntu8) feisty; urgency=low + + UdevMdadm and fixes for UdevLvm/UdevDeviceMapper: + * On dm* and md* devices, scan on change as well as add. + * If devmap_name should fail, suppress the dm-* names since those + break LILO (!) + * Include devmap_name in the initramfs. + + -- Ian Jackson Tue, 6 Feb 2007 22:06:19 +0000 + +udev (103-0ubuntu7) feisty; urgency=low + + UdevDeviceMapper: + * Process dm-* devices properly: we make the device nodes, using + dmsetup's devmap_name to tell us how. (If we don't have devmap_name + the libdevmapper is too old, and is making the devices itself.) + * Rendezvous with libdevmapper, and advertise with the flag file + /lib/udev/.udev-device-mapper-rendezvous that we do so. + * Include watershed, and /var/run, in the initramfs. + + -- Ian Jackson Tue, 6 Feb 2007 16:36:10 +0000 + +udev (103-0ubuntu6) feisty; urgency=low + + * New `watershed' utility, for use by UdevLvm et al. + + -- Ian Jackson Fri, 26 Jan 2007 17:00:38 +0000 + +udev (103-0ubuntu5) feisty; urgency=low + + * Don't issue uuid for whole disk partitions. + + -- Fabio M. Di Nitto Mon, 18 Dec 2006 11:10:05 -0800 + +udev (103-0ubuntu4) feisty; urgency=low + + * "pkill udevd" instead of "udev", otherwise we end up killing the + script we're running from, and don't move /dev into the real filesystem. + + -- Scott James Remnant Fri, 24 Nov 2006 09:08:05 +0000 + +udev (103-0ubuntu3) feisty; urgency=low + + * Use SUBSYSTEMS!="scsi" instead of SUBSYSTEM!="scsi_device" when deciding + which sd_* module to load. SCSI/SATA machines will boot again now. + + * Replace DRIVER with DRIVERS where found. + * Remove the local-top initramfs script entirely, this was only loading + ide-generic. For feisty we'll load pata_legacy for non-PCI IDE + controllers (which doesn't take over PCI interfaces) and provide an + option to force loading ata_generic for newer cards. + + -- Scott James Remnant Thu, 23 Nov 2006 14:53:17 +0000 + +udev (103-0ubuntu2) feisty; urgency=low + + * ide-generic seems to be broken, it's claiming devices and then not + actually making block devices. Disable for now, until I'm clear headed + enough to think about how to deal with this. + + -- Scott James Remnant Thu, 23 Nov 2006 12:44:33 +0000 + +udev (103-0ubuntu1) feisty; urgency=low + + * New upstream release: + - %e enumeration removed. + - MODALIAS key and substitution removed. + - Most keys renamed (see RELEASE-NOTES). + - Direct writing to sysfs attributes now supported. + + * Update patches: + - 40-udevtrigger-filters.patch: dropped, the spirit of this patch is + merged upstream and we don't need most of it anymore. + - 45-udevtrigger-sort.patch: dropped, merged upstream. + - 60-vol_id-swap.patch: dropped, merged upstream. + - 70-ifrename.patch: largely merged upstream, keep support for "eth*" + incrementing in 70-rename-netif-increment.patch. + + * Simplify the initramfs handling somewhat. We now just trigger + everything, and don't wait for things to settle; instead relying on the + loop in mountroot() which will do exactly the right thing, + * Use pkill instead of shell /proc iteration to kill udevd. Ubuntu #65711. + + * Drop most WAIT_FOR_SYSFS rules, increase kernel requirement to 2.6.19. + * Rework rules file to newer attributes and naming. Drop some symlinks + where they are not part of devices.txt and no other distribution + supplies them. + + * Rename libvolumeid0 and libvolumeid-dev to libvolume-id0 and + libvolume-id-dev to match Debian. + * Restore the "writing udev rules" documentation now that it's not wildly + inaccurate. + + -- Scott James Remnant Thu, 23 Nov 2006 10:51:23 +0000 + +udev (093-0ubuntu18) edgy; urgency=low + + * Abort fstab migration if we encounter duplicate UUIDs. Ubuntu: #64909. + + -- Scott James Remnant Mon, 16 Oct 2006 12:16:16 +0100 + +udev (093-0ubuntu17) edgy; urgency=low + + * Actually pass the device name to readlink when checking for LVM + symlinks to /dev/mapper. Ubuntu: #63626. + + -- Scott James Remnant Thu, 5 Oct 2006 10:31:09 +0100 + +udev (093-0ubuntu16) edgy; urgency=low + + * Don't convert software RAID (/dev/md[0-9]*) devices to UUID as there's + something nasty in that woodshed. Ubuntu: #62476. + + -- Scott James Remnant Tue, 26 Sep 2006 17:17:05 +0100 + +udev (093-0ubuntu15) edgy; urgency=low + + * Adding missing $ for $LINE in volumeid.postinst. Ubuntu: #59376 + * Sort the device list before triggering events. + + -- Scott James Remnant Thu, 14 Sep 2006 15:57:00 +0100 + +udev (093-0ubuntu14) edgy; urgency=low + + * Be gone foul devfs-emulation fiends from hell! + + -- Scott James Remnant Thu, 31 Aug 2006 16:09:09 +0100 + +udev (093-0ubuntu13) edgy; urgency=low + + * Make sure that net, pts and shm sub directories exist under + /lib/udev/devices in the package. Ubuntu: #57436. + + -- Scott James Remnant Wed, 23 Aug 2006 13:47:43 +0200 + +udev (093-0ubuntu12) edgy; urgency=low + + * Create /lib/udev/devices in udev.postinst so that the .deb can be + unpacked as non-root. + + -- Scott James Remnant Wed, 23 Aug 2006 09:31:05 +0200 + +udev (093-0ubuntu11) edgy; urgency=low + + * Correct a bug in the previous release, forgot "then" after "if...;" + * Move libvolume_id.so into /lib + + -- Scott James Remnant Mon, 21 Aug 2006 17:08:45 +0200 + +udev (093-0ubuntu10) edgy; urgency=low + + * Add missing Replaces for volumeid on libvolumeid0 for when the latter + contained the binary. (Ubuntu: #55003). + + * Don't transition LVM, evms and dev-mapper devices in /etc/fstab + (Ubuntu: #54002). + * Don't repeat a transition while /etc/fstab.pre-uuid exists. + (Ubuntu: #54231). + + * Create /dev/pilot symlinks for all Handspring devices. (Ubuntu: #57004). + + -- Scott James Remnant Mon, 21 Aug 2006 09:30:55 +0200 + +udev (093-0ubuntu9) edgy; urgency=low + + * Add support for uswsusp + + -- Matthew Garrett Thu, 10 Aug 2006 19:36:44 +0100 + +udev (093-0ubuntu8) edgy; urgency=low + + * Statically link the copy of vol_id in the udeb, accidentally disabled + while testing. + + -- Scott James Remnant Fri, 28 Jul 2006 00:05:10 +0100 + +udev (093-0ubuntu7) edgy; urgency=low + + * Change the libuuid1 dependency to a versioned dependency on e2fsprogs, + where the uuidgen binary has moved to. + * Move vol_id tool into its own binary package (volumeid) to allow for + SONAME transitions and multi-arch installation of libvolume_id0. + Move the UUID conversion in with it. + + -- Scott James Remnant Tue, 25 Jul 2006 13:56:03 +0100 + +udev (093-0ubuntu6) edgy; urgency=low + + * Keep a copy of the old /etc/fstab as /etc/fstab.pre-uuid. + * Fix fstab conversion not to dump out all shell variables on encountering + a blank line. Ubuntu: #53991. + * Fix IFS handling in fstab conversion to work if /bin/sh is bash. + + -- Colin Watson Tue, 25 Jul 2006 10:29:04 +0100 + +udev (093-0ubuntu5) edgy; urgency=low + + * On upgrade, convert the /etc/fstab on the system to use UUID= instead + of block device paths wherever possible. This makes the system far + more robust against hardware changes, including the impending + IDE-to-libata change. + * Add dependency on libuuid1, so we can call uuidgen during conversion + to add a UUID to an existing swap partition that was generated without + one. + + * Place vol_id in the libvolumeid0 package, and in /sbin, so that it + can be used by other tools without depending on all of udev. + * Include README that has a handy table of which filesystems support + what. + * debian/patches/60-vol_id-swap.patch: + - allow vol_id to return UUID or LABEL (with -u or -l) even if the + usage isn't usually a filesystem; e.g. swap devices with UUIDs + - detect a swap partition with a swsusp signature, and extract the + information for the underlying swap + + -- Scott James Remnant Mon, 24 Jul 2006 22:44:22 +0100 + +udev (093-0ubuntu4) edgy; urgency=low + + [Fabio M. Di Nitto] + * Call dh_makeshlibs now we ship a shared library (libvolumeid0). + + [Scott James Remnant] + * Group zaptel devices under /dev/zap. Ubuntu: #50676. + * Correct typo (= -> ==) in 40-permissions.rules. Ubuntu: #53431. + * Expand /dev/pilot rules to include all things beginning "Handspring Visor". + Ubuntu: #51760 + + -- Scott James Remnant Thu, 20 Jul 2006 16:50:48 +0100 + +udev (093-0ubuntu3) edgy; urgency=low + + * Install path_id, missed because it got moved into a sub-directory. + * Correct typo in storage_enum.sh that broke the installer (disc -> disk). + + * Restore to non-native source. + + -- Scott James Remnant Thu, 13 Jul 2006 18:15:12 +0100 + +udev (093-0ubuntu2) edgy; urgency=low + + * Correct typo in postinst (my_persistent_disk_rules -> + mv_persistent_disk_rules) + + -- Matt Zimmerman Thu, 15 Jun 2006 12:09:26 -0700 + +udev (093-0ubuntu1) edgy; urgency=low + + * New upstream release: + - libsysfs removed and replaced by simple helper functions + - Support /sys/class and /sys/block being symlinks into /sys/devices + - Programs no longer receive SUBSYSTEM as a parameter by default + - Rename persistent-disk.rules to persistent-storage.rules and support + tape devices. + - udevtrigger and udevsettle commands upstream that take on the job of + our own udevplug. + - Require that rules use "==" only for a match, and "=" for assignment. + + * Rule changes: + - Include a README in /etc/udev/rules.d + - Wait for the ioerr_cnt attribute of scsi devices to appear + - Video card devices now named /dev/dri/card* + - IEEE1394 video devices now named /dev/dv1394/* and /dev/video1394/* + - Epson SCSI Processors are probably scanners too, Ubuntu: #45412. + - Places devices from the zaptel subsystem in the dialout group. + - Create /dev/pilot symlink for Handspring Visors too. Ubuntu: #43279. + - Create persistent /dev/input/* symlinks for input devices. + + * 01-lib-udev.patch: + - Mostly merged upstream, patch just stops the /sbin/scsi_id symlink + from being created. + * 10-selinux-include-udev-h.patch: + - Merged upstream. + * 20-sparc-sorcvbuffforce.patch: + - Merged upstream. + * 40-udevplug.patch: + - Reworked to apply to udevtrigger and renamed to + 40-udevtrigger-filters.patch + * 75-format-run-rules-later.patch: + - Dropped, was upstream backport. + + * New libvolumeid0 package and libvolumeid-dev packages for developing + software that wishes to recognise volume information. + + -- Scott James Remnant Wed, 7 Jun 2006 13:58:13 +0100 + +udev (079-0ubuntu34) dapper; urgency=low + + * Don't write the empty string to /proc/sys/kernel/hotplug if it doesn't + exist (ie. the kernel wasn't compiled with CONFIG_HOTPLUG). We don't + use or need this for anything, we were just being tidy. + + -- Scott James Remnant Mon, 22 May 2006 11:07:09 +0100 + +udev (079-0ubuntu33) dapper; urgency=low + + * Only attempt to rename network interfaces that have an associated + driver, e.g. not bridges and vlans. + + -- Scott James Remnant Tue, 16 May 2006 17:24:50 +0100 + +udev (079-0ubuntu32) dapper; urgency=low + + * Add MINKVER="2.6.15" to our hook script, so mkinitramfs will refuse + to include our new udev in an old kernel's initramfs. Depend on a + new enough version of initramfs-tools so that this hack works. + + -- Adam Conrad Tue, 16 May 2006 21:13:21 +1000 + +udev (079-0ubuntu31) dapper; urgency=low + + * Add vbi symlink for v4l* application that otherwise will complain about + it and makes the X world more happy (including the maintainer that can + watch^Wtest TV): + - Update debian/60-symlinks.rules. + + -- Fabio M. Di Nitto Fri, 12 May 2006 12:22:07 +0200 + +udev (079-0ubuntu30) dapper; urgency=low + + * Drop the /etc/iftab fixing code, there are just too many little problems + with doing this. If after a breezy->dapper upgrade your network devices + are incorrectly named, fix /etc/iftab manually. We'll work on a better + solution later. + + -- Scott James Remnant Mon, 8 May 2006 14:17:26 +0100 + +udev (079-0ubuntu29) dapper; urgency=low + + * Add the address of any UP interface to /etc/iftab if not already + present to ensure they don't change names either. + + -- Scott James Remnant Fri, 5 May 2006 18:08:22 +0100 + +udev (079-0ubuntu28) dapper; urgency=low + + * Ignore device-mapper devices and let LVM take care of creating them. + + -- Scott James Remnant Fri, 28 Apr 2006 15:42:37 +0100 + +udev (079-0ubuntu27) dapper; urgency=low + + * Improve the iftab helper somewhat: + - add support for driver, bus and businfo selectors + - add support for any sysfs attribute with a SYSFS{...} selector + * On package upgrade fix any /etc/iftab entries that appear to be incorrect, + this is a rather simple fix but should work for the majority of people. + + -- Scott James Remnant Mon, 24 Apr 2006 15:48:04 +0100 + +udev (079-0ubuntu26) dapper; urgency=low + + * Add missing conflicts on ifrename; all of the work done by that tool + is now performed by udev itself. + + -- Scott James Remnant Wed, 19 Apr 2006 09:26:50 +0100 + +udev (079-0ubuntu25) dapper; urgency=low + + * Rework Andrey Borzenkov's patches applied to upstream udev into + 75-format-run-rules-later.patch; this causes any formatting added to + RUN rules to be applied after the NAME has been changed, and fixes + Ubuntu: #38787. + + -- Scott James Remnant Tue, 18 Apr 2006 08:47:14 +0100 + +udev (079-0ubuntu24) dapper; urgency=low + + * Fixed typo (PREREQS -> PREREQ) in initramfs hook, purely cosmetic + and didn't cause any problems. Ubuntu: #36962. + * Provide /dev/video and /dev/radio symlinks for compatibility with + older software. Ubuntu: #36860 + - as with all /dev symlinks, there's no guarantee which device they'll + point to if you have multiple devices. This is not considered a bug, + software should be modified to use HAL and present a list of available + devices rather than rely on symlinks. + * Changed udevplug to write "add" to the uevent file, instead of a silly + string; future kernel versions may support multiple commands. + + -- Scott James Remnant Mon, 3 Apr 2006 16:23:37 +0100 + +udev (079-0ubuntu23) dapper; urgency=low + + * Install udev.initramfs-local into casper-premount so we get to see CD + drives, etc on the live CD. + + -- Tollef Fog Heen Mon, 27 Mar 2006 20:44:32 +0200 + +udev (079-0ubuntu22) dapper; urgency=low + + "He takes his food with a horrid zest, + he eats one half and he wears the rest!" + + * Split the initramfs script out even more, instead of a case statement + in init-premount move the module loading to local-top and nfs-top. + This fixes the long-standing bug where changing boot= on the kernel + command line has no effect. + * Drop the "|| true"s from usplash_write calls, infinity says they're + unnecessary. + * Actually load modules for intelligent devices like we say we do in the + comments. + + -- Scott James Remnant Thu, 23 Mar 2006 17:44:13 +0000 + +udev (079-0ubuntu21) dapper; urgency=low + + * Split the loop-and-wait part of the initramfs script out; it'll + go in the initramfs local script itself. Ubuntu: #36010 + + -- Scott James Remnant Wed, 22 Mar 2006 15:33:12 +0000 + +udev (079-0ubuntu20) dapper; urgency=low + + "I'm just the fastest thing you'll ever see. + That streak of lightning you just missed was me." + + * Load ide-generic in all cases after loading PCI storage controller + drivers. This reduces the complexity of the root filesystem mounting + to just a single path for both IDE and everything else and opens up to + using a UUID for everything. + * Set a global usplash timeout for the entire initramfs script. + Ubuntu: #35104. + + -- Scott James Remnant Tue, 21 Mar 2006 19:47:49 +0000 + +udev (079-0ubuntu19) dapper; urgency=low + + "For I am ordinary, unimportant, and undeserving of such attention." + + * Place joysticks in the "plugdev" group, for programs that access the + joystick device directly and not through X. Ubuntu: #33354. + * The storage device enumerator used by the installer was a bit too + efficient; it would generate new symlink names every time an add event + for a device was received. The installer causes many add events to occur, + each time hw-detect and the partitioner is run. Fix the script to + return an existing symlink name if one exists in the udevdb. + Ubuntu: #27926. + * Fix iftab_helper segmentation fault when /etc/iftab doesn't exist, + caused by returning NULL rather than the suggested name; now returns + whatever name the kernel gave. Ubuntu: #34078. + + -- Scott James Remnant Wed, 15 Mar 2006 18:28:39 +0000 + +udev (079-0ubuntu18) dapper; urgency=low + + "Just a little change; Small, to say the least; + Both a little scared; Neither one prepared." + + * Fix ide_media helper to construct IDE device names above 'hdf' + properly. Ubuntu: #32679. + * Hard-code the location of usplash_write and call directly, as + we don't have "type" in busybox. This corrects usplash timing out + early while waiting for SCSI root filesystem to show up. Ubuntu: #28357. + * Set the all_partitions options for removable IOMEGA_ZIP* devices. + Ubuntu: #27752. + + -- Scott James Remnant Thu, 2 Mar 2006 13:36:49 +0100 + +udev (079-0ubuntu17) dapper; urgency=low + + "The greatest thing you'll ever learn, is just to be loved, and be loved + in return." + + * Fix build failure caused by accidental double-inclusion of the + SORECVBUFFORCE patch. + + * As the ifrename patch generally seems to be working, drop the "_clashed" + moniker and instead just use the next free interface number available to + us. So instead of eth0_clashed, you'll see e.g. eth2 now. If you wanted + it as eth0, you need to change your /etc/iftab file. + + -- Scott James Remnant Wed, 1 Mar 2006 13:06:47 +0100 + +udev (079-0ubuntu16) dapper; urgency=low + + "You better shape up, 'cause I need a man, and my heart is set on you." + + * Define the SORECVBUFFORCE socket option correctly on Sparc (and other + ancient platforms). + + -- Scott James Remnant Wed, 1 Mar 2006 11:23:41 +0100 + +udev (079-0ubuntu15) dapper; urgency=low + + "Rembrandts! El Grecos! Toulouse-Letrec-os! + Painted last week on the banks of the Thames!" + + * We also need to "catch up" events of the scsi_device, usb_device and + usb_host classes just in case the user compiled things into their kernel + or put their SATA driver into /etc/mkinitramfs/modules (yes, you, + crispin). + + -- Scott James Remnant Mon, 27 Feb 2006 14:05:25 +0100 + +udev (079-0ubuntu14) dapper; urgency=low + + "With tuppence for paper and strings, you can have your own set of wings." + + * Log the results of performing the udevplug to /dev/.udev.log by using + udevmonitor. This log file will be moved to /var/log/udev later in the + boot sequence. Note that this won't work if /usr is on a separate + filesystem because of the location of udevmonitor, but that's a small + loss. + + -- Scott James Remnant Tue, 21 Feb 2006 16:22:33 +0000 + +udev (079-0ubuntu13) dapper; urgency=low + + "But when I'm way up here, it's crystal clear; + That now i'm in a whole new world." + + * Remove the blanket loading of ide-generic after any IDE device, by + this time they should have been claimed by a driver already. I kept + this around for historical reasons, but it breaks people with multiple + IDE controllers in their machine (hi, Fabio!). If this causes new bugs, + it can go back in. + + -- Scott James Remnant Mon, 20 Feb 2006 11:01:23 +0000 + +udev (079-0ubuntu12) dapper; urgency=low + + "Should we blame the government? Or blame society? + Or should we blame the images on TV? No, Blame Canada!" + + * Drink coffee. + * Read 80-extras-iftab_helper.patch again. + * Stare in disbelief. + * Drink more coffee. + * Add "&& !found" to the "rename to clashed" if condition. + * Close bug #31188. + * Hide in shame. + + -- Scott James Remnant Tue, 14 Feb 2006 11:28:17 +0000 + +udev (079-0ubuntu11) dapper; urgency=low + + "How do you document real life when real life's getting more like + fiction each day? + + * More updates to ifrename support: + - iftab_helper now supports the common "mac" selector, used to + distinguish different interfaces created by the same driver. + + -- Scott James Remnant Mon, 13 Feb 2006 21:19:19 +0000 + +udev (079-0ubuntu10) dapper; urgency=low + + "Near, far, in our motor car; Oh what a happy time we'll spend." + + * Fixes to a couple of think-os in the previous ifrename patch: + - after renaming to the temporary interface name, make sure we copy + that into ifr_name otherwise we'll be trying to rename the interface + we've just renamed. Ubuntu #31040. + - use "OLDNAME_ifrename" as the temporary name rather than "__NEWNAME" + to avoid clashes and just generally make it more obvious. + - use "NAME_clashed" as the iftab clash name rather than "_NAME" to make + it more obvious + - don't write an initial /etc/iftab on install or upgrade; leave it to + the installer. + + -- Scott James Remnant Fri, 10 Feb 2006 14:37:02 +0000 + +udev (079-0ubuntu9) dapper; urgency=low + + "Dancing freaks and sycophants, Westwood heels and shoulder pads." + + * Rework the initramfs premount script a little to try and make the root + filesystem order a little more predictable. In particular make sure we + don't load USB/firewire/etc. drivers until we've loaded IDE and SCSI + drivers otherwise sda could be won by a fast USB key over your SATA + root filesystem. Ubuntu #28150, #30418. + + * Include support for renaming of network interfaces. This is done with + a new iftab_helper that can parse a subset of the ifrename /etc/iftab + file and return the expected name of the network interface. This is + called from a udev rule that uses the internal support for network + interface renaming. Interface swapping is supported both by renaming + network interfaces that would clash with one specified in the file and + by waiting for an interface name to become free in udev itself. + Ubuntu: #7050, #30240. + + -- Scott James Remnant Thu, 9 Feb 2006 22:04:10 +0000 + +udev (079-0ubuntu8) dapper; urgency=low + + "Forget about your algebra and calculus, You can always do your homework + on the morning bus." + + * Change the udev message to "Loading hardware drivers" to stop people + thinking this does any kind of hardware detection, which it doesn't. + + -- Scott James Remnant Tue, 7 Feb 2006 11:12:09 +0000 + +udev (079-0ubuntu7) dapper; urgency=low + + "And someday when you're old and bent, Think of those you might have spent, + With a bad, bad man!" + + * Include 65-persistent-disk.rules and helpers in the udeb so the + installer can use /dev/disk/by-*. + + -- Scott James Remnant Sat, 4 Feb 2006 11:32:54 +0000 + +udev (079-0ubuntu6) dapper; urgency=low + + "Some little token of esteem is needed, like a dish of cream." + + * Don't check whether a device is claimed by an already loaded driver, + while clever and theoretically time-saving it turns out that various + forms of devices can be claimed by multiple drivers + Ubuntu #28654, #30377. + * Load mmc_block when an mmc device is inserted; will improve once + we get a way to determine exactly which mmc sub-module we need, but + this will give us out-of-the-box SD/MMC card support for now. + * Also load i2o_block for all i2o devices, again this is a temporary + workaround for a bad kernel subsystem. + + -- Scott James Remnant Fri, 3 Feb 2006 17:50:19 +0000 + +udev (079-0ubuntu5) dapper; urgency=low + + "We was full of hope, until I got addicted to crack and dope!" + + * Switch back to using "cp -a -f" in the init script and installer + startup; that works fine with busybox and with our patched coreutils. + + -- Scott James Remnant Thu, 2 Feb 2006 09:52:00 +0000 + +udev (079-0ubuntu4) dapper; urgency=low + + "May I return to the beginning? The light is dimming, and the dream is too" + + * Remove the /dev/.udev/queue directory at the bottom of the initramfs + just in case we killed udevd while it was in the middle of something. + + -- Scott James Remnant Sat, 28 Jan 2006 16:08:08 +0000 + +udev (079-0ubuntu3) dapper; urgency=low + + "There's gonna be a quiz at your ascension, not to mention any + threat of hell." + + * Wait time for SCSI devices should be 30 seconds, not 3 seconds. + Accidentally broken while fixing usplash timeouts. + + -- Scott James Remnant Tue, 10 Jan 2006 10:54:42 +0000 + +udev (079-0ubuntu2) dapper; urgency=low + + "I'm brushing up on looking down." + + * Probe for PCI, ISA, PCMCIA, etc. brides, USB and Firewire controllers + and docking stations during initramfs, to support more distant root disks. + * Also probe for input devices so when it all goes wrong, you can use that + USB keyboard to fix it. + + * Build the udeb separately without SELinux support, as that's not + required during the installer. + * Don't allow usplash to timeout while we run udevplug in the init script + or while we wait for SCSI devices to get out of bed. + + -- Scott James Remnant Fri, 6 Jan 2006 10:10:01 +0000 + +udev (079-0ubuntu1) dapper; urgency=low + + "You know, some guys just can't hold their arsenic." + + * New upstream release: + - %e (enumerate) in rules has been deprecated. + - event environment now lists symlinks to device in DEVLINKS variable + - device-mapper support for persistent disk rules + * Dropped 10-udev-conf.patch, now included upstream. + * Dropped 02-no-sepol.patch, as we now depend on that. + * Added 10-selinux-include-udev-h.patch to fix build failure with selinux. + * Increased versioned dependency on libselinux1-dev to that which includes + matchpathcon_init_prefix. + + * Fixed dvb device naming to create correct format names, bugs in both + udev rules to match the device and program to generate the right names. + Ubuntu #20874. + * Fixed a bug in udevplug that caused it to wait for an event to complete + that it never tickled. Ubuntu #20943. + * Included firmware loading in the udeb so network cards needing firmware + will work in the installer. Ubuntu #20993 + * Plug devices in serial during the initramfs, provides a little more + predictability of device names of the root filesystem. + + * Rule changes: + - wait for the address attribute of network devices to appear in sysfs + before processing. + Rationale: solves race not yet fixed in kernel. + - dropped %e from symlink rules; this means you will only have one + /dev/cdrom symlink no matter how many devices you have - and it isn't + necessarily predictable which one it is. Software should use HAL or + similar to present "human names" for devices, and sysadmins should + use the /dev/disk/* names. + Rationale: upstream. + - /etc/udev/rules.d/65-persistent.rules renamed to 65-persistent-disk.rules + Rationale: upstream. + - place /dev/nvram in the nvram group. + Rationale: Ubuntu #21571 and breezy. + - load sg module for all SCSI devices. + Rationale: Ubuntu #12434, SuSE rules. + - place SCSI processors (SYSFS{type}==3) from HP in the scanner group. + Rationale: Ubuntu #12434. + - change permissions of removable devices (floppies, usb, ieee1394, etc.) + to 0660 (the default) instead of overriding it down to 0640. + Rationale: allows formatting of the media, and the groups are intended + to imply physical access anyway. + + -- Scott James Remnant Wed, 4 Jan 2006 07:58:45 +0000 + +udev (077-0ubuntu5) dapper; urgency=low + + "And if you're lucky, then the god's a she." + + * Spell firewire correctly (with the extra e). + * Spell midi correctly. + * Remove strange "0" floating in the IDE device permissions rules. + * Explicitly state cdrom modes as 0660 in case they've been dropped to + 0640 because they're removable. + + -- Scott James Remnant Mon, 12 Dec 2005 13:05:53 +0000 + +udev (077-0ubuntu4) dapper; urgency=low + + "Looks like you're not happy 'less I open a vein." + + * Drop -x from initramfs premount script, was there for debugging while + it was new and shiny. + * Include the general functions in the initramfs script, so we get + log_begin_msg/log_end_msg, which we use to notify that we're hanging + around for a while. + + -- Scott James Remnant Thu, 8 Dec 2005 02:19:11 +0000 + +udev (077-0ubuntu3) dapper; urgency=low + + "Watch out, Europe ... We're going on tour!" + + * Include udevinfo and udevmonitor in the udeb for installer debugging. + * Rework the initramfs premount script. Instead of trying to do the same + steps for everything, take different paths depending on the values of + $BOOT and $ROOT. + - BOOT=nfs means we only load network card drivers. + - BOOT=local means we look at ROOT, if it's an ide device we might need + to load ide-generic if probing the bus doesn't create it; if it's a + scsi or sata device we might need to wait around for a bit for the + device to appear + * Load ide-generic if not already loaded when an ide device is detected. + + * Rule changes: + - Change group of USB and IEEE1394 block devices to plugdev and change + permissions to 0640. + Rationale: pmount/g-v-m/hal needs them in this group to work. + + -- Scott James Remnant Wed, 7 Dec 2005 18:15:21 +0000 + +udev (077-0ubuntu2) dapper; urgency=low + + "I'm so hot, hot to trot; I can hardly wait to show them what I got." + + * Turns out busybox doesn't have "cp -au", go back to "-af". + + -- Scott James Remnant Tue, 6 Dec 2005 20:36:25 +0000 + +udev (077-0ubuntu1) dapper; urgency=low + + "I think dynamic tension must be awfully hard work" + + * New upstream release: + - no longer marks an event as failed when ignore_device is used + - skipping of events with SEQNUM moved to udevsend + - automatically prefix relative program paths with /lib/udev + + * Copy devices from /lib/udev/devices using plain-old cp, rather than + find and cpio; find is in /usr. + * Update installer startup script to use "cp -au" like the init script, + instead of "cp -af". + * Add /lib/udev/devices/kmem as there's no sysfs node for it yet. + * Mount udev with mode 0755 in cases of no initramfs. + * Explain to debhelper that we like the /lib/udev/devices permissions the + way they are. + + * Rule changes: + - Rename /dev/sr* to /dev/scd*, providing old name as symlink. + Rationale: LANANA. Ubuntu #20312. + - Rename USB printers to /dev/usblp*. + Rationale: expectation in cupsys source, avoids conflict with lp. + - Rename device-mapper targets to /dev/dm/*. + Rationale: names we used in breezy. + - Change /dev/pilot symlink to be enumerated. + Rationale: some people have multiple Palm Pilots (yes, really). + - Add /dev/input/aiptektablet enumerated symlink to event device. + Rationale: used in xorg.conf. Ubuntu #18358. + - Add permissions and symlinks for ltmodem /dev/ttyLTM* devices. + Rationale: included in linux-restricted-modules. + - Add enumerated /dev/cdrw, /dev/dvd and /dev/dvdrw symlinks. + Rationale: appeared in breezy. + - Left /dev/urandom permissions as 0666, despite being 0444 in breezy. + Rationale: same write function as /dev/random. Debian #332970. + + * Drop has_driver helper, instead just check ENV{PHYSDEVDRIVER}. + * Directly use the upstream persisent rules, so we keep up with changes + without having to copy them into the debian/rules.d directory. + * Remove /lib/udev/ prefix from all program rules, and let udevd add it. + + * Replace devfs rules with a simple helper that atomically enumerates + storage devices and allows us to produce the devfs-style /dev/discs, + /dev/cdroms and /dev/floppy directories that the installer still uses. + + -- Scott James Remnant Tue, 6 Dec 2005 14:26:09 +0000 + +udev (076-0ubuntu5) dapper; urgency=low + + "I played Norway, my fjords were stunning!" + + * Load modules for all storage controllers in initramfs, not just IDE + and SCSI; some SATA controllers identify themselves as RAID. + * Load modules for network controllers in initramfs. + * Call modprobe super-quiet and with blacklist support when loading + ide-generic. + + * Add -b (block devices) and -c (class devices) options to udevplug that + follow the right numbers of symlinks. + * Add -v (verbose) to udevplug for easier debugging. + * Dereference /sys symlinks given to udevplug directly. + + * Added debian/patches/55-run-program.patch which stops udevd declaring + that the sky is falling just because a program can't be found, it'll + output a warning (normally muted) and can be replayed later with + udevplug -F + + * Fix pnp_modules which was generating device aliases, instead of device + ids that we can pass to modprobe. + + * Fix a few bugs in the init script that prevented udev from being started + on systems without initramfs, or after it was stopped. + * Include null in /lib/udev/devices by default. + * Simplify the udev.installer-startup script, the installer itself will + take care of much of the heavy mountpoint lifting. + * Include udev.conf in the udeb. + + -- Scott James Remnant Thu, 1 Dec 2005 11:38:34 +0000 + +udev (076-0ubuntu4) dapper; urgency=low + + * Allow udevplug to follow symlinks in various circumstances, such as + when enumerating a bus or class heirarchy (mostly future compatibility, + but useful today). + * Correct a silly error in the udevplug manpage. + * Use -Cmem -Cmisc -Ctty -Cvc in initramfs script to ensure we follow + symlinks properly. + * Depend on the version of module-init-tools that actually supports + modprobe -Q. + * Guard notify-reboot-required call for minimal systems. + * Fix uninitialised variable in vio_type. + + -- Scott James Remnant Thu, 1 Dec 2005 01:06:49 +0000 + +udev (076-0ubuntu3) dapper; urgency=low + + * Add debian/patches/01-no-sepol.patch to avoid inclusion of libsepol1 + in main, it doesn't appear to be used. + + -- Scott James Remnant Wed, 30 Nov 2005 20:18:54 +0000 + +udev (076-0ubuntu2) dapper; urgency=low + + "Robin Hood, what a crook; gave away, what he took" + + * Recurse the /sys tree directly it udevplug rather than trying to use + libsysfs to encapsulate it; it just doesn't really work (why /dev/tty + didn't get updated permissions). + * Include the modprobe rules in the udeb. + + -- Scott James Remnant Wed, 30 Nov 2005 19:25:14 +0000 + +udev (076-0ubuntu1) dapper; urgency=low + + "There's nothing we can't face ... except for bunnies!" + + * New upstream release: + - udev daemon is now run on startup, rather than first event + - events are received exclusively over the netlink socket, you should + leave /proc/sys/kernel/hotplug empty from now on. + - events with a TIMEOUT are now processed immediately + - disks can now be accessed through /dev/disk/by-label/ and + /dev/disk/by-uuid/ if you know what disk you're looking for, but not + what kernel-assigned name it has. + - device nodes with default name and no symlink are no longer stored in + the udevdb. + - the "udev_db" option has been removed, and the udevdb moved to + /dev/.udev/db + - when there are queued events, /dev/.udev/queue will exist and contain + symlinks to the appropriate /sys paths for each event + - exit status of programs called by RUN rules is now tracked + - if an event fails, /dev/.udev/failed will exist and contain symlinks + to the appropriate /sys paths; this can be used to replay failed events + later + - rules with NAME="" will cause no device node to be created, but RUN + keys will still be run. Use OPTION "ignore_device" to completely + ignore an event. + - added WAIT_FOR_SYSFS="" key to rule syntax, all built-in + logic to work around timing has been removed and instead this rule + should be used where necessary + - syntax to test for existance of environment variable changed from + ENV{KEY}=="*" to ENV{KEY}=="?*" + - communication with daemons such as hal can now be done using sockets, + use RUN+="socket:/org/freedesktop/hal/udev_event" + + * Repackaged for Ubuntu, we have sufficiently far digressed from Debian, + especially in dealing with users trying to break their system, that + it makes sense to just maintain our own package now. Ironically this + makes it easier to send patches back as we don't have to strip out the + "back out stuff" hunks first. + * Completely replaces the functionality of the hotplug package, which will + be removed by installing this. If you had custom /etc/hotplug.d or + /etc/dev.d scripts, you will need to update those to be called by a udev + rule in /etc/udev/rules.d/8?-*.rules + * Depends on grepmap directly for the last remaining subsystems that don't + produce MODALIAS variables, rather than indirectly using the old hotplug + agents. + * Provides its own initramfs-tools hook and scripts, replacing the /dev + functionality that used to be built into it. + + * The plain udev binary and udevstart are no longer shipped; all events are + received over the netlink socket by udevd and processed internally. The + general functionality of udevstart has been replaced by udevplug. + * /etc/udev/links.conf is gone and instead replaced by the /lib/udev/devices + directory. If you need any extra device nodes, symlinks or placed in + /dev on boot just place them here; they're copied over when the system + starts. + * The udev_root and udev_rules config options have been removed, if you + really want to change these, you can; but beware that you'll need to + change a lot of other things too -- they were just too difficult to + reliably support when combined with initramfs. + * All scripts removed from /etc/udev/scripts, instead replacements (often + binaries for speed) are shipped in /lib/udev; you can replace them by + adding your own and adjusting the rules. + + * All rules are now placed directly in /etc/udev/rules.d, rather than + symlinking them in. + * All of the default rules have been replaced with new rules; if you had + modified the old ones they will be disabled but left in /etc/udev for + you (with a .dpkg-bak name). You'll need to update your rules for the + new system, and place them in a new /etc/udev/rules.d/50-*.rules file. + + -- Scott James Remnant Tue, 22 Nov 2005 08:29:24 +0000 + +udev (0.060-1ubuntu15) breezy; urgency=low + + * The kernel's input subsystem still hasn't been updated to use the new + driver core and is still running /proc/sys/kernel/hotplug (udevsend) + itself with a hand-constructed environment, rather than attaching data + to the sysfs event. + + These hand-constructed events are missing the DEVPATH= variable which + udev requires before processing its rules. + + Added debian/patches/hotplug_input_events which instead of ignoring these + events catches those from the input subsystem and processes them by + running /sbin/udev_run_hotplugd; effectively passing all responsibility + to the old hotplug input.agent which still can deal with them. + + In the long-term, the kernel will be updated to use the driver core + (there are patches starting to be floated now) and attach its + information to the sysfs event, so this hack can go when that happens. + + -- Scott James Remnant Fri, 23 Sep 2005 23:31:23 +0100 + +udev (0.060-1ubuntu14) breezy; urgency=low + + * Well, that didn't work so well now, did it folks? + + Looks like good old Mr Kernel is _only_ sending some events down the + netlink socket, and we really don't want to be ignoring them. + + Revert the ubuntu13 change, and instead start udevd manually at + S04udev. This isn't as much of a hack as it first appears, because + once /proc/sys/kernel/hotplug goes away we'll need to do this anyway. + + -- Scott James Remnant Wed, 21 Sep 2005 12:40:40 +0100 + +udev (0.060-1ubuntu13) breezy; urgency=low + + * Disable receipt of hotplug events via the netlink socket, there are + race conditions at early boot time where we can end up ignoring + udevsend events for netlink events we've already missed. This + particularly affected /dev/input/mice. (Ubuntu #12915). + + -- Scott James Remnant Wed, 21 Sep 2005 03:45:49 +0100 + +udev (0.060-1ubuntu12) breezy; urgency=low + + * extra/permissions.rules: Reorder change from previous version so that + CD-ROMs keep cdrom/0660 instead of plugdev/0640. (Ubuntu #15098) + + -- Martin Pitt Mon, 12 Sep 2005 10:12:54 +0200 + +udev (0.060-1ubuntu11) breezy; urgency=low + + * extra/permissions.rules: Assign group plugdev to removable IDE drives to + make CF card readers and the like work. (Ubuntu #14495) + + -- Martin Pitt Fri, 9 Sep 2005 15:45:26 +0200 + +udev (0.060-1ubuntu10) breezy; urgency=low + + * debian/udev.init: Cope with a /dev tmpfs already being present. + (Ubuntu #14226) + Always make sure $udev_root/.udevdb is around + (Ubuntu #12915) + + -- Jeff Bailey Mon, 29 Aug 2005 22:43:55 -0400 + +udev (0.060-1ubuntu9) breezy; urgency=low + + * debian/udev.init: Fix links.conf path check. (Ubuntu #14281) + + -- Martin Pitt Mon, 29 Aug 2005 09:39:49 +0200 + +udev (0.060-1ubuntu8) breezy; urgency=low + + * extra/permissions.rules: When calling removable.sh, additionally scan usb + and ieee1394 buses since sometimes the kernel does not regard those as + removable. (Ubuntu #14063) + * extra/removable.sh: Remove the quoting in the 'for bus in "$SCAN_BUS"' + loop to make the loop actually work. + + -- Martin Pitt Thu, 25 Aug 2005 14:38:08 +0200 + +udev (0.060-1ubuntu7) breezy; urgency=low + + * Fix typo in udev.rules that prevented the /dev/pilot symlink from + appearing. + + -- Scott James Remnant Thu, 25 Aug 2005 01:08:59 +0100 + +udev (0.060-1ubuntu6) breezy; urgency=low + + * debian/rules: Ship /etc/udev/scripts/removable.sh again, the absence of + this broke automounting on half the machines out there. (Ubuntu #13520) + + -- Martin Pitt Tue, 16 Aug 2005 22:49:26 +0200 + +udev (0.060-1ubuntu5) breezy; urgency=low + + * Add compatibility /dev/js[0-9]* symlinks for old software that + don't yet look for /dev/input/js[0-9]*. + + -- Scott James Remnant Mon, 15 Aug 2005 17:41:43 +0100 + +udev (0.060-1ubuntu4) breezy; urgency=low + + * Avoid sed /I regex flag in cdsymlinks.sh, which is a GNU extension. + + -- Colin Watson Wed, 10 Aug 2005 22:07:17 +0100 + +udev (0.060-1ubuntu3) breezy; urgency=low + + * Add ide-model.sh to the udeb. + * Add z50_run.rules to the udeb, to terminate tty device processing. + * Add z70_hotplugd.rules and helpers to the udeb, for /etc/dev.d and + /etc/hotplug.d compatibility. + + -- Colin Watson Fri, 5 Aug 2005 12:47:57 +0100 + +udev (0.060-1ubuntu2) breezy; urgency=low + + * Disable SELinux support in the udeb build. + + -- Colin Watson Wed, 13 Jul 2005 16:46:19 +0100 + +udev (0.060-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + * Prune 1394 rules, they are now part of 2.6.12 and udev upstream. + + * Redo the permissions.rules patch. The syntax changed slightly. + - Drop USB printer hackery, supported correctly with new kernel/udev + combo. + + -- Jeff Bailey Fri, 8 Jul 2005 03:13:25 +0000 + +udev (0.060-1) unstable; urgency=low + + * New upstream release. (Closes: #310960, #316478) + * Priority raised to optional. + * Enabled SELinux support. + * Added rules for ieee1394 devices. + + -- Marco d'Itri Sun, 3 Jul 2005 18:59:19 +0200 + +udev (0.056-3) unstable; urgency=high + + * Use group lp for USB printers. (Closes: #309091) + * Use group dialout for sl-modem devices. (Closes: #308488) + * Fix support for more than 9 partitions in removable.sh. (Closes: #306400) + * Mount the tmpfs from "tmpfs" instead of "none". (Closes: #307199) + + -- Marco d'Itri Sun, 29 May 2005 19:29:30 +0200 + +udev (0.056-2ubuntu2) breezy; urgency=low + + * Make sure that USB printers have group 'lp' (Ubuntu #10004) + + -- Jeff Bailey Fri, 6 May 2005 15:45:26 -0400 + +udev (0.056-2ubuntu1) breezy; urgency=low + + * Updated to new Debian version, reapplied Ubuntu changes manually; there + were too many changes and diversions. (#9688) + * Manually re-LSB'ified init script. + * debian/rules: Fix udeb generation. + + -- Martin Pitt Fri, 15 Apr 2005 15:17:10 +0200 + +udev (0.056-2) unstable; urgency=medium + + * Made the init script not fail if links.conf does not exist. + (Closes: #301525) + * Added RELEASE-NOTES to the documentation. (Closes: #301766) + * devfs.rules, udev.rules: fixed the ZIP drives hack. (Closes: #303133) + * Added patch add_firmwares_timeout: workaround for kernels with no + TIMEOUT support, which break the firmware events of some drivers. + (Closes: #302990) + * Moved all permissions-related rules to permissions.rules, installed + by default on upgrade. + + -- Marco d'Itri Sat, 9 Apr 2005 14:44:10 +0200 + +udev (0.056-1) unstable; urgency=medium + + * New upstream release. + * Improve warn_if_interactive() in the init script. (Closes: #299827) + * Stop adding by default /dev/.static/dev/ to mtab to silence df. + (Closes: #300435) + * Use /etc/udev/ instead of /tmp/ as the temporary mount point in + the init script. (Closes: #300705) + + -- Marco d'Itri Mon, 21 Mar 2005 14:56:51 +0100 + +udev (0.054-3) unstable; urgency=high + + * Do not use udevsend as the hotplug multiplexer on kernels < 2.6.10 + because they generate out of order hotplug events. + * Use /dev/.static/dev/ instead of /.dev/ to keep the root clean and + to not leave around devices with possibly insecure permissions. + This requires raising the versioned dependency on makedev to 2.3.1-77. + (Closes: #294968) + * Added upstream patch udev-segfault-DRIVER.patch to fix a segfault when + matching a non-initialized DRIVER. (Closes: #298192) + * devfs.rules, udev.rules: added the AOE character devices. + + -- Marco d'Itri Tue, 15 Mar 2005 11:55:38 +0100 + +udev (0.054-2) unstable; urgency=high + + * udev.rules: fixed the device name for raw parport devices. + * devfs.rules, udev.rules: try a different approach to setting permissions + for SCSI devices, by checking SYSFS{type}. Also detect sg devices used + by scanners and use the scanner group. (Closes: #297755) + + -- Marco d'Itri Sat, 5 Mar 2005 14:50:29 +0100 + +udev (0.054-1) unstable; urgency=high + + * New upstream release. + * Fix postinst to run udevstart on the right directory at install time. + (Closes: #296776, #296975) + * Use udevsend as the hotplug multiplexer and depend on hotplug + >= 0.0.20040329-17 to be sure that it will not be changed back by + its init script. + * Raised the tmpfs default size to 10 MB, because Alpha has 8 KB pages. + (Closes: #295087) + * Added raid-devfs.sh to udev-udeb. (Closes: #295634) + * devfs.rules, udev.rules: set group lp for raw parport and USB printer + devices. (Closes: #296256, #296276) + * Added an ide-model.sh init script to deal with partitions of Zip drives. + (Closes: #295369) + + -- Marco d'Itri Sat, 26 Feb 2005 13:41:16 +0100 + +udev (0.053-1) unstable; urgency=medium + + * New upstream release. + * Removed patches cdsymlinks_numeric (merged upstream) and scsi_id_tmp + (not needed anymore). + * Added some documentation to the init script for the benefit of people + who run commands without understanding their consequences. With the + same rationale, added some code which prints a scary message if the + script is started from an interactive shell. + * Added to the init script a check for the $UDEV_DISABLED variable, + which may be set on the kernel command line to easily disable udev. + * Do not start udev from postinst when installing in a chroot. + * Added to postinst yet another check for missing tmpfs. (Closes: #294575) + * CAPI devices now are owned by group dialout, per policy. + * Documented in README.Debian that the md RAID devices may not work. + * Updated the cdsymlinks script with a patch from the author. + + -- Marco d'Itri Sat, 12 Feb 2005 19:39:53 +0100 + +udev (0.051-1) unstable; urgency=low + + * New upstream release. + * Removed patch ignore_tmpfs_size_option, not needed anymore. + * Updated the rules files to include permissions. + The permissions files do not exist anymore. + * devfs.rules, udev.rules: added infiniband/* devices. (Closes: #293493) + * Fixed the Iomega ZIP rule. (See #289525) + * Stop creating dummy /dev/.udev.tdb. + + -- Marco d'Itri Sat, 5 Feb 2005 13:36:15 +0100 + +udev (0.050-6) unstable; urgency=high + + * Do not check the kernel version in preinst if udev is not already + active. (Closes: #292829) + + -- Marco d'Itri Sun, 30 Jan 2005 18:10:16 +0100 + +udev (0.050-5) unstable; urgency=high + + * Fixed broken upgrade test in postinst enable_udev(). (Closes: #290968) + * compat.rules: fixed the fix for #288932. (Closes: #289505) + * devfs.rules, udev.rules: added the all_partitions workaround for + ZIP drives. (Closes: #289525) + + -- Marco d'Itri Tue, 18 Jan 2005 18:39:54 +0100 + +udev (0.050-4) unstable; urgency=high + + * Create /dev/shm/ in postinst, because it may be missing on systems + which had devfs installed. + * Improved the code in postinst which determines the naming scheme to + detect devfs-like names on non-devfs systems. (Closes: #288308) + * Improved enable_udev() in postinst to make sure that it does not try + to mount a second tmpfs when upgrading from pre-.udevdb releases. + (Closes: #288775) + * compat.rules: create symlinks also for secondary audio, dsp and + mixer devices. (Closes: #288932) + * cdsymlinks.sh: fixed the NUMBERED_LINKS=0 case. (Closes: #288635) + + -- Marco d'Itri Fri, 7 Jan 2005 12:09:04 +0100 + +udev (0.050-3ubuntu7) hoary; urgency=low + + * extra/links.conf: Add raw1394, video1394 and video1394/0 ... + * extra/udev.permissions: ... and to here. + + * debian/udev.init: Set permissions on links created through + links.conf. + + Should provide the bare minimum /dev entries to get ieee1394 to + work. + + (Ubuntu BZ#3609) + + -- Jeff Bailey Tue, 29 Mar 2005 00:47:56 -0500 + +udev (0.050-3ubuntu6) hoary; urgency=low + + * debian/udev.preinst: Handle conffile move without dpkg questions. + (Ubuntu #4973) + + -- Martin Pitt Fri, 18 Mar 2005 14:50:43 +0100 + +udev (0.050-3ubuntu5) hoary; urgency=low + + * Add raid-devfs.sh to udev-udeb. + + -- Colin Watson Mon, 14 Feb 2005 14:27:22 +0000 + +udev (0.050-3ubuntu4) hoary; urgency=low + + * extra/udev.rules: put removable SCSI (USB, FireWire) and USB block devices + into group "plugdev" instead of "disk" to allow hal to read the file + system type and device label. This replaces the old /etc/udev/hal.rules + method of hal. Doing it in udev is more consistent and also avoids #6235. + * Added extras/removable.sh and install it in debian/rules. This replaces + the old device-removable.sh script from hal. + + -- Martin Pitt Mon, 7 Feb 2005 09:26:47 +0100 + +udev (0.050-3ubuntu3) hoary; urgency=low + + * Add debian/patches/include_sys_stat from Jeff Bailey, to fix a compilation + error with klibc due to a missing #include (Ubuntu #5826) + + -- Matt Zimmerman Thu, 27 Jan 2005 18:04:11 -0800 + +udev (0.050-3ubuntu2) hoary; urgency=low + + * Set the default hotplug helper to /sbin/udevsend + + -- Matt Zimmerman Sat, 8 Jan 2005 20:11:28 -0800 + +udev (0.050-3ubuntu1) hoary; urgency=low + + * Merge to new Debian version + * LSB'ified new code in init script + + -- Martin Pitt Wed, 5 Jan 2005 16:21:09 +0100 + +udev (0.050-3) unstable; urgency=high + + * Fixed the regexp in preinst which caused cd-aliases.rules to not be + enabled on upgrades. (Closes: #287225) + * Included scsi_id.config as an example. (Closes: #287959) + * Modified postinst and the init script to fail gracefully if the kernel + mounts a non-working tmpfs. (Closes: #288043) + * Added patch scsi_id_tmp: makes scsi_id create its temporary devices in + /dev instead of /tmp, which is read only when udevstart is run. + (Closes: #287959) + + -- Marco d'Itri Sat, 1 Jan 2005 23:57:26 +0100 + +udev (0.050-2) unstable; urgency=medium + + * Do not try to enable udev in postinst without a supported kernel. + (Closes: #287146) + + -- Marco d'Itri Sat, 25 Dec 2004 01:50:03 +0100 + +udev (0.050-1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * Manually resolve merge conflicts + * Remove overzealous replacement of echo with log_success_msg in init + script usage message + + -- Matt Zimmerman Sat, 25 Dec 2004 13:02:57 -0800 + +udev (0.050-1) unstable; urgency=medium + + * Added code to postinst to enable udev without rebooting. + * Stop trying to automatically restore the old /dev on removal, it cannot + made work. + * Fixed the init script to correctly recognize 2.6.1* kernels. + (Closes: #286188) + * Refuse to upgrade if the running kernel is too old. (Closes: #286530) + * Removed the scary warning about upgrades from devfs and all debconf code. + * New patch enable_after_udev disables udev if /dev/.udevdb/ does not exist. + * Fixed raid-devfs.sh and added support for Mylex controllers, courtesy + of Piotr Roszatycki. (Closes: #285066, #286809) + * Manually mount /proc before udevstart is run, because some scripts need + it. Stop running mountvirtfs, which is started again later anyway. + + -- Marco d'Itri Fri, 24 Dec 2004 13:46:13 +0100 + +udev (0.048-3) unstable; urgency=medium + + * devfs.rules: added support for /dev/{cciss,ida}/*. (Closes: #285066) + * New patch check_null_directory fixes core dump on amd64. (Closes: #285281) + * Improved the init script check for old kernels. (Closes: #285443) + * Depend on sed >= 3.95. (Closes: #285511) + * udev.permissions: fixed the inotify path. + + -- Marco d'Itri Wed, 15 Dec 2004 21:32:22 +0100 + +udev (0.048-2) unstable; urgency=high + + * Fixed again #283758, this time for real. + + -- Marco d'Itri Thu, 9 Dec 2004 19:27:45 +0100 + +udev (0.048-1) unstable; urgency=medium + + * New upstream release. + * devfs.rules, udev.rules: added Zaptel rules. (Closes: #284695) + * Made the init script fail if the system is running a kernel older + than 2.6.8. (Closes: #284782) + * Updated the udevtest-all script. (Closes: #284774) + * New patch no_strip builds unstripped executables with debugging symbols. + * Added a reportbug script. + + -- Marco d'Itri Thu, 9 Dec 2004 18:10:32 +0100 + +udev (0.046-6) unstable; urgency=high + + * Fixed preinst failure. (Closes: #284367, #284399) + * devfs.rules, udev.rules: added usb/cpad[0-9]*. (Closes: #284392) + * compat-full.rules: added ttyUSB[0-9]*. (Closes: #284264) + * Added a reportbug presubj file. + * High priority, because 0.046-5 fails to install and anyway it's + about time 046 moves to sarge. + + -- Marco d'Itri Mon, 6 Dec 2004 11:58:10 +0100 + +udev (0.046-5) unstable; urgency=medium + + * Make sure to create the default symlinks at install time even if some + other package already created a symlink for its own rules file. + (Closes: #283758) + * Added a note to README.Debian about sg nodes. (Closes: #271589) + * udev.rules, devfs.rules: fixed the names of the ALSA midi devices. + (Closes: #283527) + * Moved the rules using cdsymlinks.sh from udev.rules and compat.rules + to a new file cd-aliases.rules. + Added some code to preinst to automatically enable it at upgrade time. + * Cleaned up the rules which deal with CD devices. + * Removed from preinst the code needed to upgrade package versions older + than 0.024-9. + + -- Marco d'Itri Sat, 4 Dec 2004 14:49:44 +0100 + +udev (0.046-4) unstable; urgency=medium + + * Really move the scripts to /etc/udev/scripts/. (Closes: #283343) + * New upstream patch: fix_interfaces_renaming. (Closes: #283144) + * Deal with /etc/udev/rules.d/ being empty in postrm. (Closes: #283322) + + -- Marco d'Itri Sun, 28 Nov 2004 19:12:40 +0100 + +udev (0.046-4ubuntu2) hoary; urgency=low + + * Fix inotify permissions + + -- Thom May Mon, 6 Dec 2004 11:15:59 +0100 + +udev (0.046-4ubuntu1) hoary; urgency=low + + * Merge to new Debian revision. + + -- Martin Pitt Mon, 29 Nov 2004 08:50:01 +0100 + +udev (0.046-4) unstable; urgency=medium + + * Really move the scripts to /etc/udev/scripts/. (Closes: #283343) + * New upstream patch: fix_interfaces_renaming. (Closes: #283144) + * Deal with /etc/udev/rules.d/ being empty in postrm. (Closes: #283322) + + -- Marco d'Itri Sun, 28 Nov 2004 19:12:40 +0100 + +udev (0.046-3) unstable; urgency=medium + + * Fixed and improved /etc/init.d/udev-mtab. (Closes: #283118) + + -- Marco d'Itri Fri, 26 Nov 2004 18:32:04 +0100 + +udev (0.046-2ubuntu1) hoary; urgency=low + + * Manual merge with new Debian release: + - init script changed heavily, rewrote LSB init function usage + - activated udeb build in debian/rules + - do not install udev.startup into the udeb, it conflicts with d-i's + current rootskel + + -- Martin Pitt Fri, 26 Nov 2004 16:06:57 +0100 + +udev (0.046-2) unstable; urgency=medium + + * Run udevstart at upgrade time only if udev.tdb exists. (Closes: #282310) + * Install a new init script udev-mtab to update /etc/mtab. (Closes: #282455) + * Raised the default size of the tmpfs to 5 MB. (Closes: #282518) + * New patch ignore_tmpfs_size_option makes udev ignore the tmpfs_size + option in udev.conf. + * New patch devname.patch, from CVS. + * udev.rules: sr* devices are renamed to scd*, with a compatibility symlink. + * udev.rules, compat.rules: use cdsymlinks.sh for all kinds of cdrom drives. + (Closes: #282348) + * Added to debian/rules some code to build udev-udeb, currently disabled. + * Moved all scripts to /etc/udev/scripts/. + * Fixed postrm to not fail if /.dev/ is not present. (Closes: #283068) + + -- Marco d'Itri Fri, 26 Nov 2004 13:21:38 +0100 + +udev (0.046-1) unstable; urgency=medium + + * New upstream release. + * links.conf: manually create /dev/net/tun too. + * Try to mount --move /.dev/ over /dev/ on package removal. + * Always use mount -n in the init script. (Closes: #281921) + * Add a man page for wait_for_sysfs. (Closes: #281239) + + -- Marco d'Itri Sat, 20 Nov 2004 15:44:01 +0100 + +udev (0.042-1ubuntu3) hoary; urgency=low + + * udev-udeb depends on hotplug-udeb, not hotplug. + + -- Colin Watson Thu, 18 Nov 2004 19:05:43 +0000 + +udev (0.042-1ubuntu2) hoary; urgency=low + + * Add udev-udeb, for use in the installer. + + -- Colin Watson Tue, 16 Nov 2004 10:16:35 +0000 + +udev (0.042-1ubuntu1) hoary; urgency=low + + * Resynchronised with Debian, resolved minor merging conflicts. + * Reverted the changes from 0.026-1ubuntu4 (plugdev extension), this will be + handled by the pmount package from now on (consensus with Marco d'Itri). + * Deleted leftover work/ directory from automatic merge attempt + + -- Martin Pitt Thu, 11 Nov 2004 13:10:21 +0100 + +udev (0.042-1) unstable; urgency=medium + + * New upstream release. + * Point out again in README.Debian that rules files end in ".rules". + (Closes: #277920) + * devfs.rules, devfs.rules, udev.permissions: added pktcdvd/control. + (Closes: #278600) + * udev.permissions: added sonypi, misc/inotify. + * links.conf: manually create /dev/loop/0 and /dev/ppp, because their + drivers cannot be autoprobed in any way. + Please do not request to add other devices to the list. + + -- Marco d'Itri Sat, 30 Oct 2004 12:54:28 +0200 + +udev (0.040-1ubuntu3) hoary; urgency=low + + * Use "scd" device names in place of "sr", with a compatibility symlink for + the latter (Closes: Ubuntu#1909) + + -- Matt Zimmerman Thu, 28 Oct 2004 23:15:53 -0700 + +udev (0.040-1ubuntu2) hoary; urgency=low + + * Resolve merge conflicts + + -- Matt Zimmerman Thu, 28 Oct 2004 17:42:04 -0700 + +udev (0.040-1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Thu, 28 Oct 2004 09:53:41 +0100 + +udev (0.040-1) unstable; urgency=medium + + * New upstream release. + + Removed patch hotplug.dev_exec, merged upstream. + * devfs.rules, udev.rules, udev.permissions: moved pktcdvd* to pktcdvd/, + as requested by the udftools maintainer. (Closes: #274110) + * scsi-devfs.sh: create .../disc instead of .../disk. (Closes: #276484) + * Added a workaround to mount the tmpfs even if .udev.tdb exists in the + static /dev/ directory. + + -- Marco d'Itri Fri, 22 Oct 2004 16:36:57 +0200 + +udev (0.034-1) unstable; urgency=medium + + * New upstream release. + + Removed patch udev-whitespace-bug-01.patch, merged upstream. + * New debconf translation: nl. (Closes: #274895) + * udev.permissions: made /dev/mouse*, /dev/input/mouse* and /dev/input/mice + mode 600. (Closes: #275392) + * udev.rules: fixed errors in the sg and DVB rules. (Closes: #275469) + + -- Marco d'Itri Sat, 9 Oct 2004 14:50:22 +0200 + +udev (0.032-2) unstable; urgency=medium + + * Fixed postrm failure. (Closes: #274272) + * Added support for DVB devices. (Closes: #274335) + * Added partial support for an alternative mount point. + + -- Marco d'Itri Sun, 3 Oct 2004 12:32:48 +0200 + +udev (0.032-1) unstable; urgency=medium + + * New upstream release. + + Removed patch udevstart-fix-01.patch, merged upstream. + * Delete rules.d/ symlinks in postrm. (Closes: #271570) + * Fixed a variable name in cdsymlinks.conf. (Closes: #271656) + * Make preinst not fail if start-stop-daemon --stop fails. (Closes: #273098) + * Make inputdev.sh accept an optional keywords regexp. (Closes: #272434) + * udev.permissions: removed djs* because it's obsolete. (Closes: #272188) + * devfs.rules: fixed the "hd[a-z]*" pattern. (Closes: #271723) + + -- Marco d'Itri Thu, 30 Sep 2004 16:12:59 +0200 + +udev (0.031-2) unstable; urgency=high + + * New patch udevstart-fix-01.patch fixes %-arguments passed to PROGRAMs. + (Closes: #271372) + * Added simple-cd-aliases.rules, not enabled by default. + * Added a note to README.Debian about timestamps and non-UTC system + clocks. (Closes: #259697) + + -- Marco d'Itri Mon, 13 Sep 2004 10:03:23 +0200 + +udev (0.031-1) unstable; urgency=medium + + * New upstream release. Fixes: + + At boot time, create the mem devices before the others. (Closes: #258590) + * Run mountvirtfs in the init script, just to be sure. (See #258214) + * Updated cdsymlinks.sh, courtesy of Darren Salt. (Closes: #247179, #255150) + * scsi-devfs.sh: added support for nst* devices. (Closes: #266419) + * Fix installation of compat-full.rules in postinst. (Closes: #261559) + * udev.permissions: made /dev/input/js* and /dev/input/mouse* world + readable and /dev/input/mice world writeable. (Closes: #260941) + * udev.permissions: made /dev/usb/legousbtower world writeable. + (Closes: #265987) + * udev.rules, devfs.rules: added /dev/cpu/*/. (Closes: #265922) + * udev.rules, devfs.rules: fixed some wildcards. (Closes: #269707) + * udev.rules, devfs.rules: added /dev/input/uinput. (Closes: #270446) + * New script inputdev.sh to support different permissions for some + input events devicse, by Darren Salt. (Closes: #265799) + + -- Marco d'Itri Sun, 12 Sep 2004 20:11:57 +0200 + +udev (0.030-1) unstable; urgency=medium + + * New upstream release. + * New debconf translation: de. (Closes: #254545) + * rtc: 660 => 664 + * input/*: 644 => 600 (Closes: #257165) + + -- Marco d'Itri Sun, 11 Jul 2004 16:59:49 +0200 + +udev (0.026-1ubuntu5) warty; urgency=low + + * Create joystick devices world-readable + + -- Matt Zimmerman Fri, 17 Sep 2004 15:22:54 -0700 + +udev (0.026-1ubuntu4) warty; urgency=low + + * Added and installed extra/removable.sh to test whether a device is + removable (this will only work on kernels 2.6.8 and up; on earlier kernels + this script considers every device as non-removable) + * udev.rules: put IDE and SCSI devices in group 'plugdev' if they are + removable (Warty bug #996) + * udev.postinst: Ensure that group 'plugdev' exists. + + -- Martin Pitt Mon, 6 Sep 2004 12:21:26 +0200 + +udev (0.026-1ubuntu3) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 15:16:38 -0400 + +udev (0.026-1ubuntu2) warty; urgency=low + + * debian/udev.init: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 12:13:37 -0400 + +udev (0.026-1ubuntu1) warty; urgency=high + + * Patch udev.permissions such that /dev/input devices are mode 0600 rather + than 0644. This prevents a security issue where any user could, for + example, sniff passwords typed at the console + + -- Matt Zimmerman Mon, 5 Jul 2004 14:43:17 -0700 + +udev (0.026-1) unstable; urgency=medium + + * New upstream release. (Closes: #251566) + * udev_dbus and udev_selinux have been removed. (Closes: #243429) + * udev.permissions: added pktcdvd[0-9]*. (Closes: #252383) + * Depending on initscripts >= 2.85-16 allows to simplify the init script. + * Removed patches devfs.sh-ide-floppy, devnode_to_devname.patch and + extras_no_logging which have been merged upstream. + + -- Marco d'Itri Tue, 8 Jun 2004 11:27:54 +0200 + +udev (0.024-9) unstable; urgency=low + + * Removed MAKEDEV-wrapper and Depend on makedev > 2.3.1-70. (Closes: #245441) + * /etc/udev/.dev/ moved to /.dev/. (Closes: #246592) + If you do not want to see it anyway, just rmdir it. + You will have to manually remove /etc/udev/.dev/ after the next reboot. + You want to reboot soon anyway because MAKEDEV has been updated to look + for the new directory. + * Added a script to create by default a /dev/cdrom symlink, courtesy of + Michal Čihař. (Closes: #247179) + * Added Japanese debconf template translation. (Closes: #245434) + * Add /dev/misc/nvram to devfs.rules. (Closes: #246125) + * Fixed the group of /dev/fb*. (Closes: #246011) + * When installing on a devfs system enable compat-full.rules if + /dev/tty1 exists. (Closes: #251146) + * Removed support for $udev_root from the init script. (Closes: #249183) + * Do not start udev if the kernel lacks tmpfs support. (Closes: #250476) + * Make the nvram device g+rw and owned by group nvram. + + -- Marco d'Itri Fri, 28 May 2004 20:32:19 +0200 + +udev (0.024-7) unstable; urgency=high + + * Fixed the permissions of /dev. (Closes: #245073) + * Added Czech debconf template translation. (Closes: #244423) + * Minor preinst improvements. (Closes: #245154) + * Fixed the permissions of /dev/st*. (Closes: #244239) + * Added rules for the tun/tap devices. (Closes: #244025) + * Moved the permissions file to /etc/udev/permissions.d/. (Closes: #243949) + + -- Marco d'Itri Thu, 22 Apr 2004 01:53:33 +0200 + +udev (0.024-6) unstable; urgency=high + + * Make postinst detect correctly if dbus is installed. (Closes: #243817) + + -- Marco d'Itri Thu, 15 Apr 2004 19:36:49 +0200 + +udev (0.024-5) unstable; urgency=medium + + * Ignore broken links when updating /etc/udev/rules.d/. (Closes: #243249) + * Use invoke-rc.d to restart d-bus. (Closes: #243336) + * If devfs is being used, use devfs-style names by default. (Closes: #243164) + * Added support for IDE floppy drives. (Closes: #243093) + * Added French debconf template translation. (Closes: #242890) + * Conflict with lvm-common < 1.5.13. (Closes: #236346) + * Let's try to only Recommend dbus and see what happens. (Closes: #240500) + + -- Marco d'Itri Wed, 14 Apr 2004 14:44:43 +0200 + +udev (0.024-4) unstable; urgency=high + + * Fix the names of USB printers. (Closes: #242512) + * Added a new rules file compat-full.rules. (Closes: #241364) + * udev-devfs.rules and udev-compat.rules have been renamed, the preinst + script tries to fix the /etc/udev/rules.d/ symlinks, if any exists. + It cannot recognize some corner cases, so please check your system + after the upgrade. + + -- Marco d'Itri Thu, 8 Apr 2004 02:07:43 +0200 + +udev (0.024-3) unstable; urgency=high + + * Fixed SCSI CD names in udev.rules. (Closes: #242443) + + -- Marco d'Itri Tue, 6 Apr 2004 20:43:40 +0200 + +udev (0.024-2) unstable; urgency=high + + * New patch devnode_to_devname.patch to fix broken udev_dbus, + courtesy of Sjoerd Simons. (Closes: #242283, #242374) + * Added rules to set the permissions of rfcomm[0-9]* and hd[a-s]. + (Closes: #242306) + * New debconf template: pt_BR. (Closes: #242089) + * Read the permissions of /dev/pts/ from /etc/defaults/devpts. + (Closes: #242054) + + -- Marco d'Itri Tue, 6 Apr 2004 18:21:30 +0200 + +udev (0.024-1) unstable; urgency=high + + * New upstream release. + "high" urgency because the package currently in testing sucks too much. + * Removed patch ide-devfs_fix_no_media, which has been merged upstream. + * Clarify README.Debian. (Closes: #241318) + + -- Marco d'Itri Sat, 3 Apr 2004 14:23:09 +0200 + +udev (0.023-3) unstable; urgency=medium + + * Changed again the default rules source: now udev.conf will default to + reading all files in /etc/udev/rules.d/. If the directory is empty, + postinst will create in it a symlink to ../udev.rules. + Please double check that it's the rules set you really want to use. + * Depends on libselinux1-dev. (Closes: #240755) + * Fixed the permissions of /dev/rtc. (Closes: #240905) + * Let's try moving /sbin/udev_dbus to /usr/sbin/. (See #240500) + + -- Marco d'Itri Wed, 31 Mar 2004 17:18:51 +0200 + +udev (0.023-2) unstable; urgency=medium + + * Fixed cdrom group permissions. (Closes: #240521) + * Fixed symlinks in /etc/dev.d/. (Closes: #240517) + * Allow db_input calls to fail. (Closes: #240520) + + -- Marco d'Itri Sun, 28 Mar 2004 19:16:59 +0200 + +udev (0.023-1) unstable; urgency=medium + + * New upstream release. + * Enabled SE Linux support. Untested. + * I wonder if I should make the package not depend on the dbus and + selinux libraries, as they are only used by the little programs + in /etc/dev.d/. I encourage comments. + * New patch extras_no_logging: needed to make the dbus and selinux + helpers compile. Side effect: disables logging for them. + * Removed patch udev022_namedev_symlink_fix.patch, merged upstream. + * Removed patch run_usr_sbin_udev which is not needed anymore. + * Use tmpfs instead of ramfs. (Closes: #239941) + * Use debconf to print the reboot notice and a warning for devfs users, + patch courtesy of Scott Robinson . (Closes: #240291) + * Make sure that all cdrom drives are recognized in udev.rules. + (Closes: #239877) + * Make sg* devices of CD drives owned by the cdrom group. (Closes: #240315) + * Modified the init script to unmount /dev/pts and remount it on the + tmpfs. + + -- Marco d'Itri Sat, 27 Mar 2004 14:49:37 +0100 + +udev (0.022-1) unstable; urgency=medium + + * The "millions of flies cannot be wrong" release. + * Switched the default /dev layout to traditional style. + (Closes: #237482, #237484) + * Removed the patches udevstart_no_retval and strip_trailing_blanks + because they have been merged upstream. + * New patch run_usr_sbin_udev: first try to run /usr/sbin/udev and then + /sbin/udev if the first does not exist. This is useful to support + D-BUS without moving all the related libraries in /lib. + * New patch udev022_namedev_symlink_fix.patch, upstream bugfix. + * Make the MAKEDEV wrapper smarter by checking if something has really + been mounted over /etc/udev/.dev. + * Depends on sysvinit (>= 2.85-10) to use the already mounted /proc + and /sys. + * Limit the /dev ramfs size to 1 MB, I hope this will be enough for + any reasonable system. + * Cleaned up the init script. (Closes: #237243) + * New patch ide-devfs_fix_no_media: make ide-devfs.sh check if + /proc/ide/*/media really exists before using it. + * Updated udev.rules and udev.permissions. + (Closes: #236708, #236602, #237478) + * Added partial and untested support for SCSI tapes to scsi-devfs.sh. + (Closes: #238825) + + -- Marco d'Itri Sun, 21 Mar 2004 13:31:02 +0100 + +udev (0.021-1) unstable; urgency=medium + + * New upstream release. + * New patch udevstart_no_retval makes udevsend always return success. + * New patch strip_trailing_blanks makes comparisons of sysfs fields + ignore trailing blanks. + * Removed patches fix_expr, man-dashes.diff, no_error_on_enoent, + udev019_symlink.patch because they have been merged upstream. + + -- Marco d'Itri Thu, 4 Mar 2004 02:25:35 +0100 + +udev (0.019-3) unstable; urgency=low + + * Initial release. (Closes: #221915) + * kill udevd on upgrade. + * Removed support for multiple files in $udev_rules, now all files matching + /etc/udev/*.rules will be parsed. + * Make the ide/*/cd devices owned by cdrom group. + * Added default aliases for ttyN, ttySN and lpN. + * New patch: man-dashes.diff, fixes unescaped dashes in the man pages + (by Philipp Matthias Hahn). + * Added an updated scsi-devfs.sh from Daniel Mueller . + + -- Marco d'Itri Tue, 2 Mar 2004 19:37:30 +0100 --- udev-166.orig/debian/libgudev-1.0-0.copyright +++ udev-166/debian/libgudev-1.0-0.copyright @@ -0,0 +1,18 @@ +This is the Ubuntu package of libgudev, the interface to udev. + +Copyright © 2008 David Zeuthen + +Licence: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +On Ubuntu systems, the complete text of the GNU Lesser General Public +License can be found in ‘/usr/share/common-licenses/LGPL-2’. --- udev-166.orig/debian/libudev0-udeb.install +++ udev-166/debian/libudev0-udeb.install @@ -0,0 +1 @@ +lib/libudev.so.* --- udev-166.orig/debian/udev.installer-startup +++ udev-166/debian/udev.installer-startup @@ -0,0 +1,23 @@ +#!/bin/sh -e +# installer startup script for udev + +# Give ourselves a tmpfs to work in +mount -t tmpfs tmpfs /dev +mknod -m 600 /dev/console c 5 1 +mknod -m 666 /dev/null c 1 3 + +# Copy over default device tree +cp -a -f /lib/udev/devices/* /dev + +# It's all over netlink now +echo "" > /proc/sys/kernel/hotplug + +# Start udevd +udevd --daemon --resolve-names=never + +# Create all device nodes, and fix up permissions and missing stuff for +# those already created (by initramfs) +/sbin/udevadm trigger --action=add +/sbin/udevadm settle + +mount -t devpts devpts /dev/pts --- udev-166.orig/debian/udev.udev-finish.init +++ udev-166/debian/udev.udev-finish.init @@ -0,0 +1,52 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev-finish +# Required-Start: mountall-bootclean udev +# Required-Stop: +# Should-Start: +# Default-Start: S +# Default-Stop: +# Short-Description: Finish up udev. +# Description: Copies the udev log into /var/log and copies any rules +# generated while the root filesystem was read-only into +# /etc/udev/rules.d +### END INIT INFO + +# init script to finish up udev + +# Check the package is still installed +[ -x /sbin/udevd ] || exit 0 + +# Get LSB functions +. /lib/lsb/init-functions +. /etc/default/rcS + + +case "$1" in + start) + # Save udev log in /var/log/udev + if [ -e /dev/.udev.log ]; then + mv -f /dev/.udev.log /var/log/udev + fi + + # Make sure the root filesystem is actually writable + # (script is set -e, so this will abort) + touch /etc/udev/rules.d + + # Copy any rules generated while the root filesystem was read-only + for file in /dev/.udev/tmp-rules--*; do + dest=${file##*tmp-rules--} + [ "$dest" = '*' ] && break + cat $file >> /etc/udev/rules.d/$dest + rm -f $file + done + ;; + stop|restart|reload|force-reload) + ;; +*) + echo "Usage: /etc/init.d/udev {start|stop|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 --- udev-166.orig/debian/udev.examples +++ udev-166/debian/udev.examples @@ -0,0 +1 @@ +extras/scsi_id/scsi_id.config --- udev-166.orig/debian/udev.init +++ udev-166/debian/udev.init @@ -0,0 +1,140 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountkernfs +# Required-Stop: +# Should-Start: +# Default-Start: S +# Default-Stop: +# Short-Description: Start the udev daemon. +# Description: Mounts the /dev virtual filesystem, starts the udev +# daemon and populates /dev. +### END INIT INFO + +# Check the package is still installed +[ -x /sbin/udevd ] || exit 0 + +# Get LSB functions +. /lib/lsb/init-functions +. /etc/default/rcS + + +case "$1" in + start) + # We need the uevent support introduced in 2.6.15, bail out if we + # don't have it and fall back to a static /dev + if [ ! -f /sys/class/mem/null/uevent ]; then + if mountpoint -q /dev; then + # uh-oh, initramfs made some kind of /dev, get rid of it + umount -l /dev + fi + exit 1 + fi + + if ! mountpoint -q /dev; then + # initramfs didn't mount /dev, so we'll need to do that + mount -n -t tmpfs -o mode=0755 udev /dev + fi + + # Copy over default device tree + cp -a -f /lib/udev/devices/* /dev + + # It's all over netlink now + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" > /proc/sys/kernel/hotplug + fi + + # Start udevd + log_begin_msg "Starting kernel event manager..." + if start-stop-daemon --start --quiet --exec /sbin/udevd -- --daemon; then + log_end_msg 0 + else + log_end_msg $? + fi + + # This next bit can take a while + if type usplash_write >/dev/null 2>&1; then + usplash_write "TIMEOUT 360" ||: + trap "usplash_write 'TIMEOUT 15' ||:" 0 + fi + + # Log things that trigger does + /sbin/udevadm monitor -e >/dev/.udev.log & + UDEV_MONITOR_PID=$! + + # Fix permissions and missing symlinks/programs for devices made in + # initramfs, and catch up on everything we missed + log_begin_msg "Loading hardware drivers..." + /sbin/udevadm trigger + if /sbin/udevadm settle; then + log_end_msg 0 + else + log_end_msg $? + fi + + # Kill the udev monitor again + kill $UDEV_MONITOR_PID + ;; + stop) + log_begin_msg "Stopping kernel event manager..." + if start-stop-daemon --stop --quiet --oknodo --exec /sbin/udevd --retry 5; then + log_end_msg 0 + else + log_end_msg $? + fi + umount -l /dev + ;; + restart) + if [ ! -f /sys/kernel/uevent_seqnum ]; then + echo "Kernel uevent sequence number not available, cowardly not restarting udev" 1>&2 + exit 0 + fi + + seqnum_before=$(cat /sys/kernel/uevent_seqnum) + + log_begin_msg "Stopping kernel event manager..." + if start-stop-daemon --stop --quiet --oknodo --exec /sbin/udevd --retry 5; then + log_end_msg 0 + else + log_end_msg $? + fi + + log_begin_msg "Starting kernel event manager..." + if start-stop-daemon --start --quiet --exec /sbin/udevd -- --daemon; then + log_end_msg 0 + else + log_end_msg $? + fi + + seqnum_after=$(cat /sys/kernel/uevent_seqnum) + + if [ $seqnum_before -ne $seqnum_after ]; then + echo "Kernel uevent sequence number changed, some events may have been missed :o(" 1>&2 + fi + ;; + refresh-devices) + cp -au /lib/udev/devices/* /dev + + log_begin_msg "Loading additional hardware drivers..." + /sbin/udevadm trigger + if /sbin/udevadm settle; then + log_end_msg 0 + else + log_end_msg $? + fi + ;; + reload|force-reload) + log_begin_msg "Reloading kernel event manager..." + if start-stop-daemon --stop --signal 1 --exec /sbin/udevd; then + log_end_msg 0 + else + log_end_msg $? + fi + ;; +*) + echo "Usage: /etc/init.d/udev {start|stop|restart|refresh-devices|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 --- udev-166.orig/debian/udev.docs +++ udev-166/debian/udev.docs @@ -0,0 +1,2 @@ +README +NEWS --- udev-166.orig/debian/README-etc-rules.d +++ udev-166/debian/README-etc-rules.d @@ -0,0 +1,24 @@ +The files in this directory are read by udev(7) and used when events +are performed by the kernel. The udev daemon watches this directory +with inotify so that changes to these files are automatically picked +up, for this reason they must be files and not symlinks to another +location as in the case in Debian. + +Packages do not generally install rules here, this directory is for +local rules. If you want to override behaviour of package-supplied +rules, which can be found in /lib/udev/rules.d, you can do one of +two things: + + 1) Write your own rules in this directory that assign the name, + symlinks, permissions, etc. that you want. Pick a number higher + than the rules you want to override, and yours will be used. + + 2) Copy the file from /lib/udev/rules.d and edit it here; you + should generally only do this if you want to prevent a program + from being run. + + +If the ordering of files in this directory are not important to you, +it's recommended that you simply name your files "descriptive-name.rules" +such that they are processed AFTER all numbered rules in both this +directory and /lib/udev/rules.d and thus override anything set there. --- udev-166.orig/debian/libudev0.install +++ udev-166/debian/libudev0.install @@ -0,0 +1 @@ +lib/libudev.so.* --- udev-166.orig/debian/udev.udevtrigger.upstart +++ udev-166/debian/udev.udevtrigger.upstart @@ -0,0 +1,15 @@ +# udevtrigger - cold plug devices +# +# By the time udevd starts, we've already missed all of the events for +# the devices populated in /sys. This task causes the kernel to resend +# them. + +description "cold plug devices" + +start on (startup + and started udev) + +task + +exec udevadm trigger --action=add +post-stop exec udevadm settle --- udev-166.orig/debian/libgudev-1.0-dev.copyright +++ udev-166/debian/libgudev-1.0-dev.copyright @@ -0,0 +1,18 @@ +This is the Ubuntu package of libgudev, the interface to udev. + +Copyright © 2008 David Zeuthen + +Licence: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +On Ubuntu systems, the complete text of the GNU Lesser General Public +License can be found in ‘/usr/share/common-licenses/LGPL-2’. --- udev-166.orig/debian/copyright +++ udev-166/debian/copyright @@ -0,0 +1,34 @@ +This is the Ubuntu package of udev, the rule-base device node and kernel +event manager. + +Copyright © 2004-2006 Key Sievers +Copyright © 2005-2006 SUSE Linux Products GmbH +Copyright © 2006 Hannes Reinecke +Copyright © 2006 Red Hat, Inc. +Copyright © 2003-2004 Greg Kroah-Hartman +Copyright © 2005 John Hull +Copyright © 2005 Tobias Klauser +Copyright © 2005 W. Michael Petullo +Copyright © 2004 Andre Masella +Copyright © 2004 Arnd Bergmann +Copyright © 2004 Chris Friesen +Copyright © 2004 Harald Hoyer +Copyright © 2004 Ling, Xiaofeng +Copyright © 2004 Daniel Walsh +Copyright © 2003 IBM Corp. + +Includes code from the Linux kernel source tree. + +Licence: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation version 2 of the License. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +On Ubuntu systems, the complete text of the GNU General Public License +can be found in ‘/usr/share/common-licenses/GPL-2’. --- udev-166.orig/debian/udev.postrm +++ udev-166/debian/udev.postrm @@ -0,0 +1,183 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was removed: +# remove +# +# After the package was purged: +# purge +# +# After the package was upgraded: +# upgrade +# if that fails: +# failed-upgrade +# +# +# After all of the packages files have been replaced: +# disappear +# +# +# If preinst fails during install: +# abort-install +# +# If preinst fails during upgrade of removed package: +# abort-install +# +# If preinst fails during upgrade: +# abort-upgrade + + +# Undo removal of a no-longer used conffile +undo_rm_conffile() +{ + CONFFILE="$1" + + if [ ! -e "$CONFFILE" ]; then + if [ -e "$CONFFILE".dpkg-bak ]; then + echo "Restoring modified conffile $CONFFILE" + mv -f "$CONFFILE".dpkg-bak "$CONFFILE" + elif [ -e "$CONFFILE".dpkg-obsolete ]; then + mv -f "$CONFFILE".dpkg-obsolete "$CONFFILE" + fi + fi +} + +# Finish removal of a no-longer used conffile +finish_rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-bak ]; then + rm -f "$CONFFILE".dpkg-bak + fi +} + +# Undo move of a conffile +undo_mv_conffile() +{ + CONFFILE="$1" + + if [ ! -e "$CONFFILE" ]; then + if [ -e "$CONFFILE".dpkg-bak ]; then + mv -f "$CONFFILE".dpkg-bak "$CONFFILE" + elif [ -e "$CONFFILE".dpkg-moving ]; then + mv -f "$CONFFILE".dpkg-moving "$CONFFILE" + fi + fi +} + +# Finish move of a conffile +finish_mv_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-bak ]; then + rm -f "$CONFFILE".dpkg-bak + fi +} + + +# Enable udevadm again +enable_udevadm() +{ + rm -f /sbin/udevadm + dpkg-divert --package udev --rename --divert /sbin/udevadm.upgrade \ + --remove /sbin/udevadm +} + + +# Undo remove of Ubuntu rules in favour of upstream ones +undo_rm_ubuntu_rules() +{ + undo_rm_conffile /etc/udev/rules.d/05-options.rules + undo_rm_conffile /etc/udev/rules.d/05-udev-early.rules + undo_rm_conffile /etc/udev/rules.d/20-names.rules + undo_rm_conffile /etc/udev/rules.d/30-cdrom_id.rules + undo_rm_conffile /etc/udev/rules.d/40-basic-permissions.rules + undo_rm_conffile /etc/udev/rules.d/40-permissions.rules + undo_rm_conffile /etc/udev/rules.d/60-persistent-input.rules + undo_rm_conffile /etc/udev/rules.d/60-persistent-storage-tape.rules + undo_rm_conffile /etc/udev/rules.d/60-persistent-storage.rules + undo_rm_conffile /etc/udev/rules.d/60-symlinks.rules + undo_rm_conffile /etc/udev/rules.d/61-persistent-storage-edd.rules + undo_rm_conffile /etc/udev/rules.d/65-id-type.rules + undo_rm_conffile /etc/udev/rules.d/66-persistent-storage-edd.rules + undo_rm_conffile /etc/udev/rules.d/75-cd-aliases-generator.rules + undo_rm_conffile /etc/udev/rules.d/75-persistent-net-generator.rules + undo_rm_conffile /etc/udev/rules.d/80-programs.rules + undo_rm_conffile /etc/udev/rules.d/90-modprobe.rules + undo_rm_conffile /etc/udev/rules.d/95-udev-late.rules +} + +# Finish remove of Ubuntu rules in favour of upstream ones +finish_rm_ubuntu_rules() +{ + finish_rm_conffile /etc/udev/rules.d/05-options.rules + finish_rm_conffile /etc/udev/rules.d/05-udev-early.rules + finish_rm_conffile /etc/udev/rules.d/20-names.rules + finish_rm_conffile /etc/udev/rules.d/30-cdrom_id.rules + finish_rm_conffile /etc/udev/rules.d/40-basic-permissions.rules + finish_rm_conffile /etc/udev/rules.d/40-permissions.rules + finish_rm_conffile /etc/udev/rules.d/60-persistent-input.rules + finish_rm_conffile /etc/udev/rules.d/60-persistent-storage-tape.rules + finish_rm_conffile /etc/udev/rules.d/60-persistent-storage.rules + finish_rm_conffile /etc/udev/rules.d/60-symlinks.rules + finish_rm_conffile /etc/udev/rules.d/61-persistent-storage-edd.rules + finish_rm_conffile /etc/udev/rules.d/65-id-type.rules + finish_rm_conffile /etc/udev/rules.d/66-persistent-storage-edd.rules + finish_rm_conffile /etc/udev/rules.d/75-cd-aliases-generator.rules + finish_rm_conffile /etc/udev/rules.d/75-persistent-net-generator.rules + finish_rm_conffile /etc/udev/rules.d/80-programs.rules + finish_rm_conffile /etc/udev/rules.d/90-modprobe.rules + finish_rm_conffile /etc/udev/rules.d/95-udev-late.rules +} + + +# Remove configuration and log files +purge_files() +{ + if [ -f /etc/iftab ]; then + rm -f /etc/iftab || true + fi + + if [ -f /var/log/udev ]; then + rm -f /var/log/udev || true + fi +} + + +case "$1" in + remove) + ;; + + purge) + finish_rm_conffile /etc/scsi_id.config + finish_rm_ubuntu_rules + purge_files + ;; + + upgrade|failed-upgrade|disappear) + ;; + + abort-install|abort-upgrade) + # Abort upgrade from intrepid + if dpkg --compare-versions "$2" lt "136-4"; then + undo_rm_ubuntu_rules + fi + + # Abort upgrade from jaunty + if dpkg --compare-versions "$2" lt "143-3"; then + undo_rm_conffile /etc/scsi_id.config + fi + + enable_udevadm + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 --- udev-166.orig/debian/udev.dirs +++ udev-166/debian/udev.dirs @@ -0,0 +1,14 @@ +/sbin +/lib/firmware +/lib/udev +/lib/udev/devices +/lib/udev/devices/net +/lib/udev/devices/pts +/lib/udev/devices/shm +/lib/udev/rules.d +/etc/udev/rules.d +/usr/lib/udev +/usr/share/initramfs-tools/hooks +/usr/share/initramfs-tools/scripts/init-top +/usr/share/initramfs-tools/scripts/nfs-top +/usr/share/initramfs-tools/scripts/init-bottom --- udev-166.orig/debian/libudev-dev.copyright +++ udev-166/debian/libudev-dev.copyright @@ -0,0 +1,19 @@ +This is the Ubuntu package of libudev, the interface to udev. + +Copyright © 2008-2009 Key Sievers +Copyright © 2009 Alan Jenkins + +Licence: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +On Ubuntu systems, the complete text of the GNU Lesser General Public +License can be found in ‘/usr/share/common-licenses/LGPL-2.1’. --- udev-166.orig/debian/source/format +++ udev-166/debian/source/format @@ -0,0 +1 @@ +1.0 --- udev-166.orig/debian/source/options +++ udev-166/debian/source/options @@ -0,0 +1,4 @@ +tar-ignore .bzr +tar-ignore .git +tar-ignore test +diff-ignore '(^|/)(.bzr|.gitignore|test)($$|/)' --- udev-166.orig/debian/local/udev.py +++ udev-166/debian/local/udev.py @@ -0,0 +1,19 @@ +'''apport package hook for udev + +(c) 2009 Canonical Ltd. +Author: Martin Pitt +''' + +import os +import apport.hookutils + +def add_info(report): + apport.hookutils.attach_hardware(report) + + user_rules = [] + for f in os.listdir('/etc/udev/rules.d'): + if not f.startswith('70-persistent-') and f != 'README': + user_rules.append(f) + + if user_rules: + report['CustomUdevRuleFiles'] = ' '.join(user_rules) --- udev-166.orig/debian/local/hotplug.functions +++ udev-166/debian/local/hotplug.functions @@ -0,0 +1,61 @@ +# Setup and shell utility functions for use in hotplug agents. +# vim: syntax=sh +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2 of the License. + +if [ "$UDEV_LOG" ] && [ "$UDEV_LOG" -ge 7 ]; then + DEBUG=yes +fi + +PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' + +[ -e /etc/default/hotplug ] && . /etc/default/hotplug + + +if [ -x /usr/bin/logger ]; then + LOGGER=/usr/bin/logger +elif [ -x /bin/logger ]; then + LOGGER=/bin/logger +else + unset LOGGER +fi + +# for diagnostics +if [ -t 1 -a -z "$LOGGER" ] || [ ! -e '/dev/log' ]; then + mesg() { + echo "$@" >&2 + } +elif [ -t 1 ]; then + mesg() { + echo "$@" + $LOGGER -t "${0##*/}[$$]" "$@" + } +else + mesg() { + $LOGGER -t "${0##*/}[$$]" "$@" + } +fi + +debug_mesg() { + [ -z "$DEBUG" -o "$DEBUG" = no ] && return 0 + mesg "$@" +} + +wait_for_file() { + local file=$1 + local timeout=$2 + [ "$timeout" ] || timeout=120 + + local count=$timeout + while [ $count != 0 ]; do + [ -e "$file" ] && return 0 + sleep 1 + count=$(($count - 1)) + done + + mesg "$file did not appear before the timeout!" + exit 1 +} +