summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR25.bb (renamed from packages/altboot/altboot_wip.bb)58
-rw-r--r--packages/altboot/altboot_svn.bb46
-rw-r--r--packages/glibc/glibc-2.4/ldd-unbash.patch11
-rw-r--r--packages/glibc/glibc_2.5.bb1
-rw-r--r--packages/libopie/libopie2.inc18
-rw-r--r--packages/libopie/libopie2_1.2.2.bb2
-rw-r--r--packages/libopie/libopie2_cvs.bb2
-rw-r--r--packages/libsexy/libsexy_0.1.11.bb2
-rw-r--r--packages/openmoko-apps/files/.mtn2git_empty0
-rw-r--r--packages/openmoko-apps/files/unbreak-messages.patch29
-rw-r--r--packages/openmoko-apps/openmoko-messages_svn.bb3
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
-rw-r--r--packages/tasks/task-openmoko.bb5
-rw-r--r--packages/xorg-app/xdpyinfo_1.0.2.bb11
-rw-r--r--packages/xorg-proto/xproto-native_7.0.10.bb9
15 files changed, 155 insertions, 44 deletions
diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
index 37a8b5f9dd..e806604616 100644
--- a/packages/altboot/altboot_wip.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
@@ -23,24 +23,20 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-WIP_DATE = "20070323"
-
-PV = "1.1.1+wip-${WIP_DATE}"
-PR = "r0"
+SVN_REV = "25"
+PR = "r1"
######################################################################################
PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN} = "${MACHINE}"
PACKAGE_ARCH_${PN}-doc = "all"
PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
-
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
-S = "${WORKDIR}/${TAG}/"
+S = "${WORKDIR}/trunk/"
######################################################################################
@@ -48,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg"
######################################################################################
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
do_install() {
install -d ${D}/sbin
install -d ${D}/etc/altboot-menu
@@ -55,27 +54,48 @@ do_install() {
install -d ${D}/etc/altboot.rc
install -d ${D}/usr/share/doc/altboot
install -d ${D}/usr/share/sounds
- install -d ${D}/etc/skel/altboot
- if test -d ${S}/${MACHINE}
+ if test -d ${S}/${MACHINE_DIR}
then
- install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
else
install -m 0644 ${S}/altboot*.cfg ${D}/etc/
fi
install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
install -m 0644 ${S}/altboot.func ${D}/etc
+ install -m 0644 ${S}/altboot.sbin ${D}/etc
install -m 0644 ${S}/altbootctl.conf ${D}/etc
install -m 0755 ${S}/init.altboot ${D}/sbin
install -m 0755 ${S}/altbootctl ${D}/sbin
+
+ ln -s /sbin/init.altboot ${D}/sbin/altboot
- install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
- install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ else
+ install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
- install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
- install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ if test -d ${S}/altboot-menu/Advanced
+ then
+ install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ fi
+
+ if test -d ${S}/${MACHINE_DIR}/altboot.rc
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ else
+ install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ fi
}
######################################################################################
@@ -88,12 +108,16 @@ do_configure() {
######################################################################################
pkg_postinst_${PN}() {
+ test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+
update-alternatives --install /sbin/init init /sbin/init.altboot 55
}
######################################################################################
pkg_postrm_${PN}() {
+ test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+
update-alternatives --remove init /sbin/init.altboot
}
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index d31c5160a2..18f73dd6ae 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -24,13 +24,13 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
PV = "1.1.1+wip-${SRCDATE}"
-PR = "r0"
+PR = "r1"
######################################################################################
PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN} = "${MACHINE}"
PACKAGE_ARCH_${PN}-doc = "all"
PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
@@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg"
######################################################################################
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
do_install() {
install -d ${D}/sbin
install -d ${D}/etc/altboot-menu
@@ -51,29 +54,48 @@ do_install() {
install -d ${D}/etc/altboot.rc
install -d ${D}/usr/share/doc/altboot
install -d ${D}/usr/share/sounds
- install -d ${D}/etc/skel/altboot
- if test -d ${S}/${MACHINE}
+ if test -d ${S}/${MACHINE_DIR}
then
- install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
else
install -m 0644 ${S}/altboot*.cfg ${D}/etc/
fi
install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
install -m 0644 ${S}/altboot.func ${D}/etc
+ install -m 0644 ${S}/altboot.sbin ${D}/etc
install -m 0644 ${S}/altbootctl.conf ${D}/etc
install -m 0755 ${S}/init.altboot ${D}/sbin
install -m 0755 ${S}/altbootctl ${D}/sbin
ln -s /sbin/init.altboot ${D}/sbin/altboot
- install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
- install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ else
+ install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
- install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
- install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ if test -d ${S}/altboot-menu/Advanced
+ then
+ install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ fi
+
+ if test -d ${S}/${MACHINE_DIR}/altboot.rc
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ else
+ install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ fi
}
######################################################################################
@@ -86,12 +108,16 @@ do_configure() {
######################################################################################
pkg_postinst_${PN}() {
+ test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+
update-alternatives --install /sbin/init init /sbin/init.altboot 55
}
######################################################################################
pkg_postrm_${PN}() {
+ test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+
update-alternatives --remove init /sbin/init.altboot
}
diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch
new file mode 100644
index 0000000000..2fb8854b49
--- /dev/null
+++ b/packages/glibc/glibc-2.4/ldd-unbash.patch
@@ -0,0 +1,11 @@
+--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000
++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000
+@@ -110,7 +110,7 @@
+ # environments where the executed program might not have permissions
+ # to write to the console/tty. But only bash 3.x supports the pipefail
+ # option, and we don't bother to handle the case for older bash versions.
+-if set -o pipefail 2> /dev/null; then
++if false; then
+ try_trace() {
+ eval $add_env '"$@"' | cat
+ }
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index ee137541bb..8cd4c2ecd1 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
# file://glibc-2.4-openat-3.patch;patch=1 \
# file://fixup-aeabi-syscalls.patch;patch=1 \
file://zecke-sane-readelf.patch;patch=1 \
+ file://ldd-unbash.patch;patch=1 \
file://generic-bits_select.h \
file://generic-bits_types.h \
file://generic-bits_typesizes.h \
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 1e0d4f1b9a..17cc4be40d 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -78,22 +78,22 @@ do_install() {
done
}
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2"
+PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
-FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*"
+FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*"
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 1bef43c329..8409e4c523 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
file://include.pro \
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 4a3d3c28c5..39376a84fc 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r6"
+PR = "r7"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb
new file mode 100644
index 0000000000..042ea757e9
--- /dev/null
+++ b/packages/libsexy/libsexy_0.1.11.bb
@@ -0,0 +1,2 @@
+require libsexy.inc
+PR = "r0"
diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-apps/files/.mtn2git_empty
diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch
new file mode 100644
index 0000000000..c8d3413c0b
--- /dev/null
+++ b/packages/openmoko-apps/files/unbreak-messages.patch
@@ -0,0 +1,29 @@
+Index: sms-membership-window.c
+===================================================================
+--- sms-membership-window.c (wersja 1565)
++++ openmoko-messages/src/sms-membership-window.c (kopia robocza)
+@@ -36,9 +36,6 @@
+ #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate))
+
+ typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate;
+-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
+- GtkTreeIter *iter,
+- gpointer data);
+
+ struct _SmsMembershipWindowPrivate
+ {
+Index: main.c
+===================================================================
+--- main.c (wersja 1565)
++++ openmoko-messages/src/main.c (kopia robocza)
+@@ -41,10 +41,6 @@
+
+ #include <gtk/gtk.h>
+
+-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
+- GtkTreeIter *iter,
+- gpointer data);
+-
+ gboolean init_dbus (MessengerData* d)
+ {
+ DBusError error;
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
index 4411b860a1..1547c49d9a 100644
--- a/packages/openmoko-apps/openmoko-messages_svn.bb
+++ b/packages/openmoko-apps/openmoko-messages_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "The OpenMoko Messaging Application"
SECTION = "openmoko/applications"
PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit openmoko
+SRC_URI += "file://unbreak-messages.patch;patch=1"
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 56f3c7242a..8f8c68d7b7 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r80"
+PR = "r82"
SRC_URI = "file://boot/flash \
file://boot/disk \
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index ece303d62a..7f8b03ce33 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r32"
+PR = "r33"
PACKAGES = "\
task-openmoko-linux \
@@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\
matchbox-stroke \
matchbox-config-gtk \
matchbox-panel-2-applets \
- matchbox-panel-hacks \
matchbox-themes-extra \
matchbox-themes-gtk \
- matchbox-applet-inputmanager \
- matchbox-applet-startup-monitor \
openmoko-panel-battery \
openmoko-panel-clock \
openmoko-panel-demo \
diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb
new file mode 100644
index 0000000000..62825e5a0f
--- /dev/null
+++ b/packages/xorg-app/xdpyinfo_1.0.2.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "X display information utility"
+LICENSE = "MIT"
+
+DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb
new file mode 100644
index 0000000000..12a58b5a0a
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+PE = "1"
+
+SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 10:03:00 +0000