Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next

Conflicts: packages/initramfs/sysutils/busybox-initramfs/scripts/init
2025-07-24 11:16:51 +00:00 · 2011-05-25 07:56:43 +02:00 · 2011-05-25 07:56:43 +02:00 · a49ac5a11d
commit a49ac5a11d
parent 45e938e2b9 d17459b961
28 changed files with 244 additions and 95 deletions
--- a/packages/addons/downloadmanager/transmission/changelog.txt
+++ b/packages/addons/downloadmanager/transmission/changelog.txt
@ -1,2 +1,5 @@
+0.99.2
+- update to transmission-2.31
+
 0.99.1
 - initial version transmission-2.20
--- a/packages/addons/downloadmanager/transmission/meta
+++ b/packages/addons/downloadmanager/transmission/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="transmission"
-PKG_VERSION="2.20"
-PKG_REV="1"
+PKG_VERSION="2.31"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
--- a/packages/addons/downloadmanager/transmission/source/default.py
+++ b/packages/addons/downloadmanager/transmission/source/default.py
@ -18,9 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-import sys
-import xbmcaddon
-import os
+import xbmc, time, os, subprocess

-if ( __name__ == "__main__" ):
-    os.system("sh start.sh")
+dir = os.path.realpath(os.path.dirname(__file__))
+script = 'start.sh'
+
+launcher = os.path.join(dir, script)
+app = '/storage/.xbmc/addons/addon.downloadmanager.transmission/bin/transmission-daemon'
+
+os.chmod(launcher, 0755)
+os.chmod(app, 0755)
+
+args = [launcher, str(os.getpid()), app]
+
+p = subprocess.Popen(args)
+print p.pid
+p.wait()
+os.exit(1)
--- a/packages/addons/downloadmanager/transmission/source/settings.xml
+++ b/packages/addons/downloadmanager/transmission/source/settings.xml
@ -0,0 +1,6 @@
+<settings>
+    <setting id="TRANSMISSION_AUTH" value="false" />
+    <setting id="TRANSMISSION_IP" value="*.*.*.*" />
+    <setting id="TRANSMISSION_PWD" value="openelec" />
+    <setting id="TRANSMISSION_USER" value="openelec" />
+</settings>
--- a/packages/addons/downloadmanager/transmission/source/start.sh
+++ b/packages/addons/downloadmanager/transmission/source/start.sh
@ -20,10 +20,46 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-export TRANSMISSION_WEB_HOME="./web"
-export PATH="$PATH:./bin"
+XBMC_PID=$1
+APP=$2
+SCRIPT_DIR=$(dirname `readlink -f $0`)
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission"
+PATH="${PATH}:${SCRIPT_DIR}/bin"
+LOG_FILE="${ADDON_HOME}/service.log"

-OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission/settings.xml"
+cleanup() {
+  local EXIT_STATUS=$1
+  if [ -n "${EXIT_STATUS}" ];then
+    EXIT_STATUS=0
+  fi
+  kill -15 "${APP_PID}"
+  exit $EXIT_STATUS;
+}
+
+# trap signals for clean shutdown
+  trap cleanup 1 2 3 15
+
+launch_app() {
+  local PID
+  eval "${APP} ${TRANSMISSION_ARG} &>${LOG_FILE} &"
+  APP_PID=$!
+}
+
+pid_is_running() {
+  local PID=${1}
+  for IPID in `ps -o pid | sed 's/[A-Za-z]//g' | sed 's/\ //g'`;do
+    if [ ${IPID} -eq ${PID} ];then
+      return 0
+    fi
+  done
+  return 1
+}
+
+app_prep() {
+
+export TRANSMISSION_WEB_HOME="$SCRIPT_DIR/web"
+
+OPENELEC_SETTINGS="$ADDON_HOME/settings.xml"

 if [ ! -f "$OPENELEC_SETTINGS" ]; then
  cp settings.xml $OPENELEC_SETTINGS
@ -49,6 +85,7 @@ TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
+TRANSMISSION_ARG="$TRANSMISSION_ARG -f"

 if [ "$TRANSMISSION_AUTH" = "true" ]; then
  TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
@ -58,6 +95,24 @@ else
  TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
 fi

-chmod +x ./bin/transmission-daemon
+}

