From 3d3eb59848bd382b8a37402ae71e17c7a384fcfb Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sun, 13 Jan 2008 01:43:16 +0000
Subject: slugos: enable asterisk sound files for 1.4 version slugos: disable
 asterisk sound files for 1.2 version slugos: enable netatalk and ngrep

---
 packages/meta/slugos-packages.bb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'packages/meta')

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 04e4425a3b..5c4bb93c6e 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -24,7 +24,18 @@ SLUGOS_PACKAGES = "\
 	apex-env \
 	apr \
 	asterisk \
-	asterisk-sounds \
+	asterisk-core-sounds-en-alaw \
+	asterisk-core-sounds-en-g729 \
+	asterisk-core-sounds-en-gsm \
+	asterisk-core-sounds-en-ulaw \
+	asterisk-extra-sounds-en-alaw \
+	asterisk-extra-sounds-en-g729 \
+	asterisk-extra-sounds-en-gsm \
+	asterisk-extra-sounds-en-ulaw \
+	asterisk-moh-freeplay-alaw \
+	asterisk-moh-freeplay-g729 \
+	asterisk-moh-freeplay-gsm \
+	asterisk-moh-freeplay-ulaw \
 	atftp \
 	audiofile \
 	aumix \
@@ -148,9 +159,11 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	net-tools \
+	netatalk \
 	netcat \
 	netpbm \
 	nfs-utils \
+	ngrep \
 	nmap \
 	ntfs-3g \
 	ntp \
-- 
cgit v1.2.3


From 187b3ea62da133aefa859974a630d9c4fafa930f Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sun, 13 Jan 2008 03:07:54 +0000
Subject: add monit

---
 packages/meta/slugos-packages.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/meta')

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 5c4bb93c6e..7e1b5b15c1 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -148,6 +148,7 @@ SLUGOS_PACKAGES = "\
 	miau \
 	microcom \
 	minicom \
+	monit \
 	motion \
 	mpd \
 	mt-daapd \
-- 
cgit v1.2.3


From 9d00af25ddaebf2151f6dadbb48e1635d57ba16a Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andy@protium.com>
Date: Wed, 16 Jan 2008 01:42:45 +0000
Subject: Numerous openprotium fixes as we transition to udev based root and
 task based build

---
 packages/meta/openprotium-packages.bb | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'packages/meta')

diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index 3df2f5e3b2..7d66ee5d61 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -30,13 +30,14 @@ inherit meta
 #	flac \
 #	gphoto2 \
 #	gdb \
-#	glib-2.0 \
 #	lirc \
 #	masqmail \
 #	wakelan \
 #	wireless-tools \
 #	wpa-supplicant \
+#	openldap \
 #	bluez-utils-nodbus \
+#	lcdproc \
 #	libxml2 \
 #	libdvb \
 #	madwifi-ng \
@@ -53,7 +54,13 @@ inherit meta
 #	samba \
 #	sane-backends \
 #	vsftpd \
+#	syslog-ng \
 #	zd1211 \
+#	cdparanoia \
+#	litestream \
+#	pvrusb2-mci \
+#	pwc \
+#	fetchmail \
 
 OPENPROTIUM_PACKAGES = "\
 	alsa-lib \
@@ -70,7 +77,6 @@ OPENPROTIUM_PACKAGES = "\
 	bridge-utils \
 	bzip2 \
 	ccxstream \
-	cdparanoia \
 	cdstatus \
 	coreutils \
 	cron \
@@ -85,7 +91,6 @@ OPENPROTIUM_PACKAGES = "\
 	e2fsprogs-libs \
 	expat \
 	ez-ipupdate \
-	fetchmail \
 	file \
 	findutils \
 	flex \
@@ -94,6 +99,7 @@ OPENPROTIUM_PACKAGES = "\
 	gawk \
 	gcc \
 	gdbm \
+	glib-2.0 \
 	gnu-config \
 	grep \
 	gtk-doc \
@@ -105,8 +111,6 @@ OPENPROTIUM_PACKAGES = "\
 	ircp \
 	joe \
 	jpeg \
-	lcdproc \
-	less \
 	libao \
 	libid3tag \
 	liblockfile \
@@ -119,7 +123,6 @@ OPENPROTIUM_PACKAGES = "\
 	libupnp \
 	libusb \
 	libvorbis \
-	litestream \
 	lrzsz \
 	lsof \
 	lvm2 \
@@ -144,7 +147,6 @@ OPENPROTIUM_PACKAGES = "\
 	nmap \
 	ntp \
 	openobex-apps \
-	openldap \
 	openntpd \
 	openobex \
 	openssh \
@@ -156,8 +158,6 @@ OPENPROTIUM_PACKAGES = "\
 	pkgconfig \
 	ppp \
 	procps \
-	pvrusb2-mci \
-	pwc \
 	quilt \
 	rng-tools \
 	rsync \
@@ -169,7 +169,6 @@ OPENPROTIUM_PACKAGES = "\
 	strace \
 	streamripper \
 	sysfsutils \
-	syslog-ng \
 	tar \
 	thttpd \
 	tiff \
@@ -178,7 +177,6 @@ OPENPROTIUM_PACKAGES = "\
 	util-linux \
 	vim \
 	vlan \
