[oe-commits] org.oe.dev merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'

[oe commit]

merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
     and '5ac15bc50757ca4ed18bce46192c87c5141b1068'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d31f98aad124b724f9685f080dbcdb5bd97d183f
ViewMTN: http://monotone.openembedded.org/revision/info/d31f98aad124b724f9685f080dbcdb5bd97d183f
Files:
1
packages/images/base-image.bb
packages/images/nas-server-image.bb
packages/fmtools
packages/fmtools/files
packages/fmtools/files/makefile.patch
packages/fmtools/fmtools_1.0.2.bb
Diffs:

#
# mt diff -r4a9764846eca8e7a6608990c71feaab1b82bda1f -rd31f98aad124b724f9685f080dbcdb5bd97d183f
#
# 
# 
# patch "packages/images/base-image.bb"
#  from [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
#    to [9c81aebd2963f50d6b9de4476bda3726a21b502b]
# 
# patch "packages/images/nas-server-image.bb"
#  from [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
#    to [560048e8fa92ea93876cac92e66f0d4241079ad6]
# 
============================================================
--- packages/images/base-image.bb	a1e5aad1ac0a18575912aad884dfdc89508d7d46
+++ packages/images/base-image.bb	9c81aebd2963f50d6b9de4476bda3726a21b502b
@@ -17,22 +17,28 @@ DISTRO_SSH_DAEMON ?= "dropbear"
 # image is intended to be distro-agnostic.
 
 DISTRO_SSH_DAEMON ?= "dropbear"
+
 DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
 
+# FIXME: We need a distro-indendent way of specifying feed configs.
+# Once the RFC for the DISTRO_FEED_CONFIGS variable name is approved,
+# we can remove this default definition and set it in the distro config.
+DISTRO_FEED_CONFIGS ?= "${ANGSTROM_FEED_CONFIGS}"
+
 DEPENDS = "\
 	task-boot \
-	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
+	${DISTRO_FEED_CONFIGS} \
 	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
 	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
 
 IMAGE_INSTALL = "\
 	task-boot \
-	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
+	${DISTRO_FEED_CONFIGS} \
 	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
 	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
============================================================
--- packages/images/nas-server-image.bb	4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb	560048e8fa92ea93876cac92e66f0d4241079ad6
@@ -22,24 +22,30 @@ DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-col
 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 \
-           "
+DEPENDS = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	task-distro-base task-machine-base \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	task-nas-server-everything \
+	"
 
 IMAGE_INSTALL_TASKS = "\
-            task-nas-server-everything \
-           "
+	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} \
-	   "
+IMAGE_INSTALL = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	${IMAGE_INSTALL_TASKS} \
+	"
 
 export IMAGE_BASENAME = "nas-server-image"
 IMAGE_LINGUAS = ""


#
# mt diff -r5ac15bc50757ca4ed18bce46192c87c5141b1068 -rd31f98aad124b724f9685f080dbcdb5bd97d183f
#
# 
# 
# add_dir "packages/fmtools"
# 
# add_dir "packages/fmtools/files"
# 
# add_file "packages/fmtools/files/makefile.patch"
#  content [9867b4fde17b60384925b1bd502bdde2cc250d30]
# 
# add_file "packages/fmtools/fmtools_1.0.2.bb"
#  content [4543389e888358f731bc6de60f770a46474047d5]
# 
============================================================
--- packages/fmtools/files/makefile.patch	9867b4fde17b60384925b1bd502bdde2cc250d30
+++ packages/fmtools/files/makefile.patch	9867b4fde17b60384925b1bd502bdde2cc250d30
@@ -0,0 +1,11 @@
+--- fmtools-1.0.2/Makefile	2002-08-17 06:05:09.000000000 +0200
++++ fmtools-1.0.2p/Makefile	2007-12-22 21:45:28.000000000 +0100
+@@ -1,8 +1,5 @@
+ # fmtools Makefile - just the basics for now
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2
+-
+ INSTALL	= /usr/bin/install
+ 
+ # Since fmtools doesn't use configure, these paths are provided here
============================================================
--- packages/fmtools/fmtools_1.0.2.bb	4543389e888358f731bc6de60f770a46474047d5
+++ packages/fmtools/fmtools_1.0.2.bb	4543389e888358f731bc6de60f770a46474047d5
@@ -0,0 +1,15 @@
+DESCRIPTION = "fmtools - programs for Video for Linux radio cards"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
+           file://makefile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/fm ${D}${bindir}/fm
+    install -m 0755 ${S}/fmscan ${D}${bindir}/fmscan
+}
+