[oe-commits] org.oe.dev merge of '244367946edd2e107d611367e71371627b2c397f'

[pfalcon commit]

merge of '244367946edd2e107d611367e71371627b2c397f'
     and '9c38f2ec413f4ee965c2144128a80519d0b9ef66'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7
Files:
1
classes/base.bbclass
packages/initrdscripts/devimage
packages/images/devimage-image.bb
packages/initrdscripts/devimage/devimage.sh
packages/initrdscripts/devimage/dropbear_rsa_host_key
packages/initrdscripts/devimage/passwd
packages/initrdscripts/devimage_0.1.bb
conf/machine/h4000.conf
conf/machine/htcblueangel.conf
Diffs:

#
# mt diff -r244367946edd2e107d611367e71371627b2c397f -rd7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7
#
# 
# 
# patch "classes/base.bbclass"
#  from [ba2e0fac05c1cefedb5f538434372d5c24d922c5]
#    to [8a173bf48780618b184587ac961f0648715285fe]
# 
============================================================
--- classes/base.bbclass	ba2e0fac05c1cefedb5f538434372d5c24d922c5
+++ classes/base.bbclass	8a173bf48780618b184587ac961f0648715285fe
@@ -953,6 +953,7 @@ ftp://lsof.itap.purdue.edu/pub/tools/uni
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/
+http://www.apache.org/dist  http://archive.apache.org/dist
 
 }
 


#
# mt diff -r9c38f2ec413f4ee965c2144128a80519d0b9ef66 -rd7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7
#
# 
# 
# add_dir "packages/initrdscripts/devimage"
# 
# add_file "packages/images/devimage-image.bb"
#  content [522d69564f125613dfe3c1b5d6ddabb988157140]
# 
# add_file "packages/initrdscripts/devimage/devimage.sh"
#  content [26fb23e1daf83ec0e84e9e8e5e3041a222b5df37]
# 
# add_file "packages/initrdscripts/devimage/dropbear_rsa_host_key"
#  content [20f3e1087657d9777fb6f5fadb94291402731c2d]
# 
# add_file "packages/initrdscripts/devimage/passwd"
#  content [d5e9f5ce4df0dc0b53046a1c18ddac1ee63df46a]
# 
# add_file "packages/initrdscripts/devimage_0.1.bb"
#  content [4d6613a7cf373cad5cd52603f3a02ad18595f16e]
# 
# patch "conf/machine/h4000.conf"
#  from [0f9f407e263722cada91fcbbddd485ba1f0a85b9]
#    to [b1fe581faf246de6c051ab60e24a5ddd578bf16e]
# 
# patch "conf/machine/htcblueangel.conf"
#  from [29e2ddc11eb786ac0f566be156d09a5f96617a8b]
#    to [9f5fe21162f6a280ef6f17c8c0d23dafe9671876]
# 
============================================================
--- packages/images/devimage-image.bb	522d69564f125613dfe3c1b5d6ddabb988157140
+++ packages/images/devimage-image.bb	522d69564f125613dfe3c1b5d6ddabb988157140
@@ -0,0 +1,15 @@
+# Image for kernel debugging and development testing
+# Contains minimal userspace shim (no udev, etc.), but all useful 
+# "kernel userspace" utilities (feel free to add missing).
+# Allows to login via serial and real console or SSH
+LICENSE = "MIT"
+PR = "r1"
+
+RDEPENDS = "devimage busybox dropbear module-init-tools wireless-tools wpa-supplicant irda-utils acx-firmware"
+
+export IMAGE_BASENAME = "devimage"
+export IMAGE_LINGUAS = ""
+
+PACKAGE_INSTALL = "${RDEPENDS}"
+
+inherit image
============================================================
--- packages/initrdscripts/devimage/devimage.sh	26fb23e1daf83ec0e84e9e8e5e3041a222b5df37
+++ packages/initrdscripts/devimage/devimage.sh	26fb23e1daf83ec0e84e9e8e5e3041a222b5df37
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir /proc
+mount -t proc proc /proc
+mkdir /sys
+mount -t sysfs sysfs /sys
+mkdir -p /dev/pts
+mount -t devpts devpts /dev/pts
+
+/usr/sbin/dropbear -E
+
+/bin/sh
============================================================
# packages/initrdscripts/devimage/dropbear_rsa_host_key is binary
============================================================
--- packages/initrdscripts/devimage/passwd	d5e9f5ce4df0dc0b53046a1c18ddac1ee63df46a
+++ packages/initrdscripts/devimage/passwd	d5e9f5ce4df0dc0b53046a1c18ddac1ee63df46a
@@ -0,0 +1 @@
+root::0:0:root:/:/bin/sh
============================================================
--- packages/initrdscripts/devimage_0.1.bb	4d6613a7cf373cad5cd52603f3a02ad18595f16e
+++ packages/initrdscripts/devimage_0.1.bb	4d6613a7cf373cad5cd52603f3a02ad18595f16e
@@ -0,0 +1,11 @@
+SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
+PR = "r1"
+
+do_install() {
+        install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
+	install -d ${D}/etc/dropbear
+        install -m 0600 ${WORKDIR}/dropbear_rsa_host_key ${D}/etc/dropbear/
+        install -m 0644 ${WORKDIR}/passwd ${D}/etc/
+}
+
+FILES_${PN} += " /init /etc/*"
============================================================
--- conf/machine/h4000.conf	0f9f407e263722cada91fcbbddd485ba1f0a85b9
+++ conf/machine/h4000.conf	b1fe581faf246de6c051ab60e24a5ddd578bf16e
@@ -35,6 +35,7 @@ module_autoload_g_ether = "g_ether"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_snd-h4000_audio = "snd-h4000_audio"
 module_autoload_g_ether = "g_ether"
+module_conf_acx = "blacklist acx"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
============================================================
--- conf/machine/htcblueangel.conf	29e2ddc11eb786ac0f566be156d09a5f96617a8b
+++ conf/machine/htcblueangel.conf	9f5fe21162f6a280ef6f17c8c0d23dafe9671876
@@ -49,8 +49,8 @@ module_autoload_snd-mixer-oss     = "snd
 module_autoload_bluenagel_leds    = "bleangel_leds"
 module_autoload_hci_uart          = "hci_uart"
 module_autoload_snd-mixer-oss     = "snd-mixer-oss"
+module_conf_acx = "blacklist acx"
 
-
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"