-	watchdog \
 	wget \
 	zip \
 	zlib \
-- 
cgit v1.2.3


From 20ffd0c991e59e8ed38f63d5a9d989126c44b5ad Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 16 Jan 2008 12:32:03 +0000
Subject: meta-toolchain*: Introduce name suffix for toolchain packages to
 avoid toolchain targets overwriting each other.

---
 packages/meta/meta-toolchain-gpe-sbox.bb | 1 +
 packages/meta/meta-toolchain-gpe.bb      | 1 +
 packages/meta/meta-toolchain-openmoko.bb | 1 +
 packages/meta/meta-toolchain-sbox.bb     | 2 ++
 packages/meta/meta-toolchain.bb          | 4 +++-
 5 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'packages/meta')

diff --git a/packages/meta/meta-toolchain-gpe-sbox.bb b/packages/meta/meta-toolchain-gpe-sbox.bb
index d32087b964..74ba03825f 100644
--- a/packages/meta/meta-toolchain-gpe-sbox.bb
+++ b/packages/meta/meta-toolchain-gpe-sbox.bb
@@ -9,3 +9,4 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-gpe-sbox"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-gpe.bb b/packages/meta/meta-toolchain-gpe.bb
index f79ff31bb7..cad03d71a6 100644
--- a/packages/meta/meta-toolchain-gpe.bb
+++ b/packages/meta/meta-toolchain-gpe.bb
@@ -7,3 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-gpe"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 90eff20259..b5e392ab1c 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -2,3 +2,4 @@ TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-openmoko"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-sbox.bb b/packages/meta/meta-toolchain-sbox.bb
index 6e31fd0d69..1283c599c6 100644
--- a/packages/meta/meta-toolchain-sbox.bb
+++ b/packages/meta/meta-toolchain-sbox.bb
@@ -4,3 +4,5 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-sbox"
+
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 91467e5140..fc029505c3 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
 
 inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_SUFFIX = "toolchain"
 
 FEED_ARCH ?= "${TARGET_ARCH}"
 
@@ -120,7 +122,7 @@ do_populate_sdk() {
 	# package it up
 	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
-	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 .
 }
 
 do_populate_sdk[nostamp] = "1"
-- 
cgit v1.2.3


From 3cb1f292aa4ddce72f970ef4181ee7057cf3b573 Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Wed, 16 Jan 2008 15:09:14 +0000
Subject: unrar promoted for slugos

---
 packages/meta/slugos-packages.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/meta')

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 7e1b5b15c1..667b2b2e69 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -212,6 +212,7 @@ SLUGOS_PACKAGES = "\
 	thttpd \
 	tiff \
 	tzdata \
+	unrar \
 	unzip \
 	upslug2 \
 	usbutils \
-- 
cgit v1.2.3


From 048ace2a52af79397c783867a0fe2a37d671baf4 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 08:51:49 +0000
Subject: (Merge OM mtn modification back into mainline) Add ability to find
 the directory of parent package if the child package is of different arch.

---
 packages/meta/meta-toolchain.bb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'packages/meta')

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index fc029505c3..923844ef8c 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r1"
+PR = "r2"
 
 inherit sdk meta
 
@@ -75,10 +75,17 @@ do_populate_sdk() {
 		for arch in $revipkgarchs; do
 			pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
 			if [ -e $pkgnames ]; then
-				echo "Found $pkgnames"
+				oenote "Found $pkgnames"
 				cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
 				orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
-				pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				for aarch in $revipkgarchs; do
+					if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
+						pkg_subdir="${aarch}${pkg_subdir_postfix}"
+						break
+					fi
+				done
+				oenote "Original package in ${pkg_subdir}"
 				mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
 				cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
 				subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
-- 
cgit v1.2.3


From 357ee099c60ddf4fe162b8e24aeeba52edf4099a Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 09:03:38 +0000
Subject: (Merge OM mtn modification back into mainline) Integrate mainstream
 to build meta-toolchain-openmoko packages/meta/meta-toolchain-openmoko.bb:
 will install task-openmoko-toolchain-{target,host}
 task-openmoko-toolchain-target: specific to target arch.
 task-openmoko-toolchain-host: for host and all, such as openmoko-sample2-src
 moko-autorev.inc, sane-srcrevs.inc: add SRCREV_pn-openmoko-toolchain-scripts
 openmoko-toolchain-scripts_svn.bb: will not install sample code now.
 openmoko-sample2_svn.bb: update PACKAGE_ARCH_${PN}-src to be used by
 ipkg-sdk.conf

---
 packages/meta/meta-toolchain-openmoko.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'packages/meta')

diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index b5e392ab1c..b7e5626f61 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -1,5 +1,7 @@
-TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+PR = "r1"
 
-require meta-toolchain.bb
+TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
+TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
 
-SDK_SUFFIX = "toolchain-openmoko"
\ No newline at end of file
+require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-openmoko"
-- 
cgit v1.2.3