From: Marco d'Itri Date: Sat, 9 Feb 2019 23:00:31 +0000 (+0100) Subject: Import kmod_26-1.debian.tar.xz X-Git-Tag: archive/raspbian/34.1-2+rpi1~1^2^2^2^2~3^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=505279868f5bb9e0fed2b6aa377478e1c9f25011;p=kmod.git Import kmod_26-1.debian.tar.xz [dgit import tarball kmod 26-1 kmod_26-1.debian.tar.xz] --- 505279868f5bb9e0fed2b6aa377478e1c9f25011 diff --git a/changelog b/changelog new file mode 100644 index 0000000..3e9f99e --- /dev/null +++ b/changelog @@ -0,0 +1,226 @@ +kmod (26-1) unstable; urgency=medium + + * New upstream release. + * Removed patch check_builtin_kver, which was needed to support 2.6.32 + kernels. + * Link with OpenSSL to support parsing modules signatures. + + -- Marco d'Itri Sun, 10 Feb 2019 00:00:31 +0100 + +kmod (25-2) unstable; urgency=medium + + * Moved the libraries to /usr/lib/. (Closes: #894566) + + -- Marco d'Itri Sat, 17 Nov 2018 01:56:00 +0100 + +kmod (25-1) unstable; urgency=medium + + * New upstream release. + * Enabled support for xz-compressed modules. (Closes: #772628) + + -- Marco d'Itri Sun, 21 Jan 2018 01:02:46 +0100 + +kmod (24-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Mon, 27 Feb 2017 02:50:32 +0100 + +kmod (23-2) unstable; urgency=medium + + * Backported upstream commit 6b77f18 to stop depmod crashing after + detecting a dependency cycle. (Closes: #846888) + * Enabled hardening=+bindnow. + + -- Marco d'Itri Mon, 26 Dec 2016 03:42:54 +0100 + +kmod (23-1) unstable; urgency=medium + + * New upstream release. (Closes: #837626) + + -- Marco d'Itri Tue, 27 Sep 2016 01:40:32 +0200 + +kmod (22-1) unstable; urgency=medium + + * New upstream release. + * Set $SOURCE_DATE_EPOCH in debian/rules for reproducibility. + (Closes: #783152) + * Remove the module-init-tools transitional package. + + -- Marco d'Itri Sun, 20 Dec 2015 17:04:10 +0100 + +kmod (21-1) unstable; urgency=medium + + * New upstream release. Fixes: + + spurious spaces in lsmod output. (Closes: #782692) + + a missing comman in rmmod(8). (Closes: #787548) + * kmod.init: support the modules-load.d directories in /usr. + (Closes: #673747) + * Build the developers' documentation with gtk-doc. (Closes: #789462) + + -- Marco d'Itri Sun, 05 Jul 2015 21:18:24 +0200 + +kmod (20-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Sun, 08 Mar 2015 19:10:08 +0100 + +kmod (18-3) unstable; urgency=high + + * postinst: do not use autodie. (Closes: #762974) + * postinst: do not create an empty etc-modules-parameters.conf. + + -- Marco d'Itri Sat, 27 Sep 2014 08:01:49 +0200 + +kmod (18-2) unstable; urgency=medium + + * postinst: move any modules parameters from /etc/modules to a new + /etc/modprobe.d/etc-modules-parameters.conf file. (Closes: #627949) + * initramfs-hook: do not fail if /lib/modprobe.d/ is empty. + * Add the man page for kmod(8). (Closes: #665873) + * Document depmod --show in depmod(8). (Closes: #687435) + + -- Marco d'Itri Wed, 17 Sep 2014 03:50:34 +0200 + +kmod (18-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Sat, 21 Jun 2014 04:27:39 +0200 + +kmod (17-2) unstable; urgency=medium + + * Build-Depend on gtk-doc-tools. (Closes: #747005) + + -- Marco d'Itri Sun, 04 May 2014 20:38:42 +0200 + +kmod (17-1) unstable; urgency=medium + + * New upstream release. + * Declared that kmod Breaks oss-compat 4. (Closes: #736748) + * Merged the few useful directives from the alsa-base package and added + a versioned Breaks to force it to be unistalled. + + -- Marco d'Itri Thu, 01 May 2014 21:10:36 +0200 + +kmod (16-2) unstable; urgency=medium + + * Always Build-Depend on xsltproc. (Closes: #733760) + + -- Marco d'Itri Thu, 02 Jan 2014 04:04:26 +0100 + +kmod (16-1) unstable; urgency=low + + * New upstream release. (Closes: #716739) + + Improves error messages. (Closes: #676387) + + Fixes modprobe -f. (Closes: #720599) + * Added an example to modules(5), patch by Regid Ichira. (Closes: #711468) + + -- Marco d'Itri Tue, 31 Dec 2013 03:56:44 +0100 + +kmod (9-3) unstable; urgency=low + + * Added backported patch dot_kcmdline: correctly parse kcmdline parameters + containing a dot. (Closes: #689872) + * Added backported patch bad_alias_assertion: stop modprobe from aborting + from an assertion because of some invalid but common configuration + directives. (Closes: #674110) + * Removed the nfs4 alias from aliases.conf as requested by the kernel + team. (Closes: #683972) + * Removed the unnecessary build-dependency on perl. (Closes: #697750) + + -- Marco d'Itri Sun, 07 Apr 2013 18:19:01 +0200 + +kmod (9-2) unstable; urgency=low + + * Backported upstream fixes to make modprobe work like in module-init-tools + and not load a blacklisted module even if modprobe is invoked with one of + its aliases. + * Report an error when some .bin files do not exist. (Closes: #684901) + * Really build the udeb with -Os -fomit-frame-pointer. + + -- Marco d'Itri Mon, 27 Aug 2012 00:40:18 +0200 + +kmod (9-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Mon, 25 Jun 2012 02:48:38 +0200 + +kmod (8-2) unstable; urgency=medium + + * Implemented systemd-compatible processing of modules-load.d directories, + courtesy of Josh Triplett. (Closes: #672960) + * Properly fix kmod on ia64 with backported patch commit-d30319e. + + -- Marco d'Itri Sun, 20 May 2012 23:19:47 +0200 + +kmod (8-1) unstable; urgency=medium + + * New upstream release. Fixes: + + An unclear error message. (Closes: #668216) + * Moved libkmod.pc to the multiarch directory. (Closes: #670005) + * Do not warn about a missing modules.builtin file for kernel versions + < 2.6.33. (Closes: #670965) + * Removed patch work_around_linking_issues, which is properly fixed by + upstream patch commit-9625375. + * Made the init script exit without processing /etc/modules if the + /etc/modules-load.d/modules.conf symlink exists. + + -- Marco d'Itri Mon, 14 May 2012 02:45:06 +0200 + +kmod (6-2) unstable; urgency=low + + * Applied a few upstream changesets to fix: + + depmod correctly processing a kernel versions different from the + running one. (Closes: #662891) + + modprobe -q still too much verbose. (Closes: #662822) + + modprobe -r removing only the first argument. (Closes: #662984) + * Restored the code from the old module-init-tools package which deletes + obsolete conffiles. Abort upgrading from releases older than lenny. + (Closes: #663159) + + -- Marco d'Itri Fri, 16 Mar 2012 02:21:00 +0100 + +kmod (6-1.1) unstable; urgency=low + + * Non-maintainer upload with maintainer approval. + * Work around FTBFS on ia64 (probable toolchain bug) due to undefined + references to kmod_log when linking tools/kmod: Add libkmod-private.la + to kmod's LDADD variable to ensure that linking happens properly. + + Patch: work_around_linking_issues; tested on merulo. + + -- Cyril Brulebois Wed, 07 Mar 2012 01:40:37 +0000 + +kmod (6-1) unstable; urgency=low + + * New upstream release. Fixes: + + Documented the modprobe.blacklist parameter. (Closes: #630338) + + -- Marco d'Itri Sat, 03 Mar 2012 16:53:33 +0100 + +kmod (5-2) experimental; urgency=high + + * Added patch check_if_exists to fix loops caused by install directives. + (Closes: #659838) + + -- Marco d'Itri Sun, 19 Feb 2012 13:07:21 +0100 + +kmod (5-1) experimental; urgency=low + + * New upstream release. (Closes: #659195) + + -- Marco d'Itri Sun, 12 Feb 2012 04:48:24 +0100 + +kmod (3-1) experimental; urgency=low + + * Initial release. (Closes: #652284) + * When replacing module-init-tools: + - /etc/modules is preserved + - /etc/modprobe.d/aliases.conf is deleted if unmodified, otherwise it + is renamed to aliases-m-i-t.conf and will be used by kmod + - /etc/init.d/module-init-tools is deleted if unmodified, otherwise it + is renamed to /etc/init.d/module-init-tools.dpkg-bak + + -- Marco d'Itri Sun, 08 Jan 2012 20:47:12 +0100 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..be2eba9 --- /dev/null +++ b/control @@ -0,0 +1,50 @@ +Source: kmod +Section: admin +Priority: important +Maintainer: Marco d'Itri +Build-Depends: debhelper (>> 9.20160403~), liblzma-dev, libssl-dev, xsltproc, + autoconf, automake, libtool, gtk-doc-tools +Standards-Version: 4.2.1 +Rules-Requires-Root: no +Vcs-Git: https://salsa.debian.org/md/kmod.git +Vcs-Browser: https://salsa.debian.org/md/kmod + +Package: kmod +Architecture: linux-any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base +Breaks: oss-compat (= 4), alsa-base (<= 1.0.25+3) +Description: tools for managing Linux kernel modules + This package contains a set of programs for loading, inserting, and + removing kernel modules for Linux. + It replaces module-init-tools. + +Package: libkmod2 +Section: libs +Priority: optional +Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: libkmod shared library + This library provides an API for insertion, removal, configuration and + listing of kernel modules. + +Package: libkmod-dev +Section: libdevel +Priority: optional +Architecture: linux-any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends}, libkmod2 (= ${binary:Version}) +Description: libkmod development files + This package contains the files needed for developing applications that + use libkmod. + +Package: libkmod2-udeb +Package-Type: udeb +Section: debian-installer +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: libkmod shared library + This is a minimal version of libkmod2, only for use in the installation system. diff --git a/copyright b/copyright new file mode 100644 index 0000000..3675914 --- /dev/null +++ b/copyright @@ -0,0 +1,17 @@ +This is the Debian GNU/Linux prepackaged version of kmod. + +It has been packaged by Marco d'Itri . + +Original sources were obtained from: +http://www.kernel.org/pub/linux/utils/kernel/kmod/ + + +Copyright (C) 2011 ProFUSION embedded systems. + +The kmod tools are licensed under the GNU GPL version 2 or newer. + +libkmod is licensed under the GNU LGPL version 2.1 or newer. + +On Debian systems the complete text of the licenses can be found in +/usr/share/common-licenses/GPL-2 and /usr/share/common-licenses/LGPL-2.1 . + diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..0b42883 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-tag = v%(version)s +pristine-tar = False + +[pq] +patch-numbers = False diff --git a/kmod.dirs b/kmod.dirs new file mode 100644 index 0000000..f6a98b0 --- /dev/null +++ b/kmod.dirs @@ -0,0 +1,5 @@ +/etc/modprobe.d/ +/lib/modprobe.d/ +/sbin/ +/usr/share/doc/libkmod2/ +/usr/share/initramfs-tools/hooks/ diff --git a/kmod.init b/kmod.init new file mode 100644 index 0000000..d7ec083 --- /dev/null +++ b/kmod.init @@ -0,0 +1,92 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: kmod +# Required-Start: +# Required-Stop: +# Should-Start: checkroot +# Should-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Load the modules listed in /etc/modules. +# Description: Load the modules listed in /etc/modules. +### END INIT INFO + +# Silently exit if the kernel does not support modules. +[ -f /proc/modules ] || exit 0 +[ -x /sbin/modprobe ] || exit 0 + +[ -f /etc/default/rcS ] && . /etc/default/rcS +. /lib/lsb/init-functions + +PATH='/sbin:/bin' + +case "$1" in + start) + ;; + + stop|restart|reload|force-reload) + log_warning_msg "Action '$1' is meaningless for this init script" + exit 0 + ;; + + *) + log_success_msg "Usage: $0 start" + exit 1 +esac + +load_module() { + local module args + module="$1" + args="$2" + + if [ "$VERBOSE" != no ]; then + log_action_msg "Loading kernel module $module" + modprobe $module $args || true + else + modprobe $module $args > /dev/null 2>&1 || true + fi +} + +modules_files() { + local modules_load_dirs='/etc/modules-load.d /run/modules-load.d /usr/local/lib/modules-load.d /usr/lib/modules-load.d /lib/modules-load.d' + local processed=' ' + local add_etc_modules=true + + for dir in $modules_load_dirs; do + [ -d $dir ] || continue + for file in $(run-parts --list --regex='\.conf$' $dir 2> /dev/null || true); do + local base=${file##*/} + if echo -n "$processed" | grep -qF " $base "; then + continue + fi + if [ "$add_etc_modules" -a -L $file \ + -a "$(readlink -f $file)" = /etc/modules ]; then + add_etc_modules= + fi + processed="$processed$base " + echo $file + done + done + + if [ "$add_etc_modules" ]; then + echo /etc/modules + fi +} + +if [ "$VERBOSE" = no ]; then + log_action_begin_msg 'Loading kernel modules' +fi + +files=$(modules_files) +if [ "$files" ] ; then + grep -h '^[^#]' $files | + while read module args; do + [ "$module" ] || continue + load_module "$module" "$args" + done +fi + +if [ "$VERBOSE" = no ]; then + log_action_end_msg 0 +fi + diff --git a/kmod.initramfs-hook b/kmod.initramfs-hook new file mode 100644 index 0000000..b0b886a --- /dev/null +++ b/kmod.initramfs-hook @@ -0,0 +1,16 @@ +#!/bin/sh -e +# Copy the compatibility symlinks until initramfs-tools will be converted +# to use the kmod program. + +if [ "$1" = "prereqs" ]; then exit 0; fi + +. /usr/share/initramfs-tools/hook-functions + +copy_exec /bin/kmod +cp -a /sbin/modprobe /sbin/rmmod "$DESTDIR/sbin/" + +mkdir -p "$DESTDIR/lib/modprobe.d/" +if [ "$(echo /lib/modprobe.d/*)" != "/lib/modprobe.d/*" ]; then + cp -a /lib/modprobe.d/* "$DESTDIR/lib/modprobe.d/" +fi + diff --git a/kmod.links b/kmod.links new file mode 100644 index 0000000..a0475c9 --- /dev/null +++ b/kmod.links @@ -0,0 +1,7 @@ +/bin/kmod /sbin/depmod +/bin/kmod /sbin/insmod +/bin/kmod /sbin/lsmod +/bin/kmod /sbin/modinfo +/bin/kmod /sbin/modprobe +/bin/kmod /sbin/rmmod +/bin/kmod /bin/lsmod diff --git a/kmod.postinst b/kmod.postinst new file mode 100644 index 0000000..887a876 --- /dev/null +++ b/kmod.postinst @@ -0,0 +1,63 @@ +#!/bin/sh -e + +create_etc_modules() { + [ -e /etc/modules ] && return 0 + cat < /etc/modules +# /etc/modules: kernel modules to load at boot time. +# +# This file contains the names of kernel modules that should be loaded +# at boot time, one per line. Lines beginning with "#" are ignored. +# Parameters can be specified after the module name. + +END + chmod 644 /etc/modules +} + +# move the modules parameters from /etc/modules to a new file in modprobe.d +convert_etc_modules() { + if dpkg --compare-versions "$2" ge "18-2"; then + return + fi + + [ -e /etc/modules ] || return 0 + + if [ -e /etc/modprobe.d/etc-modules-parameters.conf ]; then + echo "/etc/modprobe.d/etc-modules-parameters.conf already exists." + return + fi + + perl -e ' + use warnings; + use strict; + + my @parameters; + while (<>) { + /^# Parameters can be specified after the module name\.$/ && next; + push(@parameters, $1) if s/^( (\s* \w+) \s+ \w.* )$/$2/x; + print $_; + } + exit 0 if not @parameters; + + open(OUT, "> /etc/modprobe.d/etc-modules-parameters.conf") or die "open: $!"; + print OUT "# These parameters have been moved from /etc/modules by the kmod package.\n\n"; + print OUT "options $_\n" foreach @parameters; + close OUT or die "close: $!"; + ' < /etc/modules > /etc/modules.kmod-postinst + + # replace the old file if it has been changed + if cmp --quiet /etc/modules /etc/modules.kmod-postinst; then + rm /etc/modules.kmod-postinst + else + mv /etc/modules.kmod-postinst /etc/modules + fi +} + +case "$1" in + configure) + create_etc_modules + convert_etc_modules "$@" +esac + +#DEBHELPER# + +exit 0 diff --git a/kmod.postrm b/kmod.postrm new file mode 100644 index 0000000..43a8d9c --- /dev/null +++ b/kmod.postrm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +case "$1" in + purge) + rm -f /etc/modules + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/libkmod-dev.dirs b/libkmod-dev.dirs new file mode 100644 index 0000000..bdb669c --- /dev/null +++ b/libkmod-dev.dirs @@ -0,0 +1 @@ +/usr/share/doc/libkmod2/ diff --git a/libkmod-dev.files b/libkmod-dev.files new file mode 100644 index 0000000..d5c3b0d --- /dev/null +++ b/libkmod-dev.files @@ -0,0 +1,4 @@ +/usr/include/ +/usr/lib/*/pkgconfig/ +/usr/lib/*/libkmod.* +/usr/share/gtk-doc/ diff --git a/libkmod2-udeb.dirs b/libkmod2-udeb.dirs new file mode 100644 index 0000000..d245f12 --- /dev/null +++ b/libkmod2-udeb.dirs @@ -0,0 +1 @@ +/etc/modprobe.d/ diff --git a/libkmod2-udeb.links b/libkmod2-udeb.links new file mode 100644 index 0000000..a0475c9 --- /dev/null +++ b/libkmod2-udeb.links @@ -0,0 +1,7 @@ +/bin/kmod /sbin/depmod +/bin/kmod /sbin/insmod +/bin/kmod /sbin/lsmod +/bin/kmod /sbin/modinfo +/bin/kmod /sbin/modprobe +/bin/kmod /sbin/rmmod +/bin/kmod /bin/lsmod diff --git a/libkmod2.files b/libkmod2.files new file mode 100644 index 0000000..2c4a66a --- /dev/null +++ b/libkmod2.files @@ -0,0 +1 @@ +usr/lib/*/libkmod.so.* diff --git a/libkmod2.symbols b/libkmod2.symbols new file mode 100644 index 0000000..d1d5803 --- /dev/null +++ b/libkmod2.symbols @@ -0,0 +1,76 @@ +libkmod.so.2 libkmod2 #MINVER# + LIBKMOD_22@LIBKMOD_22 22~ + LIBKMOD_5@LIBKMOD_5 5~ + LIBKMOD_6@LIBKMOD_6 6~ + kmod_config_get_aliases@LIBKMOD_5 5~ + kmod_config_get_blacklists@LIBKMOD_5 5~ + kmod_config_get_install_commands@LIBKMOD_5 5~ + kmod_config_get_options@LIBKMOD_5 5~ + kmod_config_get_remove_commands@LIBKMOD_5 5~ + kmod_config_get_softdeps@LIBKMOD_5 5~ + kmod_config_iter_free_iter@LIBKMOD_5 5~ + kmod_config_iter_get_key@LIBKMOD_5 5~ + kmod_config_iter_get_value@LIBKMOD_5 5~ + kmod_config_iter_next@LIBKMOD_5 5~ + kmod_dump_index@LIBKMOD_5 5~ + kmod_get_dirname@LIBKMOD_22 22~ + kmod_get_log_priority@LIBKMOD_5 5~ + kmod_get_userdata@LIBKMOD_5 5~ + kmod_list_last@LIBKMOD_5 5~ + kmod_list_next@LIBKMOD_5 5~ + kmod_list_prev@LIBKMOD_5 5~ + kmod_load_resources@LIBKMOD_5 5~ + kmod_module_apply_filter@LIBKMOD_6 6~ + kmod_module_dependency_symbol_get_bind@LIBKMOD_5 5~ + kmod_module_dependency_symbol_get_crc@LIBKMOD_5 5~ + kmod_module_dependency_symbol_get_symbol@LIBKMOD_5 5~ + kmod_module_dependency_symbols_free_list@LIBKMOD_5 5~ + kmod_module_get_dependencies@LIBKMOD_5 5~ + kmod_module_get_dependency_symbols@LIBKMOD_5 5~ + kmod_module_get_filtered_blacklist@LIBKMOD_5 5~ + kmod_module_get_holders@LIBKMOD_5 5~ + kmod_module_get_info@LIBKMOD_5 5~ + kmod_module_get_initstate@LIBKMOD_5 5~ + kmod_module_get_install_commands@LIBKMOD_5 5~ + kmod_module_get_module@LIBKMOD_5 5~ + kmod_module_get_name@LIBKMOD_5 5~ + kmod_module_get_options@LIBKMOD_5 5~ + kmod_module_get_path@LIBKMOD_5 5~ + kmod_module_get_refcnt@LIBKMOD_5 5~ + kmod_module_get_remove_commands@LIBKMOD_5 5~ + kmod_module_get_sections@LIBKMOD_5 5~ + kmod_module_get_size@LIBKMOD_5 5~ + kmod_module_get_softdeps@LIBKMOD_5 5~ + kmod_module_get_symbols@LIBKMOD_5 5~ + kmod_module_get_versions@LIBKMOD_5 5~ + kmod_module_info_free_list@LIBKMOD_5 5~ + kmod_module_info_get_key@LIBKMOD_5 5~ + kmod_module_info_get_value@LIBKMOD_5 5~ + kmod_module_initstate_str@LIBKMOD_5 5~ + kmod_module_insert_module@LIBKMOD_5 5~ + kmod_module_new_from_loaded@LIBKMOD_5 5~ + kmod_module_new_from_lookup@LIBKMOD_5 5~ + kmod_module_new_from_name@LIBKMOD_5 5~ + kmod_module_new_from_path@LIBKMOD_5 5~ + kmod_module_probe_insert_module@LIBKMOD_5 5~ + kmod_module_ref@LIBKMOD_5 5~ + kmod_module_remove_module@LIBKMOD_5 5~ + kmod_module_section_free_list@LIBKMOD_5 5~ + kmod_module_section_get_address@LIBKMOD_5 5~ + kmod_module_section_get_name@LIBKMOD_5 5~ + kmod_module_symbol_get_crc@LIBKMOD_5 5~ + kmod_module_symbol_get_symbol@LIBKMOD_5 5~ + kmod_module_symbols_free_list@LIBKMOD_5 5~ + kmod_module_unref@LIBKMOD_5 5~ + kmod_module_unref_list@LIBKMOD_5 5~ + kmod_module_version_get_crc@LIBKMOD_5 5~ + kmod_module_version_get_symbol@LIBKMOD_5 5~ + kmod_module_versions_free_list@LIBKMOD_5 5~ + kmod_new@LIBKMOD_5 5~ + kmod_ref@LIBKMOD_5 5~ + kmod_set_log_fn@LIBKMOD_5 5~ + kmod_set_log_priority@LIBKMOD_5 5~ + kmod_set_userdata@LIBKMOD_5 5~ + kmod_unload_resources@LIBKMOD_5 5~ + kmod_unref@LIBKMOD_5 5~ + kmod_validate_resources@LIBKMOD_5 5~ diff --git a/patches/aliases_conf b/patches/aliases_conf new file mode 100644 index 0000000..960cc3e --- /dev/null +++ b/patches/aliases_conf @@ -0,0 +1,20 @@ +--- /dev/null ++++ b/extra/aliases.conf +@@ -0,0 +1,17 @@ ++# These are the standard aliases and dependencies. ++# This file does not need to be modified. ++ ++# prevent unusual drivers from appearing as the first sound device ########### ++options snd-pcsp index=-2 ++options snd-usb-audio index=-2 ++options cx88_alsa index=-2 ++options snd-atiixp-modem index=-2 ++options snd-intel8x0m index=-2 ++options snd-via82xx-modem index=-2 ++ ++# work around other kernel issues ############################################ ++# The EHCI driver should be loaded before the ones for low speed controllers ++# or some devices may be confused when they are disconnected and reconnected. ++softdep uhci-hcd pre: ehci-hcd ++softdep ohci-hcd pre: ehci-hcd ++ diff --git a/patches/debian_manpages b/patches/debian_manpages new file mode 100644 index 0000000..ff2c917 --- /dev/null +++ b/patches/debian_manpages @@ -0,0 +1,50 @@ +--- /dev/null ++++ b/extra/modules.5 +@@ -0,0 +1,25 @@ ++.TH MODULES 5 "Version 1.2" "Debian GNU/Linux" ++.SH NAME ++/etc/modules - kernel modules to load at boot time ++.SH DESCRIPTION ++.PP ++The ++.B /etc/modules ++file contains the names of kernel modules that are to be loaded at boot ++time, one per line. Arguments can be given in the same line as the module ++name. Lines beginning with a '#' are ignored. ++.SH "EXAMPLE" ++ # /etc/modules: kernel modules to load at boot time. ++ # ++ # This file contains the names of kernel modules that ++ # should be loaded at boot time, one per line. Lines ++ # beginning with "#" are ignored. ++ ++ w83781d ++ ++ 3c509 irq=15 ++ nf_nat_ftp ++.SH "SEE ALSO" ++.BR depmod (8) ++.BR modprobe (8) ++.BR modprobe.conf (5) +--- /dev/null ++++ b/extra/modules.fr.5 +@@ -0,0 +1,19 @@ ++.\"Traduction Lundi 14 octobre 2002 par Antoine Gémis ++.\"(agemis@netuup.com) ++.TH MODULES 5 "Version 1.1" "Debian GNU/Linux" ++.SH NOM ++/etc/modules - modules du noyau à charger au démarrage ++.SH DESCRIPTION ++.PP ++Le fichier ++.B /etc/modules ++contient la liste des modules du noyau à charger au démarrage, un module par ++ligne. Une ligne peut inclure, après le nom du module, des paramètres à lui ++passer. Sur une ligne, tout ce qui suit «\ #\ » sera considéré comme commentaire ++et ignoré. ++.SH "VOIR AUSSI" ++.BR depmod (8) ++.BR modprobe (8) ++.BR modprobe.conf (5) ++.SH TRADUCTION ++Antoine Gémis . diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..a0f32d0 --- /dev/null +++ b/patches/series @@ -0,0 +1,9 @@ + +# fixes to be pushed upstream +verbose_missing_bin + +# features to be pushed upstream + +# Debian integration +aliases_conf +debian_manpages diff --git a/patches/verbose_missing_bin b/patches/verbose_missing_bin new file mode 100644 index 0000000..f2aec1f --- /dev/null +++ b/patches/verbose_missing_bin @@ -0,0 +1,25 @@ +Description: Report an error when some .bin files do not exist +Author: Marco d'Itri +Bug-Debian: http://bugs.debian.org/684901 +--- + +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -503,7 +503,7 @@ static char *lookup_builtin_file(struct + + idx = index_file_open(fn); + if (idx == NULL) { +- DBG(ctx, "could not open builtin file '%s'\n", fn); ++ ERR(ctx, "could not open builtin file '%s'\n", fn); + return NULL; + } + +@@ -575,7 +575,7 @@ char *kmod_search_moddep(struct kmod_ctx + + idx = index_file_open(fn); + if (idx == NULL) { +- DBG(ctx, "could not open moddep file '%s'\n", fn); ++ ERR(ctx, "could not open moddep file '%s'\n", fn); + return NULL; + } + diff --git a/rules b/rules new file mode 100755 index 0000000..dc16e92 --- /dev/null +++ b/rules @@ -0,0 +1,145 @@ +#!/usr/bin/make -f +SHELL+= -e + +ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) +BUILD_UDEB := 1 +endif + +D := $(CURDIR)/debian/kmod +DK := $(CURDIR)/debian/libkmod2 +DD := $(CURDIR)/debian/libkmod-dev +DKU := $(CURDIR)/debian/libkmod2-udeb + +CONFFLAGS = \ + --sysconfdir=/etc \ + --bindir=/bin \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-rootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH) +CONFFLAGS_deb = $(CONFFLAGS) \ + $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+bindnow" \ + dpkg-buildflags --export=configure || true) \ + --enable-gtk-doc \ + --with-openssl \ + --with-xz \ + --enable-debug +CONFFLAGS_udeb = $(CONFFLAGS) \ + $(subst -O2,-Os -fomit-frame-pointer,$(shell DEB_BUILD_MAINT_OPTIONS="hardening=-all" \ + dpkg-buildflags --export=configure || true)) + +############################################################################## +SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog --show-field=Date | date --file=- +%s) +export SOURCE_DATE_EPOCH + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +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 + +ifdef BUILD_UDEB + BUILD_UDEB_TARGET := .stamp-build-udeb +else + NO_PACKAGE := --no-package=libkmod2-udeb +endif + +############################################################################## +clean: + rm -rf .stamp-* build-*deb + dh_autoreconf_clean + # delete the symlinks created by gtkdocize + rm -f $$(find m4/ build-aux/ libkmod/ -type l) + dh_clean + +libkmod/docs/gtk-doc.make: + gtkdocize --docdir libkmod/docs + +configure: configure.ac libkmod/docs/gtk-doc.make + dh_autoreconf + +build-deb/config.status: configure + [ -d build-deb ] || mkdir build-deb + cd build-deb/ && \ + ../configure $(CONFFLAGS_deb) + +build-udeb/config.status: configure + [ -d build-udeb ] || mkdir build-udeb + cd build-udeb/ && \ + ../configure $(CONFFLAGS_udeb) + +build: build-arch build-indep +build-arch: .stamp-build $(BUILD_UDEB_TARGET) +build-indep: .stamp-build $(BUILD_UDEB_TARGET) +.stamp-build: build-deb/config.status + dh_testdir + cd build-deb/ && \ + $(MAKE) all V=1 + touch $@ + +build-udeb: .stamp-build-udeb +.stamp-build-udeb: build-udeb/config.status + dh_testdir + cd build-udeb/ && \ + $(MAKE) all V=1 + touch $@ + +binary-all: .stamp-binary +.stamp-binary: build + dh_testdir + dh_testroot + dh_prep + + cd build-deb/ && \ + $(MAKE) install DESTDIR=$D + rm $D/usr/lib/*/*.la + + dh_movefiles --sourcedir=debian/kmod + rmdir --parents --ignore-fail-on-non-empty $$(find $D -type d -empty) + + dh_installdirs + cp extra/aliases.conf $D/lib/modprobe.d/ + install --mode=755 debian/kmod.initramfs-hook \ + $D/usr/share/initramfs-tools/hooks/kmod + +ifdef BUILD_UDEB + cd build-udeb/ && \ + $(MAKE) install-exec DESTDIR=$(DKU) + rm -r $(DKU)/usr/ + + egrep -i '^[a-z]' extra/aliases.conf > $(DKU)/etc/modprobe.d/aliases.conf +endif + + dh_installdocs -pkmod -plibkmod-dev --link-doc=libkmod2 + dh_installdocs -pkmod --link-doc=libkmod2 README TODO + dh_installdocs -plibkmod2 + cp libkmod/README $(DD)/usr/share/doc/libkmod2/README.libkmod + dh_installchangelogs NEWS + dh_installman extra/*.5 + dh_installinit --no-start + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs --add-udeb=libkmod2-udeb -- -c4 + dh_shlibdeps -- --warnings=7 + dh_installdeb + dh_gencontrol $(NO_PACKAGE) + dh_md5sums + touch $@ + +binary-arch: .stamp-binary + dh_builddeb -a $(NO_PACKAGE) + +binary-indep: .stamp-binary + dh_builddeb -i + +binary: binary-arch binary-indep + +get-orig-source: + cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ + uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR) + +.PHONY: clean build build-arch build-indep binary binary-arch binary-indep diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..1b7a902 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=3 +http://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-(\d+)\.tar\.xz