diff options
Diffstat (limited to 'packages')
48 files changed, 717 insertions, 53 deletions
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index f9df951e1f..e3374b4903 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r26" +PR = "r27" LICENSE = "GPL" SRC_URI = " \ @@ -150,6 +150,12 @@ do_install_append_nylon() { rm -r ${D}/mnt/* } +do_install_append_openslug() { + rm ${D}${sysconfdir}/resolv.conf + touch ${D}${sysconfdir}/resolv.conf + rm -r ${D}/mnt/* +} + PACKAGES = "${PN}-doc ${PN}" FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" @@ -165,5 +171,7 @@ RPROVIDES_${PN}-unslung = "${PN}" FILES_${PN}-unslung = "" +CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" +CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc index 3d8adf0e6a..bc92e28755 100644 --- a/packages/bluez-utils/bluez-utils-common_2.14.inc +++ b/packages/bluez-utils/bluez-utils-common_2.14.inc @@ -5,7 +5,7 @@ DEPENDS = "bluez-libs-2.14 pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" -PR = "r2" +PR = "r4" FILES_${PN}-ciptool = "/bin/ciptool" FILES_${PN}-bluepin = "/bin/bluepin" @@ -34,3 +34,5 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "bluetooth" INITSCRIPT_PARAMS = "defaults 23 19" +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" diff --git a/packages/bluez-utils/bluez-utils-dbus_2.14.bb b/packages/bluez-utils/bluez-utils-dbus_2.14.bb index 6cee31a3d3..f405cd5133 100644 --- a/packages/bluez-utils/bluez-utils-dbus_2.14.bb +++ b/packages/bluez-utils/bluez-utils-dbus_2.14.bb @@ -1,6 +1,5 @@ include bluez-utils-common_${PV}.inc DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" -PR = "r1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb b/packages/bluez-utils/bluez-utils-nodbus_2.14.bb index 9fa32d11ca..6334a4a499 100644 --- a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb +++ b/packages/bluez-utils/bluez-utils-nodbus_2.14.bb @@ -1,5 +1,4 @@ include bluez-utils-common_${PV}.inc -PR = "r1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez-utils/files/openslug/bluetooth.default b/packages/bluez-utils/files/openslug/bluetooth.default index e69de29bb2..10f628e314 100644 --- a/packages/bluez-utils/files/openslug/bluetooth.default +++ b/packages/bluez-utils/files/openslug/bluetooth.default @@ -0,0 +1,37 @@ +# Bluetooth configuraton file + +# Start of hcid (allowed values are "true" and "false") +HCID_ENABLE=true + +# Config file for hcid +HCID_CONFIG="/etc/bluetooth/hcid.conf" + +# Start sdpd (allowed values are "true" and "false") +SDPD_ENABLE=true + +# Start hidd (allowed values are "true" and "false") +HIDD_ENABLE=false + +# Arguments to hidd +HIDD_OPTIONS="" + +# Run hid2hci (allowed values are "true" and "false") +HID2HCI_ENABLE=false + +# Bind rfcomm devices (allowed values are "true" and "false") +RFCOMM_ENABLE=true + +# Config file for rfcomm +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +# Start dund (allowed values are "true" and "false") +DUND_ENABLE=true + +# Arguments to dund +DUND_OPTIONS="--listen --persist" + +# Start pand (allowed values are "true" and "false") +PAND_ENABLE=true + +# Arguments to pand +PAND_OPTIONS="--listen --role NAP" diff --git a/packages/ixp425-eth/files/intdriven.patch b/packages/ixp425-eth/files/intdriven.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ixp425-eth/files/intdriven.patch diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 5f1e37220a..6332aeaadb 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \ file://makefile.patch;patch=1 \ - file://ethhdr.patch;patch=1" + file://ethhdr.patch;patch=1 \ + file://intdriven.patch;patch=1" +PR = "r1" + S = "${WORKDIR}" COMPATIBLE_HOST = "^armeb-linux.*" diff --git a/packages/linux/openslug-kernel-2.6.11.2/defconfig b/packages/linux/openslug-kernel-2.6.11.2/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/defconfig diff --git a/packages/linux/openslug-kernel-2.6.11.2/ixp4xx_copy_from.patch b/packages/linux/openslug-kernel-2.6.11.2/ixp4xx_copy_from.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/ixp4xx_copy_from.patch diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-part.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-part.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-part.c diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-pci.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-pci.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-pci.c diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-setup.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-setup.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-setup.c diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2.h b/packages/linux/openslug-kernel-2.6.11.2/nslu2.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2.h diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2_2.6.11.patch b/packages/linux/openslug-kernel-2.6.11.2/nslu2_2.6.11.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2_2.6.11.patch diff --git a/packages/linux/openslug-kernel-2.6.11.2/usbnet.patch b/packages/linux/openslug-kernel-2.6.11.2/usbnet.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/usbnet.patch diff --git a/packages/linux/openslug-kernel-2.6.11.2/x1205-rtc.c b/packages/linux/openslug-kernel-2.6.11.2/x1205-rtc.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/x1205-rtc.c diff --git a/packages/linux/openslug-kernel-2.6.11/defconfig b/packages/linux/openslug-kernel-2.6.11/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/defconfig diff --git a/packages/linux/openslug-kernel-2.6.11/ixp4xx_copy_from.patch b/packages/linux/openslug-kernel-2.6.11/ixp4xx_copy_from.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/ixp4xx_copy_from.patch diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2-io.c b/packages/linux/openslug-kernel-2.6.11/nslu2-io.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2-io.c diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2-part.c b/packages/linux/openslug-kernel-2.6.11/nslu2-part.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2-part.c diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2-pci.c b/packages/linux/openslug-kernel-2.6.11/nslu2-pci.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2-pci.c diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2-setup.c b/packages/linux/openslug-kernel-2.6.11/nslu2-setup.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2-setup.c diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2.h b/packages/linux/openslug-kernel-2.6.11/nslu2.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2.h diff --git a/packages/linux/openslug-kernel-2.6.11/nslu2_2.6.11.patch b/packages/linux/openslug-kernel-2.6.11/nslu2_2.6.11.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/nslu2_2.6.11.patch diff --git a/packages/linux/openslug-kernel-2.6.11/usbnet.patch b/packages/linux/openslug-kernel-2.6.11/usbnet.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/usbnet.patch diff --git a/packages/linux/openslug-kernel-2.6.11/x1205-rtc.c b/packages/linux/openslug-kernel-2.6.11/x1205-rtc.c new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11/x1205-rtc.c diff --git a/packages/linux/openslug-kernel-2.6.9/defconfig b/packages/linux/openslug-kernel-2.6.9/defconfig index ca1502b73a..87c5009449 100644 --- a/packages/linux/openslug-kernel-2.6.9/defconfig +++ b/packages/linux/openslug-kernel-2.6.9/defconfig @@ -25,17 +25,17 @@ CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_HOTPLUG=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=m CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_NOOP=n +CONFIG_IOSCHED_AS=n CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_CFQ=n CONFIG_CC_OPTIMIZE_FOR_SIZE=y # @@ -229,7 +229,7 @@ CONFIG_MTD_IXP4XX=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_CARMEL is not set @@ -240,7 +240,14 @@ CONFIG_BLK_DEV_INITRD=y # # Multi-device support (RAID and LVM) # -# CONFIG_MD is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +# CONFIG_MD_LINEAR is not set +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID5=m +# CONFIG_MD_MULTIPATH is not set +# CONFIG_BLK_DEV_LVM # # Networking support @@ -256,14 +263,14 @@ CONFIG_NETLINK_DEV=m CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_FWMARK=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_FWMARK is not set CONFIG_IP_ROUTE_NAT=y -CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_MULTIPATH is not set CONFIG_IP_ROUTE_TOS=y -CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y @@ -271,9 +278,9 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y +# CONFIG_IP_MROUTE is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set @@ -331,7 +338,7 @@ CONFIG_BRIDGE_NETFILTER=y # Bridge: Netfilter Configuration # # CONFIG_BRIDGE_NF_EBTABLES is not set -CONFIG_XFRM=y +# CONFIG_XFRM is not set # CONFIG_XFRM_USER is not set # @@ -577,7 +584,7 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_QLOGIC_ISP is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA2XXX=m +# CONFIG_SCSI_QLA2XXX is not set # CONFIG_SCSI_QLA21XX is not set # CONFIG_SCSI_QLA22XX is not set # CONFIG_SCSI_QLA2300 is not set @@ -792,19 +799,19 @@ CONFIG_SENSORS_X1205=y # File systems # CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_POSIX_ACL is not set # CONFIG_EXT2_FS_SECURITY is not set CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y +# CONFIG_FS_MBCACHE is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y +# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -936,7 +943,7 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_OHCI_HCD=y diff --git a/packages/linux/openslug-kernel-2.6.9/x1205-rtc.c b/packages/linux/openslug-kernel-2.6.9/x1205-rtc.c index e69de29bb2..50fbc9e280 100644 --- a/packages/linux/openslug-kernel-2.6.9/x1205-rtc.c +++ b/packages/linux/openslug-kernel-2.6.9/x1205-rtc.c @@ -0,0 +1,548 @@ +/* + x1205 - an 12c driver for the Xicor X1205 RTC + Copyright 2004 Karen Spearel + + please send all reports to: + kas11 at tampabay dot rr dot com + + based on linux/drivers/acron/char/pcf8583.h + Copyright (C) 2000 Russell King + + 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 of the License, 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 this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + + * i2c_adapter is the structure used to identify a physical i2c bus along + * with the access algorithms necessary to access it. + +struct i2c_adapter { + struct module *owner; + unsigned int id; == is algo->id | hwdep.struct->id, for registered values see below + unsigned int class; + struct i2c_algorithm *algo; the algorithm to access the bus + void *algo_data; + + --- administration stuff. + int (*client_register)(struct i2c_client *); + int (*client_unregister)(struct i2c_client *); + + data fields that are valid for all devices + struct semaphore bus_lock; + struct semaphore clist_lock; + + int timeout; + int retries; + struct device dev; the adapter device + struct class_device class_dev; the class device + +#ifdef CONFIG_PROC_FS + No need to set this when you initialize the adapter + int inode; +#endif def CONFIG_PROC_FS + + int nr; + struct list_head clients; + struct list_head list; + char name[I2C_NAME_SIZE]; + struct completion dev_released; + struct completion class_dev_released; +}; +*/ + + +/*========== Driver for the X1205 on the Linksys NSLU2 ==================*/ + +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/errno.h> +#include <linux/bcd.h> +#include <linux/rtc.h> +#include <linux/fs.h> +#include <linux/proc_fs.h> +#include <linux/miscdevice.h> +#include <linux/device.h> +#include <asm/uaccess.h> +#include <asm/system.h> +#include <linux/moduleparam.h> + +#define RTC_GETDATETIME 0 +#define RTC_SETTIME 1 +#define RTC_SETDATETIME 2 + +#define I2C_M_WR 0 // just for consistancy + +// offsets into read buf - add 2 for write buf +#define CCR_SEC 0 +#define CCR_MIN 1 +#define CCR_HOUR 2 +#define CCR_MDAY 3 +#define CCR_MONTH 4 +#define CCR_YEAR 5 +#define CCR_WDAY 6 +#define CCR_Y2K 7 + +#define X1205_I2C_BUS_ADDR 0x6f // hardwired into x1205 +#define X1205_ALM0_BASE 0x00 // Base address of the ALM0 +#define X1205_CCR_BASE 0x30 // Base address of the CCR +#define X1205_SR_ADDR 0x3f // Status Register +#define X1205_SR_WEL 0x02 // Write Enable Latch bit +#define X1205_SR_RWEL 0x04 // Register Write Enable Bit +#define X1205_MILBIT 0x80 // this bit set in ccr.hour for 24 hr mode +#define NOERR 0 +#define RTC_NODATE 0 +#define RTC_DATETOO 1 + +// comment out next line is your x1205 can't do page writes +//#define X1205PAGEWRITE 1 +#ifdef X1205PAGEWRITE +#define DRIVERNAME "Xicor x1205 RTC Driver v0.9.3.3" +#else +#define DRIVERNAME "Xicor x1205 RTC Dvr v0.9.3.3NPW" +#endif + +#define DEBUG KERN_DEBUG + + +static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, u8 reg_base); +static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, int datetoo, u8 reg_base); +static int x1205_attach(struct i2c_adapter *adapter); +static int x1205_detach(struct i2c_client *client); +static int x1205_validate_tm(struct rtc_time *tm); +static int x1205_command(struct i2c_client *client, unsigned int cmd, void *arg); +static int x1205_sync_rtc(void); +static int x1205_read(struct file *file, char *buf, size_t count, loff_t *ptr); +static int x1205_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); +static int x1205_read_proc(char *buf, char **start, off_t off, int len, int *eof, void *data); + +static struct i2c_driver x1205_driver = { + .owner = THIS_MODULE, + .name = DRIVERNAME, + .id = I2C_DRIVERID_X1205, + .flags = I2C_DF_NOTIFY, + .attach_adapter = &x1205_attach, //we don't need to probe...x1205 is hardwired @ 0x6f + .detach_client = &x1205_detach, + .command = &x1205_command, //this prolly never gets called...used internally tho +}; + +static struct i2c_client x1205_i2c_client = { + .id = I2C_DRIVERID_X1205, + .flags = 0, + .addr = X1205_I2C_BUS_ADDR, // chip address - NOTE: 7bit + .adapter = NULL, // the adapter we sit on assigned in attach + .driver = &x1205_driver, // and our access routines + .usage_count = 0, // How many accesses currently to this client + .dev = {}, // the device structure + .list = {}, + .name = DRIVERNAME, + .released = {}, +}; + +static struct file_operations rtc_fops = { + owner: THIS_MODULE, + ioctl: x1205_ioctl, + read: x1205_read, +}; + +static struct miscdevice x1205_miscdev = { + .minor = RTC_MINOR, + .name = "rtc", + .fops = &rtc_fops, +}; +extern int (*set_rtc)(void); +static unsigned epoch = 1900; //coresponds to year 0 +static unsigned rtc_epoch = 2000; +static const unsigned char days_in_mo[] = +{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + +//===================================CODE====================================== +// in the routines that deal directly with the x1205 hardware, we use +// rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch +// Epoch is inited as 2000. Time is set to UT +//============================================================================= +static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, u8 reg_base) +{ + static unsigned char addr[2] = { 0,} ; + unsigned char buf[8]; + struct i2c_msg msgs[2] = { + { client->addr, I2C_M_WR, 2, addr }, //msg 1 = send base address + { client->addr, I2C_M_RD, 8, buf }, //msg 2 = read sequential data + }; + addr[1] = reg_base; + if ((i2c_transfer(client->adapter, msgs, 2)) == 2) { //did we read 2 messages? + printk(KERN_DEBUG "raw x1205 read data - sec-%02x min-%02x hr-%02x mday-%02x mon-%02x year-%02x wday-%02x y2k-%02x\n", + buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6], buf[7]); + tm->tm_sec = BCD2BIN(buf[CCR_SEC]); + tm->tm_min = BCD2BIN(buf[CCR_MIN]); + buf[CCR_HOUR] &= ~X1205_MILBIT; + tm->tm_hour = BCD2BIN(buf[CCR_HOUR]); //hr is 0-23 + tm->tm_mday = BCD2BIN(buf[CCR_MDAY]); + tm->tm_mon = BCD2BIN(buf[CCR_MONTH]); + rtc_epoch = BCD2BIN(buf[CCR_Y2K]) * 100; + tm->tm_year = BCD2BIN(buf[CCR_YEAR]) + rtc_epoch - epoch; + tm->tm_wday = buf[CCR_WDAY]; + printk(KERN_DEBUG "rtc_time output data - sec-%02d min-%02d hr-%02d mday-%02d mon-%02d year-%02d wday-%02d epoch-%d rtc_epoch-%d\n", + tm->tm_sec,tm->tm_min,tm->tm_hour,tm->tm_mday,tm->tm_mon,tm->tm_year,tm->tm_wday,epoch, rtc_epoch); + } else { + printk(KERN_DEBUG "i2c_transfer Read Error\n"); + return -EIO; + } + + return NOERR; +} +// x1205pagewrite allows writing a block of registers in msg3 even though the x1205 says +// nothing about this in its spec. +// it needs more testing as it is possible some x1205s are actually not-completely- +// functional x1226s and there is a reason for the multiple write to not be in the spec. +// anyhow, it is enabled for the time being...and we even push out luck by sending 10 bytes + +static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, int datetoo, u8 reg_base) +{ + static unsigned char wel[3] = { 0, X1205_SR_ADDR, X1205_SR_WEL }; + static unsigned char rwel[3] = { 0, X1205_SR_ADDR, X1205_SR_WEL | X1205_SR_RWEL }; + static unsigned char diswe[3] = { 0, X1205_SR_ADDR, 0 }; + +#ifdef X1205PAGEWRITE + + static unsigned char buf[10] = { 0, X1205_CCR_BASE, }; + struct i2c_msg msgs[4] = { + { client->addr, I2C_M_WR, 3, wel }, //msg 1 = write WEL to to ccr sr + { client->addr, I2C_M_WR, 3, rwel }, //msg 2 = write RWEL to ccr sr + { client->addr, I2C_M_WR, 10, buf }, //msg 3 = write ccr base addr +seq data + { client->addr, I2C_M_WR, 3, diswe }, //msg 4 = 0 to ccr sr to disable writes + }; + + msgs[2].len = 5; // 5 bytes + addr to set time only + buf [1] = reg_base; + buf[CCR_SEC+2] = BIN2BCD(tm->tm_sec); + buf[CCR_MIN+2] = BIN2BCD(tm->tm_min); + buf[CCR_HOUR+2] = BIN2BCD(tm->tm_hour) | X1205_MILBIT; // set 24 hour format + if (datetoo == 1) { + buf[CCR_MDAY+2] = BIN2BCD(tm->tm_mday); + buf[CCR_MONTH+2] = BIN2BCD(tm->tm_mon); // input is 0-11 + buf[CCR_YEAR+2] = BIN2BCD((tm->tm_year + epoch - rtc_epoch)); // input is yrs since 1900 + buf[CCR_WDAY+2] = tm->tm_wday & 7; + buf[CCR_Y2K+2] = BIN2BCD((rtc_epoch/100)); + msgs[2].len += 5; //5 more bytes to set date + } + printk(KERN_DEBUG "rtc_time input - sec-%02d min-%02d hour-%02d mday-%02d mon-%02d year-%02d wday-%02d epoch-%d rtc_epoch-%d\n", + tm->tm_sec,tm->tm_min,tm->tm_hour,tm->tm_mday,tm->tm_mon,tm->tm_year,tm->tm_wday, epoch, rtc_epoch); + printk(KERN_DEBUG "BCD write data - sec-%02x min-%02x hour-%02x mday-%02x mon-%02x year-%02x wday-%02x y2k-%02x\n", + buf[2],buf[3],buf[4],buf[5],buf[6], buf[7], buf[8], buf[9]); + + if ((i2c_transfer(client->adapter, msgs, 4)) != 4) + return -EIO; + return NOERR; + +#else //do this if page writes aren't working + + int i,xfer; + static unsigned char data[3] = { 0,}; + static unsigned char buf[8]; + + buf[CCR_SEC] = BIN2BCD(tm->tm_sec); + buf[CCR_MIN] = BIN2BCD(tm->tm_min); + buf[CCR_HOUR] = BIN2BCD(tm->tm_hour) | X1205_MILBIT; // set 24 hour format + if (datetoo == 1) { + buf[CCR_MDAY] = BIN2BCD(tm->tm_mday); + buf[CCR_MONTH] = BIN2BCD(tm->tm_mon); // input is 0-11 + buf[CCR_YEAR] = BIN2BCD((tm->tm_year + epoch - rtc_epoch)); // input is yrs since 1900 + buf[CCR_WDAY] = tm->tm_wday & 7; + buf[CCR_Y2K] = BIN2BCD((rtc_epoch/100)); + } + printk(KERN_DEBUG "rtc_time input - sec-%02d min-%02d hour-%02d mday-%02d mon-%02d year-%02d wday-%02d epoch-%d rtc_epoch-%d\n", + tm->tm_sec,tm->tm_min,tm->tm_hour,tm->tm_mday,tm->tm_mon,tm->tm_year,tm->tm_wday, epoch, rtc_epoch); + + xfer = i2c_master_send(client, wel, 3); + printk(KERN_DEBUG "wen - %x\n", xfer); + if (xfer != 3) + return -EIO; + + xfer = i2c_master_send(client, rwel, 3); + printk(KERN_DEBUG "wenb - %x\n", xfer); + if (xfer != 3) + return -EIO; + + for (i = 0; i < 8; i++) { + data[1] = i + reg_base; + data[2] = buf[i]; + xfer = i2c_master_send(client, data, 3); + printk(KERN_DEBUG "xfer - %d addr - %02x data - %02x\n", xfer, data[1], data[2]); + if (xfer != 3) + return -EIO; + }; + + xfer = i2c_master_send(client, diswe, 3); + printk(KERN_DEBUG "wdis - %x\n", xfer); + if (xfer != 3) + return -EIO; + return NOERR; +#endif +} +//============================================================================= + +static int x1205_attach(struct i2c_adapter *adapter) +{ + struct rtc_time tm; + struct timespec tv; + int errno; + + x1205_i2c_client.adapter = adapter; + x1205_i2c_client.id++; + + if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) != NOERR) //test for functional driver + return -EIO; + + if ((errno = i2c_attach_client(&x1205_i2c_client)) != NOERR) + return errno; + + tv.tv_nsec = tm.tm_sec * 10000000; + tv.tv_sec = mktime(tm.tm_year+epoch, tm.tm_mon, tm.tm_mday, tm.tm_hour, + tm.tm_min, tm.tm_sec); + do_settimeofday(&tv); + set_rtc = x1205_sync_rtc; + + printk(KERN_DEBUG "%s attached on adapter %s\n",x1205_i2c_client.name, + x1205_i2c_client.adapter->name); //why is this name a null string? + + return NOERR; +} + +static int x1205_detach(struct i2c_client *client) +{ + int errno; + + if ((errno = i2c_detach_client(client)) != 0) { + printk(KERN_DEBUG "i2c_detach failed - errno = %d\n", errno); + return errno; + } + + return NOERR; +} + +// make sure the rtc_time values are in bounds +static int x1205_validate_tm(struct rtc_time *tm) +{ + tm->tm_year += 1900; + + if (tm->tm_year < 1970) + return -EINVAL; + + if ((tm->tm_mon > 11) || (tm->tm_mday == 0)) + return -EINVAL; + + if (tm->tm_mday > (days_in_mo[tm->tm_mon] + ( (tm->tm_mon == 1) && + ((!(tm->tm_year % 4) && (tm->tm_year % 100) ) || !(tm->tm_year % 400))))) + return -EINVAL; + + if ((tm->tm_year -= epoch) > 255) + return -EINVAL; + + if ((tm->tm_hour >= 24) || (tm->tm_min >= 60) || (tm->tm_sec >= 60)) + return -EINVAL; + return NOERR; +} + +static int x1205_command(struct i2c_client *client, unsigned int cmd, void *tm) +{ + int errno, dodate = RTC_DATETOO; + + if (client == NULL || tm == NULL) + return -EINVAL; + if (!capable(CAP_SYS_TIME)) + return -EACCES; + + printk(KERN_DEBUG "x1205_command %d\n", cmd); + + switch (cmd) { + case RTC_GETDATETIME: + return x1205_get_datetime(client, tm, X1205_CCR_BASE); + + case RTC_SETTIME: // note fall thru + dodate = RTC_NODATE; + case RTC_SETDATETIME: + if ((errno = x1205_validate_tm(tm)) < NOERR) + return errno; + return x1205_set_datetime(client, tm, dodate, X1205_CCR_BASE); + + default: + return -EINVAL; + } +} + +static int x1205_sync_rtc(void) +{ + struct rtc_time new_tm, old_tm; + unsigned long cur_secs = xtime.tv_sec; + + printk(KERN_DEBUG "x1205_sync_rtc entry\n"); + + if (x1205_command(&x1205_i2c_client, RTC_GETDATETIME, &old_tm)) + return 0; + +// xtime.tv_nsec = old_tm.tm_sec * 10000000; //FIXME: + new_tm.tm_sec = cur_secs % 60; + cur_secs /= 60; + new_tm.tm_min = cur_secs % 60; + cur_secs /= 60; + new_tm.tm_hour = cur_secs % 24; + + /* + * avoid writing when we're going to change the day + * of the month. We will retry in the next minute. + * This basically means that if the RTC must not drift + * by more than 1 minute in 11 minutes. + */ + if ((old_tm.tm_hour == 23 && old_tm.tm_min == 59) || + (new_tm.tm_hour == 23 && new_tm.tm_min == 59)) + return 1; + printk(KERN_DEBUG "x1205_sync_rtc exit\n"); + + return x1205_command(&x1205_i2c_client, RTC_SETTIME, &new_tm); +} + +static int x1205_read(struct file *file, char *buf, size_t count, loff_t *ptr) +{ + struct rtc_time tm; + + if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) < NOERR) + return -EIO; + return copy_to_user(buf, &tm, sizeof(tm)) ? -EFAULT : NOERR; +} + +//============================================================================== + +static int x1205_ioctl(struct inode *inode, struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct rtc_time tm; + int errno; + + printk(KERN_DEBUG "ioctl = %x\n", cmd); + + switch (cmd) { + case RTC_RD_TIME: + if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) < NOERR) + return -EIO; + break; + + case RTC_SET_TIME: + if (!capable(CAP_SYS_TIME)) + return -EACCES; + + if (copy_from_user(&tm, (struct rtc_time *) arg, sizeof(struct rtc_time))) + return -EFAULT; + if ((errno = x1205_validate_tm(&tm)) < NOERR) + return errno; + return x1205_set_datetime(&x1205_i2c_client, &tm, RTC_DATETOO, X1205_CCR_BASE); + + case RTC_ALM_SET: //FIXME: set Control Regs + if (copy_from_user(&tm, (struct rtc_time *) arg, sizeof(struct rtc_time))) + return -EFAULT; + return x1205_set_datetime(&x1205_i2c_client, &tm, RTC_DATETOO, X1205_ALM0_BASE); + + case RTC_ALM_READ: + if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_ALM0_BASE)) < NOERR) + return -EIO; + break; + + case RTC_EPOCH_READ: + + return put_user (epoch, (unsigned long __user *)arg); + + case RTC_EPOCH_SET: + if (arg < 1900) + return -EINVAL; + + if (!capable(CAP_SYS_TIME)) + return -EACCES; + + epoch = arg; + return 0; + + default: + return -ENOTTY; + } + return copy_to_user((void __user *)arg, &tm, sizeof tm) ? -EFAULT : 0; + +} + +static int x1205_read_proc(char *buf, char **start, off_t off, int len, int *eof, void *data) +{ + struct rtc_time tm; + int slen, errno; + + if ((errno = x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) < NOERR) + return errno; + +// here we return the real year and the month as 1-12 since it is human-readable + slen = sprintf(buf, "rtc_time\t: %02d:%02d:%02d\nrtc_date\t: %04d-%02d-%02d\n", + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900, tm.tm_mon+1, tm.tm_mday); + printk(KERN_DEBUG "raw rtc_time\t: %02d:%02d:%02d\nraw rtc_date\t: %04d-%02d-%02d\n", + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year, tm.tm_mon, tm.tm_mday); + + if (slen <= off + len) + *eof = 1; + *start = buf + off; + slen -= off; + if (slen > len) + slen = len; + if ( slen < 0 ) + slen = 0; + + return slen; +} + +static int __init x1205_init(void) +{ + struct rtc_time tm; + int errno; + printk(KERN_INFO "LOADED %s\n", DRIVERNAME); + + if ((errno = i2c_add_driver(&x1205_driver)) != NOERR) { + dev_dbg(x1205_i2c_client.dev, "x1205_init failed - errno = %d\n", errno); + return (errno); + } + if ((errno = misc_register(&x1205_miscdev)) != NOERR) { + dev_dbg(x1205_i2c_client.dev, "Register Misc Driver failed - errno = %d\n", errno); + i2c_del_driver(&x1205_driver); + return errno; + } + if (create_proc_read_entry("driver/rtc", 0, NULL, x1205_read_proc, NULL) < NOERR) + return -ENOMEM; + if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) != NOERR) //test for functionality + return -EIO; + + return NOERR; +} + +static void __exit x1205_exit(void) +{ + remove_proc_entry("driver/rtc", NULL); + misc_deregister(&x1205_miscdev); + i2c_del_driver(&x1205_driver); + set_rtc = NULL; +} + +MODULE_AUTHOR("Karen Spearel <kas11@tampabay.rr.com>"); +MODULE_DESCRIPTION("Xicor X1205-RTC Driver"); +MODULE_LICENSE("GPL"); +static int debug = 7; +module_param(debug, bool, 0644); +MODULE_PARM_DESC(debug, "Debugging enabled = 1"); + +module_init(x1205_init); +module_exit(x1205_exit); diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel_2.6.11.2.bb diff --git a/packages/linux/openslug-kernel_2.6.11.bb b/packages/linux/openslug-kernel_2.6.11.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openslug-kernel_2.6.11.bb diff --git a/packages/linux/openslug-kernel_2.6.9.bb b/packages/linux/openslug-kernel_2.6.9.bb index 68e61af50b..5397a8fbcc 100644 --- a/packages/linux/openslug-kernel_2.6.9.bb +++ b/packages/linux/openslug-kernel_2.6.9.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r9" +PR = "r11" KERNEL_SUFFIX = "openslug" diff --git a/packages/linux/unslung-kernel-2.3r25/able/defconfig b/packages/linux/unslung-kernel-2.3r25/able/defconfig index 136f4fa23e..93d47c08d7 100644 --- a/packages/linux/unslung-kernel-2.3r25/able/defconfig +++ b/packages/linux/unslung-kernel-2.3r25/able/defconfig @@ -494,7 +494,10 @@ CONFIG_8139CP_PHY_NUM=32 # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -# CONFIG_PPP is not set +CONFIG_PPP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m # CONFIG_SLIP is not set # @@ -940,7 +943,7 @@ CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=y +CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_RIO500 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_TIGL is not set @@ -950,7 +953,13 @@ CONFIG_USB_SERIAL_PL2303=y # # Bluetooth support # -# CONFIG_BLUEZ is not set +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HCIUSB=m # # Kernel hacking diff --git a/packages/linux/unslung-kernel-2.3r25/ppp_mppe.patch b/packages/linux/unslung-kernel-2.3r25/ppp_mppe.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/unslung-kernel-2.3r25/ppp_mppe.patch diff --git a/packages/linux/unslung-standard-kernel_2.3r25.bb b/packages/linux/unslung-standard-kernel_2.3r25.bb index 890ee3fffd..65afe5f26d 100644 --- a/packages/linux/unslung-standard-kernel_2.3r25.bb +++ b/packages/linux/unslung-standard-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 = "r9" +PR = "r11" UNSLUNG_VARIANT ?= "standard" KERNEL_SUFFIX = "unslung-${UNSLUNG_VARIANT}" @@ -19,6 +19,7 @@ SRC_URI += "file://limit1gb.patch;patch=1 \ file://usbnet.patch;patch=1 \ file://missing-usb-ioctls.patch;patch=1 \ file://anonymiser.patch;patch=1 \ + file://ppp_mppe.patch;patch=1 \ ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}/${UNSLUNG_VARIANT}', '${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 a58f3d7c2d..07eceb42e8 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r6" IMAGE_BASENAME = "openslug" @@ -8,22 +8,25 @@ 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 = "base-files base-passwd-3.5.7 \ - busybox dropbear initscripts netbase \ +DEPENDS = "virtual/kernel base-files base-passwd-3.5.7 \ + busybox dropbear hotplug-ng initscripts netbase \ sysvinit tinylogin lrzsz portmap \ ixp4xx-csr ixp425-eth openslug-init \ - ipkg-collateral ipkg ipkg-link \ - cpio findutils e2fsprogs \ + module-init-tools modutils-initscripts \ + ipkg-collateral ipkg ipkg-link diffutils \ + cpio findutils e2fsprogs mtd-utils \ ${OPENSLUG_EXTRA_DEPENDS}" IPKG_INSTALL = "base-files base-passwd \ - busybox dropbear initscripts netbase \ + busybox dropbear hotplug-ng initscripts netbase \ update-modules sysvinit tinylogin lrzsz portmap \ ixp4xx-csr ixp425-eth openslug-init \ - ipkg-collateral ipkg ipkg-link \ + module-init-tools modutils-initscripts \ + ipkg-collateral ipkg ipkg-link diffutils \ cpio findutils e2fsprogs-mke2fs \ e2fsprogs-fsck e2fsprogs-e2fsck \ kernel-module-nfs kernel-module-sunrpc kernel-module-lockd \ + kernel-module-ehci-hcd \ ${OPENSLUG_EXTRA_INSTALL}" inherit image_ipk diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/meta/openslug-packages.bb diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb index ba230d48d5..190397777b 100644 --- a/packages/mgetty/mgetty_1.1.30.bb +++ b/packages/mgetty/mgetty_1.1.30.bb @@ -3,6 +3,8 @@ DESCRIPTION = "The mgetty package contains an intelligent \ getty for allowing logins over a serial line (such as \ through a modem) and receiving incoming faxes." LICENSE = "GPL" +PR="r2" + SRC_URI = "${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz \ file://debian.patch;patch=1 \ file://00-g3_Makefile;patch=1 \ @@ -37,6 +39,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz \ file://policy.h \ file://voice-defs.h" +CFLAGS_prepend = "-DAUTO_PPP -DFIDO " + do_compile () { cp ${WORKDIR}/policy.h ${WORKDIR}/voice-defs.h . ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ @@ -65,3 +69,6 @@ do_compile () { do_install () { oe_runmake install DESTDIR="${D}" prefix="${D}${prefix}" } + +CONFFILES_${PN} = "${sysconfdir}/mgetty/mgetty.config \ + ${sysconfdir}/mgetty/login.config ${sysconfdir}/mgetty/sendfax.config" diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb index e69de29bb2..afbb782252 100644 --- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb +++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb @@ -0,0 +1,24 @@ +SECTION = "base" +DEPENDS = "slugimage-native unzip-native" +PACKAGES = "" +LICENSE = "GPL" +INHIBIT_DEFAULT_DEPS = "1" +PR = "r3" + +SRC_URI = "ftp://ftp.linksys.com/pub/network/nslu2-fw-2.3r25.zip" +S = "${WORKDIR}" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2") +} + +do_compile () { + slugimage -u -i NSLU2_V23R25.bin -b RedBoot -s SysConf -r ramdisk.ext2.gz -t Trailer + install -d ${STAGING_LIBDIR}/nslu2-binaries + install -m 0755 RedBoot ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 SysConf ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 ramdisk.ext2.gz ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 Trailer ${STAGING_LIBDIR}/nslu2-binaries/ +} diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb index 797775cc4c..e8c7a0765c 100644 --- a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb +++ b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb @@ -1,6 +1,7 @@ SECTION = "base" DEPENDS = "" PACKAGES = "" +LICENSE = "BSD" INHIBIT_DEFAULT_DEPS = "1" PR = "r18" diff --git a/packages/openslug-init/openslug-init-0.10/modutils.txt b/packages/openslug-init/openslug-init-0.10/modutils.txt index 3c0301c3d8..5b4d9938c5 100644 --- a/packages/openslug-init/openslug-init-0.10/modutils.txt +++ b/packages/openslug-init/openslug-init-0.10/modutils.txt @@ -1,5 +1,2 @@ # Adding modules to be automatically loaded via update-modules -#ixp425_eth leave this one to sysconfsetup for now because it loads -#too late for first boot -#ehci-hcd these are now compiled into the kernel -#ohci-hcd ditto +ehci-hcd diff --git a/packages/openslug-init/openslug-init-0.10/sysconfsetup b/packages/openslug-init/openslug-init-0.10/sysconfsetup index d52f6e12ed..f048dfc9bc 100644 --- a/packages/openslug-init/openslug-init-0.10/sysconfsetup +++ b/packages/openslug-init/openslug-init-0.10/sysconfsetup @@ -25,7 +25,7 @@ EOF strings /etc/linksysconf | grep ip_addr >> /etc/original-network-settings strings /etc/linksysconf | grep ^netmask >> /etc/original-network-settings - strings /etc/linksysconf | grep gateway >> /etc/original-network-settings + strings /etc/linksysconf | grep ^gateway=. >> /etc/original-network-settings strings /etc/linksysconf | grep hw_addr >> /etc/original-network-settings sed -i -e 's/ip_addr=/ address /' /etc/original-network-settings sed -i -e 's/netmask=/ netmask /' /etc/original-network-settings diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 7be1798965..9960988561 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Openslug initial network config via sysconf" SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files" -PR = "r13" +PR = "r15" SRC_URI = "file://sysconfsetup \ file://modutils.txt \ @@ -43,3 +43,5 @@ do_install() { } FILES_${PN} = "/" + +CONFFILES_${PN} = "${sysconfdir}/modutils/modutils.txt ${sysconfdir}/modprobe.conf" diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb index 93f5169f7a..47f6d0f88c 100644 --- a/packages/openssh/openssh_3.8p1.bb +++ b/packages/openssh/openssh_3.8p1.bb @@ -11,7 +11,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -81,5 +81,5 @@ else fi } -CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config" -CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config" +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb index 5280c6e651..368c8ed875 100644 --- a/packages/ppp/ppp_2.4.1.bb +++ b/packages/ppp/ppp_2.4.1.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" LICENSE = "BSD GPLv2" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz \ file://pppd.patch;patch=1 \ @@ -35,7 +35,7 @@ do_install_append () { install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ } -CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets" +CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" pkg_postinst() { if test "x$D" != "x"; then diff --git a/packages/puppy/puppy_1.6.bb b/packages/puppy/puppy_1.6.bb index e69de29bb2..bd7dc7a76d 100644 --- a/packages/puppy/puppy_1.6.bb +++ b/packages/puppy/puppy_1.6.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Interface software for the TopField TF5000PVRt" +SECTION = "networking" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +HOMEPAGE = "http://sf.net/project/puppy/" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_6" +S = "${WORKDIR}/puppy" + +inherit autotools + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/puppy ${D}${bindir}/puppy +} diff --git a/packages/pwc/files/Makefile b/packages/pwc/files/Makefile new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pwc/files/Makefile diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pwc/pwc_10.0.6a.bb |