-transmission-daemon $TRANSMISSION_ARG
+main() {
+	app_prep
+	launch_app "${APP}"
+	pid_is_running "${XBMC_PID}"
+	XBMC_RUNNING=$?
+	pid_is_running "${APP_PID}"
+	APP_RUNNING=$?
+
+	while [ $XBMC_RUNNING -eq 0 -a ${APP_RUNNING} -eq 0 ]; do
+		sleep 1
+		pid_is_running "${XBMC_PID}"
+		XBMC_RUNNING=$?
+		pid_is_running "${APP_PID}"
+		APP_RUNNING=$?
+	done
+}
+
+main
+cleanup
--- a/packages/initramfs/devel/eglibc-initramfs/install
+++ b/packages/initramfs/devel/eglibc-initramfs/install
@ -28,3 +28,4 @@ mkdir -p $INSTALL/lib
  cp $EGLIBC_DIR/objdir-eglibc/elf/ld*.so.* $INSTALL/lib
  cp $EGLIBC_DIR/objdir-eglibc/libc.so.6 $INSTALL/lib
  cp $EGLIBC_DIR/objdir-eglibc/math/libm.so.6 $INSTALL/lib
+  cp $EGLIBC_DIR/objdir-eglibc/nptl/libpthread.so.0 $INSTALL/lib
--- a/packages/initramfs/meta
+++ b/packages/initramfs/meta
@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite"
+PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite e2fsprogs-initramfs util-linux-initramfs"
 PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs plymouth-lite"
 PKG_PRIORITY="optional"
 PKG_SECTION="initramfs"
@ -34,7 +34,3 @@ PKG_LONGDESC="debug is a Metapackage for installing initramfs"
 PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"
-
-if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs util-linux-initramfs"
-fi
--- a/packages/initramfs/sysutils/busybox-initramfs/install
+++ b/packages/initramfs/sysutils/busybox-initramfs/install
@ -27,6 +27,10 @@ mkdir -p $INSTALL/bin
  ln -sf busybox $INSTALL/bin/sh
  chmod 4755 $INSTALL/bin/busybox

