[oe-commits] org.oe.dev merge of '0639bf215ed95b383ca3a8350a92186db74d524c'
hrw commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 06:50:58 UTC 2007
merge of '0639bf215ed95b383ca3a8350a92186db74d524c'
and '748f0b4080c69e5c9af7c58036128de6d3b29c83'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 096af4db5787781750ffca1b165b4c7e87bc2c94
ViewMTN: http://monotone.openembedded.org/revision.psp?id=096af4db5787781750ffca1b165b4c7e87bc2c94
Files:
1
packages/xorg-xserver/xorg-xserver-common.inc
classes/rm_work.bbclass
conf/distro/include/slugos.inc
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/gpsd/gpsd.inc
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/meta/slugos-packages.bb
packages/tasks/task-mokogateway.bb
Diffs:
#
# mt diff -r0639bf215ed95b383ca3a8350a92186db74d524c -r096af4db5787781750ffca1b165b4c7e87bc2c94
#
#
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
# from [60aa521448a78ec17e7543808246323e44623474]
# to [9a281ac539ce984563ccaec7aa10f8986035f896]
#
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc 60aa521448a78ec17e7543808246323e44623474
+++ packages/xorg-xserver/xorg-xserver-common.inc 9a281ac539ce984563ccaec7aa10f8986035f896
@@ -16,7 +16,7 @@ XORG_PN = "xorg-server"
REPENDS="rgb"
XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
file://xorg.conf"
S = "${WORKDIR}/${XORG_PN}-${PV}"
#
# mt diff -r748f0b4080c69e5c9af7c58036128de6d3b29c83 -r096af4db5787781750ffca1b165b4c7e87bc2c94
#
#
#
# patch "classes/rm_work.bbclass"
# from [3c8ff49c617d0924fef4b991d29f8b91ab35b298]
# to [80b9b22e230989c7a6265d0b1860252d37fca5fb]
#
# patch "conf/distro/include/slugos.inc"
# from [1ed5c83dbbd6bec20b79c26848084996f55b58d2]
# to [a724746ec3f5b6ab813d5d7a21e191799ed2518b]
#
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
# from [14115392139c7f57ea82db2f816b5069fffa2238]
# to [fac18deeba57a44702190636a5aeb017a33d2e86]
#
# patch "packages/apex/apex-nslu2_1.5.8.bb"
# from [a955d4e6ecf87a690890636436fb86c26ee760ec]
# to [15acb3b25031d818b76e970bb441e2b3b6844d3d]
#
# patch "packages/gpsd/gpsd.inc"
# from [bf39dceefc04642d65caefe9f5ad7660f44eb04a]
# to [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
#
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
# from [b599ca5cfe1b41f4bc77f77d3387c5249106151f]
# to [f75223758a267c3ed4d7b73bcb5deb2688268664]
#
# patch "packages/meta/slugos-packages.bb"
# from [17945a027e80de4d6c5f734175f99298ef499727]
# to [a711c84e9e2e4d98253996205dc7d161ee6d80d0]
#
# patch "packages/tasks/task-mokogateway.bb"
# from [baab49be88ae0d782d8b73266ba9450f0c4af0a7]
# to [cca68ea72f5d84032e651bc005390558dc96dcb5]
#
============================================================
--- classes/rm_work.bbclass 3c8ff49c617d0924fef4b991d29f8b91ab35b298
+++ classes/rm_work.bbclass 80b9b22e230989c7a6265d0b1860252d37fca5fb
@@ -7,7 +7,7 @@ RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
#
RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
-BB_DEFAULT_TASK = "rm_work"
+BB_DEFAULT_TASK = "rm_work_all"
do_rm_work () {
cd ${WORKDIR}
@@ -23,4 +23,9 @@ addtask rm_work after do_build
# Uncomment me when we can use bitbake 1.8.8
#addtask rm_work after do_${RMWORK_ORIG_TASK}
addtask rm_work after do_build
+
+do_rm_work_all () {
+ :
+}
+do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all
-do_rm_work[recrdeptask] = "do_rm_work"
============================================================
--- conf/distro/include/slugos.inc 1ed5c83dbbd6bec20b79c26848084996f55b58d2
+++ conf/distro/include/slugos.inc a724746ec3f5b6ab813d5d7a21e191799ed2518b
@@ -145,3 +145,19 @@ PREFERRED_VERSION_linux-libc-headers = "
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb 14115392139c7f57ea82db2f816b5069fffa2238
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb fac18deeba57a44702190636a5aeb017a33d2e86
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/apex/apex-nslu2_1.5.8.bb a955d4e6ecf87a690890636436fb86c26ee760ec
+++ packages/apex/apex-nslu2_1.5.8.bb 15acb3b25031d818b76e970bb441e2b3b6844d3d
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/gpsd/gpsd.inc bf39dceefc04642d65caefe9f5ad7660f44eb04a
+++ packages/gpsd/gpsd.inc 6ccdc1d0e17c682348f2cf4bf46c24536c69178d
@@ -7,7 +7,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-dbus \
- --disable-python"
+ --enable-python"
SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
file://gpsd-default \
@@ -23,6 +23,7 @@ do_compile_prepend() {
do_compile_prepend() {
export BUILD_SYS="${BUILD_SYS}"
export HOST_SYS="${HOST_SYS}"
+ find ${S} -name "*.so" -exec rm -f {} \;
}
do_install_prepend() {
@@ -48,7 +49,7 @@ FILES_${PN} += "${sysconfdir}"
PACKAGES =+ "libgps python-pygps"
FILES_${PN} += "${sysconfdir}"
-FILES_libgps = "${libdir}/*.so*"
+FILES_libgps = "${libdir}/*.so.*"
CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
DESCRIPTION_python-pygps = "Python bindings to gpsd"
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b599ca5cfe1b41f4bc77f77d3387c5249106151f
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb f75223758a267c3ed4d7b73bcb5deb2688268664
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
LICENSE = "GPL"
-PR = "r19"
+PR = "r20"
COMPATIBLE_HOST = 'arm.*-linux'
COMPATIBLE_MACHINE = "nslu2"
@@ -39,7 +39,7 @@ KERNEL_IMAGETYPE = "zImage"
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-KERNEL_SUFFIX = "${MACHINE}"
+KERNEL_SUFFIX = "ixp4xxbe"
CMDLINE_CONSOLE ?= "ttyS0,115200"
CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M at 0x00000000"
CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
============================================================
--- packages/meta/slugos-packages.bb 17945a027e80de4d6c5f734175f99298ef499727
+++ packages/meta/slugos-packages.bb a711c84e9e2e4d98253996205dc7d161ee6d80d0
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r33"
+PR = "r34"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -21,6 +21,8 @@ SLUGOS_PACKAGES = "\
SLUGOS_PACKAGES = "\
alsa-lib \
alsa-utils \
+ apex-env \
+ apr \
asterisk \
asterisk-sounds \
atftp \
@@ -35,6 +37,8 @@ SLUGOS_PACKAGES = "\
binutils \
bison \
bluez-utils \
+ bogofilter \
+ boost \
bridge-utils \
bzip2 \
ccxstream \
@@ -54,14 +58,17 @@ SLUGOS_PACKAGES = "\
diffutils \
dircproxy \
dnsmasq \
+ dsniff \
e2fsprogs \
e2fsprogs-libs \
eciadsl \
expat \
ez-ipupdate \
+ fconfig \
fetchmail \
file \
findutils \
+ fis \
flac \
flex \
flite \
@@ -74,32 +81,39 @@ SLUGOS_PACKAGES = "\
glib-2.0 \
gnu-config \
grep \
+ groff \
gspcav1 \
gtk-doc \
gzip \
hdparm \
ifupdown \
+ iperf \
ipkg-utils \
iptables \
ircp \
+ irssi \
joe \
jpeg \
lcdproc \
less \
libao \
libdvb \
+ libexif \
libid3tag \
liblockfile \
libmad \
libmikmod \
libogg \
libol \
+ libpam \
+ libpcre \
libpng \
libtool \
libupnp \
libusb \
libvorbis \
libxml2 \
+ linphone \
litestream \
lrzsz \
lsof \
@@ -109,8 +123,10 @@ SLUGOS_PACKAGES = "\
madwifi-ng \
mailx \
make \
+ man man-pages \
masqmail \
mdadm \
+ mediatomb \
memtester \
mgetty \
miau \
@@ -133,19 +149,20 @@ SLUGOS_PACKAGES = "\
obexftp \
obexpush \
openobex-apps \
- openldap \
openntpd \
openobex \
openssh \
openvpn \
patch \
pciutils \
- libpcre \
perl \
picocom \
pkgconfig \
+ popt \
+ postfix \
ppp \
procps \
+ psmisc \
puppy \
python \
quilt \
@@ -153,6 +170,7 @@ SLUGOS_PACKAGES = "\
rng-tools \
rsync \
samba \
+ screen \
sed \
setpwc \
setserial \
@@ -162,15 +180,18 @@ SLUGOS_PACKAGES = "\
ssmtp \
strace \
streamripper \
+ sudo \
sysfsutils \
tar \
task-mokogateway-everything \
thttpd \
tiff \
+ timezones \
tzdata \
unzip \
upslug2 \
usbutils \
+ ushare \
util-linux \
vim \
vlan \
@@ -183,6 +204,10 @@ SLUGOS_PACKAGES = "\
wireless-tools \
wireshark \
wpa-supplicant \
+ wview-sim wview-vpro wview-wxt510 \
+ xinetd \
+ yeaphone \
+ yp-tools ypbind ypserv \
zd1211-firmware \
zip \
zlib \
@@ -191,12 +216,12 @@ SLUGOS_BROKEN_PACKAGES = "\
# Packages currently broken on all platforms
SLUGOS_BROKEN_PACKAGES = "\
bwmon \
- gphoto2 \
- irssi \
- libgphoto2 \
+ ctrlproxy \
+ libgphoto2 gphoto2 \
logrotate \
madfu \
- mediatomb \
+ openldap \
+ \
mpd \
netpbm \
pvrusb2-mci \
@@ -214,55 +239,6 @@ SLUGOS_BROKEN_PACKAGES = "\
wview-wxt510-mysql \
"
-# These packages will never build because uclibc lacks (and always will lack)
-# appropriate support. This define is for documentation of this fact! The
-# normal cause is that the package uses the "NIS" interfaces (once known as
-# YP - a trademark of BT which SUN used without license - the missing function
-# calls often still have 'yp' in the name).
-
-# NOTE: rng-tools is only here until argp-standalone can be built!
-# nfs-utils \
-
-UCLIBC_UNSUPPORTABLE_PACKAGES = "\
- libpam \
- rng-tools \
- postfix \
- yp-tools ypbind ypserv \
- "
-
-# These packages work with glibc, but break on uclibc.
-# erlang \
-
-UCLIBC_BROKEN_PACKAGES = "\
- apr \
- bogofilter \
- boost \
- linphone \
- yeaphone \
- sudo \
- ushare \
- "
-
-# Packages which build only with glibc (some of these use internal
-# glibc functions and so will probably never run on uclibc).
-SLUGOS_PACKAGES_append_linux = "\
- ${UCLIBC_UNSUPPORTABLE_PACKAGES} \
- ${UCLIBC_BROKEN_PACKAGES} \
- ctrlproxy \
- dsniff \
- iperf \
- groff \
- man man-pages \
- psmisc \
- screen \
- timezones \
- wview-sim wview-vpro wview-wxt510 \
- xinetd \
- "
-
-SLUGOS_PACKAGES_append_linux-uclibc = "\
- "
-
SLUGOS_EXTRA_PACKAGES ?= ""
# The package-index at the end causes regeneration of the Packages.gz and
============================================================
--- packages/tasks/task-mokogateway.bb baab49be88ae0d782d8b73266ba9450f0c4af0a7
+++ packages/tasks/task-mokogateway.bb cca68ea72f5d84032e651bc005390558dc96dcb5
@@ -1,9 +1,9 @@ PROVIDES = "task-mokogateway-everything"
DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-mokogateway-everything"
-PR = "r3"
+PR = "r4"
PACKAGES = "\
task-mokogateway-everything \
@@ -74,7 +74,6 @@ RDEPENDS_task-mokogateway-debug = "\
DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
RDEPENDS_task-mokogateway-debug = "\
dfu-util \
- ftdi-eeprom \
openocd \
"
RRECOMMENDS_task-mokogateway-debug = "\
More information about the Openembedded-commits
mailing list