From ab13c9bab3f0000579470f223cd92988686ddd70 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 Nov 2005 12:28:48 +0000 Subject: More merging from OE git-svn-id: https://svn.o-hand.com/repos/poky@172 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/bitbake.conf | 2 +- openembedded/conf/distro/openzaurus-3.5.4.conf | 15 ++-- openembedded/conf/distro/openzaurus.conf | 1 + .../conf/distro/preferred-gpe-versions.inc | 84 ---------------------- openembedded/packages/gdb/gdb_6.3.bb | 1 + .../packages/ppp/ppp-2.4.3/enable-ipv6.patch | 11 +++ .../packages/ppp/ppp-2.4.3/pppoatm-makefile.patch | 7 ++ openembedded/packages/ppp/ppp_2.4.3.bb | 6 +- 8 files changed, 34 insertions(+), 93 deletions(-) delete mode 100644 openembedded/conf/distro/preferred-gpe-versions.inc create mode 100644 openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch create mode 100644 openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 3ad1b703f..06d9e61ac 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -295,7 +295,7 @@ GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" -HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs" +HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf index d7780e860..10214614f 100644 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ b/openembedded/conf/distro/openzaurus-3.5.4.conf @@ -10,12 +10,13 @@ DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" FEED_URIS += " \ - upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \ - machine##http://openzaurus.org/official/unstable/3.5.3/feed/machine/${MACHINE} \ - base##http://openzaurus.org/official/unstable/3.5.3/feed/base/ \ - libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/ \ - console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ - devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" + upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ +upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ + machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ + libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ + console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ + devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" # CVSDATE = "20050704" @@ -68,4 +69,4 @@ include conf/distro/preferred-gpe-versions-2.7.inc # #include conf/distro/preferred-e-versions.inc -include conf/distro/poky-additions.inc \ No newline at end of file +include conf/distro/poky-additions.inc diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf index 9208aeda0..a935ed4ac 100644 --- a/openembedded/conf/distro/openzaurus.conf +++ b/openembedded/conf/distro/openzaurus.conf @@ -10,3 +10,4 @@ TARGET_FPU = "soft" PARALLEL_INSTALL_MODULES = "1" +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc deleted file mode 100644 index de4fdb15b..000000000 --- a/openembedded/conf/distro/preferred-gpe-versions.inc +++ /dev/null @@ -1,84 +0,0 @@ -# -# Specify which versions of GPE (and related) applications to build -# - -#work around some breakages -#CVSDATE_xext=20050222 - -#set some preferred providers: -#PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus - -#specify versions, as the header says :) -#PREFERRED_VERSION_libmatchbox ?= "1.6" -#PREFERRED_VERSION_matchbox ?= "0.9.1" -#PREFERRED_VERSION_matchbox-common ?= "0.9.1" -#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -#PREFERRED_VERSION_matchbox-wm ?= "0.9.3" -#PREFERRED_VERSION_matchbox-panel ?= "0.9.1" -#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" -#PREFERRED_VERSION_gtk+ ?= "2.6.3" -#PREFERRED_VERSION_libgpewidget ?= "0.97" -#PREFERRED_VERSION_libgpepimc ?= "0.4" -#PREFERRED_VERSION_libgpevtype ?= "0.11" -#PREFERRED_VERSION_libschedule ?= "0.14" -#PREFERRED_VERSION_gpe-icons ?= "0.24" -#PREFERRED_VERSION_libgsm ?= "1.0.10" -PREFERRED_VERSION_diet-x11 ?= "6.2.1" -PREFERRED_VERSION_xproto ?= "6.6.2" -#PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" -PREFERRED_VERSION_rxvt-unicode ?= "5.3" -#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" -#PREFERRED_VERSION_xst ?= "0.14" -PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" -#PREFERRED_VERSION_gpe-login ?= "0.76" -#PREFERRED_VERSION_gpe-session-scripts ?= "0.62" -#PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" -#PREFERRED_VERSION_gpe-todo ?= "0.50" -#PREFERRED_VERSION_gpe-calendar ?= "0.61" -#PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" -#PREFERRED_VERSION_gpe-contacts ?= "0.36" -#PREFERRED_VERSION_gpe-today ?= "0.08" -#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" -PREFERRED_VERSION_dbus ?= "0.23.4" -#PREFERRED_VERSION_gpe-bluetooth ?= "0.38" -#PREFERRED_VERSION_gpe-su ?= "0.18" -#PREFERRED_VERSION_gpe-conf ?= "0.1.23" -#PREFERRED_VERSION_gpe-clock ?= "0.20" -#PREFERRED_VERSION_gpe-mininet ?= "0.5" -#PREFERRED_VERSION_gpe-mixer ?= "0.40" -#PREFERRED_VERSION_gpe-shield ?= "0.7" -#PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" -#PREFERRED_VERSION_gpe-taskmanager ?= "0.17" -#PREFERRED_VERSION_keylaunch ?= "2.0.7" -#PREFERRED_VERSION_minilite ?= "0.47" -#PREFERRED_VERSION_xmonobut ?= "0.4" -#PREFERRED_VERSION_gpe-edit ?= "0.28" -#PREFERRED_VERSION_gpe-gallery ?= "0.95" -#PREFERRED_VERSION_gpe-calculator ?= "0.2" -#PREFERRED_VERSION_gpe-package ?= "0.2" -#PREFERRED_VERSION_gpe-soundbite ?= "1.0.5" -#PREFERRED_VERSION_gpe-terminal ?= "1.1" -#PREFERRED_VERSION_gpe-watch ?= "0.10" -#PREFERRED_VERSION_gpe-what ?= "0.33" -#PREFERRED_VERSION_gpe-filemanager ?= "0.20" -#PREFERRED_VERSION_gpe-go ?= "0.05" -#PREFERRED_VERSION_gpe-irc ?= "0.07" -#PREFERRED_VERSION_gpe-lights ?= "0.13" -#PREFERRED_VERSION_gpe-nmf ?= "0.19" -#PREFERRED_VERSION_gpe-othello ?= "0.2-1" -#PREFERRED_VERSION_gpe-plucker ?= "0.2" -#PREFERRED_VERSION_gpe-tetris ?= "0.6-2" -#PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" -#PREFERRED_VERSION_xdemineur ?= "2.1.1" -#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" -#PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" -#PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" -#PREFERRED_VERSION_linphone ?= "0.12.2" -#PREFERRED_VERSION_firefox ?= "1.0" - diff --git a/openembedded/packages/gdb/gdb_6.3.bb b/openembedded/packages/gdb/gdb_6.3.bb index fcabfdc5f..98825500f 100644 --- a/openembedded/packages/gdb/gdb_6.3.bb +++ b/openembedded/packages/gdb/gdb_6.3.bb @@ -6,6 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Pawel Osiczko " DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" +PR = "r2" PACKAGES =+ 'gdbserver ' FILES_gdbserver = '${bindir}/gdbserver' diff --git a/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch b/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch new file mode 100644 index 000000000..7b8acb2dd --- /dev/null +++ b/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch @@ -0,0 +1,11 @@ +--- ppp-2.4.3/pppd/Makefile.linux.orig 2005-10-28 21:07:40.396359250 +0100 ++++ ppp-2.4.3/pppd/Makefile.linux 2005-10-28 21:07:54.217223000 +0100 +@@ -62,7 +62,7 @@ + + HAS_SHADOW=y + #USE_PAM=y +-#HAVE_INET6=y ++HAVE_INET6=y + + # Enable plugins + PLUGIN=y diff --git a/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch b/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch new file mode 100644 index 000000000..5601f593d --- /dev/null +++ b/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch @@ -0,0 +1,7 @@ +--- ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux.orig 2005-10-26 20:38:50.990298750 +0100 ++++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux 2005-10-26 20:39:05.583210750 +0100 +@@ -1,4 +1,3 @@ +-CC = gcc + COPTS = -O2 -g + CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC + LDFLAGS = -shared diff --git a/openembedded/packages/ppp/ppp_2.4.3.bb b/openembedded/packages/ppp/ppp_2.4.3.bb index 29ce2b520..8701efc55 100644 --- a/openembedded/packages/ppp/ppp_2.4.3.bb +++ b/openembedded/packages/ppp/ppp_2.4.3.bb @@ -10,6 +10,8 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://cifdefroute.patch;patch=1 \ file://pppd-resolv-varrun.patch;patch=1 \ file://plugins-fix-CC.patch;patch=1 \ + file://pppoatm-makefile.patch;patch=1 \ + file://enable-ipv6.patch;patch=1 \ file://pon \ file://poff \ file://init \ @@ -40,14 +42,16 @@ do_install_append () { } CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES += "ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" +PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" +FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" FILES_ppp-radius = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so" FILES_ppp-winbind = "/usr/lib/pppd/2.4.3/winbind.so" FILES_ppp-minconn = "/usr/lib/pppd/2.4.3/minconn.so" FILES_ppp-password = "/usr/lib/pppd/2.4.3/pass*.so" FILES_ppp-tools = "/usr/sbin/pppstats /usr/sbin/pppdump" +DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM" DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet" DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS" DESCRIPTION_ppp-winbind = "Plugin for PPP to authenticate against Samba or Windows" -- cgit v1.2.3