+mkdir -p $INSTALL/etc
+  touch $INSTALL/etc/fstab
+  ln -sf /proc/self/mounts $INSTALL/etc/mtab
+
 mkdir -p $INSTALL/dev
 mkdir -p $INSTALL/proc
 mkdir -p $INSTALL/sys
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@ -118,18 +118,26 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"

  mount_part() {
    progress "trying to mount $1 ..."
-    for i in 1 2 3 4 5 6 7 8 9 10; do
-      ERR_ENV=1
-      if [ -z "$4" ]; then
-        mount_opts="-o $3 $1 $2"
-      else
-        mount_opts="-t $4 -o $3 $1 $2"
-      fi
-      $IONICE /bin/busybox mount $mount_opts > /dev/null 2>&1
-      [ "$?" -eq "0" ] && ERR_ENV=0 && break
-      /bin/busybox usleep 1000000
-    done
-    [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
+
+      progress "check filesystem $1 ..."
+        $IONICE /sbin/fsck -y $1 > /dev/null 2>&1
+
+      for i in 1 2 3 4 5 6 7 8 9 10; do
+        ERR_ENV=1
+        MOUNT_OPTIONS="-o $3 $1 $2"
+
+        if [ -z "$4" ]; then
+          MOUNT_OPTIONS="-t $4 $MOUNT_OPTIONS"
+        fi
+
+        progress "mount filesystem $1 ..."
+          $IONICE /bin/busybox mount $mount_opts > /dev/null 2>&1
+          [ "$?" -eq "0" ] && ERR_ENV=0 && break
+
+        /bin/busybox usleep 1000000
+      done
+      [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
+
  }

  update() {
@ -143,15 +151,6 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
    fi
  }

-  hfsdiskprep() {
-    for DEV in `/bin/busybox ls /dev/sd*`; do
-      FS_TYPE=$(/sbin/blkid -o value -s TYPE $DEV)
-      if [ "$FS_TYPE" = "hfs" -o "$FS_TYPE" = "hfsplus" ]; then
-        /sbin/fsck_hfs -r -y $DEV > /dev/null 2>&1
-      fi
-    done
-  }
-
  mount_nbd() {
    retry_nr=0
    retry_delay=20
@ -186,11 +185,6 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"

  mount_disk() {

-  # deal with hfs partitions
-    if [ -x /sbin/fsck_hfs ]; then
-      hfsdiskprep
-    fi
-
    mount_part "$boot" "/flash" "ro,noatime"
    show_splash

--- a/packages/initramfs/sysutils/e2fsprogs-initramfs/install
+++ b/packages/initramfs/sysutils/e2fsprogs-initramfs/install
@ -0,0 +1,44 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+E2FSPROGS_DIR="$BUILD/e2fsprogs-*"
+
+mkdir -p $INSTALL/etc
+  cp $E2FSPROGS_DIR/misc/mke2fs.conf $INSTALL/etc
+
+mkdir -p $INSTALL/sbin
+  cp $E2FSPROGS_DIR/e2fsck/e2fsck $INSTALL/sbin
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
+  cp $E2FSPROGS_DIR/misc/fsck $INSTALL/sbin
+
+mkdir -p $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/e2p/libe2p.so.* $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/libe2p.so.[0-9] $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/et/libcom_err.so.* $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/libcom_err.so.[0-9] $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/ext2fs/libext2fs.so.* $INSTALL/lib
+  cp -P $E2FSPROGS_DIR/lib/libext2fs.so.[0-9] $INSTALL/lib
--- a/packages/initramfs/sysutils/e2fsprogs-initramfs/meta
+++ b/packages/initramfs/sysutils/e2fsprogs-initramfs/meta
@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="e2fsprogs-initramfs"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://e2fsprogs.sourceforge.net/"
+PKG_URL=""
+PKG_DEPENDS="util-linux-initramfs"
+PKG_BUILD_DEPENDS="toolchain e2fsprogs"
+PKG_PRIORITY="optional"
+PKG_SECTION="tools"
+PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem"
+PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+if [ "$HFSTOOLS" = "yes" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs"
+fi
--- a/packages/network/avahi/config/service-ssh
+++ b/packages/network/avahi/config/service-ssh
@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">Secure Shell on %h</name>
-  <service>
-   <type>_ssh._tcp</type>
-   <port>22</port>
-  </service>
-</service-group>
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@ -35,11 +35,15 @@ mkdir -p $INSTALL/etc/avahi
  cp $PKG_BUILD/avahi-daemon/hosts $INSTALL/etc/avahi

 mkdir -p $INSTALL/etc/avahi/services
-#  cp $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
-#  cp $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
+  cp $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
  cp $PKG_DIR/config/http.service $INSTALL/etc/avahi/services
 #  cp $PKG_DIR/config/samba.service $INSTALL/etc/avahi/services

+  if [ $SFTP_SERVER = "yes" ]; then
+    cp $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
+  fi
+
+
 mkdir -p $INSTALL/etc/dbus-1/system.d
  cp $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d

--- a/packages/network/netmount/scripts/netmount
+++ b/packages/network/netmount/scripts/netmount
--- a/packages/network/openssh/install
+++ b/packages/network/openssh/install
@ -26,7 +26,8 @@ add_user sshd x 74 74 "Privilege-separated SSH" "/var/empty/sshd" "/bin/sh"
 add_group sshd 74

 mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/* $INSTALL/etc
+  cp $PKG_DIR/config/ssh_config $INSTALL/etc
+  cp $PKG_DIR/config/sshd_config $INSTALL/etc
  cp $PKG_BUILD/moduli $INSTALL/etc

 mkdir -p $INSTALL/usr/bin
--- a/packages/sysutils/diskdev_cmds/install
+++ b/packages/sysutils/diskdev_cmds/install
@ -22,11 +22,11 @@

 . config/options $1

-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/fsck_hfs.tproj/fsck_hfs $INSTALL/usr/sbin
-    ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfs
-    ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfsplus
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/fsck_hfs.tproj/fsck_hfs $INSTALL/sbin
+    ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs
+    ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus

-  cp $PKG_BUILD/newfs_hfs.tproj/newfs_hfs $INSTALL/usr/sbin
-    ln -sf newfs_hfs $INSTALL/usr/sbin/mkfs.hfs
-    ln -sf newfs_hfs $INSTALL/usr/sbin/mkfs.hfsplus
+  cp $PKG_BUILD/newfs_hfs.tproj/newfs_hfs $INSTALL/sbin
+    ln -sf newfs_hfs $INSTALL/sbin/mkfs.hfs
+    ln -sf newfs_hfs $INSTALL/sbin/mkfs.hfsplus
--- a/packages/sysutils/e2fsprogs/build
+++ b/packages/sysutils/e2fsprogs/build
--- a/packages/sysutils/e2fsprogs/install
+++ b/packages/sysutils/e2fsprogs/install
@ -25,25 +25,24 @@
 mkdir -p $INSTALL/etc
  cp $PKG_BUILD/misc/mke2fs.conf $INSTALL/etc

-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/sbin
-  cp $PKG_BUILD/misc/fsck $INSTALL/usr/sbin
-    ln -sf fsck $INSTALL/usr/sbin/fsck.ext2
-    ln -sf fsck $INSTALL/usr/sbin/fsck.ext3
-    ln -sf fsck $INSTALL/usr/sbin/fsck.ext4
-    ln -sf fsck $INSTALL/usr/sbin/fsck.ext4dev
-  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/sbin
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4dev
-  cp $PKG_BUILD/resize/resize2fs $INSTALL/usr/sbin
-  cp $PKG_BUILD/misc/tune2fs $INSTALL/usr/sbin
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/sbin
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
+  cp $PKG_BUILD/misc/fsck $INSTALL/sbin
+  cp $PKG_BUILD/misc/mke2fs $INSTALL/sbin
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext3
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
+  cp $PKG_BUILD/resize/resize2fs $INSTALL/sbin
+  cp $PKG_BUILD/misc/tune2fs $INSTALL/sbin

-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/e2p/libe2p.so.* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/et/libcom_err.so.* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/ext2fs/libext2fs.so.* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/ss/libss.so.* $INSTALL/usr/lib
+mkdir -p $INSTALL/lib
+  cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/lib
+  cp -P $PKG_BUILD/lib/e2p/libe2p.so.* $INSTALL/lib
+  cp -P $PKG_BUILD/lib/et/libcom_err.so.* $INSTALL/lib
+  cp -P $PKG_BUILD/lib/ext2fs/libext2fs.so.* $INSTALL/lib
+  cp -P $PKG_BUILD/lib/ss/libss.so.* $INSTALL/lib
--- a/packages/sysutils/e2fsprogs/meta
+++ b/packages/sysutils/e2fsprogs/meta
@ -34,3 +34,7 @@ PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck
 PKG_IS_ADDON="no"

 PKG_AUTORECONF="yes"
+
+if [ "$HFSTOOLS" = "yes" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds"
+fi
--- a/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules
+++ b/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules
@ -20,10 +20,8 @@
 ################################################################################

 SUBSYSTEM!="block", GOTO="end"
-ACTION!="add", GOTO="end"

-ACTION=="add", IMPORT{program}="/sbin/blkid -o udev -p %N"
-ACTION=="add", ENV{ID_FS_TYPE}=="hfs|hfsplus", RUN+="/usr/sbin/fsck.hfsplus -r -y /dev/%k"
+ACTION=="add|change", RUN+="/sbin/fsck -y /dev/%k"

 # exit
 LABEL="end"
--- a/packages/sysutils/udisks/init.d/31_mount-disks
+++ b/packages/sysutils/udisks/init.d/31_mount-disks
@ -40,6 +40,7 @@
    USAGE="`show_info "usage" $DEVICE`"

    if [ "$REMOVABLE" = "0" -a "$MOUNTED" = "0" -a "$USAGE" = "filesystem" ]; then
+      fsck "$DEVICE" >/dev/null
      udisks --mount "$DEVICE" >/dev/null
    fi

--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="270.41.19"
+PKG_VERSION="275.09"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@ -950,7 +950,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_R8169=m
+CONFIG_R8169=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -159,7 +159,7 @@
  NTFS3G="yes"

 # build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="no"
+  HFSTOOLS="yes"

 # build and install Apple device mount support (via ifuse) (yes / no)
  APPLEMOUNT="yes"
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -159,7 +159,7 @@
  NTFS3G="yes"

 # build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="no"
+  HFSTOOLS="yes"

 # build and install Apple device mount support (via ifuse) (yes / no)
  APPLEMOUNT="yes"
--- a/projects/ION/options
+++ b/projects/ION/options
@ -159,7 +159,7 @@
  NTFS3G="yes"

 # build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="no"
+  HFSTOOLS="yes"

 # build and install Apple device mount support (via ifuse) (yes / no)
  APPLEMOUNT="yes"
--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -159,7 +159,7 @@
  NTFS3G="yes"

 # build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="no"
+  HFSTOOLS="yes"

 # build and install Apple device mount support (via ifuse) (yes / no)
  APPLEMOUNT="yes"
--- a/scripts/image
+++ b/scripts/image
@ -112,9 +112,6 @@ mkdir -p $INSTALL
 # NTFS 3G support
  [ "$NTFS3G" = "yes" ] && $SCRIPTS/install ntfs-3g_ntfsprogs

-# hfs utils support
-  [ "$HFSTOOLS" = "yes" ] && $SCRIPTS/install diskdev_cmds
-
 # Apple mount (ifuse) support
  [ "$APPLEMOUNT" = "yes" ] && $SCRIPTS/install ifuse