diff options
Diffstat (limited to 'packages')
48 files changed, 963 insertions, 202 deletions
diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig index 192d218d57..463b3a8d19 100644 --- a/packages/busybox/slingbox-1.00/defconfig +++ b/packages/busybox/slingbox-1.00/defconfig @@ -75,7 +75,7 @@ CONFIG_UNZIP=y CONFIG_CHROOT=y # CONFIG_CMP is not set # CONFIG_CP is not set -# CONFIG_CUT is not set +CONFIG_CUT=y # CONFIG_DATE is not set # CONFIG_DD is not set # CONFIG_DF is not set @@ -98,7 +98,7 @@ CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_LS is not set CONFIG_MD5SUM=y # CONFIG_MKDIR is not set -# CONFIG_MKFIFO is not set +CONFIG_MKFIFO=y # CONFIG_MKNOD is not set # CONFIG_MV is not set # CONFIG_OD is not set @@ -115,7 +115,7 @@ CONFIG_SORT=y # CONFIG_SYNC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set +CONFIG_TEE=y # CONFIG_TEST is not set # CONFIG_TOUCH is not set # CONFIG_TR is not set @@ -153,7 +153,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Debian Utilities # -# CONFIG_MKTEMP is not set +CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set # CONFIG_READLINK is not set # CONFIG_RUN_PARTS is not set diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc index 18a4440351..355a05b568 100644 --- a/packages/busybox/switchbox-1.00/linuxrc +++ b/packages/busybox/switchbox-1.00/linuxrc @@ -1,18 +1,15 @@ #!/bin/sh mounted= -runboot= prefroot= +runboot= /bin/mount -t proc proc /proc -/bin/echo "0x0100" > /proc/sys/kernel/real-root-dev sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | /usr/bin/hexdump -n 6 -e '"%02d"'` ipaddr=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep ip_addr | sed -e s/ip_addr=//` netmask=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep netmask | sed -e s/netmask=//` gateway=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep gateway | sed -e s/gateway=//` -nfsrootloc=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 1` -nfsrootopts=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 2- | sed -e s/\"//g` device=/dev/`/bin/sed -n -e 's/^\(mtd[0-9]*\): .* "FIS directory"/\1/p' /proc/mtd` length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /usr/bin/hexdump -n 4 -e '4/1 "%02X"' $device` @@ -22,6 +19,10 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then /bin/echo "Preferred root device is /dev/ram0 (recovery)" mounted= prefroot= + elif [ -f /mnt/jffs2/.ramdisk ] ; then + /bin/echo "Preferred root device is /dev/ram1 (maintenence)" + mounted=/mnt/newroot + prefroot=maintenence elif [ -f /mnt/jffs2/.sda1root ] ; then /bin/echo "Preferred root device is /dev/sda1 (disk 1)" mounted=/mnt/newroot @@ -38,10 +39,10 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then /bin/echo "Preferred root device is /dev/sdb2 (disk 2)" mounted=/mnt/newroot prefroot=sdb2 - elif [ -f /mnt/jffs2/.ramdisk ] ; then - /bin/echo "Preferred root device is /dev/ram1 (maintenence)" + elif [ -f /mnt/jffs2/.altroot ] ; then + /bin/echo "Preferred root device is a user defined blockdevice" mounted=/mnt/newroot - prefroot=maintenence + prefroot=altroot elif [ -f /mnt/jffs2/.nfsroot ] ; then /bin/echo "Preferred root device is through NFS" mounted=/mnt/newroot @@ -76,7 +77,7 @@ if [ -n "$prefroot" ] ; then /bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=12k 2>/dev/null /bin/mkdir /lib /bin/ln -s /mnt/jffs2/lib/* /lib - /bin/mkdir /usr/bin + /bin/mkdir -p /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/mke2fs /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/find /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/cpio /usr/bin @@ -107,12 +108,26 @@ if [ -n "$prefroot" ] ; then fi - if [ $prefroot = "nfsroot" ] ; then + if [ $prefroot = "altroot" ] ; then + # The altrootloc and altrootopts vars MUST be chosen here. + # ie: $altrootopts="-rt ext3" and $altrootloc=/dev/md0 + # Also modules can be loaded here. + # also if you have a really slow starting disk, you can put a large sleep value here. + . /mnt/jffs2/.altroot + + /bin/mount $altrootopts $altrootloc /mnt/newroot + if [ -L /mnt/newroot/sbin/init -o -x /mnt/newroot/sbin/init -o \ + -L /mnt/newroot/bin/init -o -x /mnt/newroot/bin/init ] ; then + /bin/echo "Root filesystem will be mounted from a user defined rootfs (altroot) ..." + else + /bin/umount /mnt/newroot + /bin/echo "Cant find valid rootfs on user defined rootfs (altroot), using jffs2 ..." + mounted=/mnt/jffs2 + prefroot=jffs2 + fi + fi - /bin/mkdir -p /lib - /bin/ln -s /mnt/jffs2/lib/* /lib - /bin/mkdir -p /sbin - /bin/ln -s /mnt/jffs2/sbin/portmap /sbin + if [ $prefroot = "nfsroot" ] ; then /sbin/insmod ixp400 /sbin/insmod ixp425_eth @@ -120,16 +135,15 @@ if [ -n "$prefroot" ] ; then /sbin/route add default gw $gateway /sbin/ifconfig lo up 127.0.0.1 - /sbin/portmap # The nfsrootloc and nfsrootopts vars can be overridden here. . /mnt/jffs2/.nfsroot - mount -o $nfsrootopts $nfsrootloc /mnt/newroot + /bin/mount $nfsrootopts $nfsrootloc /mnt/newroot if [ -L /mnt/newroot/sbin/init -o -x /mnt/newroot/sbin/init -o \ -L /mnt/newroot/bin/init -o -x /mnt/newroot/bin/init ] ; then - /bin/echo "Root filesystem will be mounted from a NFS root ..." + /bin/echo "Root filesystem will be mounted from an NFS root ..." mounted=/mnt/newroot else /bin/umount /mnt/newroot @@ -154,14 +168,11 @@ fi # Pivot if [ -n "$mounted" ] ; then - if [ $prefroot = "nfsroot" ] ; then - /usr/bin/killall portmap - fi if [ $mounted != "/mnt/jffs2" ] ; then sleep 1 /bin/umount /mnt/jffs2 fi - umount /proc + /bin/umount /proc cd $mounted if [ -x ./linuxrc -o -L ./linuxrc ] ; then runboot=/linuxrc @@ -173,7 +184,7 @@ if [ -n "$mounted" ] ; then runboot=/bin/sh fi /sbin/pivot_root . initrd - exec /usr/sbin/chroot . $runboot < dev/console > dev/console 2>&1 + exec /usr/sbin/chroot . $runboot < /dev/console 1> /dev/console 2> /dev/console fi if [ -z "$mounted" ] ; then diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb index 7ddecf8738..d1ad177ffa 100644 --- a/packages/busybox/switchbox_1.00.bb +++ b/packages/busybox/switchbox_1.00.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r10" +PR = "r11" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/tmp-permissions.patch b/packages/db/db_4.3.27.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/tmp-permissions.patch +++ b/packages/db/db_4.3.27.bb diff --git a/packages/linux/openslug-kernel-2.6.11.2/defconfig b/packages/linux/openslug-kernel-2.6.11.2/defconfig index 07ec66bb9a..85d5f732e9 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.11.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11 -# Tue Mar 8 02:00:48 2005 +# Linux kernel version: 2.6.11.2 +# Fri Apr 8 14:02:10 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -33,7 +33,7 @@ CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y -CONFIG_KALLSYMS=n +# CONFIG_KALLSYMS is not set CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -144,7 +144,6 @@ CONFIG_PCI_LEGACY_PROC=y # At least one math emulation must be selected # CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set # CONFIG_FPE_FASTFPE is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set @@ -161,7 +160,7 @@ CONFIG_PM=y # CONFIG_PREEMPT is not set CONFIG_APM=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000 console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000 console=ttyS0,115200n8" CONFIG_ALIGNMENT_TRAP=y # @@ -685,11 +684,6 @@ CONFIG_SCSI_QLA2XXX=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set # # Input I/O drivers @@ -701,11 +695,6 @@ CONFIG_SOUND_GAMEPORT=y # # Input Device Drivers # -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set # # Character devices @@ -902,7 +891,10 @@ CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set # CONFIG_JFS_FS is not set # @@ -919,15 +911,23 @@ CONFIG_DNOTIFY=y # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_NTFS_FS is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -1014,45 +1014,45 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=m -CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m # # Profiling support @@ -1067,7 +1067,17 @@ CONFIG_NLS_DEFAULT="iso8859-1" # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # Misc devices @@ -1103,10 +1113,12 @@ CONFIG_USB_UHCI_HCD=m # # USB Device Class drivers # +CONFIG_USB_AUDIO=m # # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem # +# CONFIG_USB_MIDI is not set # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=m @@ -1132,16 +1144,6 @@ CONFIG_USB_STORAGE=y # # USB HID Boot Protocol drivers # -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_MTOUCH is not set -# CONFIG_USB_EGALAX is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set # # USB Imaging devices @@ -1153,10 +1155,14 @@ CONFIG_USB_STORAGE=y # USB Multimedia devices # # CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set # # USB Network Adapters diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb index f61ab24748..ca03d0f8bd 100644 --- a/packages/linux/openslug-kernel_2.6.11.2.bb +++ b/packages/linux/openslug-kernel_2.6.11.2.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r1" +PR = "r4" KERNEL_SUFFIX = "openslug" diff --git a/packages/linux/unslung-kernel-2.3r25/defconfig b/packages/linux/unslung-kernel-2.3r25/defconfig index b55fe0ab6c..0ad6b8dc4d 100644 --- a/packages/linux/unslung-kernel-2.3r25/defconfig +++ b/packages/linux/unslung-kernel-2.3r25/defconfig @@ -1001,7 +1001,31 @@ CONFIG_NLS_DEFAULT="iso8859-1" # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m +# CONFIG_SOUND_ALI5455 is not set +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_FORTE is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_TVMIXER is not set + # # Misc devices @@ -1032,13 +1056,13 @@ CONFIG_USB_OHCI=y # # USB Device Class drivers # -# CONFIG_USB_AUDIO is not set +CONFIG_USB_AUDIO=m # CONFIG_USB_EMI26 is not set # # USB Bluetooth can only be used with disabled Bluetooth subsystem # -# CONFIG_USB_MIDI is not set +CONFIG_USB_MIDI=m CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_HOTPLUG_SCSIDEV_NUMBER is not set diff --git a/packages/pwc/files/Makefile b/packages/linux/unslung-kernel-2.3r25/nfs-blocksize.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/pwc/files/Makefile +++ b/packages/linux/unslung-kernel-2.3r25/nfs-blocksize.patch diff --git a/packages/linux/unslung-kernel_2.3r25.bb b/packages/linux/unslung-kernel_2.3r25.bb index 95093d1960..618b1495fe 100644 --- a/packages/linux/unslung-kernel_2.3r25.bb +++ b/packages/linux/unslung-kernel_2.3r25.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r14" +PR = "r15" KERNEL_SUFFIX = "unslung" @@ -19,6 +19,7 @@ SRC_URI += "file://limit1gb.patch;patch=1 \ file://missing-usb-ioctls.patch;patch=1 \ file://anonymiser.patch;patch=1 \ file://ppp_mppe.patch;patch=1 \ + file://nfs-blocksize.patch;patch=1 \ ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index c9da288034..e3dd483341 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r9" IMAGE_BASENAME = "openslug" @@ -8,7 +8,7 @@ USE_DEVFS = "1" OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native ${PATCH_DEPENDS} virtual/armeb-linux-uclibc-gcc \ virtual/libc makedevs-native mtd-utils-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware " -DEPENDS = "virtual/kernel base-files base-passwd-3.5.9 \ +DEPENDS = "virtual/kernel base-files base-passwd \ busybox dropbear hotplug-ng initscripts netbase \ sysvinit tinylogin lrzsz portmap \ ixp4xx-csr ixp425-eth openslug-init \ @@ -17,6 +17,8 @@ DEPENDS = "virtual/kernel base-files base-passwd-3.5.9 \ cpio findutils e2fsprogs mtd-utils \ ${OPENSLUG_EXTRA_DEPENDS}" +# NOTE: file system kernel modules are defined in openslug.conf +# (OPENSLUG_EXTRA_FILESYSTEMS, included in OPENSLUG_EXTRA_INSTALL) IPKG_INSTALL = "base-files base-passwd \ busybox dropbear hotplug-ng initscripts netbase \ update-modules sysvinit tinylogin lrzsz portmap \ @@ -25,7 +27,6 @@ IPKG_INSTALL = "base-files base-passwd \ ipkg-collateral ipkg ipkg-link diffutils \ cpio findutils e2fsprogs-mke2fs \ e2fsprogs-fsck e2fsprogs-e2fsck \ - kernel-module-nfs kernel-module-sunrpc kernel-module-lockd \ ${OPENSLUG_EXTRA_INSTALL}" inherit image_ipk diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 470a811ddd..e3447b5b4a 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -6,52 +6,65 @@ ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_DEVELOPMENT = "\ - autoconf \ - automake \ - bash \ - bison \ - bzip2 \ - coreutils \ + autoconf \ + automake \ + bash \ + bison \ + bzip2 \ + coreutils \ cvs \ - diffutils \ - findutils \ - flex \ + diffutils \ + findutils \ + flex \ gawk \ - gcc \ - gdb \ - grep \ - lsof \ - m4 \ - make \ - ncurses \ - openssh \ - pciutils \ - perl \ - quilt \ - sed \ - strace \ - tar thttpd \ + gcc \ + gdb \ + grep \ + lsof \ + m4 \ + make \ + ncurses \ + openssh \ + pciutils \ + quilt \ + sed \ + " + +# These packages only build on TARGET_OS=linux, not +# TARGET_OS=linux-uclibc +OPENSLUG_DEVELOPMENT_append_linux = "\ + perl \ + tar \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ - bluez-utils-nodbus \ + bluez-utils-nodbus bridge-utils \ coreutils cvs\ - miau \ - microcom \ - mt-daapd \ + expat \ + miau microcom mt-daapd mysql \ nail \ openssh \ - ppp puppy \ + ppp puppy pwc \ rsync \ - strace sudo \ + sudo sysfsutils \ thttpd \ + db4 \ + openldap \ + " + +# These packages only build on TARGET_OS=linux, not +# TARGET_OS=linux-uclibc +OPENSLUG_PACKAGES_append_linux = "\ + php \ + yp-tools ypbind ypserv \ " BROKEN_PACKAGES = "\ mgetty \ + strace \ " DEPENDS = 'openslug-image \ diff --git a/packages/module-init-tools/files/depmod-byteswap.patch b/packages/module-init-tools/files/depmod-byteswap.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/module-init-tools/files/depmod-byteswap.patch diff --git a/packages/module-init-tools/module-init-tools-cross_3.1.bb b/packages/module-init-tools/module-init-tools-cross_3.1.bb index e69de29bb2..21a49171eb 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.1.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.1.bb @@ -0,0 +1,24 @@ +LICENSE = GPL +include module-init-tools_${PV}.bb +inherit cross +DEFAULT_PREFERENCE = "0" +PROVIDES += "virtual/${TARGET_PREFIX}depmod" + +PR=r3 + +# When cross compiling depmod as shipped cannot handle endian +# differences between host and target, this fixes |