diff options
| -rw-r--r-- | packages/apex/apex-env_1.5.8.bb | 6 | ||||
| -rw-r--r-- | packages/apex/files/find-apex-partition.patch | 34 | ||||
| -rw-r--r-- | packages/images/nas-server-image.bb | 47 | ||||
| -rw-r--r-- | packages/meta/meta-nas-server.bb | 10 | ||||
| -rw-r--r-- | packages/meta/unslung-binary-kernel-packages.bb | 19 | ||||
| -rw-r--r-- | packages/tasks/task-nas-server.bb | 94 | ||||
| -rw-r--r-- | packages/tzdata/tzdata_2007e.bb | 5 |
7 files changed, 193 insertions, 22 deletions
diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb index 0f310f107e..a0e44346bb 100644 --- a/packages/apex/apex-env_1.5.8.bb +++ b/packages/apex/apex-env_1.5.8.bb @@ -3,9 +3,11 @@ SECTION = "util" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r1" +PR = "r1" -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz" +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://find-apex-partition.patch;patch=1 \ + " S = ${WORKDIR}/apex-${PV}/usr EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" diff --git a/packages/apex/files/find-apex-partition.patch b/packages/apex/files/find-apex-partition.patch new file mode 100644 index 0000000000..3aa62a186a --- /dev/null +++ b/packages/apex/files/find-apex-partition.patch @@ -0,0 +1,34 @@ +*** usr/link.cc.orig Sun Dec 23 20:31:49 2007 +--- usr/link.cc Sun Dec 23 20:32:46 2007 +*************** +*** 278,285 **** + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it uses the first partition with the assumption that APEX +! may be the primary boot loader. + + */ + +--- 278,286 ---- + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it then looks for the "apex" partition. If there is none, +! it uses the first partition with the assumption that APEX may be +! the primary boot loader. + + */ + +*************** +*** 289,294 **** +--- 290,298 ---- + MTDPartition mtd = MTDPartition::find ("Loader"); + + if (!mtd.is ()) ++ mtd = MTDPartition::find ("apex"); ++ ++ if (!mtd.is ()) + mtd = MTDPartition::first (); + + bool fFound = mtd.is () && open_apex (mtd); diff --git a/packages/images/nas-server-image.bb b/packages/images/nas-server-image.bb new file mode 100644 index 0000000000..d4a012c082 --- /dev/null +++ b/packages/images/nas-server-image.bb @@ -0,0 +1,47 @@ +# This image is intended to provide a configuration +# for a network attached storage server device. + +# Key features are: +# +# 1) Must be able to mount attached storage devices like +# internal disks, external USB disks, etc. Should support +# various filesystem choices, but ext2 at a minimum. +# +# 2) Must be able to boot from internal flash, or directly +# from a filesystem stored on the attached storage. +# +# 3) Must be able to share that storage across the network +# using various protocols like Samba, NFS, etc. +# +# 4) Bonus points for being able to support other central +# network services like a central gateway machine might. + +# Although it is tested with the Angstrom distro, it is +# intended to be distro-agnostic. + +DISTRO_SSH_DAEMON ?= "dropbear" +DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" + +DEPENDS = "task-boot task-base-apex \ + task-distro-base task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + task-base-usbhost task-base-ext2 \ + task-nas-server-everything \ + " + +IMAGE_INSTALL_TASKS = "\ + task-nas-server-everything \ + " + +IMAGE_INSTALL = "task-boot task-base-apex \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + task-base-usbhost task-base-ext2 \ + ${IMAGE_INSTALL_TASKS} \ + " + +export IMAGE_BASENAME = "nas-server-image" +IMAGE_LINGUAS = "" + +inherit image diff --git a/packages/meta/meta-nas-server.bb b/packages/meta/meta-nas-server.bb new file mode 100644 index 0000000000..3deb44c2bd --- /dev/null +++ b/packages/meta/meta-nas-server.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Meta-package for a network attached storage server" +LICENSE = "MIT" +PR = "r0" + +RDEPENDS = "\ + task-nas-server-everything \ + " + +inherit meta + diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb deleted file mode 100644 index eb95b847fd..0000000000 --- a/packages/meta/unslung-binary-kernel-packages.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware" -LICENSE = "MIT" -PR = "r2" -COMPATIBLE_MACHINE = "nslu2" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -inherit meta - -UNSLUNG_PACKAGES = "\ - " - -BROKEN_PACKAGES = "\ - " - -DEPENDS = 'unslung-image \ - ${UNSLUNG_PACKAGES} \ - package-index' diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb new file mode 100644 index 0000000000..bfecfc8822 --- /dev/null +++ b/packages/tasks/task-nas-server.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "Tasks for a Network Attached Storage server" +LICENSE = "MIT" +PROVIDES = "task-nas-server-everything" +PR = "r0" + +inherit task + +PACKAGES = "\ + task-nas-server-everything \ + ${NAS_SERVER_PACKAGES} \ +" + +NAS_SERVER_PACKAGES = "\ + task-nas-server-base \ + task-nas-server-samba \ + task-nas-server-dnsmasq \ + task-nas-server-iptables \ + task-nas-server-tzdata \ + task-nas-server-nfs \ + task-nas-server-vfat \ + task-nas-server-ntfs \ + task-nas-server-ext3 \ + task-nas-server-reiserfs \ +" + +RDEPENDS_task-nas-server-everything = "${NAS_SERVER_PACKAGES}" + +DESCRIPTION_task-nas-server-base = "NAS-Server: Base Packages" +RDEPENDS_task-nas-server-base = "\ +" +RRECOMMENDS_task-nas-server-base = "\ +" + +DESCRIPTION_task-nas-server-samba = "NAS-Server: Samba Server" +RDEPENDS_task-nas-server-samba = "\ + samba swat \ +" +RRECOMMENDS_task-nas-server-samba = "\ +" + +DESCRIPTION_task-nas-server-dnsmasq = "NAS-Server: DNS/DHCP Server" +RDEPENDS_task-nas-server-dnsmasq = "\ + dnsmasq \ +" +RRECOMMENDS_task-nas-server-dnsmasq = "\ +" + +DESCRIPTION_task-nas-server-iptables = "NAS-Server: Netfilter/Iptables Support" +RDEPENDS_task-nas-server-iptables = "\ + iptables \ +" +RRECOMMENDS_task-nas-server-iptables = "\ + kernel-module-iptable-nat \ + kernel-module-iptable-mangle \ + kernel-module-ipt-masquerade \ +" + +DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support" +RDEPENDS_task-nas-server-tzdata = "\ + tzdata \ +" +RRECOMMENDS_task-nas-server-tzdata = "\ +" + +DESCRIPTION_task-nas-server-nfs = "NAS-Server: NFS Server" +RDEPENDS_task-nas-server-nfs = "\ + nfs-utils portmap \ +" +RRECOMMENDS_task-nas-server-nfs = "\ +" + +DESCRIPTION_task-nas-server-vfat = "NAS-Server: FAT Filesystem" +RDEPENDS_task-nas-server-vfat = "\ +" +RRECOMMENDS_task-nas-server-vfat = "\ +" + +DESCRIPTION_task-nas-server-ntfs = "NAS-Server: NTFS Filesystem" +RDEPENDS_task-nas-server-ntfs = "\ +" +RRECOMMENDS_task-nas-server-ntfs = "\ +" + +DESCRIPTION_task-nas-server-ext3 = "NAS-Server: EXT3 Filesystem" +RDEPENDS_task-nas-server-ext3 = "\ +" +RRECOMMENDS_task-nas-server-ext3 = "\ +" + +DESCRIPTION_task-nas-server-reiserfs = "NAS-Server: ReiserFS Filesystem" +RDEPENDS_task-nas-server-reiserfs = "\ +" +RRECOMMENDS_task-nas-server-reiserfs = "\ +" diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007e.bb index 46d941c269..d873bfd0d6 100644 --- a/packages/tzdata/tzdata_2007e.bb +++ b/packages/tzdata/tzdata_2007e.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r0" +PR = "r1" PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ @@ -126,6 +126,9 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Bankok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Darwin \ + ${datadir}/zoneinfo/Australia/Adelaide \ + ${datadir}/zoneinfo/Australia/Brisbane \ ${datadir}/zoneinfo/Australia/Sydney \ ${datadir}/zoneinfo/Pacific/Noumea \ ${datadir}/zoneinfo/CET \ |