diff options
| author | Kevin Tian <kevin.tian@intel.com> | 2010-07-21 13:21:49 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 21:44:37 +0100 |
| commit | b376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch) | |
| tree | b642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/modutils_extension.patch | |
| parent | 8a251accbfd68078fbab23a96411b76928cf1063 (diff) | |
| download | poky-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz | |
module-init-tools: upgrade to 3.12
[Patches]
KEEP _ignore_arch_directory_: ignore /etc/modprobe.d/arch, not sure reason now.
keep it and to be verified later
REMOVE _module-init-tools-remove-index.patch_: in upstream
NEW _disable_man.patch_: a simpler patch to replace below removed two
REMOVE _manpagesopt_: due to above new patch
REMOVE _no_man_rebuild_: ditto
KEEP _modutils_extension_: poky has its own name convention and thus need such knowledge
in code
[Recipe]
- adjust indention
- remove some old lines like ${S} and EXTRA_OECONF
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/module-init-tools/files/modutils_extension.patch')
| -rw-r--r-- | meta/packages/module-init-tools/files/modutils_extension.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/packages/module-init-tools/files/modutils_extension.patch b/meta/packages/module-init-tools/files/modutils_extension.patch new file mode 100644 index 0000000000..128c9531a1 --- /dev/null +++ b/meta/packages/module-init-tools/files/modutils_extension.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | # poky uses new name to differentiate from modutils, so reflect this new name in source | ||
| 2 | # | ||
| 3 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | ||
| 4 | --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf | ||
| 5 | +++ module-init-tools-3.0-pre10/generate-modprobe.conf | ||
| 6 | @@ -45,12 +45,12 @@ | ||
| 7 | cp $TESTING_MODPROBE_CONF $MODPROBECONF | ||
| 8 | elif [ "$STDIN" = "1" ]; then | ||
| 9 | cat > $MODPROBECONF | ||
| 10 | -elif [ -x /sbin/modprobe.old ]; then | ||
| 11 | +elif [ -x /sbin/modprobe.24 ]; then | ||
| 12 | # In sbin. | ||
| 13 | - /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort | ||
| 14 | -elif modprobe.old -c >/dev/null 2>&1; then | ||
| 15 | + /sbin/modprobe.24 -c > $MODPROBECONF || modprobe_abort | ||
| 16 | +elif modprobe.24 -c >/dev/null 2>&1; then | ||
| 17 | # Somewhere in path. | ||
| 18 | - modprobe.old -c > $MODPROBECONF || modprobe_abort | ||
| 19 | + modprobe.24 -c > $MODPROBECONF || modprobe_abort | ||
| 20 | elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then | ||
| 21 | # Running /sbin/modprobe gives old version. | ||
| 22 | /sbin/modprobe -c > $MODPROBECONF || modprobe_abort | ||