From: Marco d'Itri Date: Fri, 8 Jan 2021 01:37:04 +0000 (+0100) Subject: kmod (28-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/34.1-2+rpi1~1^2^2^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=34373e7988aca27312c2090381857c06c79727e2;p=kmod.git kmod (28-1) unstable; urgency=medium * New upstream release. * Fixed modinfo -F for built-in modules. (Closes: #970871) [dgit import unpatched kmod 28-1] --- 34373e7988aca27312c2090381857c06c79727e2 diff --cc debian/changelog index 0000000,0000000..d8e24f4 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,289 @@@ ++kmod (28-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Fixed modinfo -F for built-in modules. (Closes: #970871) ++ ++ -- Marco d'Itri Fri, 08 Jan 2021 02:37:04 +0100 ++ ++kmod (27+20200310-2) unstable; urgency=medium ++ ++ * Re-upload to unstable. ++ ++ -- Marco d'Itri Sat, 18 Apr 2020 17:53:55 +0200 ++ ++kmod (27+20200310-1) experimental; urgency=medium ++ ++ * New upstream snapshot. ++ * Split kmod-udeb off of libkmod2-udeb and actually ship the libraries ++ in libkmod2-udeb. (Closes: #953952) ++ ++ -- Marco d'Itri Sun, 12 Apr 2020 00:59:25 +0200 ++ ++kmod (27-2) unstable; urgency=medium ++ ++ * Drop the verbose_missing_bin patch, which became too much noisy after ++ new files were introduced by 5.3 kernels. (Closes: #949444) ++ ++ -- Marco d'Itri Fri, 13 Mar 2020 22:53:37 +0100 ++ ++kmod (27-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Reset the SELinux file attributes in the initramfs. (Closes: #948366) ++ ++ -- Marco d'Itri Wed, 19 Feb 2020 04:56:30 +0100 ++ ++kmod (26+20191223-1) unstable; urgency=medium ++ ++ [ Debian Janitor ] ++ * Trim trailing whitespace. ++ * Use secure URI in debian/watch. ++ * Rely on pre-initialized dpkg-architecture variables. ++ * Set upstream metadata fields: Repository. ++ ++ [ Marco d'Itri ] ++ * New upstream snapshot. ++ ++ -- Marco d'Itri Mon, 06 Jan 2020 01:59:49 +0100 ++ ++kmod (26-3) unstable; urgency=medium ++ ++ * Create again /etc/modprobe.d/. (Closes: #940221) ++ * Do not reference removed options support in modules(5). (Closes: #931136) ++ ++ -- Marco d'Itri Tue, 17 Sep 2019 21:40:12 +0200 ++ ++kmod (26-2) unstable; urgency=medium ++ ++ * Removed --add-udeb from dh_makeshlibs, since libkmod2-udeb does not ++ actually contain a library. (Closes: #939779) ++ * Switched to dh. ++ ++ -- Marco d'Itri Wed, 11 Sep 2019 09:29:57 +0200 ++ ++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 --cc debian/control index 0000000,0000000..11c722c new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,58 @@@ ++Source: kmod ++Section: admin ++Priority: important ++Maintainer: Marco d'Itri ++Build-Depends: debhelper-compat (= 12), liblzma-dev, libssl-dev, xsltproc, ++ autoconf, automake, libtool, gtk-doc-tools ++Standards-Version: 4.5.1.0 ++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 ++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: kmod-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 kmod, only for use in the installation system. ++ ++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 --cc debian/copyright index 0000000,0000000..3675914 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,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 --cc debian/gbp.conf index 0000000,0000000..5a8398f new file mode 100644 --- /dev/null +++ b/debian/gbp.conf @@@ -1,0 -1,0 +1,7 @@@ ++[DEFAULT] ++upstream-tag = v%(version)s ++pristine-tar = False ++compression = xz ++ ++[pq] ++patch-numbers = False diff --cc debian/kmod-udeb.dirs index 0000000,0000000..d245f12 new file mode 100644 --- /dev/null +++ b/debian/kmod-udeb.dirs @@@ -1,0 -1,0 +1,1 @@@ ++/etc/modprobe.d/ diff --cc debian/kmod-udeb.links index 0000000,0000000..a0475c9 new file mode 100644 --- /dev/null +++ b/debian/kmod-udeb.links @@@ -1,0 -1,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 --cc debian/kmod.dirs index 0000000,0000000..f6a98b0 new file mode 100644 --- /dev/null +++ b/debian/kmod.dirs @@@ -1,0 -1,0 +1,5 @@@ ++/etc/modprobe.d/ ++/lib/modprobe.d/ ++/sbin/ ++/usr/share/doc/libkmod2/ ++/usr/share/initramfs-tools/hooks/ diff --cc debian/kmod.init index 0000000,0000000..d7ec083 new file mode 100644 --- /dev/null +++ b/debian/kmod.init @@@ -1,0 -1,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 --cc debian/kmod.initramfs-hook index 0000000,0000000..9e4a7e3 new file mode 100644 --- /dev/null +++ b/debian/kmod.initramfs-hook @@@ -1,0 -1,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 -aZ /sbin/modprobe /sbin/rmmod "$DESTDIR/sbin/" ++ ++mkdir -p "$DESTDIR/lib/modprobe.d/" ++if [ "$(echo /lib/modprobe.d/*)" != "/lib/modprobe.d/*" ]; then ++ cp -aZ /lib/modprobe.d/* "$DESTDIR/lib/modprobe.d/" ++fi ++ diff --cc debian/kmod.links index 0000000,0000000..a0475c9 new file mode 100644 --- /dev/null +++ b/debian/kmod.links @@@ -1,0 -1,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 --cc debian/kmod.manpages index 0000000,0000000..f9844a9 new file mode 100644 --- /dev/null +++ b/debian/kmod.manpages @@@ -1,0 -1,0 +1,1 @@@ ++extra/*.5 diff --cc debian/kmod.postinst index 0000000,0000000..887a876 new file mode 100644 --- /dev/null +++ b/debian/kmod.postinst @@@ -1,0 -1,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 --cc debian/kmod.postrm index 0000000,0000000..43a8d9c new file mode 100644 --- /dev/null +++ b/debian/kmod.postrm @@@ -1,0 -1,0 +1,11 @@@ ++#!/bin/sh -e ++ ++case "$1" in ++ purge) ++ rm -f /etc/modules ++ ;; ++esac ++ ++#DEBHELPER# ++ ++exit 0 diff --cc debian/libkmod-dev.dirs index 0000000,0000000..bdb669c new file mode 100644 --- /dev/null +++ b/debian/libkmod-dev.dirs @@@ -1,0 -1,0 +1,1 @@@ ++/usr/share/doc/libkmod2/ diff --cc debian/libkmod-dev.files index 0000000,0000000..d5c3b0d new file mode 100644 --- /dev/null +++ b/debian/libkmod-dev.files @@@ -1,0 -1,0 +1,4 @@@ ++/usr/include/ ++/usr/lib/*/pkgconfig/ ++/usr/lib/*/libkmod.* ++/usr/share/gtk-doc/ diff --cc debian/libkmod2-udeb.dirs index 0000000,0000000..fce258f new file mode 100644 --- /dev/null +++ b/debian/libkmod2-udeb.dirs @@@ -1,0 -1,0 +1,1 @@@ ++/usr/lib/ diff --cc debian/libkmod2.files index 0000000,0000000..2c4a66a new file mode 100644 --- /dev/null +++ b/debian/libkmod2.files @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/libkmod.so.* diff --cc debian/libkmod2.symbols index 0000000,0000000..d1d5803 new file mode 100644 --- /dev/null +++ b/debian/libkmod2.symbols @@@ -1,0 -1,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 --cc debian/patches/aliases_conf index 0000000,0000000..960cc3e new file mode 100644 --- /dev/null +++ b/debian/patches/aliases_conf @@@ -1,0 -1,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 --cc debian/patches/debian_manpages index 0000000,0000000..949f9d1 new file mode 100644 --- /dev/null +++ b/debian/patches/debian_manpages @@@ -1,0 -1,0 +1,53 @@@ ++--- /dev/null +++++ b/extra/modules.5 ++@@ -0,0 +1,26 @@ +++.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. Options can only be specified using +++.B modprobe.d +++configuration files. 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 +++ nf_nat_ftp +++.SH "SEE ALSO" +++.BR depmod (8) +++.BR modprobe (8) +++.BR modprobe\.d (5) ++--- /dev/null +++++ b/extra/modules.fr.5 ++@@ -0,0 +1,21 @@ +++.\"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. Les paramètres du module doivent être spécifiés avec les fichiers de +++configuration +++.B modprobe.d. +++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\.d (5) +++.SH TRADUCTION +++Antoine Gémis . diff --cc debian/patches/fix_modinfo_F index 0000000,0000000..1959333 new file mode 100644 --- /dev/null +++ b/debian/patches/fix_modinfo_F @@@ -1,0 -1,0 +1,15 @@@ ++--- a/tools/modinfo.c +++++ b/tools/modinfo.c ++@@ -178,7 +178,11 @@ static int modinfo_do(struct kmod_module ++ is_builtin = (filename == NULL); ++ ++ if (is_builtin) { ++- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); +++ if (field == NULL) +++ printf("%-16s%s%c", "name:", +++ kmod_module_get_name(mod), separator); +++ else if (field != NULL && streq(field, "name")) +++ printf("%s%c", kmod_module_get_name(mod), separator); ++ filename = "(builtin)"; ++ } ++ diff --cc debian/patches/series index 0000000,0000000..adcf0ed new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,9 @@@ ++ ++# fixes to be pushed upstream ++fix_modinfo_F ++ ++# features to be pushed upstream ++ ++# Debian integration ++aliases_conf ++debian_manpages diff --cc debian/rules index 0000000,0000000..fd0d076 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,108 @@@ ++#!/usr/bin/make -f ++ ++ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) ++BUILD_UDEB := 1 ++endif ++ ++D := $(CURDIR)/debian/kmod ++DK := $(CURDIR)/debian/libkmod2 ++DD := $(CURDIR)/debian/libkmod-dev ++DU := $(CURDIR)/debian/kmod-udeb ++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)) ++ ++############################################################################## ++include /usr/share/dpkg/architecture.mk ++ ++ifdef BUILD_UDEB ++ BUILD_UDEB_TARGET := build-udeb/.stamp-build ++else ++ NO_PACKAGE := --no-package=kmod-udeb --no-package=libkmod2-udeb ++endif ++ ++############################################################################## ++%: ++ dh $@ $(NO_PACKAGE) ++ ++override_dh_clean: ++ rm -rf build-*deb ++ dh_clean $$(find m4/ build-aux/ libkmod/ -type l) ++ ++libkmod/docs/gtk-doc.make: ++ gtkdocize --docdir libkmod/docs ++ ++override_dh_autoreconf: libkmod/docs/gtk-doc.make ++ dh_autoreconf ++ ++build-deb/config.status: configure ++ dh_auto_configure --builddir=build-deb -- $(CONFFLAGS_deb) ++ ++build-udeb/config.status: configure ++ dh_auto_configure --builddir=build-udeb -- $(CONFFLAGS_udeb) ++ ++override_dh_auto_configure: ++ ++build-deb/.stamp-build: build-deb/config.status ++ dh_auto_build --builddir=build-deb ++ touch $@ ++ ++build-udeb/.stamp-build: build-udeb/config.status ++ dh_auto_build --builddir=build-udeb ++ touch $@ ++ ++override_dh_auto_build: build-deb/.stamp-build $(BUILD_UDEB_TARGET) ++ ++override_dh_auto_test: ++ ++override_dh_auto_install: ++ dh_auto_install --builddir=build-deb --destdir=$D ++ifdef BUILD_UDEB ++ dh_auto_install --builddir=build-udeb --destdir=$(DU) ++endif ++ ++override_dh_install: ++ rm $D/usr/lib/*/*.la ++ dh_movefiles --sourcedir=debian/kmod ++ cp extra/aliases.conf $D/lib/modprobe.d/ ++ install --mode=755 debian/kmod.initramfs-hook \ ++ $D/usr/share/initramfs-tools/hooks/kmod ++ rmdir --parents --ignore-fail-on-non-empty $D/sbin/ $$(find $D/usr/ -type d -empty) ++ifdef BUILD_UDEB ++ mv $(DU)/usr/lib/*/libkmod.so.* $(DKU)/usr/lib/ ++ rm -r $(DU)/usr/ ++ egrep -i '^[a-z]' extra/aliases.conf > $(DU)/etc/modprobe.d/aliases.conf ++endif ++ ++override_dh_installdocs: ++ 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 ++ ++override_dh_installchangelogs: ++ dh_installchangelogs NEWS ++ ++override_dh_installinit: ++ dh_installinit --no-start ++ ++override_dh_makeshlibs: ++ dh_makeshlibs -- -c4 ++ ++override_dh_shlibdeps: ++ dh_shlibdeps -- --warnings=7 ++ diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/upstream/metadata index 0000000,0000000..4d957f5 new file mode 100644 --- /dev/null +++ b/debian/upstream/metadata @@@ -1,0 -1,0 +1,1 @@@ ++Repository: https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git diff --cc debian/watch index 0000000,0000000..ea377ee new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,2 @@@ ++version=3 ++https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-(\d+)\.tar\.xz