From d014df2d6befd02ba3189e051fd8d4c5e36d06a7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 23 May 2011 18:48:30 +0200 Subject: [PATCH 01/17] transmission: fix startup, update to transmission-2.31 Signed-off-by: Stephan Raue --- .../addons/downloadmanager/transmission/addon | 3 + .../transmission/changelog.txt | 3 + .../addons/downloadmanager/transmission/meta | 4 +- .../transmission/source/default.py | 21 ++++-- .../transmission/source/settings.xml | 6 ++ .../transmission/source/start.sh | 65 +++++++++++++++++-- 6 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 packages/addons/downloadmanager/transmission/source/settings.xml diff --git a/packages/addons/downloadmanager/transmission/addon b/packages/addons/downloadmanager/transmission/addon index 909fab06e8..56f88c6a3d 100755 --- a/packages/addons/downloadmanager/transmission/addon +++ b/packages/addons/downloadmanager/transmission/addon @@ -22,6 +22,9 @@ . config/options $1 +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID + cp $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/downloadmanager/transmission/changelog.txt b/packages/addons/downloadmanager/transmission/changelog.txt index 7ccba46688..a0a9d4eea0 100644 --- 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 \ No newline at end of file diff --git a/packages/addons/downloadmanager/transmission/meta b/packages/addons/downloadmanager/transmission/meta index 6afb5a0f8a..37a0bb4e4f 100644 --- 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/" diff --git a/packages/addons/downloadmanager/transmission/source/default.py b/packages/addons/downloadmanager/transmission/source/default.py index 5f07881ccc..1acdc284b2 100644 --- 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) diff --git a/packages/addons/downloadmanager/transmission/source/settings.xml b/packages/addons/downloadmanager/transmission/source/settings.xml new file mode 100644 index 0000000000..ed63074495 --- /dev/null +++ b/packages/addons/downloadmanager/transmission/source/settings.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/addons/downloadmanager/transmission/source/start.sh b/packages/addons/downloadmanager/transmission/source/start.sh index b771950cf1..5aa65352bc 100755 --- 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 From 839943e4f63b11540cff88f6423a11f71e6216a4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 23 May 2011 19:30:40 +0200 Subject: [PATCH 02/17] transmission: fix addon build script Signed-off-by: Stephan Raue --- packages/addons/downloadmanager/transmission/addon | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/addons/downloadmanager/transmission/addon b/packages/addons/downloadmanager/transmission/addon index 56f88c6a3d..909fab06e8 100755 --- a/packages/addons/downloadmanager/transmission/addon +++ b/packages/addons/downloadmanager/transmission/addon @@ -22,9 +22,6 @@ . config/options $1 -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin From 45bdfe98b492748c447472f81680c8cf99406c1a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 23 May 2011 23:37:09 +0200 Subject: [PATCH 03/17] netmount: fix permissions Signed-off-by: Stephan Raue --- packages/network/netmount/scripts/netmount | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/network/netmount/scripts/netmount diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount old mode 100644 new mode 100755 From e031cea641a98af4f2884f2917d8d78b8cddf924 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 13:37:44 +0200 Subject: [PATCH 04/17] avahi: install sftp service file if build with sftp support Signed-off-by: Stephan Raue --- packages/network/avahi/config/service-ssh | 9 --------- packages/network/avahi/install | 8 ++++++-- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 packages/network/avahi/config/service-ssh diff --git a/packages/network/avahi/config/service-ssh b/packages/network/avahi/config/service-ssh deleted file mode 100644 index b415803784..0000000000 --- a/packages/network/avahi/config/service-ssh +++ /dev/null @@ -1,9 +0,0 @@ - - - - Secure Shell on %h - - _ssh._tcp - 22 - - diff --git a/packages/network/avahi/install b/packages/network/avahi/install index f1c8d73fce..4ed7caad21 100755 --- 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 From 7ed16517e114cb9dbe57cc29b15dd0e82252b669 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 13:38:25 +0200 Subject: [PATCH 05/17] openssh: cleanup Signed-off-by: Stephan Raue --- packages/network/openssh/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/network/openssh/install b/packages/network/openssh/install index 57f5f56fb3..fc1e182b0d 100755 --- 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 From 0315fda93126ecf5cdef703a381934114fb3fd23 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 18:25:32 +0200 Subject: [PATCH 06/17] projects/Intel/linux: buildin all LAN drivers statically Signed-off-by: Stephan Raue --- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.i386.conf | 72 +++++++++++++------------- projects/ION/linux/linux.i386.conf | 14 ++--- projects/ION/linux/linux.x86_64.conf | 14 ++--- projects/Intel/linux/linux.i386.conf | 8 +-- projects/Intel/linux/linux.x86_64.conf | 8 +-- 6 files changed, 58 insertions(+), 60 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 9d97e7cd78..919a6f12f5 100644 --- 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 diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 2801b7336f..818715357e 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -956,17 +956,17 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=y +CONFIG_DAVICOM_PHY=y +CONFIG_QSEMI_PHY=y +CONFIG_LXT_PHY=y # CONFIG_CICADA_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set -CONFIG_BROADCOM_PHY=m +CONFIG_BROADCOM_PHY=y # CONFIG_BCM63XX_PHY is not set -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m +CONFIG_ICPLUS_PHY=y +CONFIG_REALTEK_PHY=y # CONFIG_NATIONAL_PHY is not set # CONFIG_STE10XP is not set # CONFIG_LSI_ET1011C_PHY is not set @@ -978,7 +978,7 @@ CONFIG_NET_ETHERNET=y # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m +CONFIG_VORTEX=y # CONFIG_TYPHOON is not set # CONFIG_ETHOC is not set # CONFIG_DNET is not set @@ -998,21 +998,21 @@ CONFIG_ULI526X=m # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m +CONFIG_PCNET32=y # CONFIG_AMD8111_ETH is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set -CONFIG_B44=m +CONFIG_B44=y CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -CONFIG_E100=m +CONFIG_FORCEDETH=y +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_8139CP is not set -CONFIG_8139TOO=m +CONFIG_8139TOO=y CONFIG_8139TOO_PIO=y # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set @@ -1024,34 +1024,34 @@ CONFIG_8139TOO_PIO=y # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_KS8851_MLL is not set -CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE=y # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_SC92031 is not set -CONFIG_ATL2=m +CONFIG_ATL2=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set -CONFIG_IGB=m +CONFIG_IGB=y # CONFIG_IGBVF is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_R8169=y +CONFIG_SIS190=y +CONFIG_SKGE=y +CONFIG_SKY2=y +CONFIG_VIA_VELOCITY=y +CONFIG_TIGON3=y +CONFIG_BNX2=y +CONFIG_CNIC=y +CONFIG_QLA3XXX=y +CONFIG_ATL1=y +CONFIG_ATL1E=y +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set @@ -1089,7 +1089,6 @@ CONFIG_ATH9K_HTC=m CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y -# CONFIG_B43_SDIO is not set CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -1616,14 +1615,12 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB=m +CONFIG_SSB=y CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y @@ -2246,6 +2243,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -2517,7 +2515,7 @@ CONFIG_RTC_DRV_CMOS=y # # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set -CONFIG_UIO=m +CONFIG_UIO=y # CONFIG_UIO_CIF is not set # CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set @@ -3010,7 +3008,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m +CONFIG_CRC_CCITT=y CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set CONFIG_CRC_ITU_T=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 7443c83450..0e6ce17608 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -959,8 +959,8 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set -CONFIG_FORCEDETH=m -CONFIG_E100=m +CONFIG_FORCEDETH=y +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -979,15 +979,15 @@ CONFIG_E100=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # 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 @@ -998,8 +998,8 @@ CONFIG_R8169=m # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 207f89f44b..c074563494 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -908,8 +908,8 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set -CONFIG_FORCEDETH=m -CONFIG_E100=m +CONFIG_FORCEDETH=y +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -928,15 +928,15 @@ CONFIG_E100=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # 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 @@ -947,8 +947,8 @@ CONFIG_R8169=m # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 1d33d6c7c0..457a2d0849 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -962,7 +962,7 @@ CONFIG_NET_PCI=y # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -CONFIG_E100=m +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -981,15 +981,15 @@ CONFIG_E100=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # 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 diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 81a68a906b..f6f0ebd978 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -912,7 +912,7 @@ CONFIG_NET_PCI=y # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -CONFIG_E100=m +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -931,15 +931,15 @@ CONFIG_E100=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # 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 From 9488889fc0d3b775ce23352d238ba0f340680cf9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 18:26:16 +0200 Subject: [PATCH 07/17] projects/*/options: install hfstools per default on all builds Signed-off-by: Stephan Raue --- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/Fusion/options b/projects/Fusion/options index 4a1cbca68c..ea9a0947e0 100644 --- 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" diff --git a/projects/Generic/options b/projects/Generic/options index 698828cd81..84a0466b51 100644 --- 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" diff --git a/projects/ION/options b/projects/ION/options index b02530737c..167c423ec0 100644 --- 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" diff --git a/projects/Intel/options b/projects/Intel/options index b71cc765e3..936e79432e 100644 --- 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" From 1b6ea3be3208528e39c0053013122d44673ffc6e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 18:26:43 +0200 Subject: [PATCH 08/17] diskdev_cmds: install all applets to /sbin Signed-off-by: Stephan Raue --- packages/sysutils/diskdev_cmds/install | 14 +++++++------- .../sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/sysutils/diskdev_cmds/install b/packages/sysutils/diskdev_cmds/install index e21a54406d..032b34818e 100755 --- 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 diff --git a/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules b/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules index 961dcc02da..1565eb95ec 100644 --- a/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules +++ b/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules @@ -23,7 +23,7 @@ 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", ENV{ID_FS_TYPE}=="hfs|hfsplus", RUN+="/sbin/fsck.hfsplus -r -y /dev/%k" # exit LABEL="end" From 4ddf2fbb67fb49b9e09db12f97ffa4155b513207 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 18:29:08 +0200 Subject: [PATCH 09/17] e2fsprogs: install all applets to /sbin Signed-off-by: Stephan Raue --- packages/tools/e2fsprogs/install | 41 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/packages/tools/e2fsprogs/install b/packages/tools/e2fsprogs/install index 3ef9a6ba8f..27cb510f22 100755 --- a/packages/tools/e2fsprogs/install +++ b/packages/tools/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 From ccaca0b7750f6a5d7937e04999f17cb7dec32825 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 18:30:04 +0200 Subject: [PATCH 10/17] new package: add package 'e2fsprogs-initramfs' Signed-off-by: Stephan Raue --- .../initramfs/devel/eglibc-initramfs/install | 1 + packages/initramfs/meta | 4 +- .../sysutils/busybox-initramfs/install | 4 ++ .../sysutils/e2fsprogs-initramfs/install | 44 +++++++++++++++++++ .../sysutils/e2fsprogs-initramfs/meta | 36 +++++++++++++++ 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100755 packages/initramfs/sysutils/e2fsprogs-initramfs/install create mode 100644 packages/initramfs/sysutils/e2fsprogs-initramfs/meta diff --git a/packages/initramfs/devel/eglibc-initramfs/install b/packages/initramfs/devel/eglibc-initramfs/install index fff49ebbbd..c21348ba4a 100755 --- 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 diff --git a/packages/initramfs/meta b/packages/initramfs/meta index a7cd1ce35f..f251010baa 100644 --- 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" @@ -36,5 +36,5 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$HFSTOOLS" = "yes" ]; then - PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs util-linux-initramfs" + PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs" fi diff --git a/packages/initramfs/sysutils/busybox-initramfs/install b/packages/initramfs/sysutils/busybox-initramfs/install index 272e82f227..3a64d74d67 100755 --- 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 diff --git a/packages/initramfs/sysutils/e2fsprogs-initramfs/install b/packages/initramfs/sysutils/e2fsprogs-initramfs/install new file mode 100755 index 0000000000..28e889166e --- /dev/null +++ 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 diff --git a/packages/initramfs/sysutils/e2fsprogs-initramfs/meta b/packages/initramfs/sysutils/e2fsprogs-initramfs/meta new file mode 100644 index 0000000000..00c440b1c3 --- /dev/null +++ b/packages/initramfs/sysutils/e2fsprogs-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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" From 9e59e8422c8afb0c7560f92e38359fa727da9870 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 19:55:11 +0200 Subject: [PATCH 11/17] e2fsprogs: move to sysutils Signed-off-by: Stephan Raue --- packages/{tools => sysutils}/e2fsprogs/build | 0 packages/{tools => sysutils}/e2fsprogs/install | 0 packages/{tools => sysutils}/e2fsprogs/meta | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename packages/{tools => sysutils}/e2fsprogs/build (100%) rename packages/{tools => sysutils}/e2fsprogs/install (100%) rename packages/{tools => sysutils}/e2fsprogs/meta (100%) diff --git a/packages/tools/e2fsprogs/build b/packages/sysutils/e2fsprogs/build similarity index 100% rename from packages/tools/e2fsprogs/build rename to packages/sysutils/e2fsprogs/build diff --git a/packages/tools/e2fsprogs/install b/packages/sysutils/e2fsprogs/install similarity index 100% rename from packages/tools/e2fsprogs/install rename to packages/sysutils/e2fsprogs/install diff --git a/packages/tools/e2fsprogs/meta b/packages/sysutils/e2fsprogs/meta similarity index 100% rename from packages/tools/e2fsprogs/meta rename to packages/sysutils/e2fsprogs/meta From b666fdfd51f70bf828859287243658f4d837bbfe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 19:58:25 +0200 Subject: [PATCH 12/17] e2fsprogs: install diskdev_cmds from here if enabled Signed-off-by: Stephan Raue --- packages/sysutils/e2fsprogs/meta | 4 ++++ scripts/image | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/e2fsprogs/meta b/packages/sysutils/e2fsprogs/meta index 0984c05100..3014c7b284 100644 --- 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 diff --git a/scripts/image b/scripts/image index f35613919e..706c350fe3 100755 --- 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 From 8156b25ca2b3f03fbdc931b8e05c13d9b10e2fa5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 20:00:08 +0200 Subject: [PATCH 13/17] e2fsprogs-initramfs: install diskdev_cmds-initramfs from here if enabled Signed-off-by: Stephan Raue --- packages/initramfs/meta | 4 ---- packages/initramfs/sysutils/e2fsprogs-initramfs/meta | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/initramfs/meta b/packages/initramfs/meta index f251010baa..0207d6e94f 100644 --- a/packages/initramfs/meta +++ b/packages/initramfs/meta @@ -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" -fi diff --git a/packages/initramfs/sysutils/e2fsprogs-initramfs/meta b/packages/initramfs/sysutils/e2fsprogs-initramfs/meta index 00c440b1c3..5ce49ec8e7 100644 --- a/packages/initramfs/sysutils/e2fsprogs-initramfs/meta +++ b/packages/initramfs/sysutils/e2fsprogs-initramfs/meta @@ -34,3 +34,7 @@ PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +if [ "$HFSTOOLS" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs" +fi From 1791043a3140712b68e96c9529520cb3d94f038e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 20:06:15 +0200 Subject: [PATCH 14/17] e2fsprogs: move udev rule to force fsck check from diskdev_cmds package to here, rework udev rule to check all supported disks Signed-off-by: Stephan Raue --- .../10-fsck-hfs.rules => e2fsprogs/udev.d/10-fsck.rules} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename packages/sysutils/{diskdev_cmds/udev.d/10-fsck-hfs.rules => e2fsprogs/udev.d/10-fsck.rules} (86%) diff --git a/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules b/packages/sysutils/e2fsprogs/udev.d/10-fsck.rules similarity index 86% rename from packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules rename to packages/sysutils/e2fsprogs/udev.d/10-fsck.rules index 1565eb95ec..7077d860e8 100644 --- a/packages/sysutils/diskdev_cmds/udev.d/10-fsck-hfs.rules +++ b/packages/sysutils/e2fsprogs/udev.d/10-fsck.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+="/sbin/fsck.hfsplus -r -y /dev/%k" +ACTION=="add|change", RUN+="/sbin/fsck -y /dev/%k" # exit LABEL="end" From ec67d66b00205e4ccab72404425db989e78a475f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 20:07:47 +0200 Subject: [PATCH 15/17] busybox-initramfs: check every supported filesystem before mounting Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/scripts/init | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index e11f839414..68dc46cb15 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -95,13 +95,18 @@ REBOOT="0" mount_part() { progress "trying to mount $1 ..." - for i in 1 2 3 4 5 6 7 8 9 10; do - ERR_ENV=1 - $IONICE /bin/busybox mount -o $3 $1 $2 > /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 ..." + /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 + progress "mount filesystem $1 ..." + /bin/busybox mount -o $3 $1 $2 > /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() { @@ -115,20 +120,6 @@ REBOOT="0" 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 - } - -# deal with hfs partitions - if [ -x /sbin/fsck_hfs ]; then - hfsdiskprep - fi - mount_part "$boot" "/flash" "ro,noatime" if [ -f "/flash/atv_single_boot" ]; then From 6bd2b6c39d14749fade7311af37af6c99314cf11 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 May 2011 20:29:56 +0200 Subject: [PATCH 16/17] udisks: force filesystem check on supported devices Signed-off-by: Stephan Raue --- packages/sysutils/udisks/init.d/31_mount-disks | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/udisks/init.d/31_mount-disks b/packages/sysutils/udisks/init.d/31_mount-disks index a02d14aebd..40180cfa2f 100644 --- 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 From d17459b9619e4af8593b5e46ed2c478b00e1219c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 May 2011 07:44:41 +0200 Subject: [PATCH 17/17] xf86-video-nvidia: update to xf86-video-nvidia-275.09 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index 136c91789c..feced14386 100644 --- 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"