diff options
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -rw-r--r-- | packages/gpsdrive/files/gpsdrive-pda-fix.patch | 4 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map | 136 | ||||
| -rw-r--r-- | packages/meta/meta-sdk.bb | 28 | ||||
| -rw-r--r-- | packages/vlan/vlan_1.8.bb | 11 |
5 files changed, 90 insertions, 91 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7535f63a01..6f321b50a6 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -103,7 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # Tracking the latest version, so the following is commented out. # Uncomment it before release! -#PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" +PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch index f76d83e3ad..85f220bd16 100644 --- a/packages/gpsdrive/files/gpsdrive-pda-fix.patch +++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch @@ -1,5 +1,5 @@ ---- src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200 -+++ src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200 +--- gpsdrive/src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200 ++++ gpsdrive/src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200 @@ -10516,7 +10516,7 @@ PangoFontDescription *font_desc; font_desc = diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dc7fa37401..85a194b850 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -143,71 +143,71 @@ string Prior = "\033[5~" string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +compose '`' 'A' to '� +compose '`' 'a' to '� +compose '\'' 'A' to '� +compose '\'' 'a' to '� +compose '^' 'A' to '� +compose '^' 'a' to '� +compose '~' 'A' to '� +compose '~' 'a' to '� +compose '"' 'A' to '� +compose '"' 'a' to '� +compose 'O' 'A' to '� +compose 'o' 'a' to '� +compose '0' 'A' to '� +compose '0' 'a' to '� +compose 'A' 'A' to '� +compose 'a' 'a' to '� +compose 'A' 'E' to '� +compose 'a' 'e' to '� +compose ',' 'C' to '� +compose ',' 'c' to '� +compose '`' 'E' to '� +compose '`' 'e' to '� +compose '\'' 'E' to '� +compose '\'' 'e' to '� +compose '^' 'E' to '� +compose '^' 'e' to '� +compose '"' 'E' to '� +compose '"' 'e' to '� +compose '`' 'I' to '� +compose '`' 'i' to '� +compose '\'' 'I' to '� +compose '\'' 'i' to '� +compose '^' 'I' to '� +compose '^' 'i' to '� +compose '"' 'I' to '� +compose '"' 'i' to '� +compose '-' 'D' to '� +compose '-' 'd' to '� +compose '~' 'N' to '� +compose '~' 'n' to '� +compose '`' 'O' to '� +compose '`' 'o' to '� +compose '\'' 'O' to '� +compose '\'' 'o' to '� +compose '^' 'O' to '� +compose '^' 'o' to '� +compose '~' 'O' to '� +compose '~' 'o' to '� +compose '"' 'O' to '� +compose '"' 'o' to '� +compose '/' 'O' to '� +compose '/' 'o' to '' +compose '`' 'U' to '� +compose '`' 'u' to '' +compose '\'' 'U' to '� +compose '\'' 'u' to '' +compose '^' 'U' to '� +compose '^' 'u' to '' +compose '"' 'U' to '� +compose '"' 'u' to '' +compose '\'' 'Y' to '� +compose '\'' 'y' to '' +compose 'T' 'H' to '� +compose 't' 'h' to '' +compose 's' 's' to '� +compose '"' 'y' to '' +compose 's' 'z' to '� +compose 'i' 'j' to '' diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 565988763b..757c72ecb3 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,6 @@ -PR = "r4" -LICENSE = MIT +PR = "r2" + DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe" -DEPENDS += "libidl libsvg-cairo sed-native" PACKAGES = "" @@ -20,7 +19,7 @@ compositeext-dev \ damageext-dev \ dbus-dev \ fixesext-dev \ -gconf-dbus-dev \ +gconf-dev \ gtk+-dev \ gtk-engines-dev \ libapm-dev \ @@ -87,15 +86,17 @@ libxtst-dev \ libz-dev \ matchbox-desktop-dev \ ncurses-dev \ +orbit2-dev \ pango-dev \ randrext-dev \ recordext-dev \ renderext-dev \ resourceext-dev \ -libiw-dev \ +rxvt-unicode-dev \ +wireless-tools-dev \ xcalibrateext-dev \ xextensions-dev \ -libxmu-dev \ +xmu-dev \ xproto-dev \ xtrans-dev \ " @@ -147,24 +148,12 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la - - # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f" - done - mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} fakeroot tar cfj ${SDK_DEPLOY}/oe-sdk-$(date +"%Y%m%d%H%M%S").tar.bz2 . @@ -172,3 +161,4 @@ EOF do_populate_sdk[nostamp] = 1 addtask populate_sdk before do_build after do_install +LICENSE = MIT diff --git a/packages/vlan/vlan_1.8.bb b/packages/vlan/vlan_1.8.bb index 01ae798240..44cc9fa06f 100644 --- a/packages/vlan/vlan_1.8.bb +++ b/packages/vlan/vlan_1.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "802.1q vlan support program" RRECOMMENDS = "kernel-module-8021q" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" -PR = "r1" +PR = "r2" S = "${WORKDIR}/vlan/" @@ -10,6 +10,15 @@ SRC_URI = "http://scry.wanfear.com/~greear/vlan/vlan.1.8.tar.gz \ inherit base +CCFLAGS = "-g -D_GNU_SOURCE -Wall -I${STAGING_INCDIR}" +LDLIBS = "" + +do_compile() { + ${CC} ${CCFLAGS} -c vconfig.c + ${CC} ${CCFLAGS} ${LDFLAGS} -o vconfig vconfig.o ${LDLIBS} + ${STRIP} vconfig +} + do_install() { install -d "${D}/usr/sbin" install -m 755 "${S}/vconfig" "${D}/usr/sbin/vconfig" |