diff options
20 files changed, 380 insertions, 48 deletions
diff --git a/packages/inetutils/inetutils_1.5.bb b/packages/inetutils/inetutils_1.5.bb index 0971e58967..12a96b20b1 100644 --- a/packages/inetutils/inetutils_1.5.bb +++ b/packages/inetutils/inetutils_1.5.bb @@ -6,7 +6,8 @@ networking utilities and servers including ftp, ftpd, rcp, \ rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ talkd, telnet, telnetd, tftp, tftpd, and uucpd." -SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ +" inherit autotools diff --git a/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch b/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch index 6e09bfd103..407fd89a26 100644 --- a/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch +++ b/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch @@ -1,28 +1,68 @@ -diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c linux-2.6.24/drivers/rtc/rtc-sa1100.c +diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c --- linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/rtc/rtc-sa1100.c 2008-03-17 20:52:41.000000000 +0100 -@@ -15,6 +15,10 @@ - * Converted to the RTC subsystem and Driver Model - * by Richard Purdie <rpurdie@rpsys.net> - * -+ * 2008/03/17 mrdata: -+ * disable IRQ RTC1Hz and RTCAlrm before request_irq -+ * in sa1100_rtc_open() -+ * - * 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 -@@ -154,7 +158,12 @@ - static int sa1100_rtc_open(struct device *dev) ++++ linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c 2008-03-24 13:49:40.000000000 +0100 +@@ -79,7 +79,10 @@ + + rtsr = RTSR; + /* clear interrupt sources */ +- RTSR = 0; ++ RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work ++ RTSR &= ~RTSR_HZ; ++ RTSR &= ~RTSR_ALE; ++ RTSR &= ~RTSR_AL; + RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2); + + /* clear alarm interrupt if it has occurred */ +@@ -155,6 +158,20 @@ { int ret; -- -+ + ++ /* ++ * On some devices RTSR is set to some value but it must be set to 0. ++ * We have to set RTSR to 0 and OIER/OSSR to default. This should not be ++ * necessary here but it is. ++ */ + spin_lock_irq(&sa1100_rtc_lock); + RTSR &= ~RTSR_HZE; ++ RTSR &= ~RTSR_HZ; + RTSR &= ~RTSR_ALE; ++ RTSR &= ~RTSR_AL; ++ OIER &= ~OIER_E1; ++ OSSR = OSSR_M1; + spin_unlock_irq(&sa1100_rtc_lock); -+ ++ ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, "rtc 1Hz", dev); if (ret) { +@@ -186,7 +203,10 @@ + static void sa1100_rtc_release(struct device *dev) + { + spin_lock_irq(&sa1100_rtc_lock); +- RTSR = 0; ++ RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work ++ RTSR &= ~RTSR_HZ; ++ RTSR &= ~RTSR_ALE; ++ RTSR &= ~RTSR_AL; + OIER &= ~OIER_E1; + OSSR = OSSR_M1; + spin_unlock_irq(&sa1100_rtc_lock); +@@ -339,6 +359,19 @@ + + platform_set_drvdata(pdev, rtc); + ++ /* ++ * On some devices RTSR is set to some value but it must be set to 0. ++ * We have to set RTSR to 0 and OIER/OSSR to default. ++ */ ++ spin_lock_irq(&sa1100_rtc_lock); ++ RTSR &= ~RTSR_HZE; ++ RTSR &= ~RTSR_HZ; ++ RTSR &= ~RTSR_ALE; ++ RTSR &= ~RTSR_AL; ++ OIER &= ~OIER_E1; ++ OSSR = OSSR_M1; ++ spin_unlock_irq(&sa1100_rtc_lock); ++ + return 0; + } + diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index a3ae2f9248..c0751634a5 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE_ts72xx = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" -PR = "r10" +PR = "r11" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ diff --git a/packages/mamona/bash-noemu-3.2/.mtn2git_empty b/packages/mamona/bash-noemu-3.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mamona/bash-noemu-3.2/.mtn2git_empty diff --git a/packages/mamona/bash-noemu_3.2.bb b/packages/mamona/bash-noemu_3.2.bb new file mode 100644 index 0000000000..c638b038fc --- /dev/null +++ b/packages/mamona/bash-noemu_3.2.bb @@ -0,0 +1,29 @@ +require ../bash/bash.inc +PR = "r1" + +SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ + file://001-005.patch;patch=1" + +S = "${WORKDIR}/bash-${PV}" + +EXTRA_OECONF += "--enable-static-link --without-bash-malloc" + +#HOST_SYS = "${BUILD_SYS}" +#CONFIG_SITE = "" + +do_configure () { + export CPP="gcc -E" + export CC=gcc + export AS=as + export LD=ld + export CXX=g++ + export AR=ar + export OBJCOPY=objcopy + export OBJDUMP=objdump + export RANLIB=ranlib + export NM=nm + export STRIP=strip + export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" + export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden" + oe_runconf +} diff --git a/packages/mamona/binutils-noemu-2.17.50.0.5/.mtn2git_empty b/packages/mamona/binutils-noemu-2.17.50.0.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mamona/binutils-noemu-2.17.50.0.5/.mtn2git_empty diff --git a/packages/mamona/binutils-noemu_2.17.50.0.5.bb b/packages/mamona/binutils-noemu_2.17.50.0.5.bb new file mode 100644 index 0000000000..cefc2af1c4 --- /dev/null +++ b/packages/mamona/binutils-noemu_2.17.50.0.5.bb @@ -0,0 +1,32 @@ +require ../binutils/binutils.inc + +PR = "r1" + +SRC_URI = \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ + file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ + file://binutils-configure-texinfo-version.patch;patch=1 \ + file://110-arm-eabi-conf.patch;patch=1 \ + file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ + file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ + file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ + " + +EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ + --program-prefix=${TARGET_PREFIX} --disable-shared" + +HOST_SYS = "${BUILD_SYS}" + +do_configure () { + CC=gcc AS=as LD=ld CXX=g++ AR=ar OBJCOPY=objcopy OBJDUMP=objdump RANLIB=ranlib NM=nm STRIP=strip oe_runconf +} + +do_compile() { + make configure-host + make LDFLAGS=\"-all-static\" +} + +do_stage() { + : +} diff --git a/packages/mamona/gcc-noemu-4.1.1/.mtn2git_empty b/packages/mamona/gcc-noemu-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mamona/gcc-noemu-4.1.1/.mtn2git_empty diff --git a/packages/mamona/gcc-noemu_4.1.1.bb b/packages/mamona/gcc-noemu_4.1.1.bb new file mode 100644 index 0000000000..fbf1b0dd46 --- /dev/null +++ b/packages/mamona/gcc-noemu_4.1.1.bb @@ -0,0 +1,82 @@ +PR = "r14" +DESCRIPTION = "The GNU cc and gcc C compilers." +HOMEPAGE = "http://www.gnu.org/software/gcc/" +SECTION = "devel" +LICENSE = "GPL" + +inherit autotools gettext + +require gcc-package-noemu.inc + +SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ + file://100-uclibc-conf.patch;patch=1 \ + file://110-arm-eabi.patch;patch=1 \ + file://200-uclibc-locale.patch;patch=1 \ + file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://740-sh-pr24836.patch;patch=1 \ + file://800-arm-bigendian.patch;patch=1 \ + file://801-arm-bigendian-eabi.patch;patch=1 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://arm-thumb.patch;patch=1 \ + file://arm-thumb-cache.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://cse.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ + file://unbreak-armv4t.patch;patch=1 \ + file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ + file://gcc-4.1.1-pr13685-1.patch;patch=1 \ + file://gcc-ignore-cache.patch;patch=1 \ + " + +SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " + +#This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc +#the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc +SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \ + file://ppc-sfp-long-double-gcc411-7.patch;patch=1 " + + +#Set the fortran bits +# 'fortran' or '', not 'f77' like gcc3 had +FORTRAN = "" +HAS_GFORTRAN = "no" +HAS_G2C = "no" + +#Set the java bits +JAVA_arm = "" +JAVA = "" + +LANGUAGES = "c,c++${FORTRAN}${JAVA}" +require packages/gcc/gcc-${PV}.inc + +EXTRA_OECONF += "--disable-libspp --with-slibdir=\"/lib\"" + +EXTRA_OEMAKE += "LDFLAGS=\"-static\" build_tooldir=\"${STAGING_DIR}/${TARGET_SYS}\"" + +HOST_SYS = ${BUILD_SYS} + +CONFIG_SITE="" + +do_configure () { + export CPP="gcc -E" + export CC=gcc + export AS=as + export LD=ld + export CXX=g++ + export AR=ar + export OBJCOPY=objcopy + export OBJDUMP=objdump + export RANLIB=ranlib + export NM=nm + export STRIP=strip + export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" + export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden" + oe_runconf +} diff --git a/packages/mamona/gcc-package-noemu.inc b/packages/mamona/gcc-package-noemu.inc new file mode 100644 index 0000000000..548c3d4f01 --- /dev/null +++ b/packages/mamona/gcc-package-noemu.inc @@ -0,0 +1,126 @@ +gcclibdir ?= "${libdir}/gcc" +BINV ?= "${PV}" + +PACKAGES = "libgcc ${PN} ${PN}-symlinks \ + g++-noemu g++-noemu-symlinks \ + cpp-noemu cpp-noemu-symlinks \ + g77-noemu g77-noemu-symlinks \ + gcov-noemu gcov-noemu-symlinks \ + libmudflap-noemu libmudflap-noemu-dev \ + libstdc++-noemu libg2c-noemu \ + libstdc++-noemu-dev libg2c-noemu-dev \ + ${PN}-doc" + +FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \ + ${bindir}/${TARGET_PREFIX}gccbug \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include" +FILES_${PN}-symlinks = "${bindir}/cc \ + ${bindir}/gcc \ + ${bindir}/gccbug" + +FILES_g77-noemu = "${bindir}/${TARGET_PREFIX}g77 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771" +FILES_g77-noemu-symlinks = "${bindir}/g77 \ + ${bindir}/f77" + +FILES_cpp-noemu = "${bindir}/${TARGET_PREFIX}cpp \ + ${base_libdir}/cpp" +FILES_cpp-noemu-symlinks = "${bindir}/cpp" + +FILES_gcov-noemu = "${bindir}/${TARGET_PREFIX}gcov" +FILES_gcov-noemu-symlinks = "${bindir}/gcov" + +FILES_libgcc-noemu = "${base_libdir}/libgcc*.so.*" +FILES_libgcc-noemu-dev = "${base_libdir}/libgcc*.so" + +# Called from within gcc-cross, so libdir is set wrong +FILES_libg2c-noemu = "${target_libdir}/libg2c.so.*" +FILES_libg2c-noemu-dev = "${libdir}/libg2c.so \ + ${libdir}/libg2c.a \ + ${libdir}/libfrtbegin.a" + +FILES_g++-noemu = "${bindir}/${TARGET_PREFIX}g++ \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus" +FILES_g++-noemu-symlinks = "${bindir}/c++ \ + ${bindir}/g++" + +FILES_libstdc++-noemu = "${libdir}/libstdc++.so.*" +FILES_libstdc++-noemu-dev = "${includedir}/c++/${BINV} \ + ${libdir}/libstdc++.so \ + ${libdir}/libstdc++.la \ + ${libdir}/libstdc++.a \ + ${libdir}/libsupc++.la \ + ${libdir}/libsupc++.a" + +FILES_libmudflap-noemu = "${libdir}/libmudflap*.so.*" +FILES_libmudflap-noemu-dev = "${libdir}/libmudflap*.so \ + ${libdir}/libmudflap*.a \ + ${libdir}/libmudflap*.a" + + +FILES_${PN}-doc = "${infodir} \ + ${mandir} \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_libgcc', 'libgcc1', d) + bb.build.exec_func('package_do_package', d) +} + + +do_install () { + autotools_do_install + + # Cleanup some of the ${libdir}{,exec}/gcc stuff ... + rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools + rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools + + # Hack around specs file assumptions + test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs + + # Using --with-slibdir instead of this hack below.. + ## Move libgcc_s into /lib + #mkdir -p ${D}${base_libdir} + #mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} + #rm -f ${D}${libdir}/libgcc_s.so + #ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \ + # | tr -s / \ + # | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \ + # ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so + + # We don't need libtool libraries + rm -f ${D}${libdir}/libg2c.la &>/dev/null || true + + # Cleanup manpages.. + rm -rf ${D}${mandir}/man7 + + # We use libiberty from binutils + rm -f ${D}${libdir}/libiberty.a + + cd ${D}${bindir} + + # We care about g++ not c++ + rm -f *c++ + + # We don't care about the gcc-<version> ones for this + rm -f *gcc-?.?* + + # These sometimes show up, they are strange, we remove them + rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-* + + # Symlinks so we can use these trivially on the target + ln -sf ${TARGET_SYS}-g77 g77 + ln -sf ${TARGET_SYS}-g++ g++ + ln -sf ${TARGET_SYS}-gcc gcc + ln -sf g77 f77 + ln -sf g++ c++ + ln -sf gcc cc + ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp + ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp +} diff --git a/packages/opkg/files/.mtn2git_empty b/packages/opkg/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opkg/files/.mtn2git_empty diff --git a/packages/opkg/files/fix_endianness.patch b/packages/opkg/files/fix_endianness.patch new file mode 100644 index 0000000000..8632ce5658 --- /dev/null +++ b/packages/opkg/files/fix_endianness.patch @@ -0,0 +1,12 @@ +diff -urN opkg.orig/configure.ac opkg/configure.ac +--- opkg.orig/configure.ac 2008-03-20 13:29:09.000000000 +0100 ++++ opkg/configure.ac 2008-03-25 09:39:52.000000000 +0100 +@@ -94,7 +94,7 @@ + AC_CHECK_MEMBERS([struct stat.st_rdev]) + + # Checks endianness +-AC_C_BIGENDIAN(ENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",) ++AC_C_BIGENDIAN(BIGENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",) + AC_SUBST(BIGENDIAN_CFLAGS) + + # Don't do annoying tests that don't work when cross-compiling, just trust them. diff --git a/packages/opkg/opkg.inc b/packages/opkg/opkg.inc index 2179f5595e..6459ca78d8 100644 --- a/packages/opkg/opkg.inc +++ b/packages/opkg/opkg.inc @@ -5,7 +5,8 @@ LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.0+svnr${SRCREV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http" +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \ + file://fix_endianness.patch;patch=1" S = "${WORKDIR}/opkg" inherit autotools pkgconfig diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb index 30461ead4d..81401dda14 100644 --- a/packages/opkg/opkg_svn.bb +++ b/packages/opkg/opkg_svn.bb @@ -1,6 +1,6 @@ require opkg.inc -PR = "r2" +PR = "r3" PACKAGES =+ "libopkg-dev libopkg" diff --git a/packages/popt/popt-1.13/.mtn2git_empty b/packages/popt/popt-1.13/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/popt/popt-1.13/.mtn2git_empty diff --git a/packages/popt/popt-1.13/iconv.patch b/packages/popt/popt-1.13/iconv.patch new file mode 100644 index 0000000000..83c70b0560 --- /dev/null +++ b/packages/popt/popt-1.13/iconv.patch @@ -0,0 +1,13 @@ +Index: popt-1.13/Makefile.am +=================================================================== +--- popt-1.13.orig/Makefile.am 2008-03-25 21:51:12.000000000 +0100 ++++ popt-1.13/Makefile.am 2008-03-25 21:51:42.000000000 +0100 +@@ -39,7 +39,7 @@ + usrlib_LTLIBRARIES = libpopt.la + + libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c +-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ ++libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ + + if HAVE_LD_VERSION_SCRIPT + libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers diff --git a/packages/popt/popt_1.13.bb b/packages/popt/popt_1.13.bb index 9b071ba731..7a736bde87 100644 --- a/packages/popt/popt_1.13.bb +++ b/packages/popt/popt_1.13.bb @@ -2,11 +2,13 @@ require popt.inc DEPENDS = "gettext virtual/libintl" -PR = "r0" +PR = "r1" inherit autotools -SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz" +SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz \ + file://iconv.patch;patch=1 \ + " do_stage() { oe_libinstall -a -so libpopt ${STAGING_LIBDIR} diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions index 82fd7681af..02bfccb500 100644 --- a/packages/slugos-init/files/modulefunctions +++ b/packages/slugos-init/files/modulefunctions @@ -6,29 +6,29 @@ loaddiskmods(){ case "$(machine)" in - nslu2) - modprobe ehci-hcd - modprobe ohci-hcd + nslu2) + [ -d /sys/module/ehci_hcd ] || modprobe ehci-hcd + [ -d /sys/module/ohci_hcd ] || modprobe ohci-hcd + ;; + nas100d) + [ -d /sys/module/ehci_hcd ] || modprobe ehci-hcd + [ -d /sys/module/uhci_hcd ] || modprobe uhci-hcd + [ -d /sys/module/pata_artop ] || modprobe pata-artop + ;; + dsmg600) + [ -d /sys/module/ehci_hcd ] || modprobe ehci-hcd + [ -d /sys/module/uhci_hcd ] || modprobe uhci-hcd + [ -d /sys/module/pata_artop ] || modprobe pata-artop ;; - nas100d) - modprobe ehci-hcd - modprobe uhci-hcd - modprobe pata-artop - ;; - dsmg600) - modprobe ehci-hcd - modprobe uhci-hcd - modprobe pata-artop - ;; esac } loadnetmods(){ case "$(machine)" in - dsmg600) - modprobe via-velocity - ;; + dsmg600) + [ -d /sys/module/via_velocity ] || modprobe via-velocity + ;; *) true ;; @@ -36,7 +36,7 @@ loadnetmods(){ } loadnfsmods(){ - modprobe nfs + [ -d /sys/module/nfs ] || modprobe nfs } loadmiscmods(){ diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 8d4c3f0f93..c6220077a5 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -490,12 +490,6 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' -# echo 'modprobe ehci-hcd' -# echo 'modprobe ohci-hcd' -# echo 'modprobe sd_mod' -# echo 'modprobe usb-storage' -# echo 'modprobe ext3' -# echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb index ebb6ff7744..2eca9c9ecf 100644 --- a/packages/slugos-init/slugos-init_4.8.bb +++ b/packages/slugos-init/slugos-init_4.8.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r3" +PR = "r4" SRC_URI = "file://boot/flash \ file://boot/disk \ |