summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/beagle.conf9
-rw-r--r--libxine/libxine_1.0.0-rc6a.oe83
-rw-r--r--linux/montavista-sa-2.4.17-mvl21/defconfig-beagle6
-rw-r--r--linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch0
-rw-r--r--linux/montavista-sa_2.4.17-mvl21.oe17
-rw-r--r--nonworking/ppp/ppp/mppe-signed.patch284
-rw-r--r--tslib/tslib_cvs.oe1
7 files changed, 389 insertions, 11 deletions
diff --git a/conf/beagle.conf b/conf/beagle.conf
index 974c8431b1..0b76d87dc7 100644
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -6,16 +6,15 @@ TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules "
-BOOTSTRAP_EXTRA_RDEPENDS = " kernel modutils-collateral \
-kernel-module-net-fd \
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils hostap-modules orinoco-modules "
+BOOTSTRAP_EXTRA_RDEPENDS = " kernel-module-net-fd \
kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix \
kernel-module-sa1100-ir \
kernel-module-usb-eth kernel-module-sa1100usb-core \
-kernel-module-ppp-generic kernel-module-mtdchar \
+kernel-module-ppp-generic kernel-module-ppp-async kernel-module-mtdchar \
kernel-module-fat kernel-module-vfat "
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules "
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs "
# FIXME: the modules list is not complete yet!
diff --git a/libxine/libxine_1.0.0-rc6a.oe b/libxine/libxine_1.0.0-rc6a.oe
index e69de29bb2..31e5e208af 100644
--- a/libxine/libxine_1.0.0-rc6a.oe
+++ b/libxine/libxine_1.0.0-rc6a.oe
@@ -0,0 +1,83 @@
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/xine-lib-1-rc6a"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc6a.tar.gz \
+ file://cpu.patch;patch=1 \
+ file://configure.patch;patch=1"
+
+SOV = "1.0.6"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-oggtest \
+ --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-altivec --disable-vis --disable-mlib \
+ --enable-shared --disable-static \
+ --disable-fb --disable-alsa --disable-vcd \
+ --disable-asf --disable-faad --disable-iconv \
+ --disable-nls --disable-aalib --without-x \
+ --without-v4l --without-arts --without-sdl"
+
+do_compile() {
+ oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+ src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+ src/xine-utils/xine_buffer.h src/xine-engine/video_out.h \
+ src/xine-engine/buffer.h src/xine-engine/vo_scale.h \
+ src/xine-engine/configfile.h src/xine-utils/attributes.h \
+ src/xine-engine/info_helper.h src/xine-engine/scratch.h \
+ src/xine-engine/audio_decoder.h src/input/input_plugin.h \
+ src/xine-engine/spu_decoder.h src/xine-engine/audio_out.h \
+ src/xine-engine/io_helper.h src/xine-engine/video_decoder.h \
+ src/xine-engine/broadcaster.h src/xine-engine/metronom.h \
+ src/xine-utils/xmllexer.h src/xine-engine/osd.h \
+ src/xine-engine/video_overlay.h src/xine-utils/xmlparser.h \
+ src/xine-utils/compat.h src/xine-engine/plugin_catalog.h \
+ src/xine-engine/post.h src/demuxers/demux.h \
+ src/xine-engine/resample.h"
+
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xine
+
+ install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+ for file in ${HEADERS}; do
+ cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+ done
+
+ oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+ plugindir = oe.data.expand('${libdir}/xine/plugins/1.0.0', d)
+ do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+ postdir = oe.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+ do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+ fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
+ do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s')
+}
diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index 82d1d8e5e5..181b7eb1e6 100644
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -172,14 +172,12 @@ CONFIG_BINFMT_ELF=y
CONFIG_PM=y
CONFIG_APM=y
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="noinitrd root=/dev/mtdblock/1 init=/linuxrc mem=27M console=ttySA0"
+CONFIG_CMDLINE="root=/dev/mtdblock/1 mem=27M console=ttySA0 noinitrd"
CONFIG_LEDS=y
CONFIG_LEDS_TIMER=y
# CONFIG_LEDS_CPU is not set
CONFIG_ALIGNMENT_TRAP=y
CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_TIMES is not set
-# CONFIG_LOCK_BREAK is not set
#
# Parallel port support
@@ -699,7 +697,7 @@ CONFIG_DEVFS_MOUNT=y
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set
-# CONFIG_EXT2_FS is not set
+CONFIG_EXT2_FS=m
# CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set
# CONFIG_UDF_RW is not set
diff --git a/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch b/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch
diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index 5c4cd74141..ae9841d289 100644
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -21,10 +21,16 @@ SRC_URI = "http://www.vanille.de/temp/linux-${KV}_${MVLV}.tar.gz \
file://beagle-sound.patch;patch=1 \
file://linux-2.4.18-list_move.patch;patch=1 \
file://ucb1x_kill-zombie.patch;patch=1 \
+ file://pcmcia_preempt.patch;patch=1 \
file://defconfig-${MACHINE}"
S = "${WORKDIR}/linux-${KV}_${MVLV}"
+def beagle_multiline_ppp():
+ str = "alias char-major-108\tppp_generic\nalias /dev/ppp\tppp_generic"
+ return str
+
+
inherit kernel
CMDLINE = "root=/dev/mtdblock/1 mem=32M console=ttySA0 noinitrd"
@@ -41,13 +47,20 @@ module_conf_ppp_async = "alias ppp0 ppp_async"
module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
-
+module_conf_ppp_generic = "${@beagle_multiline_ppp()} "
+module_conf_ppp_mppe = "alais ppp-compress-18 ppp_mppe"
module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore "
+
+
module_autoload_sa1100_bi = "sa1100_bi"
module_autoload_sa1100_pcmcia = "sa1100_pcmcia"
module_autoload_unix = "unix"
-module_autoload_usb_eth = "usb-eth"
+module_autoload_usb-eth = "usb-eth"
+module_autoload_af_packet = "af_packet"
+
+FILES_kernel = ""
+ALLOW_EMPTY = 1
do_configure_prepend() {
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
diff --git a/nonworking/ppp/ppp/mppe-signed.patch b/nonworking/ppp/ppp/mppe-signed.patch
index e69de29bb2..3ba4e42adb 100644
--- a/nonworking/ppp/ppp/mppe-signed.patch
+++ b/nonworking/ppp/ppp/mppe-signed.patch
@@ -0,0 +1,284 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ppp/pppd/chap_ms.h~mppe-signed
++++ ppp/pppd/chap_ms.h
+@@ -2,6 +2,7 @@
+ * chap_ms.h - Challenge Handshake Authentication Protocol definitions.
+ *
+ * Copyright (c) 1995 Eric Rosenquist. All rights reserved.
++ * Copyright (c) 2004 Holger Hans Peter Freyther <freyther@inf.fu-berlin.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+--- ppp/pppd/chap_ms.c~mppe-signed
++++ ppp/pppd/chap_ms.c
+@@ -2,6 +2,7 @@
+ * chap_ms.c - Microsoft MS-CHAP compatible implementation.
+ *
+ * Copyright (c) 1995 Eric Rosenquist. All rights reserved.
++ * Copyright (c) 2004 Holger Hans Peter Freyther <freyther@inf.fu-berlin.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+@@ -110,12 +111,12 @@
+ static const char rcsid[] = RCSID;
+
+
+-static void ChallengeHash __P((u_char[16], u_char *, char *, u_char[8]));
+-static void ascii2unicode __P((char[], int, u_char[]));
+-static void NTPasswordHash __P((char *, int, u_char[MD4_SIGNATURE_SIZE]));
++static void ChallengeHash __P((u_char[16], u_char *, u_char *, u_char[8]));
++static void ascii2unicode __P((u_char[], int, u_char[]));
++static void NTPasswordHash __P((u_char *, int, u_char[MD4_SIGNATURE_SIZE]));
+ static void ChallengeResponse __P((u_char *, u_char *, u_char[24]));
+ static void ChapMS_NT __P((u_char *, char *, int, u_char[24]));
+-static void ChapMS2_NT __P((char *, u_char[16], char *, char *, int,
++static void ChapMS2_NT __P((u_char *, u_char[16], char *, char *, int,
+ u_char[24]));
+ static void GenerateAuthenticatorResponse __P((char*, int, u_char[24],
+ u_char[16], u_char *,
+@@ -126,7 +127,7 @@
+
+ #ifdef MPPE
+ static void Set_Start_Key __P((u_char *, char *, int));
+-static void SetMasterKeys __P((char *, int, u_char[24], int));
++static void SetMasterKeys __P((u_char *, int, u_char[24], int));
+ #endif
+
+ #ifdef MSLANMAN
+@@ -224,7 +225,7 @@
+ #endif
+
+ /* Generate the expected response. */
+- ChapMS(challenge, (char *)secret, secret_len, &md);
++ ChapMS(challenge, secret, secret_len, &md);
+
+ #ifdef MSLANMAN
+ /* Determine which part of response to verify against */
+@@ -255,9 +256,10 @@
+ {
+ MS_Chap2Response *rmd;
+ MS_Chap2Response md;
+- char saresponse[MS_AUTH_RESPONSE_LENGTH+1];
++ u_char saresponse[MS_AUTH_RESPONSE_LENGTH+1];
+ int challenge_len, response_len;
+
++ BZERO(&md,sizeof(md));
+ challenge_len = *challenge++; /* skip length, is 16 */
+ response_len = *response++;
+ if (response_len != MS_CHAP2_RESPONSE_LEN)
+@@ -267,8 +269,8 @@
+
+ /* Generate the expected response and our mutual auth. */
+ ChapMS2(challenge, rmd->PeerChallenge, name,
+- (char *)secret, secret_len, &md,
+- (unsigned char *)saresponse, MS_CHAP2_AUTHENTICATOR);
++ secret, secret_len, &md,
++ saresponse, MS_CHAP2_AUTHENTICATOR);
+
+ /* compare MDs and send the appropriate status */
+ /*
+@@ -341,8 +343,13 @@
+ unsigned char *challenge, char *secret, int secret_len,
+ unsigned char *private)
+ {
++ MS_Chap2Response resp;
+ challenge++; /* skip length, should be 16 */
+ *response++ = MS_CHAP2_RESPONSE_LEN;
++
++ BZERO(&resp,sizeof(resp)); /* initialize */
++
++
+ ChapMS2(challenge,
+ #ifdef DEBUGMPPEKEY
+ mschap2_peer_challenge,
+@@ -350,15 +357,18 @@
+ NULL,
+ #endif
+ our_name, secret, secret_len,
+- (MS_Chap2Response *) response, private,
++ &resp, private,
+ MS_CHAP2_AUTHENTICATEE);
++
++ /* Copy the response back */
++ BCOPY(&resp,response,MS_CHAP2_RESPONSE_LEN);
+ }
+
+ static int
+ chapms2_check_success(unsigned char *msg, int len, unsigned char *private)
+ {
+ if ((len < MS_AUTH_RESPONSE_LENGTH + 2) ||
+- strncmp((char *)msg, "S=", 2) != 0) {
++ strncmp((char*)msg, "S=", 2) != 0) {
+ /* Packet does not start with "S=" */
+ error("MS-CHAPv2 Success packet is badly formed.");
+ return 0;
+@@ -484,8 +494,8 @@
+
+ static void
+ ChallengeHash(u_char PeerChallenge[16], u_char *rchallenge,
+- char *username, u_char Challenge[8])
+-
++ u_char *username, u_char Challenge[8])
++
+ {
+ SHA1_CTX sha1Context;
+ u_char sha1Hash[SHA1_SIGNATURE_SIZE];
+@@ -500,7 +510,7 @@
+ SHA1_Init(&sha1Context);
+ SHA1_Update(&sha1Context, PeerChallenge, 16);
+ SHA1_Update(&sha1Context, rchallenge, 16);
+- SHA1_Update(&sha1Context, (unsigned char *)user, strlen(user));
++ SHA1_Update(&sha1Context, user, strlen(user));
+ SHA1_Final(sha1Hash, &sha1Context);
+
+ BCOPY(sha1Hash, Challenge, 8);
+@@ -514,17 +524,17 @@
+ * is machine-dependent.)
+ */
+ static void
+-ascii2unicode(char ascii[], int ascii_len, u_char unicode[])
++ascii2unicode(u_char ascii[], int ascii_len, u_char unicode[])
+ {
+ int i;
+
+ BZERO(unicode, ascii_len * 2);
+ for (i = 0; i < ascii_len; i++)
+- unicode[i * 2] = (u_char) ascii[i];
++ unicode[i * 2] = ascii[i];
+ }
+
+ static void
+-NTPasswordHash(char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE])
++NTPasswordHash(u_char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE])
+ {
+ #if defined __NetBSD__ || defined USE_OPENSSL
+ /* NetBSD uses the libc md4 routines which take bytes instead of bits */
+@@ -535,7 +545,7 @@
+ MD4_CTX md4Context;
+
+ MD4Init(&md4Context);
+- MD4Update(&md4Context, (unsigned char *)secret, mdlen);
++ MD4Update(&md4Context, secret, mdlen);
+ MD4Final(hash, &md4Context);
+
+ }
+@@ -549,25 +559,25 @@
+
+ /* Hash the Unicode version of the secret (== password). */
+ ascii2unicode(secret, secret_len, unicodePassword);
+- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash);
++ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash);
+
+ ChallengeResponse(rchallenge, PasswordHash, NTResponse);
+ }
+
+ static void
+-ChapMS2_NT(char *rchallenge, u_char PeerChallenge[16], char *username,
++ChapMS2_NT(u_char *rchallenge, u_char PeerChallenge[16], char *username,
+ char *secret, int secret_len, u_char NTResponse[24])
+ {
+ u_char unicodePassword[MAX_NT_PASSWORD * 2];
+ u_char PasswordHash[MD4_SIGNATURE_SIZE];
+ u_char Challenge[8];
+
+- ChallengeHash(PeerChallenge, (unsigned char *)rchallenge, username,
++ ChallengeHash(PeerChallenge, rchallenge, username,
+ Challenge);
+
+ /* Hash the Unicode version of the secret (== password). */
+ ascii2unicode(secret, secret_len, unicodePassword);
+- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash);
++ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash);
+
+ ChallengeResponse(Challenge, PasswordHash, NTResponse);
+ }
+@@ -627,8 +637,8 @@
+
+ /* Hash (x2) the Unicode version of the secret (== password). */
+ ascii2unicode(secret, secret_len, unicodePassword);
+- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash);
+- NTPasswordHash((char *)PasswordHash, sizeof(PasswordHash),
++ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash);
++ NTPasswordHash(PasswordHash, sizeof(PasswordHash),
+ PasswordHashHash);
+
+ SHA1_Init(&sha1Context);
+@@ -647,7 +657,7 @@
+
+ /* Convert to ASCII hex string. */
+ for (i = 0; i < MAX((MS_AUTH_RESPONSE_LENGTH / 2), sizeof(Digest)); i++)
+- sprintf((char *)&authResponse[i * 2], "%02X", Digest[i]);
++ sprintf(&authResponse[i * 2], "%02X", Digest[i]);
+ }
+
+
+@@ -695,7 +705,7 @@
+ * Set mppe_xxxx_key from MS-CHAPv2 credentials. (see RFC 3079)
+ */
+ static void
+-SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer)
++SetMasterKeys(u_char *secret, int secret_len, u_char NTResponse[24], int IsServer)
+ {
+ SHA1_CTX sha1Context;
+ u_char unicodePassword[MAX_NT_PASSWORD * 2];
+@@ -832,36 +842,44 @@
+ */
+ void
+ ChapMS2(u_char *rchallenge, u_char *PeerChallenge,
+- char *user, char *secret, int secret_len, MS_Chap2Response *response,
++ char *user, char *secret, int secret_len, MS_Chap2Response *_response,
+ u_char authResponse[], int authenticator)
+ {
++
+ /* ARGSUSED */
+- u_char *p = response->PeerChallenge;
++ u_char resp[16];
++ u_char ntresp[24];
+ int i;
+
+- BZERO(response, sizeof(*response));
++ /* initialize the strings */
++ BZERO(resp, sizeof(resp));
++ BZERO(ntresp, sizeof(ntresp));
+
+ /* Generate the Peer-Challenge if requested, or copy it if supplied. */
+ if (!PeerChallenge)
+- for (i = 0; i < sizeof(response->PeerChallenge); i++)
+- *p++ = (u_char) (drand48() * 0xff);
++ for (i = 0; i < 16; i++)
++ resp[i] = (u_char) (drand48() * 0xff);
+ else
+- BCOPY(PeerChallenge, response->PeerChallenge,
+- sizeof(response->PeerChallenge));
++ BCOPY(PeerChallenge, resp,
++ sizeof(resp));
+
+ /* Generate the NT-Response */
+- ChapMS2_NT((char *)rchallenge, response->PeerChallenge, user,
+- secret, secret_len, response->NTResp);
++ ChapMS2_NT(rchallenge, resp, user,
++ secret, secret_len, ntresp);
+
+ /* Generate the Authenticator Response. */
+- GenerateAuthenticatorResponse(secret, secret_len, response->NTResp,
+- response->PeerChallenge, rchallenge,
++ GenerateAuthenticatorResponse(secret, secret_len, ntresp,
++ resp, rchallenge,
+ user, authResponse);
+
+ #ifdef MPPE
+- SetMasterKeys(secret, secret_len, response->NTResp, authenticator);
++ SetMasterKeys(secret, secret_len, ntresp, authenticator);
+ mppe_keys_set = 1;
+ #endif
++
++ /* Copy the strings back */
++ BCOPY(resp,_response->PeerChallenge,sizeof(_response->PeerChallenge));
++ BCOPY(ntresp,_response->NTResp,sizeof(_response->NTResp));
+ }
+
+ #ifdef MPPE
diff --git a/tslib/tslib_cvs.oe b/tslib/tslib_cvs.oe
index 6b735fd441..2549bfda59 100644
--- a/tslib/tslib_cvs.oe
+++ b/tslib/tslib_cvs.oe
@@ -16,6 +16,7 @@ inherit autotools
PACKAGES += "tslib-tests"
EXTRA_OECONF = "--enable-shared"
EXTRA_OECONF_append_ramses = " --enable-input --disable-ucb1x00 --disable-corgi --disable-collie --disable-h3600 --disable-mk712 --disable-arctic2"
+EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
do_stage () {
oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 15:48:22 +0000