summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/base.bbclass3
-rw-r--r--classes/kernel.bbclass33
-rw-r--r--classes/linux-kernel-base.bbclass (renamed from classes/linux_modules.bbclass)23
-rw-r--r--classes/sanity.bbclass20
-rw-r--r--packages/appweb/appweb.inc4
-rw-r--r--packages/appweb/appweb_1.2.0.bb7
-rw-r--r--packages/appweb/appweb_2.0.4.bb5
-rw-r--r--packages/kbdd/kbdd-patched-20040904/.mtn2git_empty0
-rw-r--r--packages/kbdd/kbdd-patched-20040904/fellowes.patch425
-rw-r--r--packages/kbdd/kbdd_20040904.bb17
-rw-r--r--packages/kbdd/kbdd_cvs.bb13
-rw-r--r--packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty0
-rw-r--r--packages/matrixssl/matrixssl-1.0-beta/cross.patch28
-rw-r--r--packages/matrixssl/matrixssl.inc5
-rw-r--r--packages/matrixssl/matrixssl_1.0-beta.bb18
-rw-r--r--packages/matrixssl/matrixssl_1.1.1.bb12
16 files changed, 54 insertions, 559 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 0c62568107..a9b61d26b1 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -505,6 +505,9 @@ python base_eventhandler() {
monotone_revision = "<unknown>"
try:
monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
+ if monotone_revision.startswith( "format_version" ):
+ monotone_revision_words = monotone_revision.split()
+ monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
except IOError:
pass
bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 94e02925d7..3a7fd5b499 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -1,4 +1,4 @@
-inherit module_strip
+inherit linux-kernel-base module_strip
PROVIDES += "virtual/kernel"
DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
@@ -43,37 +43,6 @@ KERNEL_IMAGEDEST = "boot"
#
export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
-# parse kernel ABI version out of <linux/version.h>
-def get_kernelversion(p):
- import re, os
-
- fn = p + '/include/linux/utsrelease.h'
- if not os.path.isfile(fn):
- fn = p + '/include/linux/version.h'
-
- import re
- try:
- f = open(fn, 'r')
- except IOError:
- return None
-
- l = f.readlines()
- f.close()
- r = re.compile("#define UTS_RELEASE \"(.*)\"")
- for s in l:
- m = r.match(s)
- if m:
- return m.group(1)
- return None
-
-def get_kernelmajorversion(p):
- import re
- r = re.compile("([0-9]+\.[0-9]+).*")
- m = r.match(p);
- if m:
- return m.group(1)
- return None
-
KERNEL_VERSION = "${@get_kernelversion('${S}')}"
KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
diff --git a/classes/linux_modules.bbclass b/classes/linux-kernel-base.bbclass
index d5c4e74ca1..e58c228080 100644
--- a/classes/linux_modules.bbclass
+++ b/classes/linux-kernel-base.bbclass
@@ -1,3 +1,26 @@
+# parse kernel ABI version out of <linux/version.h>
+def get_kernelversion(p):
+ import re, os
+
+ fn = p + '/include/linux/utsrelease.h'
+ if not os.path.isfile(fn):
+ fn = p + '/include/linux/version.h'
+
+ import re
+ try:
+ f = open(fn, 'r')
+ except IOError:
+ return None
+
+ l = f.readlines()
+ f.close()
+ r = re.compile("#define UTS_RELEASE \"(.*)\"")
+ for s in l:
+ m = r.match(s)
+ if m:
+ return m.group(1)
+ return None
+
def get_kernelmajorversion(p):
import re
r = re.compile("([0-9]+\.[0-9]+).*")
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 23a8f656b2..d81def55a6 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -82,23 +82,11 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
raise_sanity_error('C++ Host-Compiler is missing, please install one' )
- if not check_app_exists('patch', e.data):
- raise_sanity_error('Please install the patch utility, preferable GNU patch.')
+ required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip"
- if not check_app_exists('diffstat', e.data):
- raise_sanity_error('Please install the diffstat utility')
-
- if not check_app_exists('texi2html', e.data):
- raise_sanity_error('Please install the texi2html binary')
-
- if not check_app_exists('cvs', e.data):
- raise_sanity_error('Please install the cvs utility')
-
- if not check_app_exists('svn', e.data):
- raise_sanity_error('Please install the svn utility')
-
- if not check_app_exists('bzip2', e.data):
- raise_sanity_error('Please install the bzip2 utility')
+ for util in required_utilities.split():
+ if not check_app_exists( util, e.data ):
+ raise_sanity_error( "Please install the %s utility." )
oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
if not oes_bb_conf:
diff --git a/packages/appweb/appweb.inc b/packages/appweb/appweb.inc
new file mode 100644
index 0000000000..0f602f70d3
--- /dev/null
+++ b/packages/appweb/appweb.inc
@@ -0,0 +1,4 @@
+def get_appweb_host(d, bb):
+ host = bb.data.getVar('HOST_SYS', d, 1)
+ return host.replace('-linux-uclibc', '-linux')
+
diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb
index 8cf506af2c..8bd6d778f0 100644
--- a/packages/appweb/appweb_1.2.0.bb
+++ b/packages/appweb/appweb_1.2.0.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
SECTION = "console/network"
-LICENSE="GPL"
+LICENSE = "GPL"
SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \
file://makerules.patch;patch=1 \
file://nonrootinstall.patch;patch=1"
@@ -9,10 +9,7 @@ S = "${WORKDIR}/appWeb-1.2.0"
APPWEB_HOST = "${@get_appweb_host(d, bb)}"
APPWEB_BUILD = "${BUILD_SYS}"
-def get_appweb_host(d, bb):
- host = bb.data.getVar('HOST_SYS', d, 1)
- return host.replace('-linux-uclibc', '-linux')
-
+require appweb.inc
# --buildNumber=NUMBER Set the build number part of the version (1.0.0.X).
# --name=NAME Set the full product name (BLD_NAME define).
diff --git a/packages/appweb/appweb_2.0.4.bb b/packages/appweb/appweb_2.0.4.bb
index f740876acd..7f7941012a 100644
--- a/packages/appweb/appweb_2.0.4.bb
+++ b/packages/appweb/appweb_2.0.4.bb
@@ -10,10 +10,7 @@ S = "${WORKDIR}/appWeb-${PV}"
APPWEB_HOST = "${@get_appweb_host(d, bb)}"
APPWEB_BUILD = "${BUILD_SYS}"
-def get_appweb_host(d, bb):
- host = bb.data.getVar('HOST_SYS', d, 1)
- return host.replace('-linux-uclibc', '-linux')
-
+require appweb.inc
# --buildNumber=NUMBER Set the build number part of the version (1.0.0.X).
# --name=NAME Set the full product name (BLD_NAME define).
diff --git a/packages/kbdd/kbdd-patched-20040904/.mtn2git_empty b/packages/kbdd/kbdd-patched-20040904/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kbdd/kbdd-patched-20040904/.mtn2git_empty
+++ /dev/null
diff --git a/packages/kbdd/kbdd-patched-20040904/fellowes.patch b/packages/kbdd/kbdd-patched-20040904/fellowes.patch
deleted file mode 100644
index f40ea0f31e..0000000000
--- a/packages/kbdd/kbdd-patched-20040904/fellowes.patch
+++ /dev/null
@@ -1,425 +0,0 @@
---- kbd.c 2004-07-06 08:07:38.000000000 -0700
-+++ ../kbdd.works/kbd.c 2005-01-01 07:59:00.000000000 -0800
-@@ -21,12 +21,14 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include <fcntl.h>
- #include <termios.h>
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
- #include <limits.h>
-+#include <signal.h>
-
- #include "keyboards.h"
- #include "dev_uinput.h"
-@@ -37,6 +39,7 @@
-
- char debug=0;
- int uindev=0;
-+static int reinit=0;
- char TTY_PORT[PATH_MAX];
-
- int open_serial(char *port, speed_t baud)
-@@ -122,6 +125,250 @@
- return 0;
- }
-
-+int stowaway_init(int fd)
-+{
-+int status;
-+unsigned char buf[16];
-+fd_set fds;
-+struct timeval tv;
-+
-+ ioctl(fd, TIOCMGET, &status);
-+ status |= TIOCM_DTR; /* Set DTR */
-+ status &= ~TIOCM_RTS; /* Clear RTS */
-+ ioctl(fd, TIOCMSET, &status);
-+
-+ /* Unfortunately, DCD seems to be high all of the time on H3900, so the following can't be used */
-+ /* ioctl(fd, TIOCMIWAIT, TIOCM_CAR */
-+ /* So we just wait instead */
-+ usleep(1000000);
-+
-+ ioctl(fd, TIOCMGET, &status);
-+ status |= TIOCM_RTS; /* Set RTS */
-+ ioctl(fd, TIOCMSET, &status);
-+ /* Stowaway will send back 0xFA 0xFD indicating successful init */
-+ tv.tv_sec = 2;
-+ tv.tv_usec = 0;
-+ FD_ZERO(&fds);
-+ FD_SET(fd, &fds);
-+ if(select(fd+1, &fds, NULL, NULL, &tv)) {
-+ read(fd, buf, 2);
-+ if((buf[0] = 0xFA) && (buf[0] = 0xFD))
-+ if (debug) fprintf(stderr, "keyboard initialised\n");
-+ }
-+
-+ return 0;
-+}
-+
-+void stowaway_sig(int sig) {
-+ reinit = 1;
-+}
-+
-+int stowaway(void)
-+{
-+int fd;
-+unsigned char buf[16];
-+char fn=0;
-+struct sigaction act;
-+int rc;
-+
-+ fd = open_serial(TTY_PORT, B9600);
-+ if (fd <= 0)
-+ return (-1);
-+
-+ /* Make SIGHUP cause a reinit of the keyboard */
-+ act.sa_handler = stowaway_sig;
-+ sigemptyset(&act.sa_mask);
-+ act.sa_flags = 0;
-+ sigaction(SIGHUP, &act, NULL);
-+
-+ while (fd > 0) {
-+
-+ stowaway_init(fd);
-+
-+ while (fd > 0) {
-+ rc = read (fd, buf, 1);
-+ if(rc == -1) {
-+ if(reinit) {
-+ reinit = 0;
-+ break;
-+ }
-+ else {
-+ perror("read");
-+ return 1;
-+ }
-+ }
-+
-+ if ( ((unsigned char)buf[0] & (unsigned char)0x80) == 0 ) {
-+ if (debug) fprintf(stderr, "press: %d\n", buf[0]);
-+ if (buf[0] == 0x08) {
-+ fn=1;
-+ continue;
-+ }
-+ if (fn)
-+ buf[0]=stowaway_function[buf[0]];
-+ else
-+ buf[0]=stowaway_normal[buf[0]];
-+ if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+ if (buf[0] > 0)
-+ dev_uinput_key(uindev, (unsigned short)buf[0], KEY_PRESSED);
-+ } else {
-+ if (debug) fprintf(stderr, "rel. : %d\n", buf[0] & ~0x80);
-+ if ((buf[0] & ~0x80) == 0x08) {
-+ fn = 0;
-+ continue;
-+ }
-+ if (fn)
-+ buf[0]=stowaway_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+ else
-+ buf[0]=stowaway_normal[(unsigned char)buf[0] & (unsigned char)~0x80];
-+ if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+ if (buf[0] > 0)
-+ dev_uinput_key(uindev, (unsigned short)buf[0], KEY_RELEASED);
-+ }
-+ }
-+ }
-+
-+return 0;
-+}
-+
-+
-+int fellowes(void)
-+{
-+#define FELLOWES_GR_FN 33
-+#define FELLOWES_BL_FN 34
-+
-+
-+ int fd;
-+ unsigned char buf[16];
-+ char bluefn=0,greenfn=0;
-+ struct sigaction act;
-+ int rc;
-+
-+
-+ fd = open_serial(TTY_PORT, B9600);
-+ if (fd <= 0)
-+ return (-1);
-+
-+ /* Make SIGHUP cause a reinit of the keyboard */
-+ act.sa_handler = stowaway_sig;
-+ sigemptyset(&act.sa_mask);
-+ act.sa_flags = 0;
-+ sigaction(SIGHUP, &act, NULL);
-+
-+ while (fd > 0) {
-+ stowaway_init(fd);
-+
-+ while (fd > 0) {
-+ rc = read (fd, buf, 1);
-+ if(rc == -1) {
-+ if(reinit) {
-+ reinit = 0;
-+ break;
-+ }
-+ else {
-+ perror("read");
-+ return 1;
-+ }
-+ }
-+
-+
-+
-+ if ( ((unsigned char)buf[0] & (unsigned char)0x80) == 0 ) {
-+ /* KEY PRESSED */
-+ if (debug) fprintf(stderr, "press: %d\n", buf[0]);
-+ if (buf[0] == FELLOWES_BL_FN) {
-+ bluefn=1;
-+ continue;
-+ }
-+
-+ if (buf[0] == FELLOWES_GR_FN) {
-+ greenfn=1;
-+ dev_uinput_key(uindev,42,KEY_PRESSED);
-+ continue;
-+ }
-+
-+ if (bluefn)
-+ buf[0]=fellowes_function[buf[0]];
-+ else if (greenfn) {
-+ buf[0]=fellowes_function[buf[0]];
-+
-+ /* fixup where green function is not shift blue function */
-+ switch(buf[0]) {
-+ case KEY_UP:
-+ buf[0]=KEY_PAGEUP;
-+ break;
-+ case KEY_LEFT:
-+ buf[0]=KEY_HOME;
-+ break;
-+ case KEY_DOWN:
-+ buf[0]=KEY_PAGEDOWN;
-+ break;
-+ case KEY_RIGHT:
-+ buf[0]=KEY_END;
-+ break;
-+ case KEY_INTL2:
-+ buf[0]=KEY_INTL3;
-+ break;
-+
-+ }
-+ } else
-+ buf[0]=fellowes_normal[buf[0]];
-+
-+ if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+ if (buf[0] != KEY_RESERVED)
-+ dev_uinput_key(uindev, (unsigned short)buf[0], KEY_PRESSED);
-+
-+ } else {
-+ /* KEY RELEASED */
-+ if (debug) fprintf(stderr, "rel. : %d\n", buf[0] & ~0x80);
-+
-+ if ((buf[0] & ~0x80) == FELLOWES_BL_FN) {
-+ bluefn = 0;
-+ continue;
-+ }
-+
-+ if ((buf[0] & ~0x80) == FELLOWES_GR_FN) {
-+ greenfn = 0;
-+ dev_uinput_key(uindev,42,KEY_RELEASED);
-+ continue;
-+ }
-+
-+ if (bluefn)
-+ buf[0]=fellowes_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+ else if (greenfn) {
-+ buf[0]=fellowes_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+
-+ /* fixup where green function is not shift blue function */
-+ switch(buf[0]) {
-+ case KEY_UP:
-+ buf[0]=KEY_PAGEUP;
-+ break;
-+ case KEY_LEFT:
-+ buf[0]=KEY_HOME;
-+ break;
-+ case KEY_DOWN:
-+ buf[0]=KEY_PAGEDOWN;
-+ break;
-+ case KEY_RIGHT:
-+ buf[0]=KEY_END;
-+ break;
-+ case KEY_INTL2:
-+ buf[0]=KEY_INTL3;
-+ break;
-+ }
-+ } else
-+ buf[0]=fellowes_normal[(unsigned char)buf[0] & (unsigned char)~0x80];
-+
-+ if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+ if (buf[0] != KEY_RESERVED)
-+ dev_uinput_key(uindev, (unsigned short)buf[0], KEY_RELEASED);
-+ }
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-
- int snapntype(void)
- {
-@@ -177,6 +424,8 @@
- fprintf (stderr, "-t <kbd type>\n");
- fprintf (stderr, "\tspecify the serial keyboard type, supported are:\n");
- fprintf (stderr, "\tfoldable - Compaq/HP foldable keyboard\n");
-+ fprintf (stderr, "\tstowaway - Targus Stowaway keyboard\n");
-+ fprintf (stderr, "\tfellowes - fellowes serial keyboard\n");
- fprintf (stderr, "\tsnapntype- Snap'n'Type\n\n");
- fprintf (stderr, "Example:\n\t%s -t foldable\n", arg0);
- }
-@@ -184,6 +433,8 @@
- #define KBD_TYPE_NONE 0
- #define KBD_TYPE_FOLDABLE 1
- #define KBD_TYPE_SNAPNTYPE 2
-+#define KBD_TYPE_STOWAWAY 3
-+#define KBD_TYPE_FELLOWES 4
-
- int main(int argc, char **argv)
- {
-@@ -204,7 +455,13 @@
- kbdtype = KBD_TYPE_FOLDABLE;
- } else if (strncmp("snapntype", optarg, 9) == 0) {
- kbdtype = KBD_TYPE_SNAPNTYPE;
-+ } else if (strncmp("stowaway", optarg, 8) == 0) {
-+ kbdtype = KBD_TYPE_STOWAWAY;
-+ } else if (strncmp("fellowes", optarg, 8) == 0) {
-+ kbdtype = KBD_TYPE_FELLOWES;
- }
-+ else
-+ fprintf(stderr, "unrecognised keyboard type %s\n", optarg);
- break;
- case 'p':
- strcpy(TTY_PORT, optarg);
-@@ -226,6 +483,10 @@
- compaq_foldable();
- else if (kbdtype == KBD_TYPE_SNAPNTYPE)
- snapntype();
-+ else if (kbdtype == KBD_TYPE_STOWAWAY)
-+ stowaway();
-+ else if (kbdtype == KBD_TYPE_FELLOWES)
-+ fellowes();
-
- return 0;
- }
---- keyboards.h 2004-07-09 17:15:52.000000000 -0700
-+++ ../kbdd.works/keyboards.h 2005-01-01 07:58:19.000000000 -0800
-@@ -24,6 +24,7 @@
-
- #include "uinput.h"
-
-+
- /***********************************************************************************
- * iConcepts
- *
-@@ -139,6 +140,95 @@
- 108, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
-
-+/***********************************************************************************
-+ * Targus Stowaway keyboard
-+ *
-+ * 9600 baud, 8N1
-+ *
-+ * Initialisation: raise DTR and drop RTS, wait for DCD pulse, then raise RTS
-+ * keyboard will then send back 0xFA 0xFD
-+ *
-+ * Key down sends one byte
-+ * Key up sends one byte & 0x80, and if the key up is the last key up (ie, no more
-+ * keys held down), then the key code & 0x80 is repeated
-+ ***********************************************************************************/
-+
-+static unsigned char stowaway_normal[128] = {
-+ /* 0, 001, 002, 003, 004, 005, 006, 007, 008, 009 */
-+/*000*/ 2, 3, 4, 44, 5, 6, 7, 8, 0, 16,
-+/*010*/ 17, 18, 19, 20, 21, 41, 45, 30, 31, 32,
-+/*020*/ 33, 34, 35, 57, 58, 15, 29, 0, 0, 0,
-+/*030*/ 0, 0, 0, 0, 0, 56, 0, 0, 0, 0,
-+/*040*/ 0, 0, 0, 0, 46, 47, 48, 49, 12, 13,
-+/*050*/ 14, 87, 9, 10, 11, 57, 26, 27, 43, 220,
-+/*060*/ 22, 23, 24, 25, 40, 28, 219, 0, 36, 37,
-+/*070*/ 38, 39, 53, 144, 183, 0, 50, 51, 52, 0,
-+/*080*/ 111, 146, 155, 151, 0, 0, 0, 0, 42, 54,
-+/*090*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*100*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*110*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*120*/ 0, 0, 0, 0, 0, 0, 0, 0, };
-+
-+static unsigned char stowaway_function[128] = {
-+ /* 0, 001, 002, 003, 004, 005, 006, 007, 008, 009 */
-+/*000*/ 59, 60, 61, 0, 62, 63, 64, 65, 0, 0,
-+/*010*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*020*/ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-+/*030*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*040*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*050*/ 92, 0, 66, 67, 68, 0, 0, 0, 0, 0,
-+/*060*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*070*/ 0, 0, 0, 104, 0, 0, 0, 0, 0, 0,
-+/*080*/ 0, 102, 109, 107, 0, 0, 0, 0, 0, 0,
-+/*090*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*100*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*110*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+/*120*/ 0, 0, 0, 0, 0, 0, 0, 0, };
-+
-+
-+
-+/***********************************************************************************
-+ * ThinkOutside / Fellowes Stowaway XT
-+ *
-+ * 9600 baud, 8N1
-+ *
-+ * Notes:
-+ * the green function key is basically shift + scancode - handled elsewhere
-+ *
-+ ***********************************************************************************/
-+unsigned char fellowes_normal[128] = {
-+ /* 000 */ 0, 0, 0, KEY_Z, 0, 0, 0, 0, KEY_LEFTMETA, KEY_Q,
-+ /* 010 */ KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, 0,KEY_X, KEY_A, KEY_S, KEY_D,
-+ /* 020 */ KEY_F, KEY_G, KEY_H, KEY_SPACE, KEY_CAPSLOCK, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0,
-+ /* 030 */ 0, 0, 0, 0, 0, KEY_LEFTALT, 0, 0, 0, 0,
-+ /* 040 */ 0, 0, 0, 0, KEY_C, KEY_V, KEY_B, KEY_N, 0, 0,
-+ /* 050 */ KEY_BACKSPACE, 0, 0, 0, 0, KEY_SPACE, KEY_MINUS, KEY_EQUAL, KEY_SLASH, 0,
-+ /* 060 */ KEY_U, KEY_I, KEY_O, KEY_P, KEY_APOSTROPHE, KEY_ENTER, 0, 0, KEY_J, KEY_K,
-+ /* 070 */ KEY_L, KEY_SEMICOLON, KEY_UP, 0, 0, 0, KEY_M, KEY_COMMA, KEY_DOT, 0,
-+ /* 080 */ KEY_DELETE, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
-+ /* 090 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 100 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 110 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 120 */ 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+unsigned fellowes_function[128] = {
-+ /* 000 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_1,
-+ /* 010 */ KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, 0, 0, KEY_F9, KEY_F10, KEY_F11,
-+ /* 020 */ KEY_F12, 0, 0, 0, KEY_NUMLOCK, KEY_ESC, 0, 0, 0, 0,
-+ /* 030 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 040 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 050 */ 0, 0, 0, 0, 0, 0, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, 0,
-+ /* 060 */ KEY_7, KEY_8, KEY_9, KEY_0, 0, 0, 0, 0, 0, 0,
-+ /* 070 */ 0, KEY_WWW, KEY_UP, 0, 0, 0, 0, KEY_INTL1, KEY_INTL2, 0,
-+ /* 080 */ 0, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, 0, 0,
-+ /* 090 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 100 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 110 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 120 */ 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+
-
- /***********************************************************************************
- * HP foldable keyboard
diff --git a/packages/kbdd/kbdd_20040904.bb b/packages/kbdd/kbdd_20040904.bb
deleted file mode 100644
index 55461b2454..0000000000
--- a/packages/kbdd/kbdd_20040904.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "unknown"
-SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV}"
-DEFAULT_PREFERENCE="-1"
-
-
-S = "${WORKDIR}/kbdd"
-LICENSE = "GPL"
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -d ${D}${docdir}/kbdd/
- install -m 0755 kbdd ${D}${bindir}/
- install -m 0644 README ${D}${docdir}/kbdd/
-}
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index 18d8bf6391..51056dc50b 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -1,21 +1,20 @@
-SECTION = "console/utils"
DESCRIPTION = "User-space keyboard daemon for external keyboards"
HOMEPAGE = "http://handhelds.org/moin/moin.cgi/kbdd"
+SECTION = "console/utils"
LICENSE = "GPLv2"
DEPENDS = "virtual/kernel"
RRECOMMENDS_${PN} = "${@linux_module_packages('keybdev uinput', d)}"
+PV = "0.10+cvs${SRCDATE}"
+PR = "r5"
+
SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \
file://kbdd.init \
file://kbdd.conf \
file://kbdd-modules"
+S = "${WORKDIR}/kbdd"
-#Remove the dash below when 0.8 changes in PV
-PV="0.10+cvs${SRCDATE}"
-PR="r5"
-
-inherit update-rc.d linux_modules
+inherit update-rc.d linux-kernel-base
-S = "${WORKDIR}/kbdd"
INITSCRIPT_NAME = "kbdd"
INITSCRIPT_PARAMS = "defaults"
diff --git a/packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty b/packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty
+++ /dev/null
diff --git a/packages/matrixssl/matrixssl-1.0-beta/cross.patch b/packages/matrixssl/matrixssl-1.0-beta/cross.patch
deleted file mode 100644
index b4c9634949..0000000000
--- a/packages/matrixssl/matrixssl-1.0-beta/cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/Makefile~cross 2004-03-01 19:12:37.000000000 -0500
-+++ src/Makefile 2004-06-04 21:59:55.527364588 -0400
-@@ -12,14 +12,14 @@
- #
- # Debug flags and C flags
- #
--DFLAGS = -O3
-+CFLAGS = -O3
- #
- # To build a debug version of the MatrixSSL library, uncomment the DFLAGS line
- # below and remove the strip command in the .so target below.
- #
--#DFLAGS = -g -DDEBUG
-+#CFLAGS = -g -DDEBUG
-
--CFLAGS = -DLINUX $(DFLAGS)
-+override CFLAGS += -DLINUX
- LDFLAGS = -Wl -lc -lpthread
-
- all: compile
-@@ -56,7 +56,6 @@
- #
- libmatrixssl.so: $(OBJECTS)
- $(CC) -shared -nostdlib -o $@ $^ $(LDFLAGS)
-- strip $(LIBRARIES)
-
- #
- # Clean up workspace
diff --git a/packages/matrixssl/matrixssl.inc b/packages/matrixssl/matrixssl.inc
new file mode 100644
index 0000000000..5f6bf43a9e
--- /dev/null
+++ b/packages/matrixssl/matrixssl.inc
@@ -0,0 +1,5 @@
+def define_os (d):
+ import bb
+ if bb.data.getVar('TARGET_OS', d).startswith('linux'):
+ return "-DLINUX"
+ return ""
diff --git a/packages/matrixssl/matrixssl_1.0-beta.bb b/packages/matrixssl/matrixssl_1.0-beta.bb
deleted file mode 100644
index 3dfd02448d..0000000000
--- a/packages/matrixssl/matrixssl_1.0-beta.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "unknown"
-SRC_URI = "http://openembedded.org/dl/matrixssl-1-0-beta2-r2.tar.gz \
- file://cross.patch;patch=1"
-S = "${WORKDIR}/matrixssl/src"
-LICENSE = "GPL"
-def define_os (d):
- import bb
- if bb.data.getVar('TARGET_OS', d).startswith('linux'):
- return "-DLINUX"
- return ""
-
-CFLAGS += " ${@define_os(d)}"
-
-do_install () {
- install -d ${D}${includedir}
- install -m 0644 ${S}/../matrixSsl.h ${D}${includedir}/
- oe_libinstall -so libmatrixssl ${D}${libdir}/
-}
diff --git a/packages/matrixssl/matrixssl_1.1.1.bb b/packages/matrixssl/matrixssl_1.1.1.bb
index 674e4b4509..09df504a8b 100644
--- a/packages/matrixssl/matrixssl_1.1.1.bb
+++ b/packages/matrixssl/matrixssl_1.1.1.bb
@@ -1,14 +1,12 @@
-SECTION = "unknown"
+DESCRIPTION = "A secure sockets library"
+SECTION = "libs"
+LICENSE = "GPL"
+
SRC_URI = "http://openembedded.org/dl/matrixssl-1-1-1.tar.gz \
file://cross.patch;patch=1"
S = "${WORKDIR}/matrixssl/src"
-LICENSE = "GPL"
-def define_os (d):
- import bb
- if bb.data.getVar('TARGET_OS', d).startswith('linux'):
- return "-DLINUX"
- return ""
+require matrixssl.inc
CFLAGS += " ${@define_os(d)}"
do_install () {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:56:11 +0000