summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/arm-kernel-shim/arm-kernel-shim_1.4.bb77
-rw-r--r--packages/gcc/gcc-cross_4.1.1.bb2
-rw-r--r--packages/gcc/gcc-cross_4.1.2.bb2
-rw-r--r--packages/gdado/.mtn2git_empty0
-rw-r--r--packages/gdado/gdado_2.2.bb15
-rw-r--r--packages/gnome/gconf-dbus_svn.bb27
-rw-r--r--packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb2
-rw-r--r--packages/gpephone/gloox_0.8.1.bb15
-rw-r--r--packages/gpephone/iksemel_1.2.bb14
-rw-r--r--packages/gpephone/linphone_1.5.0.bb3
-rw-r--r--packages/gtk-webcore/files/NRCit_HTTP_auth.diff132
-rw-r--r--packages/gtk-webcore/files/NRCit_unmap.diff39
-rw-r--r--packages/gtk-webcore/osb-nrcit_svn.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb2
-rw-r--r--packages/meta/meta-sdk-sbox-gpe.bb2
-rw-r--r--packages/nunome/nunome_1.0.2.bb (renamed from packages/nunome/nunome_1.0.1.bb)3
-rw-r--r--packages/tasks/task-base.bb3
-rw-r--r--packages/tasks/task-slugos.bb2
18 files changed, 115 insertions, 227 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
new file mode 100644
index 0000000000..3b20d33a7c
--- /dev/null
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "ARM Kernel Shim"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+# PR = "r0"
+
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+
+SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
+ file://passthrough-atags.patch;patch=1 \
+ file://cmdline_if_none.patch;patch=1 \
+ file://config-nslu2.h \
+ file://config-nas100d.h \
+ file://config-dsmg600.h \
+ file://config-fsg3.h"
+
+S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ mv ${S}/config.h ${S}/config.h.orig
+ # NSLU2
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-nslu2.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-nslu2.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+ # NAS100d
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-nas100d.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-nas100d.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+ # DSMG-600
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-dsmg600.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-dsmg600.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+ # FSG-3
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-fsg3.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-fsg3.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+ mv ${S}/config.h.orig ${S}/config.h
+}
+
+do_populate_staging() {
+ install -d ${STAGING_LOADER_DIR}
+ cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/
+}
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 04b34919ec..08bc3a836e 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -17,4 +17,4 @@ require gcc-package-cross.inc
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index dab2f332a2..657e5afaca 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r0"
+PR = "r2"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gdado/.mtn2git_empty b/packages/gdado/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gdado/.mtn2git_empty
diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb
new file mode 100644
index 0000000000..feaa6ed991
--- /dev/null
+++ b/packages/gdado/gdado_2.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "gtk+ based dice roller for RPG games"
+HOMEPAGE = "http://gdado.sf.net"
+SECTION = "x11/games"
+LICENSE = "GPLv2"
+DEPENDS = "libgnomeui gtk+"
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz"
+
+inherit autotools
+
+do_install_prepend() {
+ sed -i -e "s|Icon=gdado.png|Icon=${datadir}/pixmaps/gdado/gdado.png|" \
+ gdado.desktop
+}
+
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 87daa1d227..0bb9765749 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -6,13 +6,10 @@ PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-PV = "2.10.0+svn${SRCDATE}"
+PV = "2.16.0+svn${SRCDATE}"
PR = "r0"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
- file://gconf-dbus-update.patch;patch=1;pnum=0 \
- file://xml-backend-locks-compile-fix.patch;patch=1 \
- file://xml-backend-oldxml-Makefile.patch \
file://69gconfd-dbus"
inherit pkgconfig autotools
@@ -20,23 +17,22 @@ S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug"
+FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
+ ${libdir}/GConf-dbus/2/*.so \
+ ${libdir}/dbus-1.0 \
+ ${sysconfdir} \
+ ${datadir}/dbus*"
+FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
+ ${libdir}/GConf-dbus/2/.debug ""
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
-
-do_compile_prepend() {
- cd ${S}
- patch -p1 < ../xml-backend-oldxml-Makefile.patch
+do_configure_prepend() {
+ touch ${S}/gtk-doc.make
}
do_stage() {
- oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/gconf/2/gconf/
- ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
- install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+ autotools_stage_all
}
do_install_append () {
@@ -45,3 +41,4 @@ do_install_append () {
install -d ${D}/${datadir}/dbus-1.0/services/
install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
+
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
index b2ee49cf69..90fb6faf14 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
@@ -6,6 +6,8 @@ DEPENDS = "gtk+ libgpewidget"
PR = "r1"
PV = "0.28+svn-${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI += "${GPE_SVN} \
file://svn-build.patch;patch=1"
diff --git a/packages/gpephone/gloox_0.8.1.bb b/packages/gpephone/gloox_0.8.1.bb
deleted file mode 100644
index 09004a8182..0000000000
--- a/packages/gpephone/gloox_0.8.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "full-featured Jabber/XMPP client library."
-SECTION = "networking"
-PRIORITY = "optional"
-PR = "r0"
-
-DEPENDS = "iksemel libidn gnutls"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/gpephone/iksemel_1.2.bb b/packages/gpephone/iksemel_1.2.bb
deleted file mode 100644
index 40ad32ce0e..0000000000
--- a/packages/gpephone/iksemel_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "A simple, powerful XML-parsing library written in C."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glibc"
-PR = "r0"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index bef090e22a..ee59000133 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -41,7 +41,4 @@ do_install_append() {
do_stage() {
export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
autotools_stage_all
- cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR}
- cp ${S}/mediastreamer2/src/libmediastreamer.la ${STAGING_LIBDIR}
- cp ${S}/coreapi/liblinphone.la ${STAGING_LIBDIR}
}
diff --git a/packages/gtk-webcore/files/NRCit_HTTP_auth.diff b/packages/gtk-webcore/files/NRCit_HTTP_auth.diff
deleted file mode 100644
index 7a2df30d1d..0000000000
--- a/packages/gtk-webcore/files/NRCit_HTTP_auth.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-Index: NRCit/src/Http.cpp
-===================================================================
---- NRCit/src/Http.cpp (revision 55)
-+++ NRCit/src/Http.cpp (working copy)
-@@ -299,3 +299,9 @@
- {
-
- }
-+
-+HttpHeaderWWWAuthenticate::HttpHeaderWWWAuthenticate(const gchar * value)
-+ : HttpHeader(WWWAuthenticate, "WWW-Authenticate", value)
-+{
-+
-+}
-Index: NRCit/src/HttpCurl.cpp
-===================================================================
---- NRCit/src/HttpCurl.cpp (revision 55)
-+++ NRCit/src/HttpCurl.cpp (working copy)
-@@ -69,7 +69,7 @@
- void setPostData(const gchar * contentType, GByteArray *);
-
- protected:
-- bool shouldAuthenticate() { return m_authenticate; }
-+ bool shouldAuthenticate() { return m_need_authenticate; }
-
- /** Authenticates the request. */
- void doAuth();
-@@ -89,7 +89,7 @@
-
- GByteArray * postData;
- bool headerEnd;
-- bool m_authenticate;
-+ bool m_need_authenticate;
-
- gchar * proxy;
- CurlFactory* parent;
-@@ -374,7 +374,7 @@
- ,curl_post_last(NULL)
- ,postData(NULL)
- ,headerEnd(false)
-- ,m_authenticate(true)
-+ ,m_need_authenticate(true)
- ,proxy(NULL)
- ,parent(aParent)
- ,status(-1)
-@@ -438,7 +438,8 @@
- }
-
- void CurlRequest::doAuth() {
-- m_authenticate = m_listener->authenticate(this);
-+ m_listener->authenticate(this);
-+ m_need_authenticate = false; // set false to go on processing data in CurlRequest::data
- }
-
- void CurlRequest::execute()
-@@ -457,6 +458,8 @@
- curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1);
- curl_easy_setopt(handle, CURLOPT_MAXREDIRS, 10);
-
-+ curl_easy_setopt(handle, CURLOPT_AUTOREFERER, 1);
-+
- // url ptr must remain valid through the request
- curl_easy_setopt(handle, CURLOPT_URL, m_url);
-
-@@ -534,7 +537,7 @@
-
-
- // if we are in middle of authenticating, do nothing.
-- if (status != HTTP_AUTH_REQUIRED || !m_authenticate) {
-+ if (status != HTTP_AUTH_REQUIRED || !m_need_authenticate) {
- m_listener->data(this, data, len);
- }
- }
-@@ -570,6 +573,8 @@
- header = new HttpHeaderRefresh(value);
- } else if (!strcmp(key, HTTP_SET_COOKIE)) {
- header = new HttpHeaderSetCookie(value);
-+ } else if (!strcmp(key, HTTP_WWW_AUTHENTICATE)) {
-+ header = new HttpHeaderWWWAuthenticate(value);
- } else {
- header = new HttpHeader(HttpHeader::Unknown, key, value);
- }
-@@ -584,7 +589,7 @@
- {
- HttpHeader *hdr = parseHeader(data, len);
- if (hdr) {
-- if (hdr->key() == HTTP_WWW_AUTHENTICATE && hdr->value())
-+ if (!strcmp(hdr->key(), HTTP_WWW_AUTHENTICATE) && hdr->value())
- {
- const gchar * value = hdr->value();
- char * realm = g_strrstr(value, "realm=" );
-Index: NRCit/src/PageLoadListener.cpp
-===================================================================
---- NRCit/src/PageLoadListener.cpp (revision 55)
-+++ NRCit/src/PageLoadListener.cpp (working copy)
-@@ -206,8 +206,9 @@
- creds->setCredential(newcred, space);
- request->authenticate(newcred.user(), newcred.password());
- }
-- if (user) g_free(user);
-- if (password) g_free(password);
-+ // Do not free these values which are owned by Webi.
-+ // if (user) g_free(user);
-+ // if (password) g_free(password);
- return ret;
- }
-
-Index: NRCit/src/Http.h
-===================================================================
---- NRCit/src/Http.h (revision 55)
-+++ NRCit/src/Http.h (working copy)
-@@ -165,6 +165,7 @@
- ContentLength,
- Refresh,
- SetCookie,
-+ WWWAuthenticate,
- Unknown,
- Invalid
- };
-@@ -236,6 +237,12 @@
- ~HttpHeaderSetCookie() {}
- };
-
-+class HttpHeaderWWWAuthenticate : public HttpHeader
-+{
-+public:
-+ HttpHeaderWWWAuthenticate(const gchar* value);
-+ ~HttpHeaderWWWAuthenticate() {}
-+};
-
-
- #endif
diff --git a/packages/gtk-webcore/files/NRCit_unmap.diff b/packages/gtk-webcore/files/NRCit_unmap.diff
deleted file mode 100644
index 1f2be39922..0000000000
--- a/packages/gtk-webcore/files/NRCit_unmap.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: NRCit/src/gtk/webi.cc
-===================================================================
---- NRCit/src/gtk/webi.cc (リビジョン 55)
-+++ NRCit/src/gtk/webi.cc (作業コピー)
-@@ -50,6 +50,7 @@
- static void _webi_finalize (GObject * self) G_GNUC_UNUSED;
- static void _webi_realize (GtkWidget * widget) G_GNUC_UNUSED;
- static void _webi_map (GtkWidget * widget) G_GNUC_UNUSED;
-+static void _webi_unmap (GtkWidget * widget) G_GNUC_UNUSED;
- static gboolean _webi_expose_event (GtkWidget * widget, GdkEventExpose * event) G_GNUC_UNUSED;
- static void _webi_size_allocate (GtkWidget * widget, GtkAllocation * allocation) G_GNUC_UNUSED;
-
-@@ -305,6 +306,7 @@
- g_object_class->finalize = _webi_finalize;
- gtk_widget_class->realize = _webi_realize;
- gtk_widget_class->map = _webi_map;
-+ gtk_widget_class->unmap = _webi_unmap;
- gtk_widget_class->expose_event = _webi_expose_event;
- gtk_widget_class->size_allocate = _webi_size_allocate;
- return;
-@@ -736,6 +738,18 @@
- }
- #undef PARENT_HANDLER
-
-+static void
-+_webi_unmap (GtkWidget * widget)
-+{
-+
-+ g_return_if_fail(widget != NULL);
-+ g_return_if_fail(WEBI_IS_WEBI (widget));
-+
-+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
-+
-+ gdk_window_hide(widget->window);
-+}
-+
- static gboolean
- _webi_expose_event (GtkWidget * widget, GdkEventExpose * event)
- #define PARENT_HANDLER(___widget,___event) \
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 2060cb26d4..8a11d61996 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -10,8 +10,6 @@ PR = "r0"
DEPENDS = "curl librsvg osb-nrcore"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
- file://NRCit_unmap.diff;patch=1 \
- file://NRCit_HTTP_auth.diff;patch=1 \
file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
S = "${WORKDIR}/NRCit"
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index e5868232f2..8e6f1b27df 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "800"
+IXP4XX_KERNEL_SVN_REV = "821"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/meta/meta-sdk-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb
index a66989b3aa..c9b7737af2 100644
--- a/packages/meta/meta-sdk-sbox-gpe.bb
+++ b/packages/meta/meta-sdk-sbox-gpe.bb
@@ -93,7 +93,7 @@ EOF
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz .
+ fakeroot tar cfz ${SDK_DEPLOY}/sbox-gpesdk-${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}.tar.gz .
}
do_populate_sdk[nostamp] = "1"
diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.2.bb
index d8421c12f5..ae29277291 100644
--- a/packages/nunome/nunome_1.0.1.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -4,9 +4,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
RDEPENDS = "virtual/japanese-font"
-PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
file://nunome.patch;patch=1"
S = "${WORKDIR}/nunome"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 8df6fa0450..e2bc56762b 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r22"
+PR = "r23"
PACKAGES = "task-base \
task-base-oh-minimal \
@@ -185,6 +185,7 @@ task-base-pcmcia-rrecommends = "\
kernel-module-pcnet-cs \
kernel-module-serial-cs \
kernel-module-ide-cs \
+ kernel-module-ide-disk \
${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
task-base-pcmcia24-rrecommends = "\
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 9d38763c41..acb6bcaae5 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -103,8 +103,10 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-netconsole \
"
+DISTRO_EXTRA_DEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
+DISTRO_EXTRA_RDEPENDS ?= ""
RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 16:50:56 +0000