[oe-commits] org.oe.dev merge of '192c54c4e5509fc0ef517826f454b807c6af7658'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Dec 23 12:28:52 UTC 2007
merge of '192c54c4e5509fc0ef517826f454b807c6af7658'
and 'ec60010395d1ec561cf9377a93140bd2f2f31df4'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7cacda73f6295d69f1f1e7f92b77d847df223b1b
ViewMTN: http://monotone.openembedded.org/revision/info/7cacda73f6295d69f1f1e7f92b77d847df223b1b
Files:
1
packages/meta/unslung-binary-kernel-packages.bb
packages/apex/files/find-apex-partition.patch
packages/images/nas-server-image.bb
packages/meta/meta-nas-server.bb
packages/tasks/task-nas-server.bb
packages/apex/apex-env_1.5.8.bb
packages/tzdata/tzdata_2007e.bb
contrib/angstrom/build-release.sh
Diffs:
#
# mt diff -r192c54c4e5509fc0ef517826f454b807c6af7658 -r7cacda73f6295d69f1f1e7f92b77d847df223b1b
#
#
#
# delete "packages/meta/unslung-binary-kernel-packages.bb"
#
# add_file "packages/apex/files/find-apex-partition.patch"
# content [a1985a204e000e121aa7918bb0754ef375def89a]
#
# add_file "packages/images/nas-server-image.bb"
# content [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
#
# add_file "packages/meta/meta-nas-server.bb"
# content [9c2144c3cf312ea4f3c3d49d14faace452af7137]
#
# add_file "packages/tasks/task-nas-server.bb"
# content [62167ff91124b6983115d92bd330e863aac1d877]
#
# patch "packages/apex/apex-env_1.5.8.bb"
# from [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
# to [802ae62b74a85155710d25eb4ad8101aab3c8f44]
#
# patch "packages/tzdata/tzdata_2007e.bb"
# from [4cec1441747911151c67dda8bbb5631ff1c92169]
# to [372c0e1baf2b1ab4f6293f9fb5d4903e37f0f381]
#
============================================================
--- packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
+++ packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
@@ -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);
============================================================
--- packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
@@ -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
============================================================
--- packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
+++ packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
@@ -0,0 +1,10 @@
+DESCRIPTION = "Meta-package for a network attached storage server"
+LICENSE = "MIT"
+PR = "r0"
+
+RDEPENDS = "\
+ task-nas-server-everything \
+ "
+
+inherit meta
+
============================================================
--- packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
+++ packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
@@ -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 = "\
+"
============================================================
--- packages/apex/apex-env_1.5.8.bb fdbc0b6132572b780b950c96db6cdd6c7f609f7d
+++ packages/apex/apex-env_1.5.8.bb 802ae62b74a85155710d25eb4ad8101aab3c8f44
@@ -1,11 +1,13 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
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}"
============================================================
--- packages/tzdata/tzdata_2007e.bb 4cec1441747911151c67dda8bbb5631ff1c92169
+++ packages/tzdata/tzdata_2007e.bb 372c0e1baf2b1ab4f6293f9fb5d4903e37f0f381
@@ -1,9 +1,9 @@ DEPENDS = "tzcode-native"
DESCRIPTION = "Timezone data"
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/Paci
${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 \
#
# mt diff -rec60010395d1ec561cf9377a93140bd2f2f31df4 -r7cacda73f6295d69f1f1e7f92b77d847df223b1b
#
#
#
# patch "contrib/angstrom/build-release.sh"
# from [24b8ff0eed78d3a8f1cd8458a76cfedb216e2cc6]
# to [9d5f537d764ff8ed751baf7c1ba2d41b8829d875]
#
============================================================
--- contrib/angstrom/build-release.sh 24b8ff0eed78d3a8f1cd8458a76cfedb216e2cc6
+++ contrib/angstrom/build-release.sh 9d5f537d764ff8ed751baf7c1ba2d41b8829d875
@@ -69,7 +69,7 @@ done
done
# graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
More information about the Openembedded-commits
mailing list