Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/19 00:02:58+00:00 nexus.co.uk!pb
start adding scap, the screen capture script

2005/01/19 00:02:20+00:00 nexus.co.uk!pb
bump PR on task-bootstrap for IPAQ_MODULES changes

2005/01/18 23:57:49+00:00 nexus.co.uk!pb
add keybdev to IPAQ_MODULES

2005/01/18 23:54:57+00:00 nexus.co.uk!pb
apply patch from Florian Boor to add /dev/input/mice

BKrev: 41edac68e64e0vtimIH5HFRyf6VT5w

diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index a16a182..dc7a2d0 100644 (file)
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,4 +1,4 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs" 
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
 BOOTSTRAP_EXTRA_DEPENDS += "ipaq-usbnet-support kbdd bl hostap-modules orinoco-modules mipv6"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ipaq-usbnet-support kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"

diff --git a/packages/initscripts/initscripts-1.0/device_table.txt b/packages/initscripts/initscripts-1.0/device_table.txt
index 662cca7..8d81d4a 100644 (file)
--- a/packages/initscripts/initscripts-1.0/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/device_table.txt
@@ -159,4 +159,5 @@
 /dev/ttyUSB    c       660     0       5       188     0       0       1       2
 /dev/urandom   c       644     0       0       1       9       -       -       -
 /dev/usbmouse  c       640     0       45      10      32      -       -       -
-/dev/zero      c       644     0       0       1       5       -       -
+/dev/zero      c       644     0       0       1       5       -       -       -
+/dev/input/mice        c       660     0       0       13      63      -       -       -

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 3aadf3d..4a423fe 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r28"
+PR = "r29"
 
 SRC_URI = "file://halt \
            file://ramdisk \

diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 8ecef18..aa56782 100644 (file)
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r16"
+PR = "r17"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.

diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh
new file mode 100644 (file)
index 0000000..e69de29