Merging with Openembedded
git-svn-id: https://svn.o-hand.com/repos/poky@197 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
parent
8ae1a27297
commit
b38f2a5935
|
|
@ -138,9 +138,6 @@ PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
|
|||
PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
|
||||
PREFERRED_VERSION_keylaunch ?= "2.0.7"
|
||||
PREFERRED_VERSION_librsvg ?= "2.6.5"
|
||||
PREFERRED_VERSION_libgpewidget ?= "0.103"
|
||||
PREFERRED_VERSION_libgpepimc ?= "0.5"
|
||||
PREFERRED_VERSION_libgpevtype ?= "0.12"
|
||||
PREFERRED_VERSION_libgsm ?= "1.0.10"
|
||||
PREFERRED_VERSION_libschedule ?= "0.15"
|
||||
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
|
||||
|
|
@ -149,9 +146,10 @@ PREFERRED_VERSION_minilite ?= "0.49"
|
|||
PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
|
||||
PREFERRED_VERSION_poppler ?= "0.3.3"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_rxvt-unicode ?= "5.3"
|
||||
PREFERRED_VERSION_rxvt-unicode ?= "5.6"
|
||||
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
|
||||
PREFERRED_VERSION_xdemineur ?= "2.1.1"
|
||||
PREFERRED_VERSION_xextensions ?= "1.0.1"
|
||||
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
|
||||
PREFERRED_VERSION_xmonobut ?= "0.4"
|
||||
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
|
||||
|
|
|
|||
|
|
@ -3,39 +3,40 @@
|
|||
#
|
||||
|
||||
#work around some breakages
|
||||
CVSDATE_minimo=20050401
|
||||
#CVSDATE_minimo=20050401
|
||||
|
||||
#set some preferred providers:
|
||||
#PREFERRED_PROVIDER_gconf=gconf-dbus
|
||||
PREFERRED_PROVIDER_gconf=gconf-dbus
|
||||
PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
|
||||
|
||||
#specify versions, as the header says :)
|
||||
#PREFERRED_VERSION_libmatchbox ?= "1.7"
|
||||
#PREFERRED_VERSION_matchbox ?= "0.9.1"
|
||||
#PREFERRED_VERSION_matchbox-common ?= "0.9.1"
|
||||
#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
|
||||
#PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
|
||||
#PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
|
||||
#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
|
||||
PREFERRED_VERSION_libmatchbox ?= "1.7"
|
||||
PREFERRED_VERSION_matchbox ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-common ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
|
||||
PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
|
||||
PREFERRED_VERSION_atk ?= "1.9.0"
|
||||
PREFERRED_VERSION_cairo ?= "0.5.2"
|
||||
PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
|
||||
PREFERRED_VERSION_gtk+ ?= "2.6.7"
|
||||
PREFERRED_VERSION_pango ?= "1.8.1"
|
||||
PREFERRED_VERSION_librsvg ?= "2.6.5"
|
||||
PREFERRED_VERSION_libgpewidget ?= "0.103"
|
||||
PREFERRED_VERSION_libgpewidget ?= "0.105"
|
||||
PREFERRED_VERSION_libgpepimc ?= "0.5"
|
||||
PREFERRED_VERSION_libgpevtype ?= "0.12"
|
||||
PREFERRED_VERSION_libgpevtype ?= "0.14"
|
||||
PREFERRED_VERSION_libschedule ?= "0.15"
|
||||
PREFERRED_VERSION_gpe-icons ?= "0.25"
|
||||
PREFERRED_VERSION_libgsm ?= "1.0.10"
|
||||
PREFERRED_VERSION_diet-x11 ?= "6.2.1"
|
||||
PREFERRED_VERSION_xproto ?= "6.6.2"
|
||||
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
|
||||
PREFERRED_VERSION_rxvt-unicode ?= "5.3"
|
||||
PREFERRED_VERSION_rxvt-unicode ?= "5.6"
|
||||
PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
|
||||
PREFERRED_VERSION_xst ?= "0.15"
|
||||
#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xextensions ?= "1.0.1"
|
||||
PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207"
|
||||
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
|
||||
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
|
||||
|
|
@ -43,20 +44,20 @@ PREFERRED_VERSION_gpe-login ?= "0.83"
|
|||
PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
|
||||
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
|
||||
PREFERRED_VERSION_gpe-todo ?= "0.54"
|
||||
PREFERRED_VERSION_gpe-calendar ?= "0.65"
|
||||
PREFERRED_VERSION_gpe-calendar ?= "0.66"
|
||||
PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
|
||||
PREFERRED_VERSION_gpe-contacts ?= "0.42"
|
||||
PREFERRED_VERSION_gpe-today ?= "0.10"
|
||||
#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
|
||||
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
|
||||
PREFERRED_VERSION_dbus ?= "0.23.4"
|
||||
PREFERRED_VERSION_gpe-beam ?= "0.2.8"
|
||||
PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
|
||||
PREFERRED_VERSION_gpe-su ?= "0.18"
|
||||
PREFERRED_VERSION_gpe-conf ?= "0.1.25"
|
||||
PREFERRED_VERSION_gpe-bluetooth ?= "0.47"
|
||||
PREFERRED_VERSION_gpe-su ?= "0.19"
|
||||
PREFERRED_VERSION_gpe-conf ?= "0.1.26"
|
||||
PREFERRED_VERSION_gpe-clock ?= "0.21"
|
||||
PREFERRED_VERSION_gpe-mininet ?= "0.5"
|
||||
PREFERRED_VERSION_gpe-mixer ?= "0.42"
|
||||
PREFERRED_VERSION_gpe-shield ?= "0.7"
|
||||
PREFERRED_VERSION_gpe-shield ?= "0.8"
|
||||
PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
|
||||
PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
|
||||
PREFERRED_VERSION_keylaunch ?= "2.0.7"
|
||||
|
|
@ -80,7 +81,7 @@ PREFERRED_VERSION_gpe-plucker ?= "0.2"
|
|||
PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
|
||||
PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
|
||||
PREFERRED_VERSION_xdemineur ?= "2.1.1"
|
||||
#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
|
||||
PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_dillo2 ?= "0.6.6"
|
||||
PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
|
||||
|
|
@ -90,4 +91,4 @@ PREFERRED_VERSION_firefox ?= "1.0"
|
|||
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
|
||||
PREFERRED_VERSION_poppler ?= "0.3.3"
|
||||
PREFERRED_VERSION_evince ?= "0.3.2"
|
||||
PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
|
||||
PREFERRED_VERSION_gpe_mini_browser ?= "0.17"
|
||||
|
|
|
|||
|
|
@ -1,100 +1,13 @@
|
|||
SECTION = "devel"
|
||||
include gcc_${PV}.bb
|
||||
include gcc-paths-cross.inc
|
||||
inherit cross
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
|
||||
|
||||
PR="r3"
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
|
||||
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
||||
|
||||
# Files for these are defined in the main gcc.oe
|
||||
PACKAGES = "libgcc libstdc++ libg2c"
|
||||
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
|
||||
--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
|
||||
|
||||
export CPPFLAGS = ""
|
||||
export CXXFLAGS = ""
|
||||
export CFLAGS = ""
|
||||
export LDFLAGS = ""
|
||||
|
||||
do_configure () {
|
||||
export CC="${BUILD_CC}"
|
||||
export AR="${TARGET_SYS}-ar"
|
||||
export RANLIB="${TARGET_SYS}-ranlib"
|
||||
export LD="${TARGET_SYS}-ld"
|
||||
export NM="${TARGET_SYS}-nm"
|
||||
rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
|
||||
(cd ${S} && gnu-configize) || die "failure running gnu-configize"
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
do_compile_prepend () {
|
||||
export CC="${BUILD_CC}"
|
||||
export AR_FOR_TARGET="${TARGET_SYS}-ar"
|
||||
export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
|
||||
export LD_FOR_TARGET="${TARGET_SYS}-ld"
|
||||
export NM_FOR_TARGET="${TARGET_SYS}-nm"
|
||||
export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
|
||||
}
|
||||
|
||||
do_stage_append () {
|
||||
for d in info man share/doc share/locale ; do
|
||||
rm -rf ${CROSS_DIR}/$d
|
||||
done
|
||||
|
||||
# These aren't useful on the cross toolchain
|
||||
rm -f ${CROSS_DIR}/bin/*gcov
|
||||
rm -f ${CROSS_DIR}/bin/*gccbug
|
||||
|
||||
# Fix a few include links so cross builds are happier
|
||||
if [ ! -e ${STAGING_INCDIR}/c++ ]; then
|
||||
mkdir -p ${STAGING_INCDIR}
|
||||
rm -f ${STAGING_INCDIR}/c++
|
||||
ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
|
||||
${STAGING_INCDIR}/
|
||||
fi
|
||||
|
||||
# We use libiberty from binutils
|
||||
rm -f ${CROSS_DIR}/lib/libiberty.a
|
||||
|
||||
# We probably don't need these
|
||||
rmdir ${CROSS_DIR}/include || :
|
||||
|
||||
# We don't really need to keep this around
|
||||
rm -rf ${CROSS_DIR}/share
|
||||
}
|
||||
|
||||
python do_package() {
|
||||
if bb.data.getVar('DEBIAN_NAMES', d, 1):
|
||||
bb.data.setVar('PKG_libgcc', 'libgcc1', d)
|
||||
bb.build.exec_func('package_do_package', d)
|
||||
}
|
||||
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
|
||||
# Move libgcc_s into /lib
|
||||
mkdir -p ${D}${base_libdir}
|
||||
if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
|
||||
# native builds drop one pathname component
|
||||
mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
|
||||
else
|
||||
mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
|
||||
fi
|
||||
|
||||
# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
|
||||
TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
|
||||
mkdir -p ${D}${TGT_LIBDIR}
|
||||
mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
|
||||
mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
|
||||
|
||||
# Manually run the target stripper since we won't get it run by
|
||||
# the packaging.
|
||||
if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
|
||||
${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
|
||||
${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
|
||||
${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
|
||||
fi
|
||||
}
|
||||
include gcc3-build-cross.inc
|
||||
include gcc-package-cross.inc
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
DESCRIPTION = "hdparm is a Linux shell utility for viewing \
|
||||
and manipulating various IDE drive and driver parameters."
|
||||
SECTION = "console/utils"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "BSD"
|
||||
|
||||
SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \
|
||||
file://bswap.patch;patch=1 \
|
||||
file://uclibc.patch;patch=1"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}/${sbindir} ${D}/${mandir}/man8
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ EXTRA_OECONF_append_h2200 = " --enable-small-icons "
|
|||
EXTRA_OECONF_append_collie = " --enable-small-icons "
|
||||
EXTRA_OECONF_append_poodle = " --enable-small-icons "
|
||||
EXTRA_OECONF_append_mnci = " --enable-small-icons "
|
||||
EXTRA_OECONF_append_integral = " --enable-small-icons "
|
||||
EXTRA_OECONF_append_integral13 = " --enable-small-icons "
|
||||
|
||||
FILES_${PN} = "${bindir} \
|
||||
${datadir}/applications \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
include matchbox-panel.inc
|
||||
|
||||
PR="r2"
|
||||
PR="r3"
|
||||
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
|
||||
removing kernel modules for Linux (versions 2.5.48 and above). It serves \
|
||||
the same function that the modutils package serves for Linux 2.4."
|
||||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
PR = "r0"
|
||||
|
||||
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
|
||||
RDEPENDS_${PN} += "module-init-tools-depmod"
|
||||
|
||||
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
|
||||
FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
|
||||
|
||||
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
|
||||
file://ignore_arch_directory;patch=1 \
|
||||
file://modutils_extension;patch=1 \
|
||||
file://no_man_rebuild;patch=1 \
|
||||
file://manpagesopt;patch=1 "
|
||||
S = "${WORKDIR}/module-init-tools-${PV}"
|
||||
|
||||
EXTRA_OECONF = "--disable-manpages"
|
||||
|
||||
bindir = "/bin"
|
||||
sbindir = "/sbin"
|
||||
|
||||
inherit autotools
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
|
||||
mv ${D}/$f ${D}/$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --install /$f $bn /$f.26 60
|
||||
done
|
||||
update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
|
||||
update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --remove $bn /$f.26
|
||||
done
|
||||
update-alternatives --remove bin-lsmod /bin/lsmod.26
|
||||
update-alternatives --remove lsmod /bin/lsmod.26
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools-depmod() {
|
||||
#!/bin/sh
|
||||
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
update-alternatives --remove depmod /sbin/depmod.26
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
|
|||
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
|
||||
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
|
||||
|
||||
PR = "r6"
|
||||
PR = "r10"
|
||||
|
||||
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
|
||||
FILES_xserver-kdrive-ati = "${bindir}/Xati"
|
||||
|
|
@ -35,34 +35,29 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
|
|||
|
||||
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
|
||||
file://kmode.patch;patch=1 \
|
||||
file://disable-apm.patch;patch=1 \
|
||||
file://fbdev-not-fix.patch;patch=1 "
|
||||
|
||||
SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
|
||||
file://kmode.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1 \
|
||||
file://fbdev-not-fix.patch;patch=1 "
|
||||
|
||||
|
||||
SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1 \
|
||||
file://devfs.patch;patch=1 \
|
||||
file://disable-apm.patch;patch=1"
|
||||
file://devfs.patch;patch=1"
|
||||
SRC_URI_append_collie = " file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
|
||||
SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1"
|
||||
SRC_URI_append_h3600 = " file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_h3900 = " file://disable-apm.patch;patch=1"
|
||||
SRC_URI_append_h2200 = " file://disable-apm.patch;patch=1"
|
||||
SRC_URI_append_spitz = " file://disable-apm.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_akita = " file://disable-apm.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_borzoi = " file://disable-apm.patch;patch=1 \
|
||||
file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_akita = " file://faster-rotated.patch;patch=1"
|
||||
SRC_URI_append_borzoi = " file://faster-rotated.patch;patch=1"
|
||||
|
||||
PACKAGE_ARCH_mnci = "mnci"
|
||||
PACKAGE_ARCH_collie = "collie"
|
||||
PACKAGE_ARCH_poodle = "poodle"
|
||||
PACKAGE_ARCH_c7x0 = "c7x0"
|
||||
PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
|
||||
PACKAGE_ARCH_h3600 = "h3600"
|
||||
PACKAGE_ARCH_h3900 = "h3900"
|
||||
PACKAGE_ARCH_h2200 = "h2200"
|
||||
PACKAGE_ARCH_spitz = "spitz"
|
||||
PACKAGE_ARCH_akita = "akita"
|
||||
PACKAGE_ARCH_borzoi = "borzoi"
|
||||
|
|
|
|||
Loading…
Reference in New Issue