diff options
| -rw-r--r-- | conf/distro/ucslugc.conf | 31 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 4 | ||||
| -rw-r--r-- | packages/asterisk/asterisk-1.0.9/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.0.7/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/asterisk/asterisk-1.0.9/gsm.patch | 71 | ||||
| -rw-r--r-- | packages/asterisk/asterisk-1.0.9/makefile.patch (renamed from packages/asterisk/asterisk-1.0.7/makefile.patch) | 60 | ||||
| -rw-r--r-- | packages/asterisk/asterisk_1.0.9.bb (renamed from packages/asterisk/asterisk_1.0.7.bb) | 1 | ||||
| -rw-r--r-- | packages/e17/engage/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/e17/engage/no-local-includes.patch | 17 | ||||
| -rw-r--r-- | packages/e17/engage_20050810.bb | 9 | ||||
| -rw-r--r-- | packages/e17/entrance/config-db.patch | 2 | ||||
| -rw-r--r-- | packages/e17/entrance_20050810.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop_2.10.2.bb | 2 |
12 files changed, 126 insertions, 73 deletions
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 39251c5375..69e70cd41e 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -7,6 +7,7 @@ #---------------------------------------------------------------------------------- DISTRO_NAME = "UcSlugC" DISTRO_VERSION = "1.1-beta" +DISTRO_FEED = "unstable" DISTRO_TYPE ?= "beta" TARGET_FPU = "soft" @@ -19,7 +20,7 @@ ARM_INTERWORK = ":thumb-interwork" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2-jffs2-image" +INHERIT += " package_ipk debian" # The OVERRIDES are modified here so that 'openslug' overrides are picked up if # present (ucslugc overrides take precedence). @@ -46,11 +47,15 @@ include conf/distro/freeze.conf # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- # Add to the user's feeds from local.conf (there may be none) -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}" +# +#NOTE: at present there is no released feed for ucslugc, therefore this feed +# is set to the 'unstable' version. In released images DISTRO_FEED will typically +# be DISTRO_VERSION. +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_FEED}" # -# Uncomment the following to get the unstable feeds +# Uncomment the following to get the unstable feeds in a released version. #FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable" #FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable" @@ -76,6 +81,24 @@ CMDLINE_DEBUG = "noirqdebug" # root file system), if this is not the case the following must not be done! IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" +# Building a full image. If you add the following extra commands will be +# appended to the openslug-image build by classes/nslu2-jffs2-image.bbclass +# (note that you can, instead, simply add 'inherit nslu2-jffs2-image' to +# openslug-image.bb). If you do this you will need to find a source for the +# LinkSys software to be placed in the full image - 'RedBoot' (the boot loader), +# 'Trailer' (just a bunch of bytes to flag the image as valid) and 'SysConf' +# (actually just a block of unset data - you could modify this to pre-configure +# the SysConf partition of the image). If you own an NSLU2 then this data is +# already in the flash of the NSLU2 and you can download it (including new +# versions) from the LinkSys web site - the bbclass will output information +# about where to put the downloaded data. +# +#NOTE: you do not actually need the boot loader in normal use because it is +# *not* overwritten by a standard upslug upgrade, so you can make an image with +# just non-LinkSys software which can be flashed into the NSLU2. + +#INHERIT += " nslu2-jffs2-image" + # EXTRA PACKAGES # -------------- # UcSlugC builds an openslug-image with no extra packages - to add packages to the diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index da7952d994..9e1b677ecf 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,8 +22,8 @@ include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf diff --git a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.0.9/gsm.patch b/packages/asterisk/asterisk-1.0.9/gsm.patch new file mode 100644 index 0000000000..c59aa80bba --- /dev/null +++ b/packages/asterisk/asterisk-1.0.9/gsm.patch @@ -0,0 +1,71 @@ +--- asterisk-1.0.9.org/codecs/gsm/Makefile 2005-06-21 16:27:28.000000000 +0200 ++++ asterisk-1.0.9/codecs/gsm/Makefile 2005-08-14 21:47:10.000000000 +0200 +@@ -37,26 +37,6 @@ + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. + +-ifneq (${OSARCH},Darwin) +-ifneq (${PROC},x86_64) +-ifneq (${PROC},ultrasparc) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq (${PROC},sparc64) +-ifneq (${PROC},ppc) +-ifneq (${PROC},ppc64) +-OPTIMIZE+=-march=$(PROC) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- + #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. + #This works for even old (2.96) versions of gcc and provides a small boost either way. + #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. +@@ -218,19 +198,6 @@ + $(SRC)/gsm_option.c \ + $(SRC)/short_term.c \ + $(SRC)/table.c +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m),x86_64) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq ($(shell uname -m),sparc64) +-GSM_SOURCES+= $(SRC)/k6opt.s +-endif +-endif +-endif +-endif +-endif +-endif + + TOAST_SOURCES = $(SRC)/toast.c \ + $(SRC)/toast_lin.c \ +@@ -276,20 +243,6 @@ + $(SRC)/short_term.o \ + $(SRC)/table.o + +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m), x86_64) +-ifneq ($(shell uname -m), ppc) +-ifneq ($(shell uname -m), alpha) +-ifneq ($(shell uname -m), armv4l) +-ifneq ($(shell uname -m), sparc64) +-GSM_OBJECTS+= $(SRC)/k6opt.o +-endif +-endif +-endif +-endif +-endif +-endif +- + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ + $(SRC)/toast_ulaw.o \ + diff --git a/packages/asterisk/asterisk-1.0.7/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch index 2eea89636d..066fb677dc 100644 --- a/packages/asterisk/asterisk-1.0.7/makefile.patch +++ b/packages/asterisk/asterisk-1.0.9/makefile.patch @@ -212,66 +212,6 @@ # Add KDE Console if appropriate #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") ---- asterisk-1.0.7/codecs/gsm/Makefile~makefile.patch -+++ asterisk-1.0.7/codecs/gsm/Makefile -@@ -37,20 +37,6 @@ - ######### ppro's, etc, as well as the AMD K6 and K7. The compile will - ######### probably require gcc. - --ifneq (${OSARCH},Darwin) --ifneq (${PROC},x86_64) --ifneq (${PROC},ultrasparc) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq (${PROC},sparc64) --OPTIMIZE+=-march=$(PROC) --endif --endif --endif --endif --endif --endif -- - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. - #This works for even old (2.96) versions of gcc and provides a small boost either way. - #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. -@@ -212,17 +198,6 @@ - $(SRC)/gsm_option.c \ - $(SRC)/short_term.c \ - $(SRC)/table.c --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m),x86_64) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq ($(shell uname -m),sparc64) --GSM_SOURCES+= $(SRC)/k6opt.s --endif --endif --endif --endif --endif - - TOAST_SOURCES = $(SRC)/toast.c \ - $(SRC)/toast_lin.c \ -@@ -268,18 +243,6 @@ - $(SRC)/short_term.o \ - $(SRC)/table.o - --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m), x86_64) --ifneq ($(shell uname -m), ppc) --ifneq ($(shell uname -m), alpha) --ifneq ($(shell uname -m), sparc64) --GSM_OBJECTS+= $(SRC)/k6opt.o --endif --endif --endif --endif --endif -- - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ - $(SRC)/toast_ulaw.o \ --- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch +++ asterisk-1.0.7/codecs/lpc10/Makefile @@ -25,28 +25,6 @@ diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.9.bb index 1116849592..ccb6fe518f 100644 --- a/packages/asterisk/asterisk_1.0.7.bb +++ b/packages/asterisk/asterisk_1.0.9.bb @@ -2,6 +2,7 @@ DESCRIPTION="The Astersisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \ + file://gsm.patch;patch=1 \ file://makefile.patch;patch=1" DEPENDS="ncurses zlib openssl" diff --git a/packages/e17/engage/.mtn2git_empty b/packages/e17/engage/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e17/engage/.mtn2git_empty diff --git a/packages/e17/engage/no-local-includes.patch b/packages/e17/engage/no-local-includes.patch new file mode 100644 index 0000000000..09cc8da98d --- /dev/null +++ b/packages/e17/engage/no-local-includes.patch @@ -0,0 +1,17 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- engage/src/module/Makefile.am~no-local-includes ++++ engage/src/module/Makefile.am +@@ -10,8 +10,7 @@ + + # the module .so file + INCLUDES = -I. \ +- -I$(top_srcdir) \ +- -I$(includedir) \ ++ -I$(top_srcdir) \ + @e_cflags@ + pkgdir = @e_modules@/engage/$(MODULE_ARCH) + pkg_LTLIBRARIES = module.la diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb index e8f9467239..f12d7d2605 100644 --- a/packages/e17/engage_20050810.bb +++ b/packages/e17/engage_20050810.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm" +DEPENDS = "evas-x11 ecore-x11 esmart imlib2-x11 edje ewl e" LICENSE = "MIT" -SECTION = "e" +SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -PR = "r0" +PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ + file://no-local-includes.patch;patch=1" S = "${WORKDIR}/engage" inherit autotools pkgconfig binconfig diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch index f326ac50c9..33da62435f 100644 --- a/packages/e17/entrance/config-db.patch +++ b/packages/e17/entrance/config-db.patch @@ -5,7 +5,7 @@ # set auth to 1 for pam, 2 for shadow -edb_ed $DB add /entrance/auth int @auth_mode@ -+edb_ed $DB add /entrance/auth int 2 ++edb_ed $DB add /entrance/auth int 0 # uncomment the below to enable experimental OpenGL hardware acceleration #edb_ed $DB add /entrance/engine int 1 diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index de00734985..574f6ea445 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -7,7 +7,7 @@ RDEPENDS += "bash gpe-dm" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://longer-sleep.patch;patch=1 \ diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index d385068c59..f3eca5d574 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" PR = "r0" DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome +inherit gnome pkgconfig DEPENDS = "gnome-common libgnomeui" |