Magellan Linux

Diff of /trunk/extras/networkmanager/networkmanager-0.9.6.0-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 13120 by niro, Wed Aug 22 10:49:09 2012 UTC revision 13121 by niro, Wed Aug 22 12:39:41 2012 UTC
# Line 47  SRC_URI=( Line 47  SRC_URI=(
47   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
48   mirror://${PNAME}/nm-system-settings.conf   mirror://${PNAME}/nm-system-settings.conf
49   mirror://${PNAME}/networkmanager.conf.tmpfile   mirror://${PNAME}/networkmanager.conf.tmpfile
50   mirror://${PNAME}/${PNAME}-0.9.4.0-magellan-3.patch   mirror://${PNAME}/${PNAME}-0.9.6.0-magellan.patch
51   mirror://${PNAME}/${PNAME}-0.9.4.0-plugdev.patch   mirror://${PNAME}/${PNAME}-0.9.6.0-hostname.patch
  mirror://${PNAME}/${PNAME}-0.8.9997-hostname.patch  
  mirror://${PNAME}/${PNAME}-0.9.4.0-fix-connections.patch  
  mirror://${PNAME}/${PNAME}-0.9.4.0-fix-nmremote-setting.patch  
  mirror://${PNAME}/${PNAME}-0.9.4.0-linux-libc-headers.patch  
52  )  )
53    
54  UP2DATE="updatecmd_gnome NetworkManager"  UP2DATE="updatecmd_gnome NetworkManager"
# Line 63  src_prepare() Line 59  src_prepare()
59   cd ${SRCDIR}   cd ${SRCDIR}
60    
61   # support our distro   # support our distro
62   mpatch ${PNAME}-0.9.4.0-magellan-3.patch || die   mpatch ${PNAME}-0.9.6.0-magellan.patch || die
   
  # allow plugdev group to do things  
  mpatch ${PNAME}-0.9.4.0-plugdev.patch || die  
63    
64   # do not change the hostname on magellan   # do not change the hostname on magellan
65   mpatch ${PNAME}-0.8.9997-hostname.patch || die   mpatch ${PNAME}-0.9.6.0-hostname.patch || die
   
  # fix: Error: Can't obtain connections: settings service is not running.  
  # see: http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=8a2267ab6b37948a70c10f0af781be4822a54c6b  
  mpatch ${PNAME}-0.9.4.0-fix-connections.patch || die  
  mpatch ${PNAME}-0.9.4.0-fix-nmremote-setting.patch || die  
   
  # fix ftbfs with >=linux-libc-headers-3.4  
  mpatch ${PNAME}-0.9.4.0-linux-libc-headers.patch || die  
66    
67   # regen configure files   # regen configure files
68   mautoreconf || die   mautoreconf || die

Legend:
Removed from v.13120  
changed lines
  Added in v.13121