summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/angstrom-2007.1.conf4
-rw-r--r--conf/distro/include/angstrom.inc48
-rw-r--r--packages/avahi/avahi-python_0.6.21.bb4
-rw-r--r--packages/avahi/avahi.inc4
-rw-r--r--packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch2
-rw-r--r--packages/fbreader/fbreader_0.8.2a.bb2
-rw-r--r--packages/xserver-common/xserver-common_1.10.bb12
-rw-r--r--packages/xserver-common/xserver-common_1.18.bb (renamed from packages/xserver-common/xserver-common_1.17.bb)0
-rw-r--r--packages/xserver-common/xserver-common_1.3.bb3
-rw-r--r--packages/xserver-common/xserver-common_1.8.bb10
-rw-r--r--packages/xserver-common/xserver-common_1.9.bb12
11 files changed, 56 insertions, 45 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d0e732bcc9..6d5d84a794 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -220,8 +220,6 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
-PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
-
# Needed for crappy ipaqs with broken hostap in the kernel
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
PREFERRED_VERSION_hostap-utils ?= "0.4.7"
@@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}"
PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
+PREFERRED_PROVIDER_avahi = "avahi"
+
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 3b859a9d04..f90d863fd9 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -210,6 +210,54 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
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')}"
+
+# Configuration for tinderbox, so people only need:
+# INHERIT += "tinderclient"
+# in their local.conf
+
+#Name of the client
+TINDER_MACHINE = "${MACHINE}-${ANGSTROM_MODE}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG = "${TMPDIR}/tinder.log"
+TINDER_TREE = "Angstrom"
+
+# HTTP posting
+TINDER_HOST ?= "ewi546.ewi.utwente.nl"
+TINDER_URL ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH = "org.openembedded.dev"
+
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER = "1"
+TINDER_AUTOBUILD = "1"
+
+## Do a report at all
+TINDER_REPORT = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku"
+# SEPPUKU_USER = "your_bugzilla@user.id"
+# SEPPUKU_PASS = "your_bugzilla_password"
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?"
+SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_AUTOBUILD = "1"
+
+SEPPUKU_PRODUCT = "Openembedded"
+SEPPUKU_COMPONENT = "build"
+
+
+
+
+
# We want images supporting the following features (for task-base)
DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
index 8eaac073ac..eea8295ac8 100644
--- a/packages/avahi/avahi-python_0.6.21.bb
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -11,4 +11,8 @@ SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
file://configure-check-pymod.patch;patch=1"
S = "${WORKDIR}/avahi-${PV}"
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
+PACKAGES =+ "python-avahi"
+
AVAHI_PYTHON = "--enable-python"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 991d282a3e..3864dc5135 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -12,8 +12,6 @@ DEPENDS = "expat libdaemon dbus glib-2.0"
RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
RDEPENDS_avahi-autoipd = "update-rc.d"
-RDEPENDS_avahi-discover = "python-avahi python-pygtk"
-RDEPENDS_python-avahi = "python-dbus"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd file://99avahi-autoipd"
@@ -28,7 +26,7 @@ EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
-PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
index ecb60a2108..858a713125 100644
--- a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
+++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/make
+ UILIBS = -lqt-mt
else
- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
endif
-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index c932d21bdc..ca25bdc620 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -40,8 +40,6 @@ FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
-LDFLAGS_append = " -liconv"
-
inherit pkgconfig
do_configure() {
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
deleted file mode 100644
index 69e92ecdf3..0000000000
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1 \
- file://w100.patch;patch=1 \
- file://poodle-xmodmap-2.6.patch;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
diff --git a/packages/xserver-common/xserver-common_1.17.bb b/packages/xserver-common/xserver-common_1.18.bb
index a30a37c893..a30a37c893 100644
--- a/packages/xserver-common/xserver-common_1.17.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb
deleted file mode 100644
index af2fb894b5..0000000000
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require xserver-common.inc
-
-PR = "r1"
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
deleted file mode 100644
index 249576f6da..0000000000
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb
deleted file mode 100644
index a8343a8548..0000000000
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1 \
- file://poodle-xmodmap-2.6.patch;patch=1 \
- file://rxvt-less-pink.diff;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 06:40:58 +0000