[arch-commits] Commit in udev/repos (4 files)

Tobias Powalowski tpowa at archlinux.org
Sun Jan 24 04:31:32 EST 2010


    Date: Sunday, January 24, 2010 @ 04:31:31
  Author: tpowa
Revision: 65082

Merged revisions 63063,63099,65080-65081 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/udev/trunk

........
  r63063 | thomas | 2010-01-14 11:04:26 +0000 (Do, 14 Jan 2010) | 2 lines
  
  Remove resolve-modalias, use the new modprobe --resolve-alias function which has been merged in module-init-tools 3.11
........
  r63099 | thomas | 2010-01-14 16:48:48 +0000 (Do, 14 Jan 2010) | 2 lines
  
  Correct ${RESOLVEALIAS} usage in load-modules.sh which broke after the last commit
........
  r65080 | tpowa | 2010-01-24 09:29:36 +0000 (So, 24 Jan 2010) | 2 lines
  
  upgpkg: udev 150-1
      bump to latest version
........
  r65081 | tpowa | 2010-01-24 09:30:37 +0000 (So, 24 Jan 2010) | 2 lines
  
  upgpkg: udev 150-1
      bump to latest version
........

Modified:
  udev/repos/testing-i686/	(properties)
  udev/repos/testing-i686/PKGBUILD
  udev/repos/testing-i686/load-modules.sh
Deleted:
  udev/repos/testing-i686/resolve-modalias.c

--------------------+
 PKGBUILD           |   14 ++++-----
 load-modules.sh    |    4 +-
 resolve-modalias.c |   73 ---------------------------------------------------
 3 files changed, 8 insertions(+), 83 deletions(-)


Property changes on: udev/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /udev/trunk:1-61602
   + /udev/trunk:1-65081

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2010-01-24 09:30:37 UTC (rev 65081)
+++ testing-i686/PKGBUILD	2010-01-24 09:31:31 UTC (rev 65082)
@@ -5,7 +5,7 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=149
+pkgver=150
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -15,12 +15,11 @@
 options=(!makeflags !libtool)
 makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
-        81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
+        81-arch.rules load-modules.sh cdsymlinks.sh root-link.sh
         arch-udev-rules.patch ignore-remove.sh)
-md5sums=('b218bd15939e8afc6368e1907a48bb26'
+md5sums=('4ad5ada5f5cefb2517996825c1d2a7d6'
          'cc6406e8b67b2b8711942098a66cde6b'
-         'f4951f61438d69894b728212dac7318b'
-         '64a0169dc9d883a63ff9f8f491fdc34a'
+         'a2d0d59742b80b3b28ed498718654eb7'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
          '22c1f059cdeddaac5e7fe33b007da6a3'
@@ -37,7 +36,8 @@
   
 package_udev() {
   pkgdesc="The userspace dev tools (udev)"
-  depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2')
+  depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2'
+           'module-init-tools>=3.11')
   install=udev.install
   backup=(etc/udev/udev.conf
           etc/modprobe.d/framebuffer_blacklist.conf)
@@ -54,8 +54,6 @@
   install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
   # install our module loading subsystem
   install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
-  install -d -m755 $pkgdir/bin
-  gcc -Wall $CFLAGS -o $pkgdir/bin/resolve-modalias $srcdir/resolve-modalias.c || return 1
   # install cdsymlinks.sh
   install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
   # install root-link.sh

Modified: testing-i686/load-modules.sh
===================================================================
--- testing-i686/load-modules.sh	2010-01-24 09:30:37 UTC (rev 65081)
+++ testing-i686/load-modules.sh	2010-01-24 09:31:31 UTC (rev 65082)
@@ -9,7 +9,7 @@
 BLACKLIST="${MOD_BLACKLIST[@]}"
 MODPROBE="/sbin/modprobe"
 LOGGER="/usr/bin/logger"
-RESOLVEALIAS="/bin/resolve-modalias"
+RESOLVEALIAS="${MODPROBE} --resolve-alias"
 USEBLACKLIST="--use-blacklist"
 
 if [ -f /proc/cmdline ]; then 
@@ -42,7 +42,7 @@
     #sanitize the blacklist
     BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')"
     # Try to find all modules for the alias
-    mods=$($RESOLVEALIAS /lib/modules/$(uname -r)/modules.alias $1)
+    mods=$($RESOLVEALIAS $1)
     # If no modules could be found, try if the alias name is a module name
     # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour
     [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST=""

Deleted: testing-i686/resolve-modalias.c
===================================================================
--- testing-i686/resolve-modalias.c	2010-01-24 09:30:37 UTC (rev 65081)
+++ testing-i686/resolve-modalias.c	2010-01-24 09:31:31 UTC (rev 65082)
@@ -1,73 +0,0 @@
-#include <stdio.h>
-#include <fnmatch.h>
-#include <string.h>
-#include <malloc.h>
-
-static char *my_getline(FILE *file) {
-  static size_t size = 1024;
-  static char *buf = NULL;
-  static unsigned int i = 0, r = 0;;
-
-  if(buf == NULL)
-    buf = (char*)malloc(size);
-
-  if(i) {
-    memmove(buf, buf+i, size-i);
-    r -= i;
-    i = 0;
-  }
-
-  while(1) {
-    if(i == size) {
-      size *= 2;
-      buf = (char*)realloc(buf, size);
-    }
-
-    if(i==r)
-      r += fread(buf+i, 1, size-i, file);
-
-    if(i==r && i == 0) {
-      free(buf);
-      buf = NULL;
-      r = 0;
-      return NULL;
-    }
-
-    if(i==r || buf[i] == '\n') {
-      buf[i++] = '\0';
-      return buf;
-    }
-    i++;
-  }
-}
-
-int main(int argc, char *argv[]) {
-  char *line, *pattern, *module;
-  char *pos1, *pos2;
-
-  if(argc != 3) {
-      fprintf(stderr, "usage: resolve-modalias <alias file> <modalias>\n");
-      return 1;
-  }
-
-  FILE *f=fopen(argv[1], "r");
-  if(!f) {
-    perror("error opening alias file");
-    return 1;
-  }
-
-  while((line=my_getline(f))!=NULL) {
-    if(!strncmp(line, "alias", strlen("alias"))) {
-      pos1 = index(line, ' ');
-      pos2 = index(pos1+1, ' ');
-      pattern = pos1+1;
-      *pos2 = '\0';
-      module = pos2+1;
-
-      if(!fnmatch(pattern, argv[2], 0))
-        printf("%s\n", module);
-    }
-  }
-  return 0;
-}
-//vim: set ts=2 sw=2 et:



More information about the arch-commits mailing list