diff options
1484 files changed, 4466 insertions, 2108 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 85756edacd..e36c3e3aa3 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -172,7 +172,7 @@ oe_libinstall() { dir=`pwd` fi dotlai=$libname.lai - dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` + dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 853abfd1b3..78b902f85d 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -1,7 +1,8 @@ FILES_${PN} += '${libdir}/perl5' +EXTRA_CPANFLAGS = "" cpan_do_configure () { - perl Makefile.PL + perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c9192b6720..0a141f883e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -341,7 +341,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 020e3f98a3..058f39214e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -51,7 +51,7 @@ PREFERRED_VERSION_freetype = "2.2.1" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-drive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 3e4b581353..27a6164e54 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -154,7 +154,7 @@ PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfont ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f509cd0a5d..fa3675fb59 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" @@ -37,10 +37,10 @@ include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +#include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-iwmmxt.conf # These modules are now compiled into the kernel: diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb index 83bc8c5c86..10ebacee9b 100644 --- a/packages/alsa/alsa-utils_1.0.11.bb +++ b/packages/alsa/alsa-utils_1.0.11.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" @@ -49,5 +49,6 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" +RDEPENDS_alsa-utils-alsamixer += "alsa-conf" ALLOW_EMPTY_alsa-utils = "1" diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 0058623f9c..2f1aa23ee8 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,13 +1,14 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r12" +PR = "r15" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" BOOTMODULES_RRECOMMENDS ?= "" DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb",d)}' - +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb procps",d)}' +EXTRA_STUFF ?= "" +PCMCIA_MANAGER ?= "pcmciautils" PACKAGES = "\ angstrom-base-depends \ @@ -34,7 +35,9 @@ RDEPENDS_angstrom-base-depends = "\ ipkg ipkg-collateral \ wireless-tools \ tslib-tests tslib-calibrate \ + ${EXTRA_STUFF} \ ${DEBUG_APPS} \ + ${PCMCIA_MANAGER} \ " RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " @@ -68,6 +71,7 @@ RDEPENDS_angstrom-x11-base-depends := "\ RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ + dbus-glib \ xcursor-transparent-theme \ rxvt-unicode \ matchbox-themes-gtk \ diff --git a/packages/antlr/antlr-native_2.7.5.bb b/packages/antlr/antlr-native_2.7.5.bb index cd6ce7a76b..77cb88c7e7 100644 --- a/packages/antlr/antlr-native_2.7.5.bb +++ b/packages/antlr/antlr-native_2.7.5.bb @@ -1,4 +1,4 @@ -include antlr_${PV}.bb +require antlr_${PV}.bb inherit native # A native antlr would need a native java virtual machine.. diff --git a/packages/apt/apt_0.5.28.6.bb b/packages/apt/apt_0.5.28.6.bb index 99f5ef63c7..d898a572ec 100644 --- a/packages/apt/apt_0.5.28.6.bb +++ b/packages/apt/apt_0.5.28.6.bb @@ -1,11 +1,11 @@ -include apt.inc +require apt.inc PR = "r1" SRC_URI += "file://autofoo.patch;patch=1" inherit autotools gettext -include apt-package.inc +require apt-package.inc apt-manpages += "doc/vendors.list.5 \ doc/fr/vendors.list.fr.5 \ diff --git a/packages/apt/apt_0.6.25.bb b/packages/apt/apt_0.6.25.bb index a6f9f9e223..03ecaaee85 100644 --- a/packages/apt/apt_0.6.25.bb +++ b/packages/apt/apt_0.6.25.bb @@ -1,11 +1,11 @@ -include apt.inc +require apt.inc PR = "r2" SRC_URI += "file://autofoo.patch;patch=1" inherit autotools gettext -include apt-package.inc +require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb index fb13e24bdf..8364df06a9 100644 --- a/packages/aspell/aspell5-en_6.0-0.bb +++ b/packages/aspell/aspell5-en_6.0-0.bb @@ -1,4 +1,4 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2" -include aspell-lang.inc +require aspell-lang.inc diff --git a/packages/autoconf/autoconf-2.59/sizeof_types.patch b/packages/autoconf/autoconf-2.59/sizeof_types.patch index 0f1e0d1fee..30fd5c1926 100644 --- a/packages/autoconf/autoconf-2.59/sizeof_types.patch +++ b/packages/autoconf/autoconf-2.59/sizeof_types.patch @@ -3,15 +3,38 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # ---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch 2003-05-22 08:05:14.000000000 -0400 -+++ autoconf-2.59/lib/autoconf/types.m4 2004-05-29 01:31:24.828295015 -0400 -@@ -380,32 +380,38 @@ +Index: autoconf-2.59/lib/autoconf/types.m4 +=================================================================== +--- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200 ++++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200 +@@ -380,26 +380,66 @@ # Generic checks. # # ---------------- # ++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60 ++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH ) ++# ------------------------------------------------------------------------ ++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.) ++AC_DEFUN([AC_CHECK_TARGET_TOOL], ++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl ++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4]) ++if test -z "$ac_cv_prog_$1"; then ++ if test "$build" = "$target"; then ++ ac_ct_$1=$$1 ++ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4]) ++ $1=ac_ct_$1 ++ else ++ $1="$3" ++ fi ++else ++ $1="$ac_cv_prog_$1" ++fi ++])# AC_CHECK_TARGET_TOOL ++ ++ +AC_DEFUN([AC_PROG_SIZE], +[ -+ AC_CHECK_TOOL(SIZE, size, :) ++ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH]) +]) # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) @@ -35,14 +58,25 @@ - [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) +[ +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], -+ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` -+ ], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=0 -+ ]) ++ if test "$cross_compiling" = yes; then ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], ++ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], ++ [ ++ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` ++ ], ++ [ ++ AS_TR_SH([ac_cv_sizeof_$1])=0 ++ ]) ++ else ++ # The cast to unsigned long works around a bug in the HP C Compiler ++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++ # This bug is HP SR number 8606223364. ++ _AC_COMPUTE_INT([(long) (sizeof ($1))], ++ [AS_TR_SH([ac_cv_sizeof_$1])], ++ [AC_INCLUDES_DEFAULT([$3])], ++ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) ++ fi else AS_TR_SH([ac_cv_sizeof_$1])=0 -fi])dnl @@ -51,9 +85,3 @@ AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), [The size of a `$1', as computed by sizeof.]) ])# AC_CHECK_SIZEOF - -- -- - # ---------------- # - # Generic checks. # - # ---------------- # diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb index aac4b67ada..347cd354cf 100644 --- a/packages/autoconf/autoconf-native_2.59.bb +++ b/packages/autoconf/autoconf-native_2.59.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include autoconf_${PV}.bb +require autoconf_${PV}.bb DEPENDS = "m4-native gnu-config-native" RDEPENDS_${PN} = "m4-native gnu-config-native" RRECOMMENDS_${PN} = "" diff --git a/packages/automake/automake-native_1.8.2.bb b/packages/automake/automake-native_1.8.2.bb index 6e36766445..9a8b1726a8 100644 --- a/packages/automake/automake-native_1.8.2.bb +++ b/packages/automake/automake-native_1.8.2.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include automake_${PV}.bb +require automake_${PV}.bb S = "${WORKDIR}/automake-${PV}" DEPENDS = "autoconf-native" RDEPENDS_${PN} = "autoconf-native perl-native-runtime" diff --git a/packages/automake/automake-native_1.8.4.bb b/packages/automake/automake-native_1.8.4.bb index 6e36766445..9a8b1726a8 100644 --- a/packages/automake/automake-native_1.8.4.bb +++ b/packages/automake/automake-native_1.8.4.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include automake_${PV}.bb +require automake_${PV}.bb S = "${WORKDIR}/automake-${PV}" DEPENDS = "autoconf-native" RDEPENDS_${PN} = "autoconf-native perl-native-runtime" diff --git a/packages/automake/automake-native_1.9.2.bb b/packages/automake/automake-native_1.9.2.bb index 536f41570f..2ecb0eaa1e 100644 --- a/packages/automake/automake-native_1.9.2.bb +++ b/packages/automake/automake-native_1.9.2.bb @@ -1,2 +1,2 @@ PV := "${PV}" -include automake-native.inc +require automake-native.inc diff --git a/packages/automake/automake-native_1.9.3.bb b/packages/automake/automake-native_1.9.3.bb index 39544b7c1d..92c861f49c 100644 --- a/packages/automake/automake-native_1.9.3.bb +++ b/packages/automake/automake-native_1.9.3.bb @@ -1,3 +1,3 @@ PV := "${PV}" -include automake-native.inc +require automake-native.inc diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb index 7483868ee4..4c00ea0891 100644 --- a/packages/automake/automake_1.7.7.bb +++ b/packages/automake/automake_1.7.7.bb @@ -8,7 +8,7 @@ inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" -include automake.inc +require automake.inc do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb index 9921a8d6a4..30002191f5 100644 --- a/packages/automake/automake_1.8.2.bb +++ b/packages/automake/automake_1.8.2.bb @@ -12,7 +12,7 @@ inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" -include automake.inc +require automake.inc do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb index 493d2cc907..d10ff553df 100644 --- a/packages/automake/automake_1.8.4.bb +++ b/packages/automake/automake_1.8.4.bb @@ -12,7 +12,7 @@ inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" -include automake.inc +require automake.inc do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb index 4027862768..19d5d56979 100644 --- a/packages/automake/automake_1.9.2.bb +++ b/packages/automake/automake_1.9.2.bb @@ -13,7 +13,7 @@ inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" -include automake.inc +require automake.inc do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb index fb75b83b68..52f9b981aa 100644 --- a/packages/automake/automake_1.9.3.bb +++ b/packages/automake/automake_1.9.3.bb @@ -14,7 +14,7 @@ inherit autotools export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" -include automake.inc +require automake.inc do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/base-files/base-files/jornada720/fstab b/packages/base-files/base-files/jornada720/fstab deleted file mode 100644 index 07ccff0fe6..0000000000 --- a/packages/base-files/base-files/jornada720/fstab +++ /dev/null @@ -1,6 +0,0 @@ -/dev/mtdblock1 / jffs2 rw,noatime 1 1 -proc /proc proc defaults 0 0 -/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file diff --git a/packages/base-files/base-files/jornada720/.mtn2git_empty b/packages/base-files/base-files/jornada7xx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/base-files/base-files/jornada720/.mtn2git_empty +++ b/packages/base-files/base-files/jornada7xx/.mtn2git_empty diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab new file mode 100644 index 0000000000..504a1a2f4e --- /dev/null +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -0,0 +1,7 @@ +proc /proc proc defaults 0 0 +/dev/hda2 / ext2 defaults 0 0 +/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 +/dev/hda3 none swap sw 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /mnt/ram tmpfs defaults 0 0 +devpts /dev/pts devpts defaults 0 0
\ No newline at end of file diff --git a/packages/beecrypt/beecrypt-native_3.1.0.bb b/packages/beecrypt/beecrypt-native_3.1.0.bb index 81bbe2bcd9..b056a0fb41 100644 --- a/packages/beecrypt/beecrypt-native_3.1.0.bb +++ b/packages/beecrypt/beecrypt-native_3.1.0.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include beecrypt_${PV}.bb +require beecrypt_${PV}.bb S = "${WORKDIR}/beecrypt-${PV}" inherit native diff --git a/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb index bb7f6b54fd..33e0a24a53 100644 --- a/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb +++ b/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" diff --git a/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb index bb7f6b54fd..33e0a24a53 100644 --- a/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb +++ b/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" diff --git a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb index bb7f6b54fd..33e0a24a53 100644 --- a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb +++ b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb index 714e3ce7ef..9161a520ff 100644 --- a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb +++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb index 714e3ce7ef..9161a520ff 100644 --- a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb +++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" diff --git a/packages/binutils/binutils-cross-sdk_cvs.bb b/packages/binutils/binutils-cross-sdk_cvs.bb index c91be690bb..1a9093ff15 100644 --- a/packages/binutils/binutils-cross-sdk_cvs.bb +++ b/packages/binutils/binutils-cross-sdk_cvs.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_cvs.bb +require binutils_cvs.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" diff --git a/packages/binutils/binutils-cross_2.14.90.0.6.bb b/packages/binutils/binutils-cross_2.14.90.0.6.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.14.90.0.6.bb +++ b/packages/binutils/binutils-cross_2.14.90.0.6.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.14.90.0.7.bb b/packages/binutils/binutils-cross_2.14.90.0.7.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.14.90.0.7.bb +++ b/packages/binutils/binutils-cross_2.14.90.0.7.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.15.94.0.1.bb b/packages/binutils/binutils-cross_2.15.94.0.1.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.15.94.0.1.bb +++ b/packages/binutils/binutils-cross_2.15.94.0.1.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.16.91.0.6.bb b/packages/binutils/binutils-cross_2.16.91.0.6.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.16.91.0.6.bb +++ b/packages/binutils/binutils-cross_2.16.91.0.6.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.16.91.0.7.bb b/packages/binutils/binutils-cross_2.16.91.0.7.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.16.91.0.7.bb +++ b/packages/binutils/binutils-cross_2.16.91.0.7.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.16.bb b/packages/binutils/binutils-cross_2.16.bb index df0f17b1ef..d245f7d11a 100644 --- a/packages/binutils/binutils-cross_2.16.bb +++ b/packages/binutils/binutils-cross_2.16.bb @@ -1,3 +1,3 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" -include binutils_${PV}.bb -include binutils-cross.inc +require binutils_${PV}.bb +require binutils-cross.inc diff --git a/packages/binutils/binutils-cross_2.17.50.0.1.bb b/packages/binutils/binutils-cross_2.17.50.0.1.bb index 7e165271d7..1f2f43ecf8 100644 --- a/packages/binutils/binutils-cross_2.17.50.0.1.bb +++ b/packages/binutils/binutils-cross_2.17.50.0.1.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_${PV}.bb +require binutils_${PV}.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_2.17.bb b/packages/binutils/binutils-cross_2.17.bb index df0f17b1ef..d245f7d11a 100644 --- a/packages/binutils/binutils-cross_2.17.bb +++ b/packages/binutils/binutils-cross_2.17.bb @@ -1,3 +1,3 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" -include binutils_${PV}.bb -include binutils-cross.inc +require binutils_${PV}.bb +require binutils-cross.inc diff --git a/packages/binutils/binutils-cross_csl-arm-20050416.bb b/packages/binutils/binutils-cross_csl-arm-20050416.bb index b80f3611d2..2b04e83295 100644 --- a/packages/binutils/binutils-cross_csl-arm-20050416.bb +++ b/packages/binutils/binutils-cross_csl-arm-20050416.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_csl-arm-20050416.bb +require binutils_csl-arm-20050416.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_csl-arm-20050603.bb b/packages/binutils/binutils-cross_csl-arm-20050603.bb index f06be486f5..83eec9b9c6 100644 --- a/packages/binutils/binutils-cross_csl-arm-20050603.bb +++ b/packages/binutils/binutils-cross_csl-arm-20050603.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_csl-arm-20050603.bb +require binutils_csl-arm-20050603.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils-cross_cvs.bb b/packages/binutils/binutils-cross_cvs.bb index 0e338b52a7..d37740b5e9 100644 --- a/packages/binutils/binutils-cross_cvs.bb +++ b/packages/binutils/binutils-cross_cvs.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include binutils_cvs.bb +require binutils_cvs.bb inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index 5b936dcc66..dbb4b94d2e 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -23,4 +23,4 @@ SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1" S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -include binutils.inc +require binutils.inc diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb index 52b5ade90e..3edbe204e8 100644 --- a/packages/binutils/binutils_2.17.bb +++ b/packages/binutils/binutils_2.17.bb @@ -26,4 +26,4 @@ SRC_URI += "\ S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -include binutils.inc +require binutils.inc diff --git a/packages/bison/bison-native_2.0.bb b/packages/bison/bison-native_2.0.bb index 57065cd502..db2b0b9683 100644 --- a/packages/bison/bison-native_2.0.bb +++ b/packages/bison/bison-native_2.0.bb @@ -1,4 +1,4 @@ -include bison_${PV}.bb +require bison_${PV}.bb SECTION = "devel" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}" S = "${WORKDIR}/bison-${PV}" diff --git a/packages/bitbake/bitbake_1.0.bb b/packages/bitbake/bitbake_1.0.bb index 9f8f054355..c4b724d967 100644 --- a/packages/bitbake/bitbake_1.0.bb +++ b/packages/bitbake/bitbake_1.0.bb @@ -1,4 +1,4 @@ -include bitbake.inc +require bitbake.inc # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" @@ -8,4 +8,4 @@ S = "${WORKDIR}/bitbake-${PV}" inherit distutils -include bitbake-package.inc +require bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.1.bb b/packages/bitbake/bitbake_1.1.bb index 9f8f054355..c4b724d967 100644 --- a/packages/bitbake/bitbake_1.1.bb +++ b/packages/bitbake/bitbake_1.1.bb @@ -1,4 +1,4 @@ -include bitbake.inc +require bitbake.inc # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" @@ -8,4 +8,4 @@ S = "${WORKDIR}/bitbake-${PV}" inherit distutils -include bitbake-package.inc +require bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.4.2.bb b/packages/bitbake/bitbake_1.4.2.bb index 0727eafd41..ac4a1ce122 100644 --- a/packages/bitbake/bitbake_1.4.2.bb +++ b/packages/bitbake/bitbake_1.4.2.bb @@ -1,4 +1,4 @@ -include bitbake.inc +require bitbake.inc # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" @@ -8,7 +8,7 @@ S = "${WORKDIR}/bitbake-${PV}" inherit distutils -include bitbake-package.inc +require bitbake-package.inc RDEPENDS += "python-shell python-lang python-textutils python-pickle" diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb index a4ff2ae540..1df6dacbed 100644 --- a/packages/bitbake/bitbake_svn.bb +++ b/packages/bitbake/bitbake_svn.bb @@ -1,4 +1,4 @@ -include bitbake.inc +require bitbake.inc # Don't use the tip of svn by default DEFAULT_PREFERENCE = "-1" @@ -13,4 +13,4 @@ S = "${WORKDIR}/bitbake" inherit distutils -include bitbake-package.inc +require bitbake-package.inc diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index 2aad6eae13..d55361c63d 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r11" diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb index 8db7852c84..11decf1208 100644 --- a/packages/bluez/bluez-utils-dbus_2.21.bb +++ b/packages/bluez/bluez-utils-dbus_2.21.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r5" diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb index f490f9c622..601a3f1f0c 100644 --- a/packages/bluez/bluez-utils-dbus_2.24.bb +++ b/packages/bluez/bluez-utils-dbus_2.24.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r2" diff --git a/packages/bluez/bluez-utils-dbus_2.25.bb b/packages/bluez/bluez-utils-dbus_2.25.bb index c0b2c62cc4..954121c330 100644 --- a/packages/bluez/bluez-utils-dbus_2.25.bb +++ b/packages/bluez/bluez-utils-dbus_2.25.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r1" diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb index 006d1258bc..e7b5ad5f43 100644 --- a/packages/bluez/bluez-utils-nodbus_2.20.bb +++ b/packages/bluez/bluez-utils-nodbus_2.20.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r3" diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb index 49162d55d9..5e1f417cc0 100644 --- a/packages/bluez/bluez-utils-nodbus_2.21.bb +++ b/packages/bluez/bluez-utils-nodbus_2.21.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r3" diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb index 7a9e73216a..b0a601d625 100644 --- a/packages/bluez/bluez-utils-nodbus_2.24.bb +++ b/packages/bluez/bluez-utils-nodbus_2.24.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r2" diff --git a/packages/bluez/bluez-utils-nodbus_2.25.bb b/packages/bluez/bluez-utils-nodbus_2.25.bb index 05850a872e..bf38140a1b 100644 --- a/packages/bluez/bluez-utils-nodbus_2.25.bb +++ b/packages/bluez/bluez-utils-nodbus_2.25.bb @@ -1,4 +1,4 @@ -include bluez-utils.inc +require bluez-utils.inc PR = "r0" diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/bootchart/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-native-2.3.3/.mtn2git_empty +++ b/packages/bootchart/files/.mtn2git_empty diff --git a/packages/bootchart/files/handheld.patch b/packages/bootchart/files/handheld.patch new file mode 100644 index 0000000000..c3ded668bc --- /dev/null +++ b/packages/bootchart/files/handheld.patch @@ -0,0 +1,105 @@ +diff -ur bootchart-0.9-org/script/bootchartd bootchart-0.9/script/bootchartd +--- bootchart-0.9-org/script/bootchartd 2005-11-13 19:40:01.000000000 +0200 ++++ bootchart-0.9/script/bootchartd 2006-08-03 19:06:22.000000000 +0300 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # Bootchart logger script + # Ziga Mahkovec <ziga.mahkovec@klika.si> +@@ -43,10 +43,12 @@ + # boot), a tmpfs is mounted in /mnt. The mount point is immediately + # released using a lazy umount, so the script must never leave that + # directory. +- LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )" ++ #LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )" ++ LOG_DIR="" + if [ -z "$LOG_DIR" ]; then +- LOG_DIR="/mnt" +- LAZY_UMOUNT="yes" ++ LOG_DIR="/bootchart" ++ mkdir -p $LOG_DIR ++ #LAZY_UMOUNT="yes" + mount -n -t tmpfs -o size=$TMPFS_SIZE none "$LOG_DIR" >/dev/null 2>&1 + fi + cd "$LOG_DIR" +@@ -54,7 +56,7 @@ + [ -n "$LAZY_UMOUNT" ] && umount -nfl "$LOG_DIR" + + # Enable process accounting if configured +- if [ "$PROCESS_ACCOUNTING" = "yes" ]; then ++ if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then + > kernel_pacct + accton kernel_pacct + fi +@@ -153,7 +155,7 @@ + + # Stop process accounting if configured + local pacct= +- if [ "$PROCESS_ACCOUNTING" = "yes" ]; then ++ if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then + accton + pacct=kernel_pacct + fi +@@ -215,18 +217,34 @@ + # Started by the kernel. Start the logger in background and exec + # init(1). + IN_INIT="yes" +- echo "Starting bootchart logging" +- start & + + # Optionally, an alternative init(1) process may be specified using + # the kernel command line (e.g. "bootchart_init=/sbin/initng") ++ # Optionally, possible to override sample period using ++ # the kernel command line (e.g. "bootchart_sample_period=0.1") + init="/sbin/init" +- for i in $@; do ++ ++ #kparams=$@ ++ # For some reason, handheld kernel doesn't pass command line here - fish for it ++ mount -t proc none /bootchart ++ kparams=`cat /bootchart/cmdline` ++ umount /bootchart ++ ++ echo "Kernel params: $kparams" ++ for i in $kparams; do + if [ "${i%%=*}" = "bootchart_init" ]; then + init="${i#*=}" + break + fi ++ if [ "${i%%=*}" = "bootchart_sample_period" ]; then ++ SAMPLE_PERIOD="${i#*=}" ++ break ++ fi + done ++ ++ echo "Starting bootchart logging, sample period: ${SAMPLE_PERIOD}s" ++ start & ++ + exec $init $* + fi + +diff -ur bootchart-0.9-org/script/bootchartd.conf bootchart-0.9/script/bootchartd.conf +--- bootchart-0.9-org/script/bootchartd.conf 2005-11-13 19:40:01.000000000 +0200 ++++ bootchart-0.9/script/bootchartd.conf 2006-08-03 15:21:31.000000000 +0300 +@@ -10,16 +10,17 @@ + BOOTLOG_LOCK=".lock" + + # Sampling period (in seconds) +-SAMPLE_PERIOD=0.2 ++# Default 0.2 is not fine enough to catch peculiarities in OE-based distro ++SAMPLE_PERIOD=0.1 + + # Whether to enable and store BSD process accounting information. The + # kernel needs to be configured to enable v3 accounting + # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities + # is also required. +-PROCESS_ACCOUNTING="no" ++PROCESS_ACCOUNTING="yes" + + # Tarball for the various boot log files +-BOOTLOG_DEST=/var/log/bootchart.tgz ++BOOTLOG_DEST=/bootchart.tgz + + # Whether to automatically generate the boot chart once the boot logger + # completes. The boot chart will be generated in $AUTO_RENDER_DIR. diff --git a/packages/bootsplash/bootsplash-native_3.0.7.bb b/packages/bootsplash/bootsplash-native_3.0.7.bb index df368ce38c..7eabf484ac 100644 --- a/packages/bootsplash/bootsplash-native_3.0.7.bb +++ b/packages/bootsplash/bootsplash-native_3.0.7.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include bootsplash_${PV}.bb +require bootsplash_${PV}.bb inherit native S="${WORKDIR}/bootsplash-${PV}" diff --git a/packages/ccdv/ccdv-native.bb b/packages/ccdv/ccdv-native.bb index ece198e932..1eaebd0129 100644 --- a/packages/ccdv/ccdv-native.bb +++ b/packages/ccdv/ccdv-native.bb @@ -1,4 +1,4 @@ -include ccdv.bb +require ccdv.bb inherit native do_stage () { diff --git a/packages/cetools/cetools-native_0.3.bb b/packages/cetools/cetools-native_0.3.bb index 4e5408cb85..ca4ff302ca 100644 --- a/packages/cetools/cetools-native_0.3.bb +++ b/packages/cetools/cetools-native_0.3.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include cetools_${PV}.bb +require cetools_${PV}.bb inherit native do_stage() { diff --git a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb index a285d3dbe6..00ad9743fd 100644 --- a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb +++ b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb @@ -1,4 +1,4 @@ -include changedfiles.inc +require changedfiles.inc PR = "r1" SRC_URI += "file://autofoo.patch;patch=1" diff --git a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb index 367063870e..082dc0023b 100644 --- a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb +++ b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb @@ -1,4 +1,4 @@ -include changedfiles.inc +require changedfiles.inc PR = "r1" B = "${WORKDIR}/changedfiles-${PV}/module" diff --git a/packages/cherokee/cherokee-nossl_0.5.3.bb b/packages/cherokee/cherokee-nossl_0.5.3.bb index 6d3cd85df6..a7c08ce753 100644 --- a/packages/cherokee/cherokee-nossl_0.5.3.bb +++ b/packages/cherokee/cherokee-nossl_0.5.3.bb @@ -1,4 +1,4 @@ -include cherokee_${PV}.bb +require cherokee_${PV}.bb DEPENDS = "pcre" diff --git a/packages/classpath/classpath-gtk_0.90.bb b/packages/classpath/classpath-gtk_0.90.bb index ca36e675bc..b83d23d9c0 100644 --- a/packages/classpath/classpath-gtk_0.90.bb +++ b/packages/classpath/classpath-gtk_0.90.bb @@ -1,4 +1,4 @@ -include classpath.inc +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PBN}-gtk = "${PBN}-common (>= ${PV})" diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb index 4f08466e55..1339b2dbc8 100644 --- a/packages/classpath/classpath-minimal_0.90.bb +++ b/packages/classpath/classpath-minimal_0.90.bb @@ -1,4 +1,4 @@ -include classpath.inc +require classpath.inc DEPENDS = "jikes-native zip-native" RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})" diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb index ce7ba48efc..59a1041a43 100644 --- a/packages/conserver/conserver_8.1.14.bb +++ b/packages/conserver/conserver_8.1.14.bb @@ -1,2 +1,2 @@ -include conserver.inc +require conserver.inc PR="r2" diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb index 306a3f5129..d720a2182c 100644 --- a/packages/conserver/conserver_8.1.2.bb +++ b/packages/conserver/conserver_8.1.2.bb @@ -1,2 +1,2 @@ -include conserver.inc +require conserver.inc PR="r3" diff --git a/packages/coreutils/coreutils-native_5.1.3.bb b/packages/coreutils/coreutils-native_5.1.3.bb index 74b39541fa..ee90981895 100644 --- a/packages/coreutils/coreutils-native_5.1.3.bb +++ b/packages/coreutils/coreutils-native_5.1.3.bb @@ -3,5 +3,5 @@ SECTION = "base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" S = "${WORKDIR}/coreutils-${PV}" -include coreutils_${PV}.bb +require coreutils_${PV}.bb inherit native diff --git a/packages/coreutils/coreutils-native_5.3.0.bb b/packages/coreutils/coreutils-native_5.3.0.bb index 74b39541fa..ee90981895 100644 --- a/packages/coreutils/coreutils-native_5.3.0.bb +++ b/packages/coreutils/coreutils-native_5.3.0.bb @@ -3,5 +3,5 @@ SECTION = "base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" S = "${WORKDIR}/coreutils-${PV}" -include coreutils_${PV}.bb +require coreutils_${PV}.bb inherit native diff --git a/packages/crimsonfields/crimsonfields-native_0.4.8.bb b/packages/crimsonfields/crimsonfields-native_0.4.8.bb index 212590b754..61157e24c1 100644 --- a/packages/crimsonfields/crimsonfields-native_0.4.8.bb +++ b/packages/crimsonfields/crimsonfields-native_0.4.8.bb @@ -1,4 +1,4 @@ -include crimsonfields_${PV}.bb +require crimsonfields_${PV}.bb inherit native DEPENDS = "libsdl-native libsdl-ttf-native" diff --git a/packages/ctorrent/ctorrent_1.3.4.bb b/packages/ctorrent/ctorrent_1.3.4.bb index 561bd0d432..1b6d96c204 100644 --- a/packages/ctorrent/ctorrent_1.3.4.bb +++ b/packages/ctorrent/ctorrent_1.3.4.bb @@ -1,4 +1,4 @@ -include ctorrent.inc +require ctorrent.inc PR = "r6" SRC_URI += "file://extended_ctorrent.diff;patch=1" diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb index 52343b004e..d5b0d649ba 100644 --- a/packages/cups/cups_1.1.23.bb +++ b/packages/cups/cups_1.1.23.bb @@ -1,9 +1,10 @@ -DEPENDS = "openssl jpeg libpng zlib install-native" DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" -PR = "r1" +DEPENDS = "openssl jpeg libpng zlib install-native" + +PR = "r4" SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ file://strftime_fix.patch;patch=1" @@ -32,6 +33,17 @@ fakeroot do_install () { do_stage () { install -d ${STAGING_INCDIR}/cups install ${S}/cups/*.h ${STAGING_INCDIR}/cups/ + install ${S}/filter/*.h ${STAGING_INCDIR}/cups/ oe_libinstall -C cups -so libcups ${STAGING_LIBDIR} + oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR} } +#package the html for the webgui inside the main packages (~1MB uncompressed) +FILES_${PN} += "${datadir}/doc/cups/images \ + ${datadir}/doc/cups/*html \ + ${datadir}/doc/cups/*.css \ + " + + + + diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb index 59af4ef32e..c70dd3b9dc 100644 --- a/packages/curl/curl-native_7.14.0.bb +++ b/packages/curl/curl-native_7.14.0.bb @@ -1,4 +1,4 @@ -include curl_${PV}.bb +require curl_${PV}.bb inherit native do_stage () { diff --git a/packages/curl/curl-native_7.15.1.bb b/packages/curl/curl-native_7.15.1.bb index 59af4ef32e..c70dd3b9dc 100644 --- a/packages/curl/curl-native_7.15.1.bb +++ b/packages/curl/curl-native_7.15.1.bb @@ -1,4 +1,4 @@ -include curl_${PV}.bb +require curl_${PV}.bb inherit native do_stage () { diff --git a/packages/db/db-native_4.2.52.bb b/packages/db/db-native_4.2.52.bb index 5aaeb4329e..12a875ff13 100644 --- a/packages/db/db-native_4.2.52.bb +++ b/packages/db/db-native_4.2.52.bb @@ -8,6 +8,6 @@ CONFLICTS = "db3-native" inherit native -include db_${PV}.bb +require db_${PV}.bb PACKAGES = "" diff --git a/packages/db/db-native_4.3.29.bb b/packages/db/db-native_4.3.29.bb index 5aaeb4329e..12a875ff13 100644 --- a/packages/db/db-native_4.3.29.bb +++ b/packages/db/db-native_4.3.29.bb @@ -8,6 +8,6 @@ CONFLICTS = "db3-native" inherit native -include db_${PV}.bb +require db_${PV}.bb PACKAGES = "" diff --git a/packages/db/db3-native_3.2.9.bb b/packages/db/db3-native_3.2.9.bb index 44a8a5b605..492f7407d1 100644 --- a/packages/db/db3-native_3.2.9.bb +++ b/packages/db/db3-native_3.2.9.bb @@ -2,7 +2,7 @@ SECTION = "libs" VIRTUAL_NAME = "virtual/db-native" CONFLICTS = "db-native" inherit native -include db3_${PV}.bb +require db3_${PV}.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" diff --git a/packages/dbus/dbus-native_0.34.bb b/packages/dbus/dbus-native_0.34.bb index 916f7ad8e2..e293ecb551 100644 --- a/packages/dbus/dbus-native_0.34.bb +++ b/packages/dbus/dbus-native_0.34.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.50.bb b/packages/dbus/dbus-native_0.50.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.50.bb +++ b/packages/dbus/dbus-native_0.50.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.60.bb b/packages/dbus/dbus-native_0.60.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.60.bb +++ b/packages/dbus/dbus-native_0.60.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.61.bb b/packages/dbus/dbus-native_0.61.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.61.bb +++ b/packages/dbus/dbus-native_0.61.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.62.bb b/packages/dbus/dbus-native_0.62.bb index c91231f6f9..ab9a35c5dd 100644 --- a/packages/dbus/dbus-native_0.62.bb +++ b/packages/dbus/dbus-native_0.62.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus_0.34.bb b/packages/dbus/dbus_0.34.bb index a1d19897cc..2a9989fe3b 100644 --- a/packages/dbus/dbus_0.34.bb +++ b/packages/dbus/dbus_0.34.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.50.bb b/packages/dbus/dbus_0.50.bb index a1d19897cc..2a9989fe3b 100644 --- a/packages/dbus/dbus_0.50.bb +++ b/packages/dbus/dbus_0.50.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb index f8e16815e7..2d9a27e74d 100644 --- a/packages/dbus/dbus_0.60.bb +++ b/packages/dbus/dbus_0.60.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb index f8e16815e7..2d9a27e74d 100644 --- a/packages/dbus/dbus_0.61.bb +++ b/packages/dbus/dbus_0.61.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb index f8e16815e7..2d9a27e74d 100644 --- a/packages/dbus/dbus_0.62.bb +++ b/packages/dbus/dbus_0.62.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/debianutils/debianutils_2.15.2.bb b/packages/debianutils/debianutils_2.15.2.bb index b20ae66108..90dc5116b5 100644 --- a/packages/debianutils/debianutils_2.15.2.bb +++ b/packages/debianutils/debianutils_2.15.2.bb @@ -1 +1 @@ -include debianutils.inc +require debianutils.inc diff --git a/packages/debianutils/debianutils_2.16.1.bb b/packages/debianutils/debianutils_2.16.1.bb index b20ae66108..90dc5116b5 100644 --- a/packages/debianutils/debianutils_2.16.1.bb +++ b/packages/debianutils/debianutils_2.16.1.bb @@ -1 +1 @@ -include debianutils.inc +require debianutils.inc diff --git a/packages/debianutils/debianutils_2.8.4.bb b/packages/debianutils/debianutils_2.8.4.bb index b20ae66108..90dc5116b5 100644 --- a/packages/debianutils/debianutils_2.8.4.bb +++ b/packages/debianutils/debianutils_2.8.4.bb @@ -1 +1 @@ -include debianutils.inc +require debianutils.inc diff --git a/packages/dejagnu/dejagnu-native_1.4.4.bb b/packages/dejagnu/dejagnu-native_1.4.4.bb index dbfa564efd..adbc92df98 100644 --- a/packages/dejagnu/dejagnu-native_1.4.4.bb +++ b/packages/dejagnu/dejagnu-native_1.4.4.bb @@ -1,4 +1,4 @@ -include dejagnu_${PV}.bb +require dejagnu_${PV}.bb S = "${WORKDIR}/dejagnu-${PV}" inherit native diff --git a/packages/devio/devio-native_1.0.bb b/packages/devio/devio-native_1.0.bb index 6103b3a30f..6e214379eb 100644 --- a/packages/devio/devio-native_1.0.bb +++ b/packages/devio/devio-native_1.0.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio_1.0.bb -include devio-native.inc +require devio_1.0.bb +require devio-native.inc diff --git a/packages/devio/devio-native_1.1.bb b/packages/devio/devio-native_1.1.bb index f4f85c1636..c4d957b931 100644 --- a/packages/devio/devio-native_1.1.bb +++ b/packages/devio/devio-native_1.1.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio_1.1.bb -include devio-native.inc +require devio_1.1.bb +require devio-native.inc diff --git a/packages/devio/devio-native_1.2.bb b/packages/devio/devio-native_1.2.bb index 34d931be9d..c0040d19b2 100644 --- a/packages/devio/devio-native_1.2.bb +++ b/packages/devio/devio-native_1.2.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio.inc -include devio-native.inc +require devio.inc +require devio-native.inc diff --git a/packages/devio/devio-native_cvs.bb b/packages/devio/devio-native_cvs.bb index 71c8ae679b..a05cc28594 100644 --- a/packages/devio/devio-native_cvs.bb +++ b/packages/devio/devio-native_cvs.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio_cvs.bb -include devio-native.inc +require devio_cvs.bb +require devio-native.inc diff --git a/packages/devio/devio-native_r1.bb b/packages/devio/devio-native_r1.bb index d1a25b1896..1e7b0e5504 100644 --- a/packages/devio/devio-native_r1.bb +++ b/packages/devio/devio-native_r1.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio_r1.bb -include devio-native.inc +require devio_r1.bb +require devio-native.inc diff --git a/packages/devio/devio-native_r2.bb b/packages/devio/devio-native_r2.bb index 624b315e68..650e2299f0 100644 --- a/packages/devio/devio-native_r2.bb +++ b/packages/devio/devio-native_r2.bb @@ -1,3 +1,3 @@ # This package builds the devio program for the build architecture -include devio_r2.bb -include devio-native.inc +require devio_r2.bb +require devio-native.inc diff --git a/packages/devio/devio_1.0.bb b/packages/devio/devio_1.0.bb index 38021fa141..989fd53587 100644 --- a/packages/devio/devio_1.0.bb +++ b/packages/devio/devio_1.0.bb @@ -1 +1 @@ -include devio.inc +require devio.inc diff --git a/packages/devio/devio_1.1.bb b/packages/devio/devio_1.1.bb index 38021fa141..989fd53587 100644 --- a/packages/devio/devio_1.1.bb +++ b/packages/devio/devio_1.1.bb @@ -1 +1 @@ -include devio.inc +require devio.inc diff --git a/packages/devio/devio_1.2.bb b/packages/devio/devio_1.2.bb index 38021fa141..989fd53587 100644 --- a/packages/devio/devio_1.2.bb +++ b/packages/devio/devio_1.2.bb @@ -1 +1 @@ -include devio.inc +require devio.inc diff --git a/packages/devio/devio_cvs.bb b/packages/devio/devio_cvs.bb index a8915bc482..153748f347 100644 --- a/packages/devio/devio_cvs.bb +++ b/packages/devio/devio_cvs.bb @@ -1,2 +1,2 @@ CVS_TAG = "" -include devio-cvs.inc +require devio-cvs.inc diff --git a/packages/devio/devio_r1.bb b/packages/devio/devio_r1.bb index 66de024d1d..45fb34a562 100644 --- a/packages/devio/devio_r1.bb +++ b/packages/devio/devio_r1.bb @@ -1 +1 @@ -include devio-cvs.inc +require devio-cvs.inc diff --git a/packages/devio/devio_r2.bb b/packages/devio/devio_r2.bb index 66de024d1d..45fb34a562 100644 --- a/packages/devio/devio_r2.bb +++ b/packages/devio/devio_r2.bb @@ -1 +1 @@ -include devio-cvs.inc +require devio-cvs.inc diff --git a/packages/dialog/dialog-static_1.0-20050306.bb b/packages/dialog/dialog-static_1.0-20050306.bb index 67241cdeef..ce4199c709 100644 --- a/packages/dialog/dialog-static_1.0-20050306.bb +++ b/packages/dialog/dialog-static_1.0-20050306.bb @@ -1,4 +1,4 @@ -include dialog.inc +require dialog.inc LDFLAGS += "-static" S="${WORKDIR}/dialog-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dialog-${PV}" diff --git a/packages/dialog/dialog_1.0-20050306.bb b/packages/dialog/dialog_1.0-20050306.bb index 7b7b72f364..030b016adf 100644 --- a/packages/dialog/dialog_1.0-20050306.bb +++ b/packages/dialog/dialog_1.0-20050306.bb @@ -1 +1 @@ -include dialog.inc +require dialog.inc diff --git a/packages/didiwiki/didiwiki_0.2.bb b/packages/didiwiki/didiwiki_0.2.bb index 6873116c93..0ee2aaa496 100644 --- a/packages/didiwiki/didiwiki_0.2.bb +++ b/packages/didiwiki/didiwiki_0.2.bb @@ -1 +1 @@ -include didiwiki.inc +require didiwiki.inc diff --git a/packages/didiwiki/didiwiki_0.4.bb b/packages/didiwiki/didiwiki_0.4.bb index 6873116c93..0ee2aaa496 100644 --- a/packages/didiwiki/didiwiki_0.4.bb +++ b/packages/didiwiki/didiwiki_0.4.bb @@ -1 +1 @@ -include didiwiki.inc +require didiwiki.inc diff --git a/packages/didiwiki/didiwiki_0.5.bb b/packages/didiwiki/didiwiki_0.5.bb index 6873116c93..0ee2aaa496 100644 --- a/packages/didiwiki/didiwiki_0.5.bb +++ b/packages/didiwiki/didiwiki_0.5.bb @@ -1 +1 @@ -include didiwiki.inc +require didiwiki.inc diff --git a/packages/dnsmasq/dnsmasq_2.11.bb b/packages/dnsmasq/dnsmasq_2.11.bb index 8c7c10512a..68fa543210 100644 --- a/packages/dnsmasq/dnsmasq_2.11.bb +++ b/packages/dnsmasq/dnsmasq_2.11.bb @@ -1,4 +1,4 @@ -include dnsmasq.inc +require dnsmasq.inc SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-${PV}.tar.gz \ file://init \ diff --git a/packages/dnsmasq/dnsmasq_2.15.bb b/packages/dnsmasq/dnsmasq_2.15.bb index 20cd73084a..0d71cf8ea7 100644 --- a/packages/dnsmasq/dnsmasq_2.15.bb +++ b/packages/dnsmasq/dnsmasq_2.15.bb @@ -1,3 +1,3 @@ PR = "r2" -include dnsmasq.inc +require dnsmasq.inc diff --git a/packages/dnsmasq/dnsmasq_2.22.bb b/packages/dnsmasq/dnsmasq_2.22.bb index da04fe6d58..83aea1d299 100644 --- a/packages/dnsmasq/dnsmasq_2.22.bb +++ b/packages/dnsmasq/dnsmasq_2.22.bb @@ -1 +1 @@ -include dnsmasq.inc +require dnsmasq.inc diff --git a/packages/dosfstools/dosfstools-native_2.10.bb b/packages/dosfstools/dosfstools-native_2.10.bb index 01aaae6aa4..62709916fc 100644 --- a/packages/dosfstools/dosfstools-native_2.10.bb +++ b/packages/dosfstools/dosfstools-native_2.10.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include dosfstools_${PV}.bb +require dosfstools_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}" S="${WORKDIR}/dosfstools-${PV}" diff --git a/packages/dpkg/dpkg_1.10.28.bb b/packages/dpkg/dpkg_1.10.28.bb index ec8a887300..ae62fdbcf0 100644 --- a/packages/dpkg/dpkg_1.10.28.bb +++ b/packages/dpkg/dpkg_1.10.28.bb @@ -1,4 +1,4 @@ -include dpkg.inc +require dpkg.inc DEPENDS += "bzip2" SRC_URI += "file://autofoo.patch;patch=1" diff --git a/packages/dpkg/dpkg_1.13.11.bb b/packages/dpkg/dpkg_1.13.11.bb index c6ce0c9e66..08a9c06fbf 100644 --- a/packages/dpkg/dpkg_1.13.11.bb +++ b/packages/dpkg/dpkg_1.13.11.bb @@ -1,4 +1,4 @@ -include dpkg.inc +require dpkg.inc DEPENDS += "bzip2" inherit autotools gettext diff --git a/packages/dpkg/dpkg_1.13.4.bb b/packages/dpkg/dpkg_1.13.4.bb index ec8a887300..ae62fdbcf0 100644 --- a/packages/dpkg/dpkg_1.13.4.bb +++ b/packages/dpkg/dpkg_1.13.4.bb @@ -1,4 +1,4 @@ -include dpkg.inc +require dpkg.inc DEPENDS += "bzip2" SRC_URI += "file://autofoo.patch;patch=1" diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb index 8daf54aac3..68c6e87e75 100644 --- a/packages/dropbear/dropbear_0.45.bb +++ b/packages/dropbear/dropbear_0.45.bb @@ -1,4 +1,4 @@ -include dropbear.inc +require dropbear.inc PR = "r4" diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 9aed2dc976..d34787fa64 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -1,4 +1,4 @@ -include dropbear.inc +require dropbear.inc PR = "r6" diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb index 5990260b87..b8467e1e7c 100644 --- a/packages/dropbear/dropbear_0.47.bb +++ b/packages/dropbear/dropbear_0.47.bb @@ -1,3 +1,3 @@ -include dropbear.inc +require dropbear.inc PR = "r2" diff --git a/packages/dropbear/dropbear_0.48.1.bb b/packages/dropbear/dropbear_0.48.1.bb index d039209764..f98c0ac8f6 100644 --- a/packages/dropbear/dropbear_0.48.1.bb +++ b/packages/dropbear/dropbear_0.48.1.bb @@ -1 +1 @@ -include dropbear.inc +require dropbear.inc diff --git a/packages/e17/e-wm/add-menu-autoscroll-options.patch b/packages/e17/e-wm/add-menu-autoscroll-options.patch deleted file mode 100644 index 79bcad8e44..0000000000 --- a/packages/e17/e-wm/add-menu-autoscroll-options.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -Nur e~/src/bin/e_config.c e/src/bin/e_config.c ---- e~/src/bin/e_config.c 2005-08-05 21:12:17.000000000 -0700 -+++ e/src/bin/e_config.c 2005-08-16 13:55:06.000000000 -0700 -@@ -298,6 +298,8 @@ - E_CONFIG_VAL(D, T, resize_info_follows, INT); /**/ - E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/ - E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/ -+ E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/ -+ E_CONFIG_VAL(D, T, menu_autoscroll_cursor_margin, INT); /**/ - - e_config = e_config_domain_load("e", _e_config_edd); - if (e_config) -@@ -403,6 +405,8 @@ - e_config->resize_info_follows = 1; - e_config->focus_last_focused_per_desktop = 1; - e_config->focus_revert_on_hide_or_close = 1; -+ e_config->menu_autoscroll_margin = 10; -+ e_config->menu_autoscroll_cursor_margin = 15; - - { - E_Config_Module *em; -@@ -959,6 +963,8 @@ - E_CONFIG_LIMIT(e_config->resize_info_follows, 0, 1); - E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1); - E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1); -+ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); -+ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); - - /* apply lang config - exception because config is loaded after intl setup */ - -diff -Nur e~/src/bin/e_config.h e/src/bin/e_config.h ---- e~/src/bin/e_config.h 2005-08-05 21:12:18.000000000 -0700 -+++ e/src/bin/e_config.h 2005-08-16 13:55:06.000000000 -0700 -@@ -142,6 +142,8 @@ - int resize_info_follows; - int focus_last_focused_per_desktop; - int focus_revert_on_hide_or_close; -+ int menu_autoscroll_margin; -+ int menu_autoscroll_cursor_margin; - }; - - struct _E_Config_Module -diff -Nur e~/src/bin/e_ipc_handlers.h e/src/bin/e_ipc_handlers.h ---- e~/src/bin/e_ipc_handlers.h 2005-08-09 21:52:07.000000000 -0700 -+++ e/src/bin/e_ipc_handlers.h 2005-08-16 14:01:38.000000000 -0700 -@@ -4592,3 +4592,84 @@ - #if 0 - } - #endif -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET -+#if (TYPE == E_REMOTE_OPTIONS) -+ OP("-menu-autoscroll-margin-set", 1, "Set the distance from the edge of the screen the menu will autoscroll to", 0, HDL) -+#elif (TYPE == E_REMOTE_OUT) -+ REQ_INT(atoi(params[0]), HDL); -+#elif (TYPE == E_WM_IN) -+ START_INT(value, HDL); -+ e_config->menu_autoscroll_margin = value; -+ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); -+ SAVE; -+ END_INT; -+#elif (TYPE == E_REMOTE_IN) -+#endif -+#undef HDL -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET -+#if (TYPE == E_REMOTE_OPTIONS) -+ OP("-menu-autoscroll-margin-get", 0, "Get the distance from the edge of the screen the menu will autoscroll to", 1, HDL) -+#elif (TYPE == E_REMOTE_OUT) -+ REQ_NULL(HDL) -+#elif (TYPE == E_WM_IN) -+ SEND_INT(e_config->menu_autoscroll_margin, E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY, HDL); -+#elif (TYPE == E_REMOTE_IN) -+#endif -+#undef HDL -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY -+#if (TYPE == E_REMOTE_OPTIONS) -+#elif (TYPE == E_REMOTE_OUT) -+#elif (TYPE == E_WM_IN) -+#elif (TYPE == E_REMOTE_IN) -+ START_INT(val, HDL) -+ printf("REPLY: %i\n", val); -+ END_INT; -+#endif -+#undef HDL -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET -+#if (TYPE == E_REMOTE_OPTIONS) -+ OP("-menu-autoscroll-cursor-margin-set", 1, "Set the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 0, HDL) -+#elif (TYPE == E_REMOTE_OUT) -+ REQ_INT(atoi(params[0]), HDL); -+#elif (TYPE == E_WM_IN) -+ START_INT(value, HDL); -+ e_config->menu_autoscroll_cursor_margin = value; -+ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); -+ // e_zone_update_flip_all(); -+ SAVE; -+ END_INT; -+#elif (TYPE == E_REMOTE_IN) -+#endif -+#undef HDL -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET -+#if (TYPE == E_REMOTE_OPTIONS) -+ OP("-menu-autoscroll-cursor-margin-get", 0, "Get the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 1, HDL) -+#elif (TYPE == E_REMOTE_OUT) -+ REQ_NULL(HDL) -+#elif (TYPE == E_WM_IN) -+ SEND_INT(e_config->menu_autoscroll_cursor_margin, E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY, HDL); -+#elif (TYPE == E_REMOTE_IN) -+#endif -+#undef HDL -+ -+/****************************************************************************/ -+#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY -+#if (TYPE == E_REMOTE_OPTIONS) -+#elif (TYPE == E_REMOTE_OUT) -+#elif (TYPE == E_WM_IN) -+#elif (TYPE == E_REMOTE_IN) -+ START_INT(val, HDL) -+ printf("REPLY: %i\n", val); -+ END_INT; -+#endif -+#undef HDL -diff -Nur e~/src/bin/e_ipc_handlers_list.h e/src/bin/e_ipc_handlers_list.h ---- e~/src/bin/e_ipc_handlers_list.h 2005-08-05 21:00:03.000000000 -0700 -+++ e/src/bin/e_ipc_handlers_list.h 2005-08-16 13:55:06.000000000 -0700 -@@ -222,3 +222,9 @@ - #define E_IPC_OP_DESKTOP_NAME_DEL 222 - #define E_IPC_OP_DESKTOP_NAME_LIST 223 - #define E_IPC_OP_DESKTOP_NAME_LIST_REPLY 224 -+#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET 225 -+#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET 226 -+#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY 227 -+#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET 228 -+#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET 229 -+#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY 230 -diff -Nur e~/src/bin/e_menu.c e/src/bin/e_menu.c ---- e~/src/bin/e_menu.c 2005-07-25 02:55:44.000000000 -0700 -+++ e/src/bin/e_menu.c 2005-08-16 13:55:06.000000000 -0700 -@@ -1968,24 +1968,24 @@ - E_Menu *m; - - m = l->data; -- if (m->cur.x < m->zone->x) -+ if (m->cur.x < m->zone->x + e_config->menu_autoscroll_margin) - { -- i = m->zone->x - m->cur.x; -+ i = m->zone->x - m->cur.x + e_config->menu_autoscroll_margin; - if (i > outl) outl = i; - } -- if (m->cur.y < m->zone->y) -+ if (m->cur.y < m->zone->y + e_config->menu_autoscroll_margin) - { -- i = m->zone->y - m->cur.y; -+ i = m->zone->y - m->cur.y + e_config->menu_autoscroll_margin; - if (i > outt) outt = i; - } -- if ((m->cur.x + m->cur.w) > (m->zone->w)) -+ if ((m->cur.x + m->cur.w) > (m->zone->w - e_config->menu_autoscroll_margin)) - { -- i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); -+ i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w - e_config->menu_autoscroll_margin); - if (i > outr) outr = i; - } -- if ((m->cur.y + m->cur.h) > (m->zone->h)) -+ if ((m->cur.y + m->cur.h) > (m->zone->h - e_config->menu_autoscroll_margin)) - { -- i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); -+ i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h - e_config->menu_autoscroll_margin); - if (i > outb) outb = i; - } - } -@@ -2029,11 +2029,11 @@ - int autoscroll_x = 0; - int autoscroll_y = 0; - -- if (_e_menu_x == 0) -+ if (_e_menu_x - e_config->menu_autoscroll_cursor_margin <= 0) - { - if (_e_menu_outside_bounds_get(-1, 0)) autoscroll_x = -1; - } -- if (_e_menu_y == 0) -+ if (_e_menu_y - e_config->menu_autoscroll_cursor_margin <= 0) - { - if (_e_menu_outside_bounds_get(0, -1)) autoscroll_y = -1; - } -@@ -2044,11 +2044,11 @@ - E_Menu *m; - - m = _e_active_menus->data; -- if (_e_menu_x == (m->zone->w - 1)) -+ if (_e_menu_x + e_config->menu_autoscroll_cursor_margin >= (m->zone->w - 1)) - { - if (_e_menu_outside_bounds_get(1, 0)) autoscroll_x = 1; - } -- if (_e_menu_y == (m->zone->h - 1)) -+ if (_e_menu_y + e_config->menu_autoscroll_cursor_margin >= (m->zone->h - 1)) - { - if (_e_menu_outside_bounds_get(0, 1)) autoscroll_y = 1; - } diff --git a/packages/e17/e-wm/set-autoscroll-defaults.patch b/packages/e17/e-wm/set-autoscroll-defaults.patch new file mode 100644 index 0000000000..2d24ea69c6 --- /dev/null +++ b/packages/e17/e-wm/set-autoscroll-defaults.patch @@ -0,0 +1,13 @@ +--- enlightenment-0.16.999.032/src/bin/e_config.c~ 2006-08-05 10:46:53.000000000 -0700 ++++ enlightenment-0.16.999.032/src/bin/e_config.c 2006-08-05 10:43:14.000000000 -0700 +@@ -595,8 +595,8 @@ + e_config->focus_revert_on_hide_or_close = 1; + e_config->use_e_cursor = 1; + e_config->cursor_size = 32; +- e_config->menu_autoscroll_margin = 0; +- e_config->menu_autoscroll_cursor_margin = 1; ++ e_config->menu_autoscroll_margin = 10; ++ e_config->menu_autoscroll_cursor_margin = 10; + e_config->transient.move = 1; + e_config->transient.resize = 0; + e_config->transient.raise = 1; diff --git a/packages/e17/e-wm_0.16.999.032.bb b/packages/e17/e-wm_0.16.999.032.bb index fd8814a8ee..78c1c1aa26 100644 --- a/packages/e17/e-wm_0.16.999.032.bb +++ b/packages/e17/e-wm_0.16.999.032.bb @@ -1,12 +1,13 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo" LICENSE = "MIT" -PR = "r3" +PR = "r4" inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ + file://set-autoscroll-defaults.patch;patch=1 \ file://Xsession.d/98enlightenment" S = "${WORKDIR}/enlightenment-${PV}" diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index ffc07f7661..48c37c72a2 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,10 +2,12 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r1" +PR = "r3" inherit e +RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" + SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb new file mode 100644 index 0000000000..0e1d571205 --- /dev/null +++ b/packages/e17/entice_20060416.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Entice is the E17 picture viewer" +# can also depend on GIMP for editing +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +LICENSE = "MIT" +PR = "r0" + +inherit e + +RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" + +SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" +S = "${WORKDIR}/entice" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb index d4032f9ad9..9d0afa864b 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb @@ -1,5 +1,5 @@ SECTION = "base" -include e2fsprogs-libs_${PV}.bb +require e2fsprogs-libs_${PV}.bb inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb index a6dd30fb35..8d1d580c90 100644 --- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb @@ -1,5 +1,5 @@ SECTION = "base" -include e2fsprogs_${PV}.bb +require e2fsprogs_${PV}.bb inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/e2tools/e2tools-native_0.0.16.bb b/packages/e2tools/e2tools-native_0.0.16.bb index 95f4a0ae6f..e37eed2b18 100644 --- a/packages/e2tools/e2tools-native_0.0.16.bb +++ b/packages/e2tools/e2tools-native_0.0.16.bb @@ -1,5 +1,5 @@ SECTION = "base" -include e2tools_${PV}.bb +require e2tools_${PV}.bb inherit native DEPENDS = "e2fsprogs-libs-native e2fsprogs-native" diff --git a/packages/efl++/efl++-fb_0.1.0.bb b/packages/efl++/efl++-fb_0.1.0.bb index 713c86eb16..a2e3a7dd34 100644 --- a/packages/efl++/efl++-fb_0.1.0.bb +++ b/packages/efl++/efl++-fb_0.1.0.bb @@ -1 +1 @@ -include efl++.inc +require efl++.inc diff --git a/packages/efl++/efl++-fb_cvs.bb b/packages/efl++/efl++-fb_cvs.bb index 071b1d58cc..8706a32033 100644 --- a/packages/efl++/efl++-fb_cvs.bb +++ b/packages/efl++/efl++-fb_cvs.bb @@ -1,4 +1,4 @@ -include efl++.inc +require efl++.inc PV = "0.1.0+cvs${SRCDATE}" diff --git a/packages/efl++/efl++-x11_0.1.0.bb b/packages/efl++/efl++-x11_0.1.0.bb index d55e149d19..7f6c942790 100644 --- a/packages/efl++/efl++-x11_0.1.0.bb +++ b/packages/efl++/efl++-x11_0.1.0.bb @@ -1,3 +1,3 @@ -include efl++.inc +require efl++.inc EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11" diff --git a/packages/efl++/efl++-x11_cvs.bb b/packages/efl++/efl++-x11_cvs.bb index 016f1b1b65..4beb8c555e 100644 --- a/packages/efl++/efl++-x11_cvs.bb +++ b/packages/efl++/efl++-x11_cvs.bb @@ -1,4 +1,4 @@ -include efl++.inc +require efl++.inc EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11" PV = "0.1.0+cvs${SRCDATE}" diff --git a/packages/efl/ecore-fb_0.9.9.032.bb b/packages/efl/ecore-fb_0.9.9.032.bb index a957c5dd8c..8eb0017d26 100644 --- a/packages/efl/ecore-fb_0.9.9.032.bb +++ b/packages/efl/ecore-fb_0.9.9.032.bb @@ -1,4 +1,4 @@ -include ecore.inc +require ecore.inc PR = "r2" EXTRA_OECONF = "--enable-ecore-fb \ diff --git a/packages/efl/ecore-native_0.9.9.032.bb b/packages/efl/ecore-native_0.9.9.032.bb index 299470841c..7d7ed2370a 100644 --- a/packages/efl/ecore-native_0.9.9.032.bb +++ b/packages/efl/ecore-native_0.9.9.032.bb @@ -1,4 +1,4 @@ -include ecore-fb_${PV}.bb +require ecore-fb_${PV}.bb inherit native # disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it # DEPENDS = "curl-native eet-native evas-native" diff --git a/packages/efl/ecore-x11_0.9.9.032.bb b/packages/efl/ecore-x11_0.9.9.032.bb index 3a88ad229b..78d0a66b38 100644 --- a/packages/efl/ecore-x11_0.9.9.032.bb +++ b/packages/efl/ecore-x11_0.9.9.032.bb @@ -1,4 +1,4 @@ -include ecore.inc +require ecore.inc DEPENDS += "evas-x11" PR = "r3" diff --git a/packages/efl/edb-native_1.0.5.007.bb b/packages/efl/edb-native_1.0.5.007.bb index d83a3b77c6..82095f03cc 100644 --- a/packages/efl/edb-native_1.0.5.007.bb +++ b/packages/efl/edb-native_1.0.5.007.bb @@ -1,4 +1,4 @@ -include edb_${PV}.bb +require edb_${PV}.bb inherit native DEPENDS = "zlib-native" diff --git a/packages/efl/edje-native_0.5.0.032.bb b/packages/efl/edje-native_0.5.0.032.bb index 5eb077922a..9909811448 100644 --- a/packages/efl/edje-native_0.5.0.032.bb +++ b/packages/efl/edje-native_0.5.0.032.bb @@ -1,4 +1,4 @@ -include edje_${PV}.bb +require edje_${PV}.bb PR = "r3" inherit native diff --git a/packages/efl/eet-native_0.9.10.032.bb b/packages/efl/eet-native_0.9.10.032.bb index fa20c9fb30..7369adc915 100644 --- a/packages/efl/eet-native_0.9.10.032.bb +++ b/packages/efl/eet-native_0.9.10.032.bb @@ -1,4 +1,4 @@ -include eet_${PV}.bb +require eet_${PV}.bb inherit native DEPENDS = "zlib-native jpeg-native" diff --git a/packages/efl/embryo-native_0.9.1.032.bb b/packages/efl/embryo-native_0.9.1.032.bb index a33adb7bd2..76fe80fe3d 100644 --- a/packages/efl/embryo-native_0.9.1.032.bb +++ b/packages/efl/embryo-native_0.9.1.032.bb @@ -1,4 +1,4 @@ -include embryo_${PV}.bb +require embryo_${PV}.bb inherit native do_stage_append() { diff --git a/packages/efl/esmart-fb_0.9.0.007.bb b/packages/efl/esmart-fb_0.9.0.007.bb index f0565c6a71..3da2f13e93 100644 --- a/packages/efl/esmart-fb_0.9.0.007.bb +++ b/packages/efl/esmart-fb_0.9.0.007.bb @@ -1,4 +1,4 @@ -include esmart.inc +require esmart.inc PR = "r0" SRC_URI += "file://disable-x-only-features.patch;patch=1" diff --git a/packages/efl/esmart-x11_0.9.0.007.bb b/packages/efl/esmart-x11_0.9.0.007.bb index cb5cc1da91..7b80b581a1 100644 --- a/packages/efl/esmart-x11_0.9.0.007.bb +++ b/packages/efl/esmart-x11_0.9.0.007.bb @@ -1,4 +1,4 @@ -include esmart.inc +require esmart.inc PR = "r2" SRC_URI += "file://include-stdio.patch;patch=1" diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index 9b8114de53..3b56057418 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -2,6 +2,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool" PROVIDES += "virtual/esmart" +PACKAGES_DYNAMIC += "libesmart*" inherit efl diff --git a/packages/efl/evas-fb_0.9.9.032.bb b/packages/efl/evas-fb_0.9.9.032.bb index 3f7847874c..3e29b80cc0 100644 --- a/packages/efl/evas-fb_0.9.9.032.bb +++ b/packages/efl/evas-fb_0.9.9.032.bb @@ -1,4 +1,4 @@ -include evas.inc +require evas.inc PR = "r5" EXTRA_OECONF = "--enable-fb \ diff --git a/packages/efl/evas-native_0.9.9.032.bb b/packages/efl/evas-native_0.9.9.032.bb index cbcbe304e9..68dacbc809 100644 --- a/packages/efl/evas-native_0.9.9.032.bb +++ b/packages/efl/evas-native_0.9.9.032.bb @@ -1,4 +1,4 @@ -include evas-fb_${PV}.bb +require evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" PROVIDES = "evas-native" diff --git a/packages/efl/evas-x11_0.9.9.032.bb b/packages/efl/evas-x11_0.9.9.032.bb index da163d31ad..7555ecb2b0 100644 --- a/packages/efl/evas-x11_0.9.9.032.bb +++ b/packages/efl/evas-x11_0.9.9.032.bb @@ -1,4 +1,4 @@ -include evas.inc +require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" PR = "r7" diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb index 09fecdaf8b..776acb43f6 100644 --- a/packages/efl/imlib2-fb_1.2.2.001.bb +++ b/packages/efl/imlib2-fb_1.2.2.001.bb @@ -1,4 +1,4 @@ -include imlib2.inc +require imlib2.inc EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb index 6f8ebe477a..da75e8f439 100644 --- a/packages/efl/imlib2-native_1.2.2.001.bb +++ b/packages/efl/imlib2-native_1.2.2.001.bb @@ -1,4 +1,4 @@ -include imlib2.inc +require imlib2.inc inherit native PROVIDES = "imlib2-native" DEPENDS = "freetype-native libpng-native jpeg-native" diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb index a7dfc9d32d..e7814971c3 100644 --- a/packages/efl/imlib2-x11_1.2.2.001.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb @@ -1,4 +1,4 @@ -include imlib2.inc +require imlib2.inc DEPENDS += "virtual/libx11 libxext" PR = "r1" diff --git a/packages/elfkickers/elfkickers-native_2.0a.bb b/packages/elfkickers/elfkickers-native_2.0a.bb index 82caf51263..0de9c63a78 100644 --- a/packages/elfkickers/elfkickers-native_2.0a.bb +++ b/packages/elfkickers/elfkickers-native_2.0a.bb @@ -1,4 +1,4 @@ -include elfkickers_${PV}.bb +require elfkickers_${PV}.bb inherit native ELFPKGS = "sstrip" diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb index 003857e139..8b598bf21f 100644 --- a/packages/emacs/emacs-x11_20060801.bb +++ b/packages/emacs/emacs-x11_20060801.bb @@ -1,3 +1,3 @@ -include emacs-x11_cvs.bb +require emacs-x11_cvs.bb SRCDATE = "${PV}" DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb index 874aacae4c..8fdba95742 100644 --- a/packages/emacs/emacs-x11_cvs.bb +++ b/packages/emacs/emacs-x11_cvs.bb @@ -1,5 +1,5 @@ -include emacs_cvs.bb +require emacs_cvs.bb # full X (non-diet) is needed for X support DEPENDS += "libx11" -EXTRA_OECONF = "" +EXTRA_OECONF = "--without-sound" RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb index 642ede82fe..aa72944eca 100644 --- a/packages/emacs/emacs_20060801.bb +++ b/packages/emacs/emacs_20060801.bb @@ -1,3 +1,3 @@ -include emacs_cvs.bb +require emacs_cvs.bb SRCDATE = "${PV}" DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index 7e59cb23a0..4e7255e61c 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -8,7 +8,7 @@ DEPENDS += "qemu-native" #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2 # the build gets hung up on compiling certain .el files -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" @@ -20,14 +20,15 @@ inherit autotools PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" -FILES_emacs-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ +FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ ${datadir}/emacs/22.0.50/*/*/*.el.gz" -QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" +FILES_${PN} += "${datadir}/emacs" +QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" -EXTRA_OECONF = "--without-x" +EXTRA_OECONF = "--without-sound --without-x" do_bootstrap() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" diff --git a/packages/ethload/ethload-native_1.2.bb b/packages/ethload/ethload-native_1.2.bb index 777868006a..c2c3a55051 100644 --- a/packages/ethload/ethload-native_1.2.bb +++ b/packages/ethload/ethload-native_1.2.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include ethload_${PV}.bb +require ethload_${PV}.bb inherit native do_stage() { diff --git a/packages/ethtool/ethtool_3.bb b/packages/ethtool/ethtool_3.bb index a330cf0cce..a8e0e2a385 100644 --- a/packages/ethtool/ethtool_3.bb +++ b/packages/ethtool/ethtool_3.bb @@ -1,2 +1,2 @@ -include ethtool.inc +require ethtool.inc PR="r1" diff --git a/packages/ethtool/ethtool_4.bb b/packages/ethtool/ethtool_4.bb index 7f4ddffdc2..c1d30c678d 100644 --- a/packages/ethtool/ethtool_4.bb +++ b/packages/ethtool/ethtool_4.bb @@ -1,2 +1,2 @@ -include ethtool.inc +require ethtool.inc PR="r0" diff --git a/packages/expat/expat-native_1.95.7.bb b/packages/expat/expat-native_1.95.7.bb index 2c40ba8488..edfa53ae48 100644 --- a/packages/expat/expat-native_1.95.7.bb +++ b/packages/expat/expat-native_1.95.7.bb @@ -1,4 +1,4 @@ SECTION = "libs" -include expat_${PV}.bb +require expat_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}" diff --git a/packages/fakechroot/fakechroot-native_2.5.bb b/packages/fakechroot/fakechroot-native_2.5.bb index 5af3e79467..efd41c7126 100644 --- a/packages/fakechroot/fakechroot-native_2.5.bb +++ b/packages/fakechroot/fakechroot-native_2.5.bb @@ -1,6 +1,6 @@ SECTION = "base" PR = "r0" -include fakechroot_${PV}.bb +require fakechroot_${PV}.bb inherit native S = "${WORKDIR}/fakechroot-${PV}" diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb index cc3dfd2231..eb58e92b6e 100644 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ b/packages/fakeroot/fakeroot-native_1.2.13.bb @@ -1,6 +1,6 @@ SECTION = "base" PR = "r0" -include fakeroot_${PV}.bb +require fakeroot_${PV}.bb inherit native SRC_URI += "file://fix-prefix.patch;patch=1" diff --git a/packages/file/file-native_4.16.bb b/packages/file/file-native_4.16.bb index 3228ed683c..63554b01fb 100644 --- a/packages/file/file-native_4.16.bb +++ b/packages/file/file-native_4.16.bb @@ -1,4 +1,4 @@ -include file_${PV}.bb +require file_${PV}.bb inherit native # avoid dependency loop diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.1.20.bb index 617d1bab36..5a268cda92 100644 --- a/packages/findutils/findutils-native_4.1.20.bb +++ b/packages/findutils/findutils-native_4.1.20.bb @@ -1,4 +1,4 @@ -include findutils_${PV}.bb +require findutils_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb index ff8a42772b..1e9354afde 100644 --- a/packages/flex/flex-native_2.5.31.bb +++ b/packages/flex/flex-native_2.5.31.bb @@ -1,4 +1,4 @@ -include flex.inc +require flex.inc inherit native PR = "r2" diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb index b96c645136..3062e2d8dc 100644 --- a/packages/flex/flex_2.5.31.bb +++ b/packages/flex/flex_2.5.31.bb @@ -1,4 +1,4 @@ -include flex.inc +require flex.inc PR = "r4" SRC_URI += "file://include.patch;patch=1" diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb index b3d267b798..58589ae124 100644 --- a/packages/fontconfig/fontconfig-native_2.2.95.bb +++ b/packages/fontconfig/fontconfig-native_2.2.95.bb @@ -1,6 +1,6 @@ SECTION = "base" LICENSE = "BSD" -include fontconfig_${PV}.bb +require fontconfig_${PV}.bb inherit native DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb index b3d267b798..58589ae124 100644 --- a/packages/fontconfig/fontconfig-native_2.3.91.bb +++ b/packages/fontconfig/fontconfig-native_2.3.91.bb @@ -1,6 +1,6 @@ SECTION = "base" LICENSE = "BSD" -include fontconfig_${PV}.bb +require fontconfig_${PV}.bb inherit native DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb index be1087d691..f246bf633b 100644 --- a/packages/freedroid/freedroid_1.0.2.bb +++ b/packages/freedroid/freedroid_1.0.2.bb @@ -21,5 +21,5 @@ do_install() { install -d ${D}${bindir} install -m 0755 src/freedroid ${D}${bindir} install -d ${D}${datadir}/freedroid/ - cp -a graphics map sound ${D}${datadir}/freedroid/ + cp -pPR graphics map sound ${D}${datadir}/freedroid/ } diff --git a/packages/freetype/freetype-native_2.1.10.bb b/packages/freetype/freetype-native_2.1.10.bb index 64fac71cbe..b5e8b307cd 100644 --- a/packages/freetype/freetype-native_2.1.10.bb +++ b/packages/freetype/freetype-native_2.1.10.bb @@ -1,4 +1,4 @@ -include freetype_${PV}.bb +require freetype_${PV}.bb inherit native DEPENDS = "" FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb index 64fac71cbe..b5e8b307cd 100644 --- a/packages/freetype/freetype-native_2.1.8.bb +++ b/packages/freetype/freetype-native_2.1.8.bb @@ -1,4 +1,4 @@ -include freetype_${PV}.bb +require freetype_${PV}.bb inherit native DEPENDS = "" FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" diff --git a/packages/freetype/freetype-native_2.2.1.bb b/packages/freetype/freetype-native_2.2.1.bb index bc9ad11781..8c439d796a 100644 --- a/packages/freetype/freetype-native_2.2.1.bb +++ b/packages/freetype/freetype-native_2.2.1.bb @@ -1,4 +1,4 @@ -include freetype_${PV}.bb +require freetype_${PV}.bb inherit native DEPENDS = "" FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb index 35c0d0cbd6..532d9d083c 100644 --- a/packages/freetype/freetype_2.1.10.bb +++ b/packages/freetype/freetype_2.1.10.bb @@ -13,6 +13,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" do_configure() { cd builds/unix diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb index 5e9db480ea..49770277b9 100644 --- a/packages/freetype/freetype_2.1.8.bb +++ b/packages/freetype/freetype_2.1.8.bb @@ -11,6 +11,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" do_configure() { cd builds/unix diff --git a/packages/gaim/gaim_1.0.3.bb b/packages/gaim/gaim_1.0.3.bb index d78f7cf0be..f833ddde28 100644 --- a/packages/gaim/gaim_1.0.3.bb +++ b/packages/gaim/gaim_1.0.3.bb @@ -3,4 +3,4 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name.patch;patch=1" -include gaim.inc +require gaim.inc diff --git a/packages/gaim/gaim_1.1.0.bb b/packages/gaim/gaim_1.1.0.bb index d78f7cf0be..f833ddde28 100644 --- a/packages/gaim/gaim_1.1.0.bb +++ b/packages/gaim/gaim_1.1.0.bb @@ -3,4 +3,4 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name.patch;patch=1" -include gaim.inc +require gaim.inc diff --git a/packages/gaim/gaim_1.1.1.bb b/packages/gaim/gaim_1.1.1.bb index d78f7cf0be..f833ddde28 100644 --- a/packages/gaim/gaim_1.1.1.bb +++ b/packages/gaim/gaim_1.1.1.bb @@ -3,4 +3,4 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name.patch;patch=1" -include gaim.inc +require gaim.inc diff --git a/packages/gaim/gaim_1.1.2.bb b/packages/gaim/gaim_1.1.2.bb index fe06cb8e44..3bf9aeb3a7 100644 --- a/packages/gaim/gaim_1.1.2.bb +++ b/packages/gaim/gaim_1.1.2.bb @@ -3,7 +3,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name.patch;patch=1" -include gaim.inc +require gaim.inc CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb index ec55ea5b94..1585229b14 100644 --- a/packages/gaim/gaim_1.4.0.bb +++ b/packages/gaim/gaim_1.4.0.bb @@ -3,7 +3,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name_1.4.0.patch;patch=1" -include gaim.inc +require gaim.inc CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/gaim/gaim_1.5.0.bb index fe06cb8e44..3bf9aeb3a7 100644 --- a/packages/gaim/gaim_1.5.0.bb +++ b/packages/gaim/gaim_1.5.0.bb @@ -3,7 +3,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-name.patch;patch=1" -include gaim.inc +require gaim.inc CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb index bf18704c9b..83db95f605 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -23,7 +23,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://gaim-OE-branding.patch;patch=1 \ " -include gaim.inc +require gaim.inc S = "${WORKDIR}/gaim" diff --git a/packages/gaim/gaim_svn.bb b/packages/gaim/gaim_svn.bb index cf6d17e7be..8ef83c4b50 100644 --- a/packages/gaim/gaim_svn.bb +++ b/packages/gaim/gaim_svn.bb @@ -9,7 +9,7 @@ SRC_URI = "svn://svn.sourceforge.net/svnroot/gaim;module=trunk;proto=https \ file://gevolution-eds-dbus.patch;patch=1 \ " -include gaim.inc +require gaim.inc S = "${WORKDIR}/trunk" diff --git a/packages/gawk/gawk-native_3.1.4.bb b/packages/gawk/gawk-native_3.1.4.bb index dcfca421de..ba8efd1af7 100644 --- a/packages/gawk/gawk-native_3.1.4.bb +++ b/packages/gawk/gawk-native_3.1.4.bb @@ -1,5 +1,5 @@ INHIBIT_AUTOTOOLS_DEPS = "1" -include gawk_${PV}.bb +require gawk_${PV}.bb inherit native diff --git a/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..d12562761f --- /dev/null +++ b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch @@ -0,0 +1,13 @@ +Index: gcc-3.3.3/Makefile.in +=================================================================== +--- gcc-3.3.3.orig/Makefile.in 2003-07-05 04:37:08.000000000 +0200 ++++ gcc-3.3.3/Makefile.in 2006-08-06 12:57:53.000000000 +0200 +@@ -1355,6 +1355,8 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CPP; \ ++ CPPFLAGS=""; export CPPFLAGS; \ + CXX="$(CXX_FOR_TARGET)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ diff --git a/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..d42ab6d57d --- /dev/null +++ b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch @@ -0,0 +1,13 @@ +Index: gcc-3.3.4/Makefile.in +=================================================================== +--- gcc-3.3.4.orig/Makefile.in 2003-07-05 04:37:08.000000000 +0200 ++++ gcc-3.3.4/Makefile.in 2006-08-06 13:00:16.000000000 +0200 +@@ -1355,6 +1355,8 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CPP; \ ++ CPPFLAGS=""; export CPPFLAGS; \ + CXX="$(CXX_FOR_TARGET)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ diff --git a/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..08e7a3124d --- /dev/null +++ b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch @@ -0,0 +1,16 @@ +In contrast to the other versions this only patches libstdc++ + + +Index: gcc-3.4.3/Makefile.in +=================================================================== +--- gcc-3.4.3.orig/Makefile.in 2004-11-05 05:14:05.000000000 +0100 ++++ gcc-3.4.3/Makefile.in 2006-08-06 13:03:37.000000000 +0200 +@@ -21964,6 +21964,8 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ ++ CPPFLAGS=""; export CPPFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ diff --git a/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..ab6a3fd771 --- /dev/null +++ b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch @@ -0,0 +1,13 @@ +Index: gcc-3.4.4/Makefile.in +=================================================================== +--- gcc-3.4.4.orig/Makefile.in 2005-05-19 11:58:00.000000000 +0200 ++++ gcc-3.4.4/Makefile.in 2006-08-06 13:08:14.000000000 +0200 +@@ -21964,6 +21964,8 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ ++ CPPFLAGS=""; export CPPFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ diff --git a/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..436eff02ae --- /dev/null +++ b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.0.0/Makefile.in +=================================================================== +--- gcc-4.0.0.orig/Makefile.in 2005-04-21 09:04:10.000000000 +0200 ++++ gcc-4.0.0/Makefile.in 2006-08-06 13:14:07.000000000 +0200 +@@ -197,6 +197,7 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..ba7d7257d9 --- /dev/null +++ b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.0.2/Makefile.in +=================================================================== +--- gcc-4.0.2.orig/Makefile.in 2006-08-06 13:17:09.000000000 +0200 ++++ gcc-4.0.2/Makefile.in 2006-08-06 13:18:35.000000000 +0200 +@@ -197,6 +197,7 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..8b53f653c6 --- /dev/null +++ b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.1-20060217/Makefile.in +=================================================================== +--- gcc-4.1-20060217.orig/Makefile.in 2005-12-15 15:02:02.000000000 +0100 ++++ gcc-4.1-20060217/Makefile.in 2006-08-06 13:23:23.000000000 +0200 +@@ -194,6 +194,7 @@ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..120cf55a0f --- /dev/null +++ b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.1.0/Makefile.in +=================================================================== +--- gcc-4.1.0.orig/Makefile.in 2005-12-15 15:02:02.000000000 +0100 ++++ gcc-4.1.0/Makefile.in 2006-08-06 13:29:36.000000000 +0200 +@@ -194,6 +194,7 @@ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-4.1.1/cse.patch b/packages/gcc/gcc-4.1.1/cse.patch new file mode 100644 index 0000000000..88b22c714f --- /dev/null +++ b/packages/gcc/gcc-4.1.1/cse.patch @@ -0,0 +1,75 @@ +-- gcc-4_1-branch/gcc/cse.c 2006/07/20 14:20:26 115619 ++++ gcc-4_1-branch/gcc/cse.c 2006/07/20 15:07:25 115620 +@@ -4697,6 +4697,8 @@ + unsigned src_const_hash; + /* Table entry for constant equivalent for SET_SRC, if any. */ + struct table_elt *src_const_elt; ++ /* Table entry for the destination address. */ ++ struct table_elt *dest_addr_elt; + }; + + static void +@@ -5936,6 +5938,40 @@ + so that the destination goes into that class. */ + sets[i].src_elt = src_eqv_elt; + ++ /* Record destination addresses in the hash table. This allows us to ++ check if they are invalidated by other sets. */ ++ for (i = 0; i < n_sets; i++) ++ { ++ if (sets[i].rtl) ++ { ++ rtx x = sets[i].inner_dest; ++ struct table_elt *elt; ++ enum machine_mode mode; ++ unsigned hash; ++ ++ if (MEM_P (x)) ++ { ++ x = XEXP (x, 0); ++ mode = GET_MODE (x); ++ hash = HASH (x, mode); ++ elt = lookup (x, hash, mode); ++ if (!elt) ++ { ++ if (insert_regs (x, NULL, 0)) ++ { ++ rehash_using_reg (x); ++ hash = HASH (x, mode); ++ } ++ elt = insert (x, NULL, hash, mode); ++ } ++ ++ sets[i].dest_addr_elt = elt; ++ } ++ else ++ sets[i].dest_addr_elt = NULL; ++ } ++ } ++ + invalidate_from_clobbers (x); + + /* Some registers are invalidated by subroutine calls. Memory is +@@ -6028,12 +6064,20 @@ + } + + /* We may have just removed some of the src_elt's from the hash table. +- So replace each one with the current head of the same class. */ ++ So replace each one with the current head of the same class. ++ Also check if destination addresses have been removed. */ + + for (i = 0; i < n_sets; i++) + if (sets[i].rtl) + { +- if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0) ++ if (sets[i].dest_addr_elt ++ && sets[i].dest_addr_elt->first_same_value == 0) ++ { ++ /* The elt was removed, which means this destination s not ++ valid after this instruction. */ ++ sets[i].rtl = NULL_RTX; ++ } ++ else if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0) + /* If elt was removed, find current head of same class, + or 0 if nothing remains of that class. */ + { diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..42ec190600 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.1.1/Makefile.in +=================================================================== +--- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 ++++ gcc-4.1.1/Makefile.in 2006-08-06 13:32:46.000000000 +0200 +@@ -194,6 +194,7 @@ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch new file mode 100644 index 0000000000..ba7d7257d9 --- /dev/null +++ b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch @@ -0,0 +1,12 @@ +Index: gcc-4.0.2/Makefile.in +=================================================================== +--- gcc-4.0.2.orig/Makefile.in 2006-08-06 13:17:09.000000000 +0200 ++++ gcc-4.0.2/Makefile.in 2006-08-06 13:18:35.000000000 +0200 +@@ -197,6 +197,7 @@ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ diff --git a/packages/gcc/gcc-cross-initial_3.3.3.bb b/packages/gcc/gcc-cross-initial_3.3.3.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.3.bb +++ b/packages/gcc/gcc-cross-initial_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.3.bb +++ b/packages/gcc/gcc-cross-initial_3.4.3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.4.bb +++ b/packages/gcc/gcc-cross-initial_3.4.4.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.0.2.bb +++ b/packages/gcc/gcc-cross-initial_4.0.2.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb +++ b/packages/gcc/gcc-cross-initial_4.1-20060217.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.0.bb +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.1.bb +++ b/packages/gcc/gcc-cross-initial_4.1.1.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb index 368cbb1e47..03c6ce2b86 100644 --- a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index deb92c9b32..4b2c583fcb 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r3" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.3.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 671ee68b36..7233f79504 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc4-build-sdk.inc -include gcc-package-sdk.inc +require gcc4-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index 44ba65269e..a24752fe89 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc_${PV}.bb +require gcc_${PV}.bb inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 597b47fba8..f7a2cded51 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,6 +1,6 @@ SECTION = "devel" -include gcc_${PV}.bb -include gcc-paths-cross.inc +require gcc_${PV}.bb +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -9,5 +9,5 @@ PR="r3" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -include gcc3-build-cross.inc -include gcc-package-cross.inc
\ No newline at end of file +require gcc3-build-cross.inc +require gcc-package-cross.inc
\ No newline at end of file diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb index a5d1bda170..b61223b39c 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index d965e5b399..ef679365e1 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.1-20060217.bb +++ b/packages/gcc/gcc-cross_4.1-20060217.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 4e3805b676..4c530175f3 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -1,18 +1,18 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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 = "r5" +PR = "r6" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.2-20060513.bb b/packages/gcc/gcc-cross_4.2-20060513.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.2-20060513.bb +++ b/packages/gcc/gcc-cross_4.2-20060513.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc 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* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 044383cb84..7ea8a0d166 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-2005q3.bb +require gcc_csl-arm-2005q3.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index f83de2598d..b894c2a86e 100644 --- a/packages/gcc/gcc-cross_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-cvs.bb +require gcc_csl-arm-cvs.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb index 3be3c603a5..95bda6c95e 100644 --- a/packages/gcc/gcc-cross_csl-arm.bb +++ b/packages/gcc/gcc-cross_csl-arm.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm.bb +require gcc_csl-arm.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc new file mode 100644 index 0000000000..e2ec9565a7 --- /dev/null +++ b/packages/gcc/gcc4-build-sdk.inc @@ -0,0 +1,27 @@ +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' + +SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' + +STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" +STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" + +do_configure () { + (cd ${S} && gnu-configize) || die "failure running gnu-configize" + (cd ${S}/libstdc++-v3 && autoreconf) + oe_runconf + mkdir -p gcc + ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as + ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld + ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include + ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/ +} + +do_compile () { + 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 ${TARGET_CC_ARCH}" + oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" +} diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index 7f0091a18e..f46c481f69 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -93,6 +93,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-uclibc-3.3-110-conf.patch;patch=1 \ file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \ file://gcc-uclibc-3.3-200-code.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://bash3.patch;patch=1" MIRRORS_prepend () { diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index dc3a66cd29..4a1d146dbb 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -70,6 +70,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-uclibc-3.3-110-conf.patch;patch=1 \ file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \ file://gcc-uclibc-3.3-200-code.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://bash3.patch;patch=1" PREMIRRORS_prepend () { diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb index 1cd108aa34..906465b1a9 100644 --- a/packages/gcc/gcc_3.4.3.bb +++ b/packages/gcc/gcc_3.4.3.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://GCC3.4.0VisibilityPatch.diff;patch=1 \ file://15342.patch;patch=1 \ file://always-fixincperm.patch;patch=1 \ - file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1" + file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 " -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 579678066f..fece12cab0 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -23,10 +23,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://GCC3.4.0VisibilityPatch.diff;patch=1 \ file://15342.patch;patch=1 \ file://always-fixincperm.patch;patch=1 \ - file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1" + file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 " SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index af54c17fb8..cf9d704c45 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -7,10 +7,11 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index a83a030c8b..73ff96e28c 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -8,13 +8,14 @@ PR = "r3" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://ldflags.patch;patch=1 \ - file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1" + file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 " # uclibc patches below SRC_URI_append = " file://100-uclibc-conf.patch;patch=1 \ @@ -28,7 +29,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb index 66880d752b..6889f04a36 100644 --- a/packages/gcc/gcc_4.1-20060217.bb +++ b/packages/gcc/gcc_4.1-20060217.bb @@ -7,13 +7,14 @@ DEFAULT_PREFERENCE = "-99999" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 4d44978dab..862a1dfe5b 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -7,16 +7,17 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index c5af490b17..e2d3d25ea8 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -6,7 +6,7 @@ LICENSE = "GPL" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -25,7 +25,9 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://ldflags.patch;patch=1 \ + file://cse.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 " SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " @@ -38,7 +40,7 @@ HAS_G2C = "no" JAVA_arm = "" LANGUAGES = "c,c++" -include gcc3-build.inc +require gcc3-build.inc EXTRA_OECONF += " --disable-libssp " diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb index 68fa6d8d06..8960469a18 100644 --- a/packages/gcc/gcc_4.2-20060513.bb +++ b/packages/gcc/gcc_4.2-20060513.bb @@ -7,16 +7,17 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 02e984358f..d1053dad1d 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ file://gcc_optab_arm.patch;patch=1" @@ -22,6 +22,6 @@ do_unpack2() { addtask unpack2 after do_unpack before do_patch -include gcc3-build.inc +require gcc3-build.inc S = "${WORKDIR}/gcc-2005q3" diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb index bc704d51db..20b18b1085 100644 --- a/packages/gcc/gcc_csl-arm-cvs.bb +++ b/packages/gcc/gcc_csl-arm-cvs.bb @@ -1,4 +1,4 @@ -include gcc_csl-arm.bb +require gcc_csl-arm.bb PV = "3.4.4+csl-arm-${SRCDATE}" BINV = "3.4.4" diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index d437ece065..5bf4fb0b99 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -12,12 +12,12 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${SRCDATE} \ file://gcc34-arm-tune.patch;patch=1" -include gcc3-build.inc +require gcc3-build.inc S = "${WORKDIR}/gcc" diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb index c445cd1274..70f435603c 100644 --- a/packages/gdal/gdal_1.3.2.bb +++ b/packages/gdal/gdal_1.3.2.bb @@ -33,6 +33,6 @@ do_compile() { do_package_prepend() { # the brokenness.... - os.system('cp -a ${D}${D}* ${D}../') + os.system('cp -pPR ${D}${D}* ${D}../') } diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 1029f7bfe0..601f4a0750 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -33,6 +33,6 @@ do_configure () { do_stage() { oe_runmake 'DESTDIR=${CROSS_DIR}' install - cp -a ${CROSS_DIR}${prefix}/* ${CROSS_DIR} + cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR} rm -rf ${CROSS_DIR}${prefix} } diff --git a/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb b/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb index b81df887a4..50b371b97e 100644 --- a/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb +++ b/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb @@ -1,4 +1,4 @@ -include genext2fs_${PV}.bb +require genext2fs_${PV}.bb inherit native do_stage () { diff --git a/packages/genext2fs/genext2fs-native_1.3+cvs.bb b/packages/genext2fs/genext2fs-native_1.3+cvs.bb index b81df887a4..50b371b97e 100644 --- a/packages/genext2fs/genext2fs-native_1.3+cvs.bb +++ b/packages/genext2fs/genext2fs-native_1.3+cvs.bb @@ -1,4 +1,4 @@ -include genext2fs_${PV}.bb +require genext2fs_${PV}.bb inherit native do_stage () { diff --git a/packages/genext2fs/genext2fs-native_1.3.bb b/packages/genext2fs/genext2fs-native_1.3.bb index b840a30104..2e26fa0110 100644 --- a/packages/genext2fs/genext2fs-native_1.3.bb +++ b/packages/genext2fs/genext2fs-native_1.3.bb @@ -1,4 +1,4 @@ -include genext2fs_${PV}.bb +require genext2fs_${PV}.bb inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/genext2fs/genext2fs_1.3+1.4rc1.bb b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb index a7f14d7da0..9723036871 100644 --- a/packages/genext2fs/genext2fs_1.3+1.4rc1.bb +++ b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb @@ -1,4 +1,4 @@ -include genext2fs.inc +require genext2fs.inc TRIMMEDV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}" FILESPATH = "${FILE_DIRNAME}/genext2fs-${PV}:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files" diff --git a/packages/genext2fs/genext2fs_1.3+cvs.bb b/packages/genext2fs/genext2fs_1.3+cvs.bb index 90e7bda4f7..c7f0fbc331 100644 --- a/packages/genext2fs/genext2fs_1.3+cvs.bb +++ b/packages/genext2fs/genext2fs_1.3+cvs.bb @@ -1,4 +1,4 @@ -include genext2fs.inc +require genext2fs.inc PV_append = "${SRCDATE}" PR = "r3" diff --git a/packages/genext2fs/genext2fs_1.3.bb b/packages/genext2fs/genext2fs_1.3.bb index d32d17ae08..ab74a76a25 100644 --- a/packages/genext2fs/genext2fs_1.3.bb +++ b/packages/genext2fs/genext2fs_1.3.bb @@ -1,4 +1,4 @@ -include genext2fs.inc +require genext2fs.inc PR = "r3" diff --git a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb index 368fa428ad..999f75d7f7 100644 --- a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb +++ b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb @@ -10,4 +10,4 @@ PR = "r0" AMD_DRIVER_VERSION = "01.00.0401" AMD_DRIVER_LABEL = "AccessBus_Linux_5536_${AMD_DRIVER_VERSION}" -include geode-modules.inc
\ No newline at end of file +require geode-modules.inc
\ No newline at end of file diff --git a/packages/geode-drivers/geode-aeslx_2.6.11.bb b/packages/geode-drivers/geode-aeslx_2.6.11.bb index bb55c23775..6f9e4d4d7d 100644 --- a/packages/geode-drivers/geode-aeslx_2.6.11.bb +++ b/packages/geode-drivers/geode-aeslx_2.6.11.bb @@ -10,7 +10,7 @@ PR = "r0" AMD_DRIVER_VERSION = "02.01.0100" AMD_DRIVER_LABEL = "AES_Linux_LX_${AMD_DRIVER_VERSION}" -include geode-modules.inc +require geode-modules.inc FILES_${PN} += " /etc" diff --git a/packages/geode-drivers/geode-alsa5536_2.6.11.bb b/packages/geode-drivers/geode-alsa5536_2.6.11.bb index 177d6cca4f..2327ae067b 100644 --- a/packages/geode-drivers/geode-alsa5536_2.6.11.bb +++ b/packages/geode-drivers/geode-alsa5536_2.6.11.bb @@ -10,4 +10,4 @@ PR = "r0" AMD_DRIVER_VERSION = "1.00.0500" AMD_DRIVER_LABEL = "Audio_LinuxALSA_5536_${AMD_DRIVER_VERSION}" -include geode-modules.inc
\ No newline at end of file +require geode-modules.inc
\ No newline at end of file diff --git a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb index a6a6b2633b..c5dc37db84 100644 --- a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb +++ b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb @@ -10,7 +10,7 @@ PR = "r0" AMD_DRIVER_VERSION = "03.02.0100" AMD_DRIVER_LABEL = "Graphics_Video4Linux2_LX_${AMD_DRIVER_VERSION}" -include geode-modules.inc +require geode-modules.inc S="${WORKDIR}/${AMD_DRIVER_LABEL}/lxv4l2" diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb index 07c9361a19..6203b1f9d7 100644 --- a/packages/gettext/gettext-native_0.14.1.bb +++ b/packages/gettext/gettext-native_0.14.1.bb @@ -1,4 +1,4 @@ -include gettext_${PV}.bb +require gettext_${PV}.bb S = "${WORKDIR}/gettext-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}" inherit native diff --git a/packages/giblib/giblib_1.2.3.bb b/packages/giblib/giblib_1.2.3.bb index 59065c2abf..999b6d2d1c 100644 --- a/packages/giblib/giblib_1.2.3.bb +++ b/packages/giblib/giblib_1.2.3.bb @@ -1,4 +1,4 @@ -include giblib.inc +require giblib.inc PR = "r3" diff --git a/packages/giblib/giblib_1.2.4.bb b/packages/giblib/giblib_1.2.4.bb index 63bea99f53..a86c2fb0e2 100644 --- a/packages/giblib/giblib_1.2.4.bb +++ b/packages/giblib/giblib_1.2.4.bb @@ -1,3 +1,3 @@ -include giblib.inc +require giblib.inc PR = "r1" diff --git a/packages/git/git-native.bb b/packages/git/git-native.bb index 1bd495f085..361e5bdf39 100644 --- a/packages/git/git-native.bb +++ b/packages/git/git-native.bb @@ -1,4 +1,4 @@ -include git.bb +require git.bb inherit native do_stage () { diff --git a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch new file mode 100644 index 0000000000..023b6a51bc --- /dev/null +++ b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch @@ -0,0 +1,149 @@ +Index: glibc-2.4/configure +=================================================================== +--- glibc-2.4.orig/configure 2006-03-06 12:18:56.000000000 +0100 ++++ glibc-2.4/configure 2006-08-06 14:10:51.000000000 +0200 +@@ -5488,6 +5488,95 @@ + fi + fi + ++### XXXX copy and pasted ++# Check for readelf ++# Extract the first word of "$target_alias-readelf", so it can be a program name with args. ++set dummy $target_alias-readelf; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_READELF+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$READELF"; then ++ ac_cv_prog_READELF="$READELF" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_READELF="$target_alias-readelf" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++READELF=$ac_cv_prog_READELF ++if test -n "$READELF"; then ++ { echo "$as_me:$LINENO: result: $READELF" >&5 ++echo "${ECHO_T}$READELF" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test -z "$ac_cv_prog_READELF"; then ++ if test "$build" = "$target"; then ++ ac_ct_READELF=$READELF ++ # Extract the first word of "readelf", so it can be a program name with args. ++set dummy readelf; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_READELF"; then ++ ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_READELF="readelf" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF="readelf" ++fi ++fi ++ac_ct_READELF=$ac_cv_prog_ac_ct_READELF ++if test -n "$ac_ct_READELF"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5 ++echo "${ECHO_T}$ac_ct_READELF" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ READELF=ac_ct_READELF ++ else ++ READELF="readelf" ++ fi ++else ++ READELF="$ac_cv_prog_READELF" ++fi ++ ++### XXXX copy and pasted ++ + echo "$as_me:$LINENO: checking for .preinit_array/.init_array/.fini_array support" >&5 + echo $ECHO_N "checking for .preinit_array/.init_array/.fini_array support... $ECHO_C" >&6 + if test "${libc_cv_initfini_array+set}" = set; then +@@ -5507,7 +5596,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + then +- if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then ++ if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then + libc_cv_initfini_array=yes + else + libc_cv_initfini_array=no +@@ -5801,7 +5890,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + then +- if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then ++ if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then + libc_cv_z_combreloc=yes + else + libc_cv_z_combreloc=no +Index: glibc-2.4/configure.in +=================================================================== +--- glibc-2.4.orig/configure.in 2006-03-01 10:17:40.000000000 +0100 ++++ glibc-2.4/configure.in 2006-08-06 14:09:31.000000000 +0200 +@@ -1350,6 +1350,8 @@ + fi + fi + ++ AC_CHECK_TARGET_TOOL([READELF],[readelf],[readelf],[$PATH]) ++ + AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support, + libc_cv_initfini_array, [dnl + cat > conftest.c <<EOF +@@ -1361,7 +1363,7 @@ + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c + -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD]) + then +- if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then ++ if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then + libc_cv_initfini_array=yes + else + libc_cv_initfini_array=no +@@ -1543,7 +1545,7 @@ + dnl introducing new options this is not easily doable. Instead use a tool + dnl which always is cross-platform: readelf. To detect whether -z combreloc + dnl look for a section named .rel.dyn. +- if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then ++ if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then + libc_cv_z_combreloc=yes + else + libc_cv_z_combreloc=no diff --git a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch new file mode 100644 index 0000000000..c57494f937 --- /dev/null +++ b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch @@ -0,0 +1,149 @@ +Index: glibc-2.3.2/configure +=================================================================== +--- glibc-2.3.2.orig/configure 2006-08-05 20:18:11.000000000 +0200 ++++ glibc-2.3.2/configure 2006-08-05 22:09:08.000000000 +0200 +@@ -4799,6 +4799,95 @@ + fi + fi + ++### XXXX copy and pasted ++# Check for readelf ++# Extract the first word of "$target_alias-readelf", so it can be a program name with args. ++set dummy $target_alias-readelf; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_READELF+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$READELF"; then ++ ac_cv_prog_READELF="$READELF" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_READELF="$target_alias-readelf" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++READELF=$ac_cv_prog_READELF ++if test -n "$READELF"; then ++ { echo "$as_me:$LINENO: result: $READELF" >&5 ++echo "${ECHO_T}$READELF" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test -z "$ac_cv_prog_READELF"; then ++ if test "$build" = "$target"; then ++ ac_ct_READELF=$READELF ++ # Extract the first word of "readelf", so it can be a program name with args. ++set dummy readelf; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_READELF"; then ++ ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_READELF="readelf" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF="readelf" ++fi ++fi ++ac_ct_READELF=$ac_cv_prog_ac_ct_READELF ++if test -n "$ac_ct_READELF"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5 ++echo "${ECHO_T}$ac_ct_READELF" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ READELF=ac_ct_READELF ++ else ++ READELF="readelf" ++ fi ++else ++ READELF="$ac_cv_prog_READELF" ++fi ++ ++### XXXX copy and pasted ++ + echo "$as_me:$LINENO: checking for .preinit_array/.init_array/.fini_array support" >&5 + echo $ECHO_N "checking for .preinit_array/.init_array/.fini_array support... $ECHO_C" >&6 + if test "${libc_cv_initfinit_array+set}" = set; then +@@ -4818,7 +4907,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + then +- if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then ++ if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then + libc_cv_initfinit_array=yes + else + libc_cv_initfinit_array=no +@@ -4963,7 +5052,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + then +- if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then ++ if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then + libc_cv_z_combreloc=yes + else + libc_cv_z_combreloc=no +Index: glibc-2.3.2/configure.in +=================================================================== +--- glibc-2.3.2.orig/configure.in 2003-02-26 01:46:31.000000000 +0100 ++++ glibc-2.3.2/configure.in 2006-08-05 22:05:32.000000000 +0200 +@@ -1187,6 +1187,8 @@ + fi + fi + ++ AC_CHECK_TARGET_TOOL([READELF],[readelf],[readelf],[$PATH]) ++ + AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support, + libc_cv_initfinit_array, [dnl + cat > conftest.c <<EOF +@@ -1198,7 +1200,7 @@ + if AC_TRY_COMMAND([${CC-cc} -o conftest conftest.c + -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD]) + then +- if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then ++ if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then + libc_cv_initfinit_array=yes + else + libc_cv_initfinit_array=no +@@ -1290,7 +1292,7 @@ + dnl introducing new options this is not easily doable. Instead use a tool + dnl which always is cross-platform: readelf. To detect whether -z combreloc + dnl look for a section named .rel.dyn. +- if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then ++ if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then + libc_cv_z_combreloc=yes + else + libc_cv_z_combreloc=no diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb index 21d91ae20f..882684e9b7 100644 --- a/packages/glibc/glibc-initial_2.2.5.bb +++ b/packages/glibc/glibc-initial_2.2.5.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb index 0bfa49e030..78bdaadd9a 100644 --- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" DEPENDS = "linux-libc-headers" diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb index 53e7948f72..4433ced868 100644 --- a/packages/glibc/glibc-initial_2.3.2.bb +++ b/packages/glibc/glibc-initial_2.3.2.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" DEPENDS = "linux-libc-headers" diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb index dd2b9b2524..9ba2ac37cc 100644 --- a/packages/glibc/glibc-initial_2.4.bb +++ b/packages/glibc/glibc-initial_2.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEPENDS = "linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb index 422e8b7110..70c7e161a4 100644 --- a/packages/glibc/glibc-initial_cvs.bb +++ b/packages/glibc/glibc-initial_cvs.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEPENDS = "linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb index 3d9c6afd7d..bc582bb2cc 100644 --- a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb index 819cd0950f..01ce8bb9a8 100644 --- a/packages/glibc/glibc-intermediate_2.4.bb +++ b/packages/glibc/glibc-intermediate_2.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibc/glibc-intermediate_cvs.bb b/packages/glibc/glibc-intermediate_cvs.bb index 11e78a5d59..2283037c87 100644 --- a/packages/glibc/glibc-intermediate_cvs.bb +++ b/packages/glibc/glibc-intermediate_cvs.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 740d2dc006..22800665b3 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -245,7 +245,7 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass # Unslung distribution specific packages follow ... diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index bec6df2005..4ebce30faf 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -131,4 +131,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 8b01a9e5c3..c1202c853c 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -222,4 +222,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index ca25c2955c..0b67ac2f83 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -158,4 +158,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index b37bfd616f..706caf06ea 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -136,4 +136,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 59fd62b872..edc34df52c 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -136,4 +136,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index dc97f5a827..abe314efee 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -167,4 +167,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 067e96fbf3..9343ab9cc1 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -55,6 +55,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat file://ldsocache-varrun.patch;patch=1 \ file://5090_all_stubs-rule-fix.patch;patch=1 \ file://raise.patch;patch=1 \ + file://zecke-sane-readelf.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" @@ -184,4 +185,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index e8acc0af6e..922db459fc 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -58,6 +58,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \ file://nptl-crosscompile.patch;patch=1 \ file://glibc-2.4-compile.patch;patch=1 \ file://fixup-aeabi-syscalls.patch;patch=1 \ + file://zecke-sane-readelf.patch;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ @@ -199,4 +200,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index fc2d0812b1..57eabccf96 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -164,4 +164,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/gmp/gmp-native_4.1.2.bb b/packages/gmp/gmp-native_4.1.2.bb index 9a35da292b..c3d36e0fdb 100644 --- a/packages/gmp/gmp-native_4.1.2.bb +++ b/packages/gmp/gmp-native_4.1.2.bb @@ -1,7 +1,23 @@ -include gmp_${PV}.bb +require gmp_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}" S = "${WORKDIR}/gmp-${PV}" inherit native +# darwin 'hacks' +EXTRA_OECONF_build-darwin = " --enable-shared " +OLD_STAGING := "${STAGING_BINDIR}" +OLD_TARGET := "${TARGET_SYS}" +OLD_HOST := "${HOST_SYS}" +OLD_BUILD := "${BUILD_SYS}" + +PATH_prepend_build-darwin = "${OLD_STAGING}/${OLD_HOST}:${OLD_STAGING}:" + +TARGET_SYS_build-darwin = "none-apple-darwin" +HOST_SYS_build-darwin = "none-apple-darwin" +BUILD_SYS_build-darwin = "none-apple-darwin" + +do_compile_append_build-darwin() { + oe_runmake check +} diff --git a/packages/gnu-config/gnu-config-native_20050701.bb b/packages/gnu-config/gnu-config-native_20050701.bb index 7ee47fe5d5..e729520d60 100644 --- a/packages/gnu-config/gnu-config-native_20050701.bb +++ b/packages/gnu-config/gnu-config-native_20050701.bb @@ -1,5 +1,5 @@ SECTION = "base" -include gnu-config_${PV}.bb +require gnu-config_${PV}.bb inherit native diff --git a/packages/gnupg/gnupg2_1.9.15.bb b/packages/gnupg/gnupg2_1.9.15.bb index 05505c3c77..39de9c6d51 100644 --- a/packages/gnupg/gnupg2_1.9.15.bb +++ b/packages/gnupg/gnupg2_1.9.15.bb @@ -1,3 +1,3 @@ -include gnupg2.inc +require gnupg2.inc PR = "r3" diff --git a/packages/gnupg/gnupg_1.4.2.2.bb b/packages/gnupg/gnupg_1.4.2.2.bb index e14f39f22f..97c301cf97 100644 --- a/packages/gnupg/gnupg_1.4.2.2.bb +++ b/packages/gnupg/gnupg_1.4.2.2.bb @@ -1,4 +1,4 @@ -include gnupg.inc +require gnupg.inc DEPENDS += "readline" EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.." diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb index 1762800b6d..848209d850 100644 --- a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb +++ b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb @@ -1,4 +1,4 @@ -include gpe-contacts.inc +require gpe-contacts.inc PR="r2" SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2" diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb index 1762800b6d..848209d850 100644 --- a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb +++ b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb @@ -1,4 +1,4 @@ -include gpe-contacts.inc +require gpe-contacts.inc PR="r2" SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2" diff --git a/packages/gpe-contacts/gpe-contacts_0.43.bb b/packages/gpe-contacts/gpe-contacts_0.43.bb deleted file mode 100644 index b5afbb3a3c..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.43.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -PR = "r0" - -DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" - diff --git a/packages/gpe-contacts/gpe-contacts_0.44.bb b/packages/gpe-contacts/gpe-contacts_0.46.bb index b5afbb3a3c..04bea951f6 100644 --- a/packages/gpe-contacts/gpe-contacts_0.44.bb +++ b/packages/gpe-contacts/gpe-contacts_0.46.bb @@ -1,14 +1,13 @@ +DESCRIPTION = "GPE contacts manager" LICENSE = "GPL" -inherit gpe autotools - -PR = "r0" +SECTION = "gpe" DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index dc8f434ecc..4634b1b575 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -13,7 +13,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ +cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ } diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb index 599abee8b4..5cedd57e9c 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -13,7 +13,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ +cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ } diff --git a/packages/gpe-todo/gpe-todo_0.54.bb b/packages/gpe-todo/gpe-todo_0.54.bb index 71d641d4cd..ef97501c6f 100644 --- a/packages/gpe-todo/gpe-todo_0.54.bb +++ b/packages/gpe-todo/gpe-todo_0.54.bb @@ -1,3 +1,3 @@ -include gpe-todo.inc +require gpe-todo.inc DEPENDS += "gtk+" diff --git a/packages/gpe-todo/gpe-todo_0.55.bb b/packages/gpe-todo/gpe-todo_0.55.bb index 71d641d4cd..ef97501c6f 100644 --- a/packages/gpe-todo/gpe-todo_0.55.bb +++ b/packages/gpe-todo/gpe-todo_0.55.bb @@ -1,3 +1,3 @@ -include gpe-todo.inc +require gpe-todo.inc DEPENDS += "gtk+" diff --git a/packages/gpe-todo/gpe-todo_0.56.bb b/packages/gpe-todo/gpe-todo_0.56.bb index bef8414a94..b76e173d16 100644 --- a/packages/gpe-todo/gpe-todo_0.56.bb +++ b/packages/gpe-todo/gpe-todo_0.56.bb @@ -1,3 +1,3 @@ -include gpe-todo.inc +require gpe-todo.inc DEPENDS += "gtk+ libgpepimc" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index 7556782fa8..1a5e608aa8 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ -include gpsd.inc +require gpsd.inc PR = "r1" diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb index fa1ea9f38f..4d07974d6e 100644 --- a/packages/gpsd/gpsd_2.32.bb +++ b/packages/gpsd/gpsd_2.32.bb @@ -1,2 +1,2 @@ -include gpsd.inc +require gpsd.inc PR = "r0" diff --git a/packages/gstreamer/gst-plugins-bad_0.10.1.bb b/packages/gstreamer/gst-plugins-bad_0.10.1.bb index 182ed9349f..7c548acf7d 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.1.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.1.bb @@ -1,2 +1,2 @@ -include gst-plugins.inc +require gst-plugins.inc DEPENDS += "gst-plugins-base" diff --git a/packages/gstreamer/gst-plugins-base_0.10.5.bb b/packages/gstreamer/gst-plugins-base_0.10.5.bb index 655f2c1d66..34b5504551 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.5.bb @@ -1 +1 @@ -include gst-plugins.inc +require gst-plugins.inc diff --git a/packages/gstreamer/gst-plugins-base_0.10.6.bb b/packages/gstreamer/gst-plugins-base_0.10.6.bb index 5d5108788b..48e24bf756 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.6.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.6.bb @@ -1,2 +1,2 @@ -include gst-plugins.inc +require gst-plugins.inc PROVIDES_${PN} += "gst-plugins" diff --git a/packages/gstreamer/gst-plugins-base_0.10.7.bb b/packages/gstreamer/gst-plugins-base_0.10.7.bb index 5d5108788b..48e24bf756 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.7.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.7.bb @@ -1,2 +1,2 @@ -include gst-plugins.inc +require gst-plugins.inc PROVIDES_${PN} += "gst-plugins" diff --git a/packages/gstreamer/gst-plugins-good_0.10.2.bb b/packages/gstreamer/gst-plugins-good_0.10.2.bb index 182ed9349f..7c548acf7d 100644 --- a/packages/gstreamer/gst-plugins-good_0.10.2.bb +++ b/packages/gstreamer/gst-plugins-good_0.10.2.bb @@ -1,2 +1,2 @@ -include gst-plugins.inc +require gst-plugins.inc DEPENDS += "gst-plugins-base" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb index 182ed9349f..7c548acf7d 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb @@ -1,2 +1,2 @@ -include gst-plugins.inc +require gst-plugins.inc DEPENDS += "gst-plugins-base" diff --git a/packages/gtk-doc/gtk-doc-native.bb b/packages/gtk-doc/gtk-doc-native.bb index de7d00b273..60a8907baf 100644 --- a/packages/gtk-doc/gtk-doc-native.bb +++ b/packages/gtk-doc/gtk-doc-native.bb @@ -1,3 +1,3 @@ SECTION = "x11/base" inherit native -include gtk-doc.bb +require gtk-doc.bb diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb index 7eb822c0d4..a211dd0759 100644 --- a/packages/hostap/hostap-daemon_0.3.7.bb +++ b/packages/hostap/hostap-daemon_0.3.7.bb @@ -1,3 +1,3 @@ -include hostap-daemon.inc +require hostap-daemon.inc PR = "r1" diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb index 7eb822c0d4..a211dd0759 100644 --- a/packages/hostap/hostap-daemon_0.4.4.bb +++ b/packages/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,3 @@ -include hostap-daemon.inc +require hostap-daemon.inc PR = "r1" diff --git a/packages/hostap/hostap-daemon_0.4.8.bb b/packages/hostap/hostap-daemon_0.4.8.bb index 29cf1e8f21..4ef749c407 100644 --- a/packages/hostap/hostap-daemon_0.4.8.bb +++ b/packages/hostap/hostap-daemon_0.4.8.bb @@ -1,3 +1,3 @@ -include hostap-daemon.inc +require hostap-daemon.inc DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb index 29cf1e8f21..4ef749c407 100644 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ b/packages/hostap/hostap-daemon_0.5.1.bb @@ -1,3 +1,3 @@ -include hostap-daemon.inc +require hostap-daemon.inc DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb index d6bdd5ba37..1935d4ed22 100644 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ b/packages/hostap/hostap-modules_0.3.10.bb @@ -1,4 +1,4 @@ -include hostap-modules.inc +require hostap-modules.inc PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index c1ab69a6c9..9bf337078a 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,4 +1,4 @@ -include hostap-modules.inc +require hostap-modules.inc PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index cc09fd5952..051afadca0 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,4 +1,4 @@ -include hostap-modules.inc +require hostap-modules.inc PR = "r10" SRC_URI += "file://Makefile.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index 399d60cc20..74f39d8b58 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,4 +1,4 @@ -include hostap-modules.inc +require hostap-modules.inc PR = "r6" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb index 21effc081b..e4a34c1916 100644 --- a/packages/hostap/hostap-modules_0.4.7.bb +++ b/packages/hostap/hostap-modules_0.4.7.bb @@ -1,4 +1,4 @@ -include hostap-modules.inc +require hostap-modules.inc PR = "r4" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb index ad06cd3d6d..abfcf53663 100644 --- a/packages/hostap/hostap-utils_0.3.7.bb +++ b/packages/hostap/hostap-utils_0.3.7.bb @@ -1,3 +1,3 @@ -include hostap-utils.inc +require hostap-utils.inc PR = "r3" diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb index ad06cd3d6d..abfcf53663 100644 --- a/packages/hostap/hostap-utils_0.4.0.bb +++ b/packages/hostap/hostap-utils_0.4.0.bb @@ -1,3 +1,3 @@ -include hostap-utils.inc +require hostap-utils.inc PR = "r3" diff --git a/packages/hostap/hostap-utils_0.4.7.bb b/packages/hostap/hostap-utils_0.4.7.bb index 5b2db13498..75fd8449fe 100644 --- a/packages/hostap/hostap-utils_0.4.7.bb +++ b/packages/hostap/hostap-utils_0.4.7.bb @@ -1,3 +1,3 @@ -include hostap-utils.inc +require hostap-utils.inc DEFAULT_PREFERENCE = "-1" diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index 0cee079550..68cfac7490 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,20 +1,10 @@ -# -# old_revision [bbd3a2811e13a3b99224c1a846af2a244d292c41] -# -# add_file "packages/images/bootstrap-image-bootchart.bb" -# content [c85210cae1668b832e717ed0f45cba34e24fd811] -# -============================================================ ---- packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 -+++ packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 -@@ -0,0 +1,10 @@ -+export IMAGE_BASENAME = "bootstrap-image-bootchart" -+export IMAGE_LINGUAS = "" -+export IPKG_INSTALL = "task-bootstrap bootchart acct" -+ -+DEPENDS = "task-bootstrap bootchart" -+RDEPENDS = "acct" -+ -+inherit image_ipk -+ -+LICENSE = MIT +export IMAGE_BASENAME = "bootstrap-image-bootchart" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "task-bootstrap bootchart acct" + +DEPENDS = "task-bootstrap bootchart" +RDEPENDS = "acct" + +inherit image_ipk + +LICENSE = MIT diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index 99f3858f66..86aff41230 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -1,4 +1,4 @@ -include e-image-core.bb +require e-image-core.bb DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" PR = "r5" diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb index c8e24ae035..60e78ba414 100644 --- a/packages/images/gpe-image-blank-user.bb +++ b/packages/images/gpe-image-blank-user.bb @@ -1,4 +1,4 @@ -include gpe-image.bb +require gpe-image.bb MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com" diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb index be20ddde78..194783af7e 100644 --- a/packages/images/nylon-image-extra.bb +++ b/packages/images/nylon-image-extra.bb @@ -1,4 +1,4 @@ -include nylon-image-standard.bb +require nylon-image-standard.bb export IMAGE_BASENAME = "nylon-extra" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index 8d10e9a30f..d7acf29142 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -1,4 +1,4 @@ -include nylon-image-base.bb +require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 113608736a..7fdc22126b 100644 --- a/packages/images/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb @@ -1,4 +1,4 @@ -include opie-image.bb +require opie-image.bb DEPENDS += "kdepimpi" PR = "r1" diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices index fc96ff62ee..422336a345 100755 --- a/packages/initscripts/initscripts-1.0/jornada7xx/devices +++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices @@ -48,7 +48,7 @@ else if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi cd / mkdir -p dev/input - mknod /dev/input/ts0 c 13 128 + mknod /dev/input/ts0 c 13 65 mknod /dev/ttySC1 c 9 204 mknod /dev/irda0 c 10 204 mkdir -p dev/msys diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 0b983ab1ec..dcb57e92bb 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -4,7 +4,7 @@ # problems in the initscripts on SlugOS. The problems # mostly come down to the order the scripts are executed # in. -include initscripts_${PV}.bb +require initscripts_${PV}.bb MAINTAINER = "John Bowler <jbowler@acm.org>" RCONFLICTS = "initscripts" diff --git a/packages/intltool/intltool-native_0.30.bb b/packages/intltool/intltool-native_0.30.bb index f200d26dd1..7cf3c4e11f 100644 --- a/packages/intltool/intltool-native_0.30.bb +++ b/packages/intltool/intltool-native_0.30.bb @@ -1,4 +1,4 @@ SECTION = "devel" -include intltool_${PV}.bb +require intltool_${PV}.bb inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb index f200d26dd1..7cf3c4e11f 100644 --- a/packages/intltool/intltool-native_0.31.bb +++ b/packages/intltool/intltool-native_0.31.bb @@ -1,4 +1,4 @@ SECTION = "devel" -include intltool_${PV}.bb +require intltool_${PV}.bb inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.34.bb b/packages/intltool/intltool-native_0.34.bb index f200d26dd1..7cf3c4e11f 100644 --- a/packages/intltool/intltool-native_0.34.bb +++ b/packages/intltool/intltool-native_0.34.bb @@ -1,4 +1,4 @@ SECTION = "devel" -include intltool_${PV}.bb +require intltool_${PV}.bb inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb index 18177ffe28..fdd2652e11 100644 --- a/packages/intltool/intltool-native_0.35.0.bb +++ b/packages/intltool/intltool-native_0.35.0.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include intltool_${PV}.bb +require intltool_${PV}.bb inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index bfb91f2f56..8079b46267 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,4 +1,4 @@ -include ipkg-utils_${PV}.bb +require ipkg-utils_${PV}.bb SRC_URI += "file://ipkg-utils-fix.patch;patch=1" RDEPENDS = "" diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb index d59eab3a61..64868b1e1f 100644 --- a/packages/ipkg/ipkg-native_0.99.152.bb +++ b/packages/ipkg/ipkg-native_0.99.152.bb @@ -1,2 +1,2 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc diff --git a/packages/ipkg/ipkg-native_0.99.153.bb b/packages/ipkg/ipkg-native_0.99.153.bb index d59eab3a61..64868b1e1f 100644 --- a/packages/ipkg/ipkg-native_0.99.153.bb +++ b/packages/ipkg/ipkg-native_0.99.153.bb @@ -1,2 +1,2 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb index d59eab3a61..64868b1e1f 100644 --- a/packages/ipkg/ipkg-native_0.99.154.bb +++ b/packages/ipkg/ipkg-native_0.99.154.bb @@ -1,2 +1,2 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc diff --git a/packages/ipkg/ipkg-native_0.99.159.bb b/packages/ipkg/ipkg-native_0.99.159.bb index d59eab3a61..64868b1e1f 100644 --- a/packages/ipkg/ipkg-native_0.99.159.bb +++ b/packages/ipkg/ipkg-native_0.99.159.bb @@ -1,2 +1,2 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index 6f6a1ea4fd..bb480f0c99 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -1,7 +1,7 @@ S = "${WORKDIR}/ipkg-${PV}" -include ipkg_${PV}.bb -include ipkg-native.inc +#require ipkg_${PV}.bb +require ipkg-native.inc inherit autotools pkgconfig native diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb index 9285c61819..d76673e5c9 100644 --- a/packages/ipkg/ipkg_0.99.152.bb +++ b/packages/ipkg/ipkg_0.99.152.bb @@ -1,2 +1,2 @@ -include ipkg.inc +require ipkg.inc PR = "r2" diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb index 02de5e7f92..5a91e09f9b 100644 --- a/packages/ipkg/ipkg_0.99.153.bb +++ b/packages/ipkg/ipkg_0.99.153.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include ipkg.inc +require ipkg.inc PR = "r3" diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb index de6af147b6..0d10a29c3f 100644 --- a/packages/ipkg/ipkg_0.99.154.bb +++ b/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ -include ipkg.inc +require ipkg.inc PR = "r3" diff --git a/packages/ipkg/ipkg_0.99.155.bb b/packages/ipkg/ipkg_0.99.155.bb index d3ef6e22a8..eb7c48e9ac 100644 --- a/packages/ipkg/ipkg_0.99.155.bb +++ b/packages/ipkg/ipkg_0.99.155.bb @@ -1,3 +1,3 @@ -include ipkg.inc +require ipkg.inc PR = "r1" SRC_URI += "file://upgrade-message-garbage.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb index 1898c6656e..87fadac287 100644 --- a/packages/ipkg/ipkg_0.99.159.bb +++ b/packages/ipkg/ipkg_0.99.159.bb @@ -1 +1 @@ -include ipkg.inc +require ipkg.inc diff --git a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb index f14f7a0bb0..d4b33335df 100644 --- a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb +++ b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb @@ -1,4 +1,4 @@ -include ipsec-tools.inc +require ipsec-tools.inc BV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}" SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${BV}.tar.bz2 \ diff --git a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb index dc52b5f230..5fed6c1764 100644 --- a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb +++ b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb @@ -1,4 +1,4 @@ -include ipsec-tools.inc +require ipsec-tools.inc BV = "${@bb.data.getVar('PV', d, 1).split('+')[1].replace('-','')}" SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${BV}.tar.bz2 \ diff --git a/packages/ixp4xx/ixp-osal_1.5.bb b/packages/ixp4xx/ixp-osal_1.5.bb index 66cf9e6b06..bfb76a3fc6 100644 --- a/packages/ixp4xx/ixp-osal_1.5.bb +++ b/packages/ixp4xx/ixp-osal_1.5.bb @@ -51,9 +51,9 @@ do_stage () { # First the include files, maintain the tree structure (ixp4xx-csr # expects the exact same tree) - cp -rf --dereference include ${OSAL_DIR} + cp -RLf include ${OSAL_DIR} install -d ${OSAL_DIR}/os/linux - cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux + cp -RLf os/linux/include ${OSAL_DIR}/os/linux # Install the library/object install -d ${OSAL_DIR}/${OSAL_PATH} diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb index 84929d5cb5..4ca2543156 100644 --- a/packages/ixp4xx/ixp-osal_2.0.bb +++ b/packages/ixp4xx/ixp-osal_2.0.bb @@ -61,9 +61,9 @@ do_stage () { # First the include files, maintain the tree structure (ixp4xx-csr # expects the exact same tree) - cp -rf --dereference include ${OSAL_DIR} + cp -RLf include ${OSAL_DIR} install -d ${OSAL_DIR}/os/linux - cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux + cp -RLf os/linux/include ${OSAL_DIR}/os/linux # Install the library/object install -d ${OSAL_DIR}/${OSAL_PATH} diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb index 926d720f3a..02206fb3cf 100644 --- a/packages/ixp4xx/ixp-osal_2.1.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.1.bb @@ -80,9 +80,9 @@ do_stage () { # First the include files, maintain the tree structure (ixp4xx-csr # expects the exact same tree) - cp -rf --dereference include ${OSAL_DIR} + cp -RLf include ${OSAL_DIR} install -d ${OSAL_DIR}/os/linux - cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux + cp -RLf os/linux/include ${OSAL_DIR}/os/linux # Install the library/object install -d ${OSAL_DIR}/${OSAL_PATH} diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 0e5531a254..b020c9dafd 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -68,9 +68,9 @@ do_stage () { # First the include files, maintain the tree structure (ixp4xx-csr # expects the exact same tree) - cp -rf --dereference include ${OSAL_DIR} + cp -RLf include ${OSAL_DIR} install -d ${OSAL_DIR}/os/linux - cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux + cp -RLf os/linux/include ${OSAL_DIR}/os/linux # Install the library/object install -d ${OSAL_DIR}/${OSAL_PATH} diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb index 7146d9e402..286ecf957a 100644 --- a/packages/ixp4xx/ixp4xx-csr_1.4.bb +++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb @@ -54,7 +54,7 @@ do_compile () { do_stage () { install -d ${STAGING_INCDIR}/linux/ixp4xx-csr install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/ - cp -rf --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/ + cp -RLf src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/ } do_install () { diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb index fc5942c2f3..7bea3e3cba 100644 --- a/packages/jikes/jikes-native_1.21.bb +++ b/packages/jikes/jikes-native_1.21.bb @@ -1,6 +1,6 @@ SECTION = "devel" inherit native -include jikes_${PV}.bb +require jikes_${PV}.bb S = "${WORKDIR}/jikes-${PV}" do_stage() { diff --git a/packages/jpeg/jpeg-native_6b.bb b/packages/jpeg/jpeg-native_6b.bb index b617f1b6c0..450e4b36a7 100644 --- a/packages/jpeg/jpeg-native_6b.bb +++ b/packages/jpeg/jpeg-native_6b.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include jpeg_${PV}.bb +require jpeg_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}" DEPENDS = "" diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb index 2bcec9a929..48077ce1e3 100644 --- a/packages/kaffe/kaffe-gtk_1.1.5.bb +++ b/packages/kaffe/kaffe-gtk_1.1.5.bb @@ -3,7 +3,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz" S = "${WORKDIR}/kaffe-${PV}" -include kaffe.inc +require kaffe.inc DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native" diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb index c8ff718396..bc464e6e63 100644 --- a/packages/kaffe/kaffe-gtk_cvs.bb +++ b/packages/kaffe/kaffe-gtk_cvs.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" S = "${WORKDIR}/kaffe" -include kaffe.inc +require kaffe.inc DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native" diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb index 023e3fbcb4..bd5d2968f6 100644 --- a/packages/kaffe/kaffe-qt_cvs.bb +++ b/packages/kaffe/kaffe-qt_cvs.bb @@ -4,7 +4,7 @@ PV = "1.1.4+cvs${SRCDATE}" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" S = "${WORKDIR}/kaffe" -include kaffe.inc +require kaffe.inc DEPENDS += "libqpe-opie" diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb index 569301f3f7..54737ce8f6 100644 --- a/packages/kaffe/kaffeh-native_1.1.5.bb +++ b/packages/kaffe/kaffeh-native_1.1.5.bb @@ -2,7 +2,7 @@ SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar S = "${WORKDIR}/kaffe-${PV}" PR = "r3" -include kaffe.inc +require kaffe.inc inherit native diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb index 45bdd4088e..60dab7859e 100644 --- a/packages/kaffe/kaffeh-native_cvs.bb +++ b/packages/kaffe/kaffeh-native_cvs.bb @@ -5,7 +5,7 @@ PR = "r3" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" S = "${WORKDIR}/kaffe" -include kaffe.inc +require kaffe.inc inherit native diff --git a/packages/kanatest/kanatest_0.3.6.bb b/packages/kanatest/kanatest_0.3.6.bb index db4c7860a9..f0b17a2af9 100644 --- a/packages/kanatest/kanatest_0.3.6.bb +++ b/packages/kanatest/kanatest_0.3.6.bb @@ -2,7 +2,7 @@ PR = "r0" SRC_URI = "http://clay.ll.pl/download/${PN}-${PV}.tar.gz file://${PN}.desktop" -include kanatest.inc +require kanatest.inc CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index 843863c575..6059bf8528 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -1,6 +1,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ file://gcc4.patch;patch=1" -include kdepimpi-base.inc +require kdepimpi-base.inc PR = "r1" diff --git a/packages/kdepimpi/pwmpi_2.2.7.bb b/packages/kdepimpi/pwmpi_2.2.7.bb index 904f640955..6e67f5c7c2 100644 --- a/packages/kdepimpi/pwmpi_2.2.7.bb +++ b/packages/kdepimpi/pwmpi_2.2.7.bb @@ -1,3 +1,3 @@ -include kdepimpi_${PV}.bb +require kdepimpi_${PV}.bb -include pwmpi.inc +require pwmpi.inc diff --git a/packages/klibc/klibc_0.190.bb b/packages/klibc/klibc_0.190.bb index 750e152a91..cd1ba9d56e 100644 --- a/packages/klibc/klibc_0.190.bb +++ b/packages/klibc/klibc_0.190.bb @@ -1 +1 @@ -include klibc.inc +require klibc.inc diff --git a/packages/klibc/klibc_1.1.1.bb b/packages/klibc/klibc_1.1.1.bb index 750e152a91..cd1ba9d56e 100644 --- a/packages/klibc/klibc_1.1.1.bb +++ b/packages/klibc/klibc_1.1.1.bb @@ -1 +1 @@ -include klibc.inc +require klibc.inc diff --git a/packages/libcgicc/libcgicc_3.2.3.bb b/packages/libcgicc/libcgicc_3.2.3.bb index 5e9c9acff1..adf5108c12 100644 --- a/packages/libcgicc/libcgicc_3.2.3.bb +++ b/packages/libcgicc/libcgicc_3.2.3.bb @@ -10,6 +10,6 @@ inherit autotools do_stage () { install -d ${STAGING_INCDIR}/cgicc - cp --dereference -R cgicc/*.h ${STAGING_INCDIR}/cgicc + cp -LR cgicc/*.h ${STAGING_INCDIR}/cgicc oe_libinstall -C cgicc libcgicc ${STAGING_LIBDIR} } diff --git a/packages/libcontactsdb/libcontactsdb_0.5.bb b/packages/libcontactsdb/libcontactsdb_0.5.bb new file mode 100644 index 0000000000..30bc282da6 --- /dev/null +++ b/packages/libcontactsdb/libcontactsdb_0.5.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Database access library for GPE contacts" +LICENSE = "LGPL" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/libgpepimc/libgpepimc_0.5.bb b/packages/libgpepimc/libgpepimc_0.5.bb index 9fb9d9ab2f..57b7b22191 100644 --- a/packages/libgpepimc/libgpepimc_0.5.bb +++ b/packages/libgpepimc/libgpepimc_0.5.bb @@ -1 +1 @@ -include libgpepimc.inc +require libgpepimc.inc diff --git a/packages/libgpepimc/libgpepimc_0.6.bb b/packages/libgpepimc/libgpepimc_0.6.bb index 9fb9d9ab2f..57b7b22191 100644 --- a/packages/libgpepimc/libgpepimc_0.6.bb +++ b/packages/libgpepimc/libgpepimc_0.6.bb @@ -1 +1 @@ -include libgpepimc.inc +require libgpepimc.inc diff --git a/packages/libgpepimc/libgpepimc_0.8.bb b/packages/libgpepimc/libgpepimc_0.8.bb index 9fb9d9ab2f..57b7b22191 100644 --- a/packages/libgpepimc/libgpepimc_0.8.bb +++ b/packages/libgpepimc/libgpepimc_0.8.bb @@ -1 +1 @@ -include libgpepimc.inc +require libgpepimc.inc diff --git a/packages/libidl/libidl-native_0.8.3.bb b/packages/libidl/libidl-native_0.8.3.bb index bcc1ec61a8..ce59fd4b86 100644 --- a/packages/libidl/libidl-native_0.8.3.bb +++ b/packages/libidl/libidl-native_0.8.3.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include libidl_${PV}.bb +require libidl_${PV}.bb inherit native DEPENDS = "glib-2.0-native" diff --git a/packages/libidl/libidl-native_0.8.6.bb b/packages/libidl/libidl-native_0.8.6.bb index bcc1ec61a8..ce59fd4b86 100644 --- a/packages/libidl/libidl-native_0.8.6.bb +++ b/packages/libidl/libidl-native_0.8.6.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include libidl_${PV}.bb +require libidl_${PV}.bb inherit native DEPENDS = "glib-2.0-native" diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb index 29aa09c148..31793f9e16 100644 --- a/packages/libmailwrapper/libmailwrapper_1.2.2.bb +++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb index 8a5722ee18..4075a80823 100644 --- a/packages/libmailwrapper/libmailwrapper_cvs.bb +++ b/packages/libmailwrapper/libmailwrapper_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb index 533577b387..e7e84bb913 100644 --- a/packages/libmatchbox/libmatchbox_1.2.bb +++ b/packages/libmatchbox/libmatchbox_1.2.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r2" diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb index 876b052fd2..45a35b6190 100644 --- a/packages/libmatchbox/libmatchbox_1.3.bb +++ b/packages/libmatchbox/libmatchbox_1.3.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r1" diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb index 876b052fd2..45a35b6190 100644 --- a/packages/libmatchbox/libmatchbox_1.4.bb +++ b/packages/libmatchbox/libmatchbox_1.4.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r1" diff --git a/packages/libmatchbox/libmatchbox_1.5.bb b/packages/libmatchbox/libmatchbox_1.5.bb index dc049b3762..2f63f7ee64 100644 --- a/packages/libmatchbox/libmatchbox_1.5.bb +++ b/packages/libmatchbox/libmatchbox_1.5.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r1" diff --git a/packages/libmatchbox/libmatchbox_1.6.bb b/packages/libmatchbox/libmatchbox_1.6.bb index e3e62c5d3a..29b04635ff 100644 --- a/packages/libmatchbox/libmatchbox_1.6.bb +++ b/packages/libmatchbox/libmatchbox_1.6.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r1" diff --git a/packages/libmatchbox/libmatchbox_1.7.bb b/packages/libmatchbox/libmatchbox_1.7.bb index c3fef81f0d..7900d4e085 100644 --- a/packages/libmatchbox/libmatchbox_1.7.bb +++ b/packages/libmatchbox/libmatchbox_1.7.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ diff --git a/packages/libmatchbox/libmatchbox_1.8.bb b/packages/libmatchbox/libmatchbox_1.8.bb index 1dfcb0a4da..d87eb09150 100644 --- a/packages/libmatchbox/libmatchbox_1.8.bb +++ b/packages/libmatchbox/libmatchbox_1.8.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PR = "r0" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb new file mode 100644 index 0000000000..d87eb09150 --- /dev/null +++ b/packages/libmatchbox/libmatchbox_1.9.bb @@ -0,0 +1,9 @@ +require libmatchbox.inc +PR = "r0" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ + file://check.m4" + +do_configure_prepend () { + mv ${WORKDIR}/check.m4 ${S}/ +} diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb index ebf6dfc3f5..f22b676cd9 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,4 +1,4 @@ -include libmatchbox.inc +require libmatchbox.inc PV = "1.7+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libmimedir/files/mimedir-update.patch b/packages/libmimedir/files/mimedir-update.patch new file mode 100644 index 0000000000..f3be39eb53 --- /dev/null +++ b/packages/libmimedir/files/mimedir-update.patch @@ -0,0 +1,403 @@ +diff -Nur libmimedir_orig/Makefile.am libmimedir/Makefile.am +--- libmimedir_orig/Makefile.am 2002-08-15 15:36:01.000000000 +0200 ++++ libmimedir/Makefile.am 2006-08-04 15:51:06.000000000 +0200 +@@ -5,7 +5,22 @@ + mimedir-1.0.pc.in \ + intltool-extract.in \ + intltool-merge.in \ +- intltool-update.in ++ intltool-update.in \ ++ debian/changelog \ ++ debian/copyright \ ++ debian/control \ ++ debian/compat \ ++ debian/rules \ ++ debian/libmimedir0.files \ ++ debian/libmimedir-dev.files ++ + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = mimedir-1.0.pc ++ ++deb: dist ++ -mkdir $(top_builddir)/debian-build ++ cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz ++ cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -S -D -rfakeroot ++ cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -D -rfakeroot ++ -rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) +diff -Nur libmimedir_orig/configure.in libmimedir/configure.in +--- libmimedir_orig/configure.in 2006-02-09 13:30:13.000000000 +0100 ++++ libmimedir/configure.in 2006-08-04 15:51:06.000000000 +0200 +@@ -3,7 +3,7 @@ + AC_INIT(MIME Directory Library, 0.4.0, mailto:srittau@jroger.in-berlin.de, libmimedir) + AC_PREREQ(2.53) + AC_CONFIG_SRCDIR(mimedir/mimedir-attribute.c) +-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++AM_INIT_AUTOMAKE(libmimedir, AC_PACKAGE_VERSION) + AC_PROG_INTLTOOL + AM_CONFIG_HEADER(config.h) + +diff -Nur libmimedir_orig/mimedir/Makefile.am libmimedir/mimedir/Makefile.am +--- libmimedir_orig/mimedir/Makefile.am 2002-12-19 16:21:27.000000000 +0100 ++++ libmimedir/mimedir/Makefile.am 2006-08-04 15:56:36.000000000 +0200 +@@ -26,6 +26,7 @@ + mimedir-period.c \ + mimedir-profile.c \ + mimedir-recurrence.c \ ++ mimedir-recurrence-rule.c \ + mimedir-utils.c \ + mimedir-utils.h \ + mimedir-valarm.c \ +@@ -52,6 +53,7 @@ + mimedir-period.h \ + mimedir-profile.h \ + mimedir-recurrence.h \ ++ mimedir-recurrence-rule.h \ + mimedir-valarm.h \ + mimedir-vcal.h \ + mimedir-vcard.h \ +diff -Nur libmimedir_orig/mimedir/mimedir-attribute.c libmimedir/mimedir/mimedir-attribute.c +--- libmimedir_orig/mimedir/mimedir-attribute.c 2006-01-01 04:38:29.000000000 +0100 ++++ libmimedir/mimedir/mimedir-attribute.c 2006-08-04 15:51:06.000000000 +0200 +@@ -1417,7 +1417,7 @@ + g_return_val_if_fail (parameter != NULL, FALSE); + + p = mimedir_attribute_get_parameter (attribute, parameter); +- if (p) ++ if (p && p->values) + return (gchar *) p->values->data; + else + return NULL; +diff -Nur libmimedir_orig/mimedir/mimedir-recurrence-rule.c libmimedir/mimedir/mimedir-recurrence-rule.c +--- libmimedir_orig/mimedir/mimedir-recurrence-rule.c 1970-01-01 01:00:00.000000000 +0100 ++++ libmimedir/mimedir/mimedir-recurrence-rule.c 2006-08-04 15:52:39.000000000 +0200 +@@ -0,0 +1,171 @@ ++/* RFC 2445 iCal Recurrence Rule Object ++ * Copyright (C) 2004 Phil Blundell <pb@nexus.co.uk> ++ * ++ * $Id: mimedir-recurrence.h,v 1.1 2002/08/28 04:57:12 srittau Exp $ ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#include "mimedir-recurrence-rule.h" ++ ++ ++#ifndef _ ++#define _(x) (dgettext(GETTEXT_PACKAGE, (x))) ++#endif ++ ++ ++static void mimedir_recurrence_rule_class_init (MIMEDirRecurrenceRuleClass *klass); ++static void mimedir_recurrence_rule_init (MIMEDirRecurrenceRule *recurrence); ++static void mimedir_recurrence_rule_dispose (GObject *object); ++ ++ ++struct _MIMEDirRecurrenceRulePriv { ++ MIMEDirRecurrenceFrequency frequency; ++ int interval; ++}; ++ ++static GObjectClass *parent_class = NULL; ++ ++/* ++ * Class and Object Management ++ */ ++ ++GType ++mimedir_recurrence_rule_get_type (void) ++{ ++ static GType mimedir_recurrence_rule_type = 0; ++ ++ if (!mimedir_recurrence_rule_type) { ++ static const GTypeInfo mimedir_recurrence_rule_info = { ++ sizeof (MIMEDirRecurrenceRuleClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) mimedir_recurrence_rule_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (MIMEDirRecurrenceRule), ++ 1, /* n_preallocs */ ++ (GInstanceInitFunc) mimedir_recurrence_rule_init, ++ }; ++ ++ mimedir_recurrence_rule_type = g_type_register_static (G_TYPE_OBJECT, ++ "MIMEDirRecurrenceRule", ++ &mimedir_recurrence_rule_info, ++ 0); ++ } ++ ++ return mimedir_recurrence_rule_type; ++} ++ ++ ++static void ++mimedir_recurrence_rule_class_init (MIMEDirRecurrenceRuleClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ g_return_if_fail (klass != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE_CLASS (klass)); ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ ++ gobject_class->dispose = mimedir_recurrence_rule_dispose; ++ ++ parent_class = g_type_class_peek_parent (klass); ++} ++ ++ ++static void ++mimedir_recurrence_rule_init (MIMEDirRecurrenceRule *rule) ++{ ++ MIMEDirRecurrenceRulePriv *priv; ++ ++ g_return_if_fail (rule != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule)); ++ ++ priv = g_new0 (MIMEDirRecurrenceRulePriv, 1); ++ rule->priv = priv; ++} ++ ++ ++static void ++mimedir_recurrence_rule_dispose (GObject *object) ++{ ++ MIMEDirRecurrenceRule *rule; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE (object)); ++ ++ rule = MIMEDIR_RECURRENCE_RULE (object); ++ ++ g_free (rule->priv); ++ rule->priv = NULL; ++ ++ G_OBJECT_CLASS (parent_class)->dispose (object); ++} ++ ++/* ++ * Public Methods ++ */ ++ ++/** ++ * mimedir_recurrence_rule_new: ++ * ++ * Creates a new iCal recurrence object. ++ * ++ * Return value: a new recurrence object ++ **/ ++MIMEDirRecurrenceRule * ++mimedir_recurrence_rule_new (void) ++{ ++ MIMEDirRecurrenceRule *rule; ++ ++ rule = g_object_new (MIMEDIR_TYPE_RECURRENCE_RULE, NULL); ++ ++ return rule; ++} ++ ++/** ++ * mimedir_recurrence_rule_get_frequency: ++ * ++ * Retrieves the base frequency for the corresponding recurrence object. ++ * ++ * Return value: a #MIMEDirRecurrenceFrequency ++ **/ ++MIMEDirRecurrenceFrequency ++mimedir_recurrence_rule_get_frequency (MIMEDirRecurrenceRule *rule) ++{ ++ g_return_val_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule), 0); ++ ++ return rule->priv->frequency; ++} ++ ++/** ++ * mimedir_recurrence_rule_get_interval: ++ * ++ * Retrieves the interval for the corresponding recurrence object. ++ * ++ * Return value: an #int ++ **/ ++int ++mimedir_recurrence_rule_get_interval (MIMEDirRecurrenceRule *rule) ++{ ++ g_return_val_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule), 0); ++ ++ return rule->priv->interval; ++} +diff -Nur libmimedir_orig/mimedir/mimedir-recurrence-rule.h libmimedir/mimedir/mimedir-recurrence-rule.h +--- libmimedir_orig/mimedir/mimedir-recurrence-rule.h 1970-01-01 01:00:00.000000000 +0100 ++++ libmimedir/mimedir/mimedir-recurrence-rule.h 2006-08-04 15:52:39.000000000 +0200 +@@ -0,0 +1,74 @@ ++/* RFC 2445 iCal Recurrence Rule Object ++ * Copyright (C) 2004 Phil Blundell <pb@nexus.co.uk> ++ * ++ * $Id: mimedir-recurrence.h,v 1.1 2002/08/28 04:57:12 srittau Exp $ ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef __MIMEDIR_RECURRENCE_RULE_H__ ++#define __MIMEDIR_RECURRENCE_RULE_H__ ++ ++#include <glib.h> ++#include <glib-object.h> ++ ++#include "mimedir/mimedir-datetime.h" ++ ++#define MIMEDIR_TYPE_RECURRENCE_RULE (mimedir_recurrence_get_type()) ++#define MIMEDIR_RECURRENCE_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIMEDIR_TYPE_RECURRENCE_RULE, MIMEDirRecurrenceRule)) ++#define MIMEDIR_RECURRENCE_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MIMEDIR_TYPE_RECURRENCE_RULE, MIMEDirRecurrenceRuleClass)) ++#define MIMEDIR_IS_RECURRENCE_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIMEDIR_TYPE_RECURRENCE_RULE)) ++#define MIMEDIR_IS_RECURRENCE_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MIMEDIR_TYPE_RECURRENCE_RULE)) ++ ++typedef struct _MIMEDirRecurrenceRule MIMEDirRecurrenceRule; ++typedef struct _MIMEDirRecurrenceRulePriv MIMEDirRecurrenceRulePriv; ++typedef struct _MIMEDirRecurrenceRuleClass MIMEDirRecurrenceRuleClass; ++ ++typedef enum { ++ MIMEDIR_RECURRENCE_RULE_SECONDLY, ++ MIMEDIR_RECURRENCE_RULE_MINUTELY, ++ MIMEDIR_RECURRENCE_RULE_HOURLY, ++ MIMEDIR_RECURRENCE_RULE_DAILY, ++ MIMEDIR_RECURRENCE_RULE_WEEKLY, ++ MIMEDIR_RECURRENCE_RULE_MONTHLY, ++ MIMEDIR_RECURRENCE_RULE_YEARLY, ++} MIMEDirRecurrenceFrequency; ++ ++struct _MIMEDirRecurrenceRule ++{ ++ GObject parent; ++ ++ MIMEDirRecurrenceRulePriv *priv; ++}; ++ ++struct _MIMEDirRecurrenceRuleClass ++{ ++ GObjectClass parent_class; ++}; ++ ++MIMEDirRecurrenceFrequency mimedir_recurrence_rule_get_frequency (MIMEDirRecurrenceRule *); ++int mimedir_recurrence_rule_get_interval (MIMEDirRecurrenceRule *); ++int mimedir_recurrence_rule_get_count (MIMEDirRecurrenceRule *); ++MIMEDirDateTime *mimedir_recurrence_rule_get_end_date (MIMEDirRecurrenceRule *); ++ ++void mimedir_recurrence_rule_set (MIMEDirRecurrenceRule *, ++ MIMEDirRecurrenceFrequency freq, ++ int interval); ++ ++GType mimedir_recurrence_rule_get_type (void); ++MIMEDirRecurrenceRule *mimedir_recurrence_rule_new (void); ++ ++#endif ++ +diff -Nur libmimedir_orig/mimedir/mimedir-vcomponent.c libmimedir/mimedir/mimedir-vcomponent.c +--- libmimedir_orig/mimedir/mimedir-vcomponent.c 2005-11-26 16:40:20.000000000 +0100 ++++ libmimedir/mimedir/mimedir-vcomponent.c 2006-08-04 15:51:06.000000000 +0200 +@@ -951,52 +951,33 @@ + + s++; + +- num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); +- if (err) { +- g_propagate_error (error, err); +- return 0; +- } +- if (s[0] != 'H') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- s++; +- duration += num * SECS_PER_HOUR; +- +- if (s[0]) { ++ while (s[0] != '\0') { + num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); + if (err) { + g_propagate_error (error, err); + return 0; + } +- if (s[0] != 'M') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- s++; +- duration += num * SECS_PER_MINUTE; +- } + +- if (s[0]) { +- num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); +- if (err) { +- g_propagate_error (error, err); +- return 0; +- } +- if (s[0] != 'S') { ++ switch (s[0]) { ++ case 'H': ++ s++; ++ duration += num * SECS_PER_HOUR; ++ break; ++ case 'M': ++ s++; ++ duration += num * SECS_PER_MINUTE; ++ break; ++ case 'S': ++ s++; ++ duration += num; ++ break; ++ default: + g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); + return 0; + } +- s++; +- duration += num; + } + } + +- if (s[0] != '\0') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- + return neg ? -duration : duration; + } + +@@ -2996,7 +2977,7 @@ + g_free (priv->location); + g_free (priv->location_alt); + priv->location = g_strdup (location); +- priv->location_alt = g_strdup (uri); ++ priv->location_alt = uri ? g_strdup (uri) : NULL; + } + + /** diff --git a/packages/libmimedir/files/mimedir-write-sequence.patch b/packages/libmimedir/files/mimedir-write-sequence.patch new file mode 100644 index 0000000000..b03c5d9ca7 --- /dev/null +++ b/packages/libmimedir/files/mimedir-write-sequence.patch @@ -0,0 +1,51 @@ +? mimedir/.deps +? mimedir/.libs +? mimedir/libmimedir.la +? mimedir/mimedir-attachment.lo +? mimedir/mimedir-attendee.lo +? mimedir/mimedir-attribute.lo +? mimedir/mimedir-datetime.lo +? mimedir/mimedir-init.lo +? mimedir/mimedir-marshal.lo +? mimedir/mimedir-period.lo +? mimedir/mimedir-profile.lo +? mimedir/mimedir-recurrence.lo +? mimedir/mimedir-utils.lo +? mimedir/mimedir-valarm.lo +? mimedir/mimedir-vcal.lo +? mimedir/mimedir-vcard-address.lo +? mimedir/mimedir-vcard-email.lo +? mimedir/mimedir-vcard-phone.lo +? mimedir/mimedir-vcard.lo +? mimedir/mimedir-vcomponent.lo +? mimedir/mimedir-vevent.lo +? mimedir/mimedir-vfreebusy.lo +? mimedir/mimedir-vjournal.lo +? mimedir/mimedir-vtimezone.lo +? mimedir/mimedir-vtodo.lo +Index: mimedir/mimedir-vcomponent.c +=================================================================== +RCS file: /cvs/gnome/libmimedir/mimedir/mimedir-vcomponent.c,v +retrieving revision 1.28 +diff -B -b -u -r1.28 mimedir-vcomponent.c +--- mimedir/mimedir-vcomponent.c 26 Nov 2005 15:40:20 -0000 1.28 ++++ mimedir/mimedir-vcomponent.c 7 Aug 2006 12:20:01 -0000 +@@ -456,7 +456,7 @@ + _("Sequence"), + _("Sequence number"), + 0, G_MAXINT, 0, +- G_PARAM_READABLE); ++ G_PARAM_READWRITE); + g_object_class_install_property (gobject_class, PROP_SEQ, pspec); + } + +@@ -684,6 +684,9 @@ + g_object_ref (G_OBJECT (priv->last_modified)); + break; + } ++ case PROP_SEQ: ++ priv->sequence = g_value_get_uint (value); ++ break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb new file mode 100644 index 0000000000..14c1209b2e --- /dev/null +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native glib-2.0" +PR = "r0" +DEFAULT_PREFERENCE = "5" +SRCDATE = "20060804" +PV = "0.4.0+cvs${SRCDATE}" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ + file://mimedir-update.patch;patch=1 \ + file://mimedir-write-sequence.patch;patch=1;pnum=0" + +S = "${WORKDIR}/libmimedir" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + +PACKAGES += libmimedir-utils +FILES_libmimedir-utils = "${bindir}" +FILES_${PN} = "${libdir}" diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 33e918b278..502420c30c 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -3,13 +3,15 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native" -PR = "r1" +PR = "r2" #Remove the dash below when 0.3.1 changes in PV PV = "0.3.1+cvs-${SRCDATE}" DEFAULT_PREFERENCE = -1 -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir" +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ + file://mimedir-update.patch;patch=1" + S = "${WORKDIR}/libmimedir" inherit autotools pkgconfig diff --git a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch new file mode 100644 index 0000000000..d2e26a0b36 --- /dev/null +++ b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch @@ -0,0 +1,12 @@ +--- libopie2/opiecore/device/odevice.h 2006-08-06 12:44:20.000000000 +0000 ++++ libopie2/opiecore/device/odevice.h_orig 2006-08-06 12:42:46.000000000 +0000 +@@ -73,8 +73,7 @@ + Model_iPAQ_HX4700 = ( Model_iPAQ | 0x000A ), + Model_Jornada = ( 6 << 16 ), + Model_Jornada_56x = ( Model_Jornada | 0x0001 ), +- Model_Jornada_6xx = ( Model_Jornada | 0x0002 ), +- Model_Jornada_7xx = ( Model_Jornada | 0x0003 ), ++ Model_Jornada_720 = ( Model_Jornada | 0x0002 ), + + Model_Zaurus = ( 2 << 16 ), + diff --git a/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch new file mode 100644 index 0000000000..f3eff64b85 --- /dev/null +++ b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch @@ -0,0 +1,56 @@ +--- libopie2/opiecore/device/odevice_jornada.cpp_orig 2006-08-06 12:36:55.000000000 +0000 ++++ libopie2/opiecore/device/odevice_jornada.cpp 2006-08-06 12:53:45.000000000 +0000 +@@ -125,9 +125,12 @@ + if ( model == "HP Jornada 56x" ) { + d->m_modelstr = "Jornada 56x"; + d->m_model = Model_Jornada_56x; +- } else if ( model == "HP Jornada 720" ) { +- d->m_modelstr = "Jornada 720"; +- d->m_model = Model_Jornada_720; ++ } else if ( model == "HP Jornada 7xx" ) { ++ d->m_modelstr = "Jornada 7xx"; ++ d->m_model = Model_Jornada_7xx; ++ } else if ( model == "HP Jornada 6xx" ) { ++ d->m_modelstr = "Jornada 6xx"; ++ d->m_model = Model_Jornada_6xx; + } + + d->m_rotation = Rot0; //all Jornadas need this rotation +@@ -162,7 +165,9 @@ + { + if ( d->m_model == Model_Jornada_56x ) + return 190; +- else if (d->m_model == Model_Jornada_720 ) ++ else if (d->m_model == Model_Jornada_7xx ) ++ return 255; ++ else if (d->m_model == Model_Jornada_6xx ) + return 255; + else + return 0; +@@ -185,9 +190,10 @@ + cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power"); + else + cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright ); +- } else if ( d->m_model == Model_Jornada_720 ) { ++ } else if ( d->m_model == Model_Jornada_7xx ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/e1356fb/brightness" ).arg( bright ); +- } ++ } else if ( d->m_model == Model_Jornada_6xx ) { ++ cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/hp680-bl/brightness" ).arg( bright ); + + // No Global::shellQuote as we gurantee it to be sane + res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); +@@ -204,9 +210,11 @@ + + if ( d->m_model == Model_Jornada_56x ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" ); +- } else if ( d->m_model == Model_Jornada_720 ) { ++ } else if ( d->m_model == Model_Jornada_7xx ) { + cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/e1356fb/power").arg( on ? "0" : "4" ); +- } ++ } else if ( d->m_model == Model_Jornada_6xx ) { ++ cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/hp680-bl/power").arg( on ? "0" : "4" ); ++ } + + res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); + diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 3f21426e46..220edc215b 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -1,7 +1,9 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ - file://include.pro" + file://include.pro \ + file://odevice.h-jornada-fixup.patch;patch=0 \ + file://odevice_jornada.cpp-fixup.patch;patch=0" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index a7c7e1003c..da84cc40eb 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/libopieobex/libopieobex0_1.2.2.bb b/packages/libopieobex/libopieobex0_1.2.2.bb index f5a2b1bc45..eeaeb7bb70 100644 --- a/packages/libopieobex/libopieobex0_1.2.2.bb +++ b/packages/libopieobex/libopieobex0_1.2.2.bb @@ -1,4 +1,4 @@ -include libopieobex0.inc +require libopieobex0.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index f401f01a3e..e5f1cb8bc9 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,4 +1,4 @@ -include libopieobex0.inc +require libopieobex0.inc PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ diff --git a/packages/libopietooth/libopietooth1_1.2.2.bb b/packages/libopietooth/libopietooth1_1.2.2.bb index 0dc91b2731..f4a23d6349 100644 --- a/packages/libopietooth/libopietooth1_1.2.2.bb +++ b/packages/libopietooth/libopietooth1_1.2.2.bb @@ -1,5 +1,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib" -include libopietooth1.inc +require libopietooth1.inc diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb index 4d1a66acd6..db2d069a96 100644 --- a/packages/libopietooth/libopietooth1_cvs.bb +++ b/packages/libopietooth/libopietooth1_cvs.bb @@ -1,4 +1,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib" PV = "${OPIE_CVS_PV}" -include libopietooth1.inc +require libopietooth1.inc diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb index b03056f08d..231b956678 100644 --- a/packages/libpng/libpng-native_1.2.8.bb +++ b/packages/libpng/libpng-native_1.2.8.bb @@ -1,4 +1,4 @@ -include libpng_${PV}.bb +require libpng_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" DEPENDS = "zlib-native" diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb index 00e5ca859a..890d72b0ef 100644 --- a/packages/libqpe/libqpe-opie_1.2.2.bb +++ b/packages/libqpe/libqpe-opie_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 8b4e74afe7..076e14bc7c 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/libqtaux/libqtaux2_1.2.2.bb b/packages/libqtaux/libqtaux2_1.2.2.bb index aa694d43f1..c05c40f5ae 100644 --- a/packages/libqtaux/libqtaux2_1.2.2.bb +++ b/packages/libqtaux/libqtaux2_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb index 85cd5bdbb3..4813ef3d1d 100644 --- a/packages/libqtaux/libqtaux2_cvs.bb +++ b/packages/libqtaux/libqtaux2_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/libsdl/libsdl-ttf-native_2.0.3.bb b/packages/libsdl/libsdl-ttf-native_2.0.3.bb index ced6862ad7..9786c352b2 100644 --- a/packages/libsdl/libsdl-ttf-native_2.0.3.bb +++ b/packages/libsdl/libsdl-ttf-native_2.0.3.bb @@ -1,4 +1,4 @@ -include libsdl-ttf_${PV}.bb +require libsdl-ttf_${PV}.bb inherit native DEPENDS = "libsdl-native" diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb index 22e404c9d5..81a4990d28 100644 --- a/packages/libtool/libtool-cross_1.5.10.bb +++ b/packages/libtool/libtool-cross_1.5.10.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include libtool_${PV}.bb +require libtool_${PV}.bb PR = "r4" PACKAGES = "" diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb index b95d7f95e9..78e69e06b4 100644 --- a/packages/libtool/libtool-native_1.5.10.bb +++ b/packages/libtool/libtool-native_1.5.10.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include libtool_${PV}.bb +require libtool_${PV}.bb PR = "r4" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb deleted file mode 100644 index 386f266d2d..0000000000 --- a/packages/libvncserver/libvncserver_0.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib jpeg" -LICENSE = "GPL" -PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" -FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ - ${datadir}/fbvncserver/classes/VncViewer.jar" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" - -inherit autotools - -do_stage () { - install -d ${STAGING_INCDIR}/rfb - install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ - rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \ - rfb/default8x16.h ${STAGING_INCDIR}/rfb - - oe_libinstall -a -C libvncclient libvncclient ${STAGING_LIBDIR}/ - oe_libinstall -a libvncserver ${STAGING_LIBDIR}/ -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}/fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ -} diff --git a/packages/libvncserver/libvncserver_0.7.1.bb b/packages/libvncserver/libvncserver_0.7.1.bb deleted file mode 100644 index 80a70e5f57..0000000000 --- a/packages/libvncserver/libvncserver_0.7.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib jpeg" -LICENSE = "GPL" -PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" -FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ - ${datadir}/fbvncserver/classes/VncViewer.jar" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" -# Original SUBDIRS is='libvncserver examples contrib x11vnc vncterm classes libvncclient client_examples test' -EXTRA_OEMAKE_append=" SUBDIRS='libvncserver examples classes'" - -inherit autotools - -do_stage () { - install -d ${STAGING_INCDIR}/rfb - install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ - rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \ - rfb/default8x16.h ${STAGING_INCDIR}/rfb - - oe_libinstall -a -C libvncserver libvncserver ${STAGING_LIBDIR}/ -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}/fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ -} diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb new file mode 100644 index 0000000000..480a888745 --- /dev/null +++ b/packages/libvncserver/libvncserver_0.8.2.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A library to support implementations of RDP/VNC servers" +LICENSE = "GPLv2" +HOMEPAGE = "http://sourceforge.net/projects/libvncserver" +AUTHOR = "Johannes Schindelin <dscho@users.sourceforge.net>" +MAINTAINER = "Patrik Gfeller <gfellerpatrik@gmx.net>" +SECTION = "libs" +PRIORITY = "optional" +PROVIDES = "x11vnc" +DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa" +S = "${WORKDIR}/LibVNCServer-${PV}" + +inherit autotools + +do_stage() { + autotools_stage_all +} + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 examples/storepasswd ${D}${bindir} + install -d ${D}${datadir}/fbvncserver/classes + install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ + install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ +} + +PACKAGES =+ "x11vnc libvncserver-storepasswd libvncserver-javaapplet" +FILES_x11vnc = "${bindir}/x11vnc ${bindir}/LinuxVNC" +FILES_libvncserver-storepasswd = "${bindir}/storepasswd" +FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ + ${datadir}/fbvncserver/classes/VncViewer.jar" diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb deleted file mode 100644 index 944710497f..0000000000 --- a/packages/libvncserver/x11vnc_0.7.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "X11 VNC server" -SECTION = "x11" -PRIORITY = "optional" -DEPENDS = "zlib jpeg virtual/libx11" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" -# Original SUBDIRS is='libvncserver examples contrib vncterm classes libvncclient client_examples test' -EXTRA_OEMAKE_append=" SUBDIRS='libvncserver x11vnc'" - -inherit autotools - -do_install () { - install -d ${D}${bindir} - install -m 0755 x11vnc/x11vnc ${D}${bindir} -} diff --git a/packages/libwpd/libwpd_0.8.6.bb b/packages/libwpd/libwpd_0.8.6.bb new file mode 100644 index 0000000000..9be164437d --- /dev/null +++ b/packages/libwpd/libwpd_0.8.6.bb @@ -0,0 +1,14 @@ +LICENSE = "LGPL" +DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents." +HOMEPAGE = "http://libwpd.sourceforge.net/index.html" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" + + +inherit autotools pkgconfig + + +do_stage() { +autotools_stage_all +} diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb index 7776061757..07d7a95ae1 100644 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb +++ b/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb index e89d2cfa97..bc6443021f 100644 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ b/packages/libxfce4util/libxfce4util_4.2.2.bb @@ -2,6 +2,6 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc PR = "r1" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.2.bb b/packages/libxfcegui4/libxfcegui4_4.2.2.bb index 35b62ae44c..2def53685a 100644 --- a/packages/libxfcegui4/libxfcegui4_4.2.2.bb +++ b/packages/libxfcegui4/libxfcegui4_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/libxfcegui4/libxfcegui4_4.2.3.bb b/packages/libxfcegui4/libxfcegui4_4.2.3.bb index 35b62ae44c..2def53685a 100644 --- a/packages/libxfcegui4/libxfcegui4_4.2.3.bb +++ b/packages/libxfcegui4/libxfcegui4_4.2.3.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/linphone/linphone-1.3.99.8/.mtn2git_empty b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty diff --git a/packages/linphone/linphone-1.3.99.8/conf.patch b/packages/linphone/linphone-1.3.99.8/conf.patch new file mode 100644 index 0000000000..e8fbdf22c8 --- /dev/null +++ b/packages/linphone/linphone-1.3.99.8/conf.patch @@ -0,0 +1,33 @@ +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + dnl localization tools +-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++dnl ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) + dnl Initialize libtool + AC_PROG_LIBTOOL + AM_PROG_LIBTOOL +@@ -62,7 +62,7 @@ + gnome_ui=false + fi + +-CFLAGS="$CFLAGS -I\$(prefix)/include" ++dnl CFLAGS="$CFLAGS -I\$(prefix)/include" + + if test "$gnome_ui" = "true" ; then + +--- a/mediastreamer2/configure.ac ++++ b/mediastreamer2/configure.ac +@@ -47,8 +47,8 @@ + [wall_werror=yes] + ) + +-CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" +-LIBS="$LIBS -L\$(prefix)/lib" ++dnl CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" ++dnl LIBS="$LIBS -L\$(prefix)/lib" + + dnl enable ipv6 support + AC_ARG_ENABLE(ipv6, diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb new file mode 100644 index 0000000000..05998f889d --- /dev/null +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "SIP-based IP phone (Console edition)" +HOMEPAGE = "http://www.linphone.org/?lang=us" +LICENSE = "GPL-2" +DEPENDS = "libosip2 speex libogg alsa-lib readline" +PR = "r0" + +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \ + file://conf.patch;patch=1" + +S = "${WORKDIR}/linphone-${PV}" + +FILES_${PN} += "${datadir}/linphonec" + +inherit autotools + +EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ + --without-sdl --disable-video --enable-alsa \ + --with-osip=${STAGING_DIR}/${HOST_SYS} \ + --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --disable-truespeech --disable-manual \ + --disable-glibtest --disable-glib" + +do_install_append() { + rm -f ${D}${datadir}/sounds/linphone/hello*.wav + rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav +} diff --git a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb index 6061c44db3..a19921afa6 100644 --- a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=24 COLLIE_RAMDISK_SIZE=8 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb index 93e56d5a03..0b518920f7 100644 --- a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=32 COLLIE_RAMDISK_SIZE=0 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb index 66fe16e41c..8ddfdfbead 100644 --- a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=32 COLLIE_RAMDISK_SIZE=32 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb index fb4c892f05..d13c82163b 100644 --- a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=40 COLLIE_RAMDISK_SIZE=24 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb index 29cc546836..fd4b9ac106 100644 --- a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=48 COLLIE_RAMDISK_SIZE=16 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb index 8f42d6b383..da7e8b279b 100644 --- a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -2,7 +2,7 @@ COLLIE_MEMORY_SIZE=58 COLLIE_RAMDISK_SIZE=6 KERNEL_CONSOLE = "tty0" -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb do_deploy() { install -d ${DEPLOY_DIR_IMAGE} diff --git a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb index ce13c7d2d6..3910d0432f 100644 --- a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=58 COLLIE_RAMDISK_SIZE=6 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb index 1aeafb8953..a5f8032932 100644 --- a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,4 +1,4 @@ COLLIE_MEMORY_SIZE=64 COLLIE_RAMDISK_SIZE=0 -include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb index 81e5063b86..5870ed54b9 100644 --- a/packages/linux/corgi-kernel-2.4-embedix.bb +++ b/packages/linux/corgi-kernel-2.4-embedix.bb @@ -1,3 +1,3 @@ MACHINE = "corgi" -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch b/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch new file mode 100644 index 0000000000..2cb7b37da7 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch @@ -0,0 +1,15 @@ +Index: kernel26/arch/arm/mach-pxa/hx4700/Kconfig +=================================================================== +RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/hx4700/Kconfig,v +retrieving revision 1.22 +diff -u -r1.22 Kconfig +--- kernel26/arch/arm/mach-pxa/hx4700/Kconfig 28 Mar 2006 19:12:12 -0000 1.22 ++++ kernel26/arch/arm/mach-pxa/hx4700/Kconfig 6 Aug 2006 23:24:52 -0000 +@@ -2,6 +2,7 @@ + bool "HP iPAQ hx4700" + select PXA27x + select GPIO_KEYS ++ select IWMMXT + help + This enables support for the HP iPAQ hx4700 handheld. + diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 054868864f..0273f1b911 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,17 +3,18 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r0" +PR = "r1" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://defconfig" + file://hx-iwmmxt.patch;patch=1 \ + file://defconfig" S = "${WORKDIR}/kernel26" diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb index 815a30088f..19645079f1 100644 --- a/packages/linux/husky-kernel-2.4-embedix.bb +++ b/packages/linux/husky-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "husky" -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/ixp4xx-kernel_2.6.15.3.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb index f73b388baa..0af2032537 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.3.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb @@ -10,7 +10,7 @@ PR_CONFIG = "0" # applied to the kernel. PR = "r0.${PR_CONFIG}" -include ixp4xx-kernel.inc +require ixp4xx-kernel.inc SRC_URI += "file://defconfig" diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 008c665cfb..b7354755ef 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -10,7 +10,7 @@ PR_CONFIG = "4" # applied to the kernel. PR = "r7.${PR_CONFIG}" -include ixp4xx-kernel.inc +require ixp4xx-kernel.inc SRC_URI += "file://defconfig" diff --git a/packages/linux/ixp4xx-kernel_2.6.17.bb b/packages/linux/ixp4xx-kernel_2.6.17.bb index e3500c2e60..9025cca893 100644 --- a/packages/linux/ixp4xx-kernel_2.6.17.bb +++ b/packages/linux/ixp4xx-kernel_2.6.17.bb @@ -3,14 +3,14 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "2" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. PR = "r2.${PR_CONFIG}" -include ixp4xx-kernel.inc +require ixp4xx-kernel.inc SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/2.6.17/defconfig" diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime index bd6cd586ac..277a2d92d9 100644 --- a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Wed Jul 26 23:35:08 2006 +# Tue Aug 1 11:50:57 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -359,6 +359,7 @@ CONFIG_IRDA=m # IrDA protocols # # CONFIG_IRLAN is not set +# CONFIG_IRNET is not set # CONFIG_IRCOMM is not set # CONFIG_IRDA_ULTRA is not set @@ -407,9 +408,9 @@ CONFIG_BT=m # CONFIG_BT_HCIBLUECARD is not set # CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=m +CONFIG_IEEE80211=y # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_WEP=y CONFIG_IEEE80211_CRYPT_CCMP=m # CONFIG_IEEE80211_CRYPT_TKIP is not set CONFIG_IEEE80211_SOFTMAC=m @@ -423,7 +424,7 @@ CONFIG_WIRELESS_EXT=y # # Generic Driver Options # -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -522,7 +523,7 @@ CONFIG_IDE_SH=y # Network device support # CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set @@ -535,13 +536,28 @@ CONFIG_NETDEVICES=y # # PHY device support # +# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -# CONFIG_NET_ETHERNET is not set -CONFIG_MII=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_STNIC is not set +CONFIG_NET_VENDOR_3COM=y +# CONFIG_EL1 is not set +# CONFIG_EL2 is not set +# CONFIG_EL16 is not set +# CONFIG_EL3 is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set # CONFIG_NE2000 is not set +# CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) @@ -560,40 +576,36 @@ CONFIG_MII=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -CONFIG_ARLAN=m -CONFIG_WAVELAN=m -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set # # Wireless 802.11 Frequency Hopping cards support # -CONFIG_PCMCIA_RAYCS=m +# CONFIG_PCMCIA_RAYCS is not set # # Wireless 802.11b ISA/PCI cards support # -CONFIG_HERMES=m -CONFIG_ATMEL=m +CONFIG_HERMES=y +# CONFIG_ATMEL is not set # # Wireless 802.11b Pcmcia/Cardbus cards support # -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_WL3501=m -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_CS=m +CONFIG_PCMCIA_HERMES=y +# CONFIG_PCMCIA_SPECTRUM is not set +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set CONFIG_NET_WIRELESS=y # @@ -613,8 +625,19 @@ CONFIG_PCMCIA_AXNET=m # Wan interfaces # # CONFIG_WAN is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -646,7 +669,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=640 CONFIG_INPUT_TSDEV_SCREEN_Y=240 -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -673,10 +696,7 @@ CONFIG_TOUCHSCREEN_HP600=y # # Hardware I/O ports # -CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -1094,7 +1114,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set @@ -1107,7 +1127,7 @@ CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_DEFLATE is not set @@ -1126,3 +1146,5 @@ CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m diff --git a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime index 434c5401c7..80342d2d30 100644 --- a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime +++ b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Sat Jul 22 17:21:24 2006 +# Wed Aug 2 13:43:45 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -28,7 +28,7 @@ CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_SYSCTL is not set +CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -520,7 +520,10 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m # CONFIG_PPPOE is not set -# CONFIG_SLIP is not set +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -897,21 +900,21 @@ CONFIG_CRAMFS=y # # Network File Systems # -CONFIG_NFS_FS=m +CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m +CONFIG_NFSD=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set # CONFIG_NFSD_V4 is not set CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m +CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m +CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 4a667b895f..3aa85c1f98 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,4 +1,4 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc PR = "r42" @@ -61,12 +61,12 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1;status=merged \ ${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1;status=merged \ ${RPSRC}/mmc_oops_fix-r1.patch;patch=1;status=merged \ - ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ - ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ - file://00-hostap.patch;patch=1;status=pending \ - file://10-pcnet.patch;patch=1;status=pending \ + ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=merged \ + ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + file://00-hostap.patch;patch=1;status=merged \ + file://10-pcnet.patch;patch=1;status=merged \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r24.patch;patch=1 \ @@ -78,7 +78,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=merged \ ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb index 49e188860e..f8fd9432ec 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -1,4 +1,4 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc PR = "r8" diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 09855ef5c6..bd30de0562 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,4 +1,4 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc PR = "r15" diff --git a/packages/linux/nslu2-kernel_2.6.14-mm1.bb b/packages/linux/nslu2-kernel_2.6.14-mm1.bb index ded1e5930d..dff6b0e4b0 100644 --- a/packages/linux/nslu2-kernel_2.6.14-mm1.bb +++ b/packages/linux/nslu2-kernel_2.6.14-mm1.bb @@ -10,7 +10,7 @@ PR_CONFIG = "0" # applied to the kernel. PR = "r1.${PR_CONFIG}" -include nslu2-kernel.inc +require nslu2-kernel.inc # N2K_PATCHES - full list of patches to apply N2K_PATCHES = "\ diff --git a/packages/linux/nslu2-kernel_2.6.14.5.bb b/packages/linux/nslu2-kernel_2.6.14.5.bb index 823a8b9b1c..b7790be8be 100644 --- a/packages/linux/nslu2-kernel_2.6.14.5.bb +++ b/packages/linux/nslu2-kernel_2.6.14.5.bb @@ -10,7 +10,7 @@ PR_CONFIG = "0" # applied to the kernel. PR = "r0.${PR_CONFIG}" -include nslu2-kernel.inc +require nslu2-kernel.inc # N2K_PATCHES - full list of patches to apply N2K_PATCHES = "\ diff --git a/packages/linux/nslu2-kernel_2.6.15.bb b/packages/linux/nslu2-kernel_2.6.15.bb index 69f545b78a..68b2b56f1a 100644 --- a/packages/linux/nslu2-kernel_2.6.15.bb +++ b/packages/linux/nslu2-kernel_2.6.15.bb @@ -10,7 +10,7 @@ PR_CONFIG = "0" # applied to the kernel. PR = "r3.${PR_CONFIG}" -include nslu2-kernel.inc +require nslu2-kernel.inc # N2K_PATCHES - full list of patches to apply N2K_PATCHES = "\ diff --git a/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb index fb12c70b59..aab783407e 100644 --- a/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb @@ -1,5 +1,5 @@ SECTION = "kernel" -include opensimpad_${PV}.bb +require opensimpad_${PV}.bb SIMPAD_MEM = "64" SIMPAD_RD = "0" diff --git a/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb index 5bd4c85483..65c5a92621 100644 --- a/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb @@ -3,7 +3,7 @@ # PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0" SECTION = "kernel" -include opensimpad_${PV}.bb +require opensimpad_${PV}.bb # fraction of the memory (in Mb) used for RAM SIMPAD_MEM = "64" diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb index 303604f074..e94183aa57 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb @@ -1,2 +1,2 @@ -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb index 28fa7cc84a..37845c4c96 100644 --- a/packages/linux/poodle-kernel-2.4-embedix.bb +++ b/packages/linux/poodle-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "poodle" -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb index 613f785fb6..2b58472185 100644 --- a/packages/linux/poodle255-kernel-2.4-embedix.bb +++ b/packages/linux/poodle255-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "poodle255" -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb index bca9245715..e86996d96f 100644 --- a/packages/linux/shepherd-kernel-2.4-embedix.bb +++ b/packages/linux/shepherd-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "shepherd" -include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 6ecfd7d0f2..d9c7f4ed68 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "kernel" -include nslu2-linksys-kernel_2.4.22.bb +require nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" diff --git a/packages/lirc/lirc-modules_0.8.0.bb b/packages/lirc/lirc-modules_0.8.0.bb index 563720a892..d3a2b3d451 100644 --- a/packages/lirc/lirc-modules_0.8.0.bb +++ b/packages/lirc/lirc-modules_0.8.0.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/lirc-${PV}" inherit autotools module -include lirc-config.inc +require lirc-config.inc MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e' -C drivers" diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb index 5044c69c6e..214ae5c60a 100644 --- a/packages/lirc/lirc_0.8.0.bb +++ b/packages/lirc/lirc_0.8.0.bb @@ -32,7 +32,7 @@ INITSCRIPT_PARAMS = "defaults 20" INITSCRIPT_NAME_lirc-exec = "lircexec" INITSCRIPT_PARAMS_lirc-exec = "defaults 21" -include lirc-config.inc +require lirc-config.inc EXTRA_OEMAKE = 'SUBDIRS="daemons tools"' diff --git a/packages/lua/lua-native_5.0.2.bb b/packages/lua/lua-native_5.0.2.bb index 16ae4290c8..bf70f84ac0 100644 --- a/packages/lua/lua-native_5.0.2.bb +++ b/packages/lua/lua-native_5.0.2.bb @@ -1,4 +1,4 @@ -include lua.inc +require lua.inc PR = "r2" DEPENDS += "readline-native" @@ -11,5 +11,5 @@ S = "${WORKDIR}/lua-${PV}" FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files" inherit native -include lua-build.inc +require lua-build.inc diff --git a/packages/lua/lua_5.0.2.bb b/packages/lua/lua_5.0.2.bb index 570659af97..6dbb656166 100644 --- a/packages/lua/lua_5.0.2.bb +++ b/packages/lua/lua_5.0.2.bb @@ -1,4 +1,4 @@ -include lua.inc +require lua.inc DEPENDS += "readline" PR = "r3" @@ -10,5 +10,5 @@ SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ S = "${WORKDIR}/lua-${PV}" FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files" -include lua-build.inc +require lua-build.inc inherit binconfig diff --git a/packages/m4/m4-native_1.4.2.bb b/packages/m4/m4-native_1.4.2.bb index 67fe36c7a1..8beb8748e3 100644 --- a/packages/m4/m4-native_1.4.2.bb +++ b/packages/m4/m4-native_1.4.2.bb @@ -1,4 +1,4 @@ -include m4_${PV}.bb +require m4_${PV}.bb inherit native diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb index 78966bdb40..84af37257d 100644 --- a/packages/madwifi/madwifi-ng_r1527-20060425.bb +++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb @@ -1,2 +1,2 @@ -include madwifi-ng_r.inc +require madwifi-ng_r.inc PR="r0" diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb index 78966bdb40..84af37257d 100644 --- a/packages/madwifi/madwifi-ng_r1692-20060723.bb +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -1,2 +1,2 @@ -include madwifi-ng_r.inc +require madwifi-ng_r.inc PR="r0" diff --git a/packages/make/make-native_3.80.bb b/packages/make/make-native_3.80.bb index 8541c48927..e930740d5b 100644 --- a/packages/make/make-native_3.80.bb +++ b/packages/make/make-native_3.80.bb @@ -1,4 +1,4 @@ -include make_${PV}.bb +require make_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}" S = "${WORKDIR}/make-${PV}" diff --git a/packages/makedevs/makedevs-native_1.0.0.bb b/packages/makedevs/makedevs-native_1.0.0.bb index 1a79403550..28544e12f2 100644 --- a/packages/makedevs/makedevs-native_1.0.0.bb +++ b/packages/makedevs/makedevs-native_1.0.0.bb @@ -1,5 +1,5 @@ SECTION = "base" -include makedevs_${PV}.bb +require makedevs_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/makedevs-${PV}" diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 8be2174daf..de77f5f381 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,4 +1,4 @@ -include matchbox-panel.inc +require matchbox-panel.inc PR="r12" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb index f99b818cb3..a2cad8ac06 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -1,4 +1,4 @@ -include matchbox-panel.inc +require matchbox-panel.inc DEFAULT_PREFERENCE = "-1" PR="r0" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb index d12712f429..98b770406b 100644 --- a/packages/matchbox-panel/matchbox-panel_svn.bb +++ b/packages/matchbox-panel/matchbox-panel_svn.bb @@ -1,4 +1,4 @@ -include matchbox-panel.inc +require matchbox-panel.inc PV = "0.9.2+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb new file mode 100644 index 0000000000..8e28d0c041 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -0,0 +1,33 @@ +SECTION = "x11/wm" +DESCRIPTION = "Matchbox window manager" +LICENSE = "GPL" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +RDEPENDS = "matchbox-common" +PR="r0" + + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ + file://kbdconfig" + +S = "${WORKDIR}/matchbox-window-manager-${PV}" + +inherit autotools pkgconfig update-alternatives + +FILES_${PN} = "${bindir} \ + ${datadir}/matchbox \ + ${sysconfdir}/matchbox \ + ${datadir}/themes/blondie/matchbox \ + ${datadir}/themes/Default/matchbox \ + ${datadir}/themes/MBOpus/matchbox" + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PRIORITY = "10" + +EXTRA_OECONF = " --enable-startup-notification --disable-xrm" + +do_install_prepend() { + install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig +} + diff --git a/packages/mathomatic/mathomatic_12.4.2.bb b/packages/mathomatic/mathomatic_12.4.2.bb index c5c700c498..33e63feda9 100644 --- a/packages/mathomatic/mathomatic_12.4.2.bb +++ b/packages/mathomatic/mathomatic_12.4.2.bb @@ -1,3 +1,3 @@ -include mathomatic.inc +require mathomatic.inc SRC_URI = "http://www.panix.com/~gesslein/mathomatic-${PV}.tgz" diff --git a/packages/mathomatic/mathomatic_unstable.bb b/packages/mathomatic/mathomatic_unstable.bb index 544e0ef1c6..9e327680b2 100644 --- a/packages/mathomatic/mathomatic_unstable.bb +++ b/packages/mathomatic/mathomatic_unstable.bb @@ -1,4 +1,4 @@ -include mathomatic.inc +require mathomatic.inc SRC_URI = "http://www.panix.com/~gesslein/am.tgz" S = "${WORKDIR}/mathomatic-12.4.2" diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb index 9fa79120b7..3519f91c37 100644 --- a/packages/mdadm/mdadm_1.12.0.bb +++ b/packages/mdadm/mdadm_1.12.0.bb @@ -1,4 +1,4 @@ -include mdadm.inc +require mdadm.inc PR = "r3" SRC_URI += " file://build_flags.patch;patch=1 " diff --git a/packages/mesa/mesa_6.0.1.bb b/packages/mesa/mesa_6.0.1.bb index be63a32190..d8c857fef7 100644 --- a/packages/mesa/mesa_6.0.1.bb +++ b/packages/mesa/mesa_6.0.1.bb @@ -14,12 +14,12 @@ do_compile() { do_install() { install -d ${D}${libdir} - cp -pd lib/* ${D}${libdir}/ + cp -pP lib/* ${D}${libdir}/ install -d ${D}${includedir} - cp -r include/GL ${D}${includedir}/ + cp -R include/GL ${D}${includedir}/ } do_stage() { - cp -pd lib/* ${STAGING_LIBDIR}/ - cp -r include/GL ${STAGING_INCDIR}/ + cp -pP lib/* ${STAGING_LIBDIR}/ + cp -R include/GL ${STAGING_INCDIR}/ } diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index c39dc02d97..aca9331e00 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -34,12 +34,12 @@ do_compile() { do_install() { install -d ${D}${libdir} - cp -pd lib/* ${D}${libdir}/ + cp -pP lib/* ${D}${libdir}/ install -d ${D}${includedir} - cp -r include/GL ${D}${includedir}/ + cp -R include/GL ${D}${includedir}/ } do_stage() { - cp -pd lib/* ${STAGING_LIBDIR}/ - cp -r include/GL ${STAGING_INCDIR}/ + cp -pP lib/* ${STAGING_LIBDIR}/ + cp -R include/GL ${STAGING_INCDIR}/ } diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f729c7f22b..db8e87e6ea 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r6" +PR = "r10" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -61,6 +61,7 @@ SLUGOS_PACKAGES = "\ findutils \ flac \ flex \ + flite \ ftpd-topfield \ gawk \ gcc \ @@ -95,16 +96,19 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ + linphone \ lirc \ lrzsz \ lsof \ lvm2 \ m4 \ + madplay \ madwifi-ng \ mailx \ make \ masqmail \ mdadm \ + memtester \ mgetty \ miau \ microcom \ @@ -176,7 +180,6 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ irssi \ - memtester \ obexftp \ qc-usb-messenger \ unionfs-modules \ diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index fc8b461945..9e6bcd6eee 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -include module-init-tools_${PV}.bb +require module-init-tools_${PV}.bb inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb index 834f13adbd..23c9c755f4 100644 --- a/packages/modutils/modutils-cross_2.4.27.bb +++ b/packages/modutils/modutils-cross_2.4.27.bb @@ -1,5 +1,5 @@ SECTION = "base" -include modutils_${PV}.bb +require modutils_${PV}.bb PR = "r8" inherit cross S = "${WORKDIR}/modutils-${PV}" diff --git a/packages/mono/mono-native_1.0.bb b/packages/mono/mono-native_1.0.bb index f2c94eae06..c0e649faee 100644 --- a/packages/mono/mono-native_1.0.bb +++ b/packages/mono/mono-native_1.0.bb @@ -1,5 +1,5 @@ SECTION = "unknown" -include mono_${PV}.bb +require mono_${PV}.bb S = "${WORKDIR}/mono-${PV}" DEPENDS = "glib-2.0-native" diff --git a/packages/monotone/monotone-4_0.19.bb b/packages/monotone/monotone-4_0.19.bb index 3a7914a735..402d57db37 100644 --- a/packages/monotone/monotone-4_0.19.bb +++ b/packages/monotone/monotone-4_0.19.bb @@ -1,4 +1,4 @@ -include monotone.inc +require monotone.inc SUBV = "1" PR = "r0" diff --git a/packages/monotone/monotone-5_0.20.bb b/packages/monotone/monotone-5_0.20.bb index 3a61df634f..bee2269767 100644 --- a/packages/monotone/monotone-5_0.20.bb +++ b/packages/monotone/monotone-5_0.20.bb @@ -1,4 +1,4 @@ -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/monotone/monotone-5_0.21.bb b/packages/monotone/monotone-5_0.21.bb index ec31e22bfb..447614b92f 100644 --- a/packages/monotone/monotone-5_0.21.bb +++ b/packages/monotone/monotone-5_0.21.bb @@ -1,4 +1,4 @@ -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/monotone/monotone-5_0.22.bb b/packages/monotone/monotone-5_0.22.bb index 62eb2472f2..9ce745d04f 100644 --- a/packages/monotone/monotone-5_0.22.bb +++ b/packages/monotone/monotone-5_0.22.bb @@ -3,7 +3,7 @@ #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/monotone/monotone-5_0.23.bb b/packages/monotone/monotone-5_0.23.bb index 198d2acfec..2f0aab1077 100644 --- a/packages/monotone/monotone-5_0.23.bb +++ b/packages/monotone/monotone-5_0.23.bb @@ -3,7 +3,7 @@ #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/monotone/monotone-5_0.24.bb b/packages/monotone/monotone-5_0.24.bb index 198d2acfec..2f0aab1077 100644 --- a/packages/monotone/monotone-5_0.24.bb +++ b/packages/monotone/monotone-5_0.24.bb @@ -3,7 +3,7 @@ #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/monotone/monotone-5_0.25.2.bb b/packages/monotone/monotone-5_0.25.2.bb index cf8799261b..b5d6a376c1 100644 --- a/packages/monotone/monotone-5_0.25.2.bb +++ b/packages/monotone/monotone-5_0.25.2.bb @@ -3,7 +3,7 @@ #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -include monotone.inc +require monotone.inc PR = "r0" diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb index 668c9a6aeb..3a82dafd92 100644 --- a/packages/mozilla/firefox_1.0.7.bb +++ b/packages/mozilla/firefox_1.0.7.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/mozilla" inherit mozilla -include firefox.inc +require firefox.inc do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ diff --git a/packages/mozilla/firefox_1.5.0.1.bb b/packages/mozilla/firefox_1.5.0.1.bb index 95c9509b69..8f888db5ca 100644 --- a/packages/mozilla/firefox_1.5.0.1.bb +++ b/packages/mozilla/firefox_1.5.0.1.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" inherit mozilla -include firefox.inc +require firefox.inc do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index b2a0c8db4e..93cdc856d1 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -21,7 +21,7 @@ export MOZ_CO_PROJECT="minimo" export MINIMO=1 export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}" -include mozilla-cvs.inc +require mozilla-cvs.inc do_compile () { mozilla_do_compile @@ -34,7 +34,7 @@ do_install () { oe_runmake package cd ${S} mkdir -p ${mozdir} - cp -rL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/ + cp -RL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/ mkdir -p ${D}${datadir}/applications install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop mkdir -p ${D}${datadir}/pixmaps diff --git a/packages/mpfr/mpfr-native_2.1.1.bb b/packages/mpfr/mpfr-native_2.1.1.bb index 119249895d..01ba37c8bf 100644 --- a/packages/mpfr/mpfr-native_2.1.1.bb +++ b/packages/mpfr/mpfr-native_2.1.1.bb @@ -1,4 +1,4 @@ -include mpfr_${PV}.bb +require mpfr_${PV}.bb inherit native DEPENDS = "gmp-native" diff --git a/packages/mt-daapd/mt-daapd_0.2.1.1.bb b/packages/mt-daapd/mt-daapd_0.2.1.1.bb index 507c2dd60c..45256799aa 100644 --- a/packages/mt-daapd/mt-daapd_0.2.1.1.bb +++ b/packages/mt-daapd/mt-daapd_0.2.1.1.bb @@ -1,3 +1,3 @@ -include ${PN}.inc +require ${PN}.inc PR = "r3" SRC_URI += "file://itunes-5-fix.patch;patch=1" diff --git a/packages/mt-daapd/mt-daapd_0.2.2.bb b/packages/mt-daapd/mt-daapd_0.2.2.bb index cf844cd010..d333aab19b 100644 --- a/packages/mt-daapd/mt-daapd_0.2.2.bb +++ b/packages/mt-daapd/mt-daapd_0.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # This has not been released yet! DEFAULT_PREFERENCE = -1 PR = "r0" diff --git a/packages/mt-daapd/mt-daapd_0.2.3.bb b/packages/mt-daapd/mt-daapd_0.2.3.bb index b34a2bb2f6..a376c76229 100644 --- a/packages/mt-daapd/mt-daapd_0.2.3.bb +++ b/packages/mt-daapd/mt-daapd_0.2.3.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # This has not been released yet! #DEFAULT_PREFERENCE = -1 PR = "r0" diff --git a/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb index cd1fb7d11b..ac060ecef2 100644 --- a/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb +++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2" SECTION = "base" -include mtd-utils_${PV}.bb +require mtd-utils_${PV}.bb inherit native DEPENDS = "zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils" diff --git a/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb index cd1fb7d11b..ac060ecef2 100644 --- a/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb +++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2" SECTION = "base" -include mtd-utils_${PV}.bb +require mtd-utils_${PV}.bb inherit native DEPENDS = "zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils" diff --git a/packages/mtools/mtools-native_3.9.9.bb b/packages/mtools/mtools-native_3.9.9.bb index 4fdd36d740..16a0c37f7c 100644 --- a/packages/mtools/mtools-native_3.9.9.bb +++ b/packages/mtools/mtools-native_3.9.9.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include mtools_${PV}.bb +require mtools_${PV}.bb S="${WORKDIR}/mtools-${PV}" inherit autotools native diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb index c871a8f9da..ebef572fbb 100644 --- a/packages/mysql/mysql-native_4.1.18.bb +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include mysql_${PV}.bb +require mysql_${PV}.bb inherit native PACKAGES = "" diff --git a/packages/nasm/nasm-native_0.98.38.bb b/packages/nasm/nasm-native_0.98.38.bb index a0a11452c8..2b3672ca83 100644 --- a/packages/nasm/nasm-native_0.98.38.bb +++ b/packages/nasm/nasm-native_0.98.38.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include nasm_${PV}.bb +require nasm_${PV}.bb S = "${WORKDIR}/nasm-${PV}" inherit native diff --git a/packages/ncurses/ncurses-native_5.4.bb b/packages/ncurses/ncurses-native_5.4.bb index 26d0897c9f..19e379a15c 100644 --- a/packages/ncurses/ncurses-native_5.4.bb +++ b/packages/ncurses/ncurses-native_5.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include ncurses_${PV}.bb +require ncurses_${PV}.bb inherit native EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' DEPENDS = "" diff --git a/packages/ncurses/ncurses_5.3.bb b/packages/ncurses/ncurses_5.3.bb index fb56af9723..e023017f1a 100644 --- a/packages/ncurses/ncurses_5.3.bb +++ b/packages/ncurses/ncurses_5.3.bb @@ -8,4 +8,4 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${BaseV}.tar.gz \ file://configure.patch;patch=1" S = "${WORKDIR}/ncurses-${BaseV}" -include ncurses.inc +require ncurses.inc diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 5b03eaaeed..63272b4779 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -4,4 +4,4 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" S = "${WORKDIR}/ncurses-${PV}" -include ncurses.inc +require ncurses.inc diff --git a/packages/netkit-rpc/netkit-rpc-native_0.17.bb b/packages/netkit-rpc/netkit-rpc-native_0.17.bb index bc17d40ef7..524d20bf47 100644 --- a/packages/netkit-rpc/netkit-rpc-native_0.17.bb +++ b/packages/netkit-rpc/netkit-rpc-native_0.17.bb @@ -1,4 +1,4 @@ -include netkit-rpc_${PV}.bb +require netkit-rpc_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/netkit-rpc-${PV}:${FILE_DIRNAME}/netkit-rpc:${FILE_DIRNAME}/files:${FILE_DIRNAME}" diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb index 4db798c151..ddbc41a688 100644 --- a/packages/nis/pwdutils_2.6.bb +++ b/packages/nis/pwdutils_2.6.bb @@ -10,7 +10,7 @@ information stored in local files, NIS, NIS+ or LDAP \ and can replace the shadow suite completely." HOMEPAGE="http://lists.suse.com/archive/pwdutils/" -include nis.inc +require nis.inc SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" diff --git a/packages/nis/yp-tools_2.9.bb b/packages/nis/yp-tools_2.9.bb index dda6f7f4de..ddf7ed2c8d 100644 --- a/packages/nis/yp-tools_2.9.bb +++ b/packages/nis/yp-tools_2.9.bb @@ -8,4 +8,4 @@ This package contains ypcat, ypmatch, ypset, \ ypwhich, yppasswd, domainname, nisdomainname \ and ypdomainname." -include nis.inc +require nis.inc diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index fb6b0b3621..b544009e22 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -14,7 +14,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first." HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" -include nis.inc +require nis.inc SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" diff --git a/packages/nis/ypbind-mt_1.19.bb b/packages/nis/ypbind-mt_1.19.bb index e58daa6670..aee0864937 100644 --- a/packages/nis/ypbind-mt_1.19.bb +++ b/packages/nis/ypbind-mt_1.19.bb @@ -14,7 +14,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first." HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" -include nis.inc +require nis.inc # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb index c6c564bd50..f887c808c9 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -5,7 +5,7 @@ PR = "r0" DESCRIPTION="NIS version 2 server for Linux." HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" -include nis.inc +require nis.inc SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" diff --git a/packages/nonworking/gutenprint/.mtn2git_empty b/packages/nonworking/gutenprint/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/gutenprint/.mtn2git_empty diff --git a/packages/nonworking/gutenprint/gutenprint_5.0.0.bb b/packages/nonworking/gutenprint/gutenprint_5.0.0.bb new file mode 100644 index 0000000000..5a0de7797f --- /dev/null +++ b/packages/nonworking/gutenprint/gutenprint_5.0.0.bb @@ -0,0 +1,22 @@ + + + +DEPENDS = "glib-2.0 gtk+ cups" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/gimp-print/${P}.tar.bz2" + +EXTRA_OECONF = "\ + --disable-gtktest \ + --disable-libgutenprintui \ + --enable-libgutenprintui2 \ + --enable-translated-cups-ppds \ + --disable-gimptest \ + " + +do_configure() { + oe_runconf +} + + diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb index eb314cdf40..4e499ea4b7 100644 --- a/packages/ntp/ntp-ssl_4.1.2.bb +++ b/packages/ntp/ntp-ssl_4.1.2.bb @@ -1,4 +1,4 @@ -include ntp_4.1.2.bb +require ntp_4.1.2.bb DEPENDS = "openssl" PR = "r2" diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb index f8f80b29aa..dd83eec800 100644 --- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb +++ b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb @@ -2,7 +2,7 @@ # Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -include nvidia-drivers.inc +require nvidia-drivers.inc PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" @@ -30,13 +30,13 @@ do_install() { install -d ${D}/usr for dir in bin include lib share ; do - cp -a ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/ + cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/ done #X11R7.0 style... install -d ${D}/usr/lib/xorg/ cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/ - cp -a ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/ + cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/ ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so } diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb index 09d0aae39f..42b928f38a 100644 --- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb +++ b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb @@ -2,7 +2,7 @@ # Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -include nvidia-drivers.inc +require nvidia-drivers.inc PKG_BASENAME="NFORCE-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" @@ -59,7 +59,7 @@ do_install() { install -d ${D}/usr for dir in usr/bin nvsound/lib ; do - cp -a ${S}/$dir ${D}/usr/ + cp -pPR ${S}/$dir ${D}/usr/ done } diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb index 64840797cd..aea07aaa79 100644 --- a/packages/obexpush/obexpush-native_1.0.0.bb +++ b/packages/obexpush/obexpush-native_1.0.0.bb @@ -1,4 +1,4 @@ -include obexpush_${PV}.bb +require obexpush_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}" diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb index 4f4f70cbe3..9722ca7d8d 100644 --- a/packages/olsrd/olsrd_0.4.10.bb +++ b/packages/olsrd/olsrd_0.4.10.bb @@ -1,2 +1,2 @@ -include olsrd.inc +require olsrd.inc PR = "r1" diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb index 80e790d3df..1f186f4bbb 100644 --- a/packages/olsrd/olsrd_0.4.9.bb +++ b/packages/olsrd/olsrd_0.4.9.bb @@ -1,4 +1,4 @@ -include olsrd.inc +require olsrd.inc PR = "r2" SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1" diff --git a/packages/openssh/openssh-4.3p2/.mtn2git_empty b/packages/openssh/openssh-4.3p2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openssh/openssh-4.3p2/.mtn2git_empty diff --git a/packages/openssh/openssh-4.3p2/ssh_config b/packages/openssh/openssh-4.3p2/ssh_config new file mode 100644 index 0000000000..25ca7f56bd --- /dev/null +++ b/packages/openssh/openssh-4.3p2/ssh_config @@ -0,0 +1,38 @@ +# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for various options + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsAuthentication no +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# BatchMode no +# CheckHostIP yes +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# EscapeChar ~ +Host * + ForwardX11 yes diff --git a/packages/openssh/openssh-4.3p2/sshd_config b/packages/openssh/openssh-4.3p2/sshd_config new file mode 100644 index 0000000000..8c1069d9a6 --- /dev/null +++ b/packages/openssh/openssh-4.3p2/sshd_config @@ -0,0 +1,96 @@ +# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +Protocol 2 +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 3600 +#ServerKeyBits 768 + +# Logging +#obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 120 +#PermitRootLogin yes +#StrictModes yes + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# rhosts authentication should not be used +#RhostsAuthentication no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes + +#AFSTokenPassing no + +# Kerberos TGT Passing only works with the AFS kaserver +#KerberosTgtPassing no + +# Set this to 'yes' to enable PAM keyboard-interactive authentication +# Warning: enabling this may bypass the setting of 'PasswordAuthentication' +#PAMAuthenticationViaKbdInt no + +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#KeepAlive yes +#UseLogin no +UsePrivilegeSeparation yes +#PermitUserEnvironment no +Compression no + +#MaxStartups 10 +# no default banner path +#Banner /some/path +#VerifyReverseMapping no + +ClientAliveInterval 15 +ClientAliveCountMax 4 + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb new file mode 100644 index 0000000000..36924c5a4a --- /dev/null +++ b/packages/openssh/openssh_4.3p2.bb @@ -0,0 +1,108 @@ +DEPENDS = "zlib openssl" + +RCONFLICTS_openssh = "dropbear" +RCONFLICTS_openssh-sshd = "dropbear" + +SECTION = "console/network" +DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ +Ssh (Secure Shell) is a program for logging into a remote machine \ +and for executing commands on a remote machine. \ +It provides secure encrypted communications between two untrusted \ +hosts over an insecure network. X11 connections and arbitrary TCP/IP \ +ports can also be forwarded over the secure channel. \ +It is intended as a replacement for rlogin, rsh and rcp, and can be \ +used to provide applications with a secure communication channel." +HOMEPAGE = "http://www.openssh.org/" +LICENSE = "BSD" +MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +PR = "r0" + +SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ + file://sshd_config \ + file://ssh_config \ + file://init" + +inherit autotools + +export ASKPASS_PROGRAM = "${bindir}/ssh-askpass" +export LD = "${CC}" +CFLAGS_prepend = "-I${S} " +CFLAGS_append = " -D__FILE_OFFSET_BITS=64" +LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " +EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ + --with-rand-helper=no --without-pam \ + --without-zlib-version-check \ + --with-privsep-path=/var/run/sshd \ + --sysconfdir=${sysconfdir}/ssh \ + --with-xauth=/usr/bin/xauth" + +EXTRA_OEMAKE = "'STRIP_OPT='" + +do_configure_prepend () { + if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_compile_append () { + install -m 0644 ${WORKDIR}/sshd_config ${S}/ + install -m 0644 ${WORKDIR}/ssh_config ${S}/ +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh +} + +PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" +FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" +FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" +FILES_openssh-misc = "${bindir} ${libdir}exec/" +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd" +DEPENDS_openssh-sshd += " update-rc.d" +RDEPENDS_openssh-sshd += " update-rc.d" + +pkg_postinst_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + addgroup sshd + adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd + update-rc.d sshd defaults 9 +fi +} + +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + +pkg_postrm_openssh-ssh() { + update-alternatives --remove ${bindir}/ssh ssh.${PN} +} + +pkg_postrm_openssh-scp() { + update-alternatives --remove ${bindir}/scp scp.${PN} +} + +pkg_postrm_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + ${sysconfdir}/init.d/sshd stop + deluser sshd + delgroup sshd + update-rc.d -f sshd remove +fi +} + +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb index 6493ddd090..90d31c6a12 100644 --- a/packages/openssl/openssl_0.9.7e.bb +++ b/packages/openssl/openssl_0.9.7e.bb @@ -1,4 +1,4 @@ -include openssl.inc +require openssl.inc PR = "r3" diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb index 88f474efb7..45fcabea04 100644 --- a/packages/openssl/openssl_0.9.7g.bb +++ b/packages/openssl/openssl_0.9.7g.bb @@ -1,6 +1,6 @@ inherit pkgconfig -include openssl.inc +require openssl.inc PR = "r1" diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb index 65cb96a6e1..63acae328e 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet" diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb index fb4bf05e8a..668697dd6b 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-addressbook/opie-addressbook_1.2.2.bb b/packages/opie-addressbook/opie-addressbook_1.2.2.bb index a8bf6f7e5a..e32ef1b348 100644 --- a/packages/opie-addressbook/opie-addressbook_1.2.2.bb +++ b/packages/opie-addressbook/opie-addressbook_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb index fe99e83d5e..f0db7f32fc 100644 --- a/packages/opie-addressbook/opie-addressbook_cvs.bb +++ b/packages/opie-addressbook/opie-addressbook_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb index 8a4cc0ebc5..eb2011e5f3 100644 --- a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb +++ b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb index b552bf6152..2d365c68a6 100644 --- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb +++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-alarm/opie-alarm_1.2.2.bb b/packages/opie-alarm/opie-alarm_1.2.2.bb index ada72aea1b..7ae0b195a9 100644 --- a/packages/opie-alarm/opie-alarm_1.2.2.bb +++ b/packages/opie-alarm/opie-alarm_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb index e44a4c7049..22b8f92bbd 100644 --- a/packages/opie-alarm/opie-alarm_cvs.bb +++ b/packages/opie-alarm/opie-alarm_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-appearance/opie-appearance_1.2.2.bb b/packages/opie-appearance/opie-appearance_1.2.2.bb index 7b154b7422..e8c3ada524 100644 --- a/packages/opie-appearance/opie-appearance_1.2.2.bb +++ b/packages/opie-appearance/opie-appearance_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb index de78ccb83a..db634523f8 100644 --- a/packages/opie-appearance/opie-appearance_cvs.bb +++ b/packages/opie-appearance/opie-appearance_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb index 17a7683cef..7eff025ffc 100644 --- a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb +++ b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb index 0316ba2aeb..cbbdc6d306 100644 --- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb +++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb index f1b992d7c8..cc37c5e1bd 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb index 52a63b4135..d8a3b4a0a8 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-backgammon/opie-backgammon_1.2.2.bb b/packages/opie-backgammon/opie-backgammon_1.2.2.bb index 0cae5c2a10..892ed19759 100644 --- a/packages/opie-backgammon/opie-backgammon_1.2.2.bb +++ b/packages/opie-backgammon/opie-backgammon_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb index 8cc6e52bfd..d532ac1478 100644 --- a/packages/opie-backgammon/opie-backgammon_cvs.bb +++ b/packages/opie-backgammon/opie-backgammon_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-backup/opie-backup_1.2.2.bb b/packages/opie-backup/opie-backup_1.2.2.bb index 597fc577b8..2714fd812b 100644 --- a/packages/opie-backup/opie-backup_1.2.2.bb +++ b/packages/opie-backup/opie-backup_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \ diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb index b609b09b07..59d32bf8cd 100644 --- a/packages/opie-backup/opie-backup_cvs.bb +++ b/packages/opie-backup/opie-backup_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-bartender/opie-bartender_1.2.2.bb b/packages/opie-bartender/opie-bartender_1.2.2.bb index 40c46f0070..d91e2179bd 100644 --- a/packages/opie-bartender/opie-bartender_1.2.2.bb +++ b/packages/opie-bartender/opie-bartender_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb index 79cc45e64c..c7ab8583fa 100644 --- a/packages/opie-bartender/opie-bartender_cvs.bb +++ b/packages/opie-bartender/opie-bartender_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb index f8136964fc..38dd461cff 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \ diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb index 8f109df1cc..74041194c3 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-bluepin/opie-bluepin_1.2.2.bb b/packages/opie-bluepin/opie-bluepin_1.2.2.bb index fdfdffa0a5..1ea1deef96 100644 --- a/packages/opie-bluepin/opie-bluepin_1.2.2.bb +++ b/packages/opie-bluepin/opie-bluepin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb index d29e0a0db3..c4083ec846 100644 --- a/packages/opie-bluepin/opie-bluepin_cvs.bb +++ b/packages/opie-bluepin/opie-bluepin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb index 43d21d82db..c75a50a9e5 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index aab0257453..9387c04409 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb index 3232b06c61..6a27b53101 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb index 7ff2ac0f64..cd58cfc6c3 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \ diff --git a/packages/opie-bounce/opie-bounce_1.2.2.bb b/packages/opie-bounce/opie-bounce_1.2.2.bb index 3c49e91391..f3e587b59a 100644 --- a/packages/opie-bounce/opie-bounce_1.2.2.bb +++ b/packages/opie-bounce/opie-bounce_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb index 500931029f..c50e1adba6 100644 --- a/packages/opie-bounce/opie-bounce_cvs.bb +++ b/packages/opie-bounce/opie-bounce_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb index 854ebd07fa..2d573375ec 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb index 2a34e2534a..511df2f502 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-button-settings/opie-button-settings_1.2.2.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb index 576eba1dba..0458a28ba8 100644 --- a/packages/opie-button-settings/opie-button-settings_1.2.2.bb +++ b/packages/opie-button-settings/opie-button-settings_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \ diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb index 31afa66235..cd77a862fb 100644 --- a/packages/opie-button-settings/opie-button-settings_cvs.bb +++ b/packages/opie-button-settings/opie-button-settings_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-buzzword/opie-buzzword_1.2.2.bb b/packages/opie-buzzword/opie-buzzword_1.2.2.bb index f87d0bbf1f..d1560d811e 100644 --- a/packages/opie-buzzword/opie-buzzword_1.2.2.bb +++ b/packages/opie-buzzword/opie-buzzword_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb index 751643df29..e35f855098 100644 --- a/packages/opie-buzzword/opie-buzzword_cvs.bb +++ b/packages/opie-buzzword/opie-buzzword_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-calculator/opie-calculator_1.2.2.bb b/packages/opie-calculator/opie-calculator_1.2.2.bb index 984765fe89..90e81e787a 100644 --- a/packages/opie-calculator/opie-calculator_1.2.2.bb +++ b/packages/opie-calculator/opie-calculator_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \ diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb index 5c86dd0e65..e00da5038a 100644 --- a/packages/opie-calculator/opie-calculator_cvs.bb +++ b/packages/opie-calculator/opie-calculator_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-camera/opie-camera_1.2.2.bb b/packages/opie-camera/opie-camera_1.2.2.bb index 22b4c9b773..d6906dd80a 100644 --- a/packages/opie-camera/opie-camera_1.2.2.bb +++ b/packages/opie-camera/opie-camera_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb index b6cc271caa..571689673f 100644 --- a/packages/opie-camera/opie-camera_cvs.bb +++ b/packages/opie-camera/opie-camera_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-cardmon/opie-cardmon_1.2.2.bb b/packages/opie-cardmon/opie-cardmon_1.2.2.bb index 7283fa75f8..c5da07532f 100644 --- a/packages/opie-cardmon/opie-cardmon_1.2.2.bb +++ b/packages/opie-cardmon/opie-cardmon_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb index 25cbf6cce1..2168baffda 100644 --- a/packages/opie-cardmon/opie-cardmon_cvs.bb +++ b/packages/opie-cardmon/opie-cardmon_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-checkbook/opie-checkbook_1.2.2.bb b/packages/opie-checkbook/opie-checkbook_1.2.2.bb index 8a4cc0ebc5..eb2011e5f3 100644 --- a/packages/opie-checkbook/opie-checkbook_1.2.2.bb +++ b/packages/opie-checkbook/opie-checkbook_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb index b552bf6152..2d365c68a6 100644 --- a/packages/opie-checkbook/opie-checkbook_cvs.bb +++ b/packages/opie-checkbook/opie-checkbook_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-citytime/opie-citytime_1.2.2.bb b/packages/opie-citytime/opie-citytime_1.2.2.bb index 29d244a555..94fde31e6a 100644 --- a/packages/opie-citytime/opie-citytime_1.2.2.bb +++ b/packages/opie-citytime/opie-citytime_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb index de2ab19bf4..457b9e2bb8 100644 --- a/packages/opie-citytime/opie-citytime_cvs.bb +++ b/packages/opie-citytime/opie-citytime_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb index f123790cea..7e114bf0ca 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \ diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb index 67cc639a0b..72ae6d2ea4 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-clock/opie-clock_1.2.2.bb b/packages/opie-clock/opie-clock_1.2.2.bb index f86c3d2832..da30def9ca 100644 --- a/packages/opie-clock/opie-clock_1.2.2.bb +++ b/packages/opie-clock/opie-clock_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb index 6bff77d83f..ef670bb7a8 100644 --- a/packages/opie-clock/opie-clock_cvs.bb +++ b/packages/opie-clock/opie-clock_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb index 6810381989..31131717c4 100644 --- a/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb +++ b/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 8b107589c0..304b687109 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-confeditor/opie-confeditor_1.2.2.bb b/packages/opie-confeditor/opie-confeditor_1.2.2.bb index dce2d43da5..c6f7ff7612 100644 --- a/packages/opie-confeditor/opie-confeditor_1.2.2.bb +++ b/packages/opie-confeditor/opie-confeditor_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb index 7b1e721310..e945ad6de2 100644 --- a/packages/opie-confeditor/opie-confeditor_cvs.bb +++ b/packages/opie-confeditor/opie-confeditor_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-console/opie-console_1.2.2.bb b/packages/opie-console/opie-console_1.2.2.bb index 795e3fcb11..e8dc4d95e8 100644 --- a/packages/opie-console/opie-console_1.2.2.bb +++ b/packages/opie-console/opie-console_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 1103e1f285..ca2955fb0b 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-dagger/opie-dagger_1.2.2.bb b/packages/opie-dagger/opie-dagger_1.2.2.bb index 52b34898aa..36a938634f 100644 --- a/packages/opie-dagger/opie-dagger_1.2.2.bb +++ b/packages/opie-dagger/opie-dagger_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb index 7d3730cb10..59f2d5a943 100644 --- a/packages/opie-dagger/opie-dagger_cvs.bb +++ b/packages/opie-dagger/opie-dagger_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-dasher/opie-dasher_1.2.2.bb b/packages/opie-dasher/opie-dasher_1.2.2.bb index a8b5176961..0f19139b0a 100644 --- a/packages/opie-dasher/opie-dasher_1.2.2.bb +++ b/packages/opie-dasher/opie-dasher_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb index cd9c7488c4..58a051e2fa 100644 --- a/packages/opie-dasher/opie-dasher_cvs.bb +++ b/packages/opie-dasher/opie-dasher_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb index 515c5c9de1..c9ba827803 100644 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb index 6277c5651a..a4007d5a2c 100644 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb index bf937db7e1..f2912d602c 100644 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb index 98e5ae4c0f..707c2e94f0 100644 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb index d6d19655a7..56f2112b29 100644 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb index 84178aae18..38927d1564 100644 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-datebook/opie-datebook_1.2.2.bb b/packages/opie-datebook/opie-datebook_1.2.2.bb index 7c2b74a550..554f30cc38 100644 --- a/packages/opie-datebook/opie-datebook_1.2.2.bb +++ b/packages/opie-datebook/opie-datebook_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb index d4f8a6717a..e5e5a0e558 100644 --- a/packages/opie-datebook/opie-datebook_cvs.bb +++ b/packages/opie-datebook/opie-datebook_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb index 59aa1d2a23..14dc7ce512 100644 --- a/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb +++ b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb index 6920cac224..7cd4c8bf1a 100644 --- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb +++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb index 6f07a57e40..b4f9ff39b7 100644 --- a/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb +++ b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb index c957dd3a94..5a379e0087 100644 --- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb +++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb index 2dde102adf..77ca1c864f 100644 --- a/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb +++ b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb index cbc595a76d..506d11f26e 100644 --- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb +++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-doctab/opie-doctab_1.2.2.bb b/packages/opie-doctab/opie-doctab_1.2.2.bb index 317b556300..656c10eca3 100644 --- a/packages/opie-doctab/opie-doctab_1.2.2.bb +++ b/packages/opie-doctab/opie-doctab_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb index b318842596..cc2c7819d1 100644 --- a/packages/opie-doctab/opie-doctab_cvs.bb +++ b/packages/opie-doctab/opie-doctab_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-drawpad/opie-drawpad_1.2.2.bb b/packages/opie-drawpad/opie-drawpad_1.2.2.bb index d4a6c7a665..7d3084f05f 100644 --- a/packages/opie-drawpad/opie-drawpad_1.2.2.bb +++ b/packages/opie-drawpad/opie-drawpad_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb index c2c8e6c8a5..23e2674f9f 100644 --- a/packages/opie-drawpad/opie-drawpad_cvs.bb +++ b/packages/opie-drawpad/opie-drawpad_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-dvorak/opie-dvorak_1.2.2.bb b/packages/opie-dvorak/opie-dvorak_1.2.2.bb index f7c4394c3f..39ae44e08e 100644 --- a/packages/opie-dvorak/opie-dvorak_1.2.2.bb +++ b/packages/opie-dvorak/opie-dvorak_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb index aabac9b928..33c9345763 100644 --- a/packages/opie-dvorak/opie-dvorak_cvs.bb +++ b/packages/opie-dvorak/opie-dvorak_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb index 68af4cfec6..20a417a9c3 100644 --- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb +++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb index 98b0ecd0ef..8e0e398a30 100644 --- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb +++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-euroconv/opie-euroconv_1.2.2.bb b/packages/opie-euroconv/opie-euroconv_1.2.2.bb index 2397fda504..9053e62f5f 100644 --- a/packages/opie-euroconv/opie-euroconv_1.2.2.bb +++ b/packages/opie-euroconv/opie-euroconv_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb index bb59d3028b..56af9ca0ee 100644 --- a/packages/opie-euroconv/opie-euroconv_cvs.bb +++ b/packages/opie-euroconv/opie-euroconv_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-examples-python/opie-examples-python_1.2.2.bb b/packages/opie-examples-python/opie-examples-python_1.2.2.bb index 57a745a480..f9349e3364 100644 --- a/packages/opie-examples-python/opie-examples-python_1.2.2.bb +++ b/packages/opie-examples-python/opie-examples-python_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \ diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb index 25cfe334b4..8caf26238c 100644 --- a/packages/opie-examples-python/opie-examples-python_cvs.bb +++ b/packages/opie-examples-python/opie-examples-python_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-examples/opie-examples_1.2.2.bb b/packages/opie-examples/opie-examples_1.2.2.bb index 7b28fc1a9c..7f601d9744 100644 --- a/packages/opie-examples/opie-examples_1.2.2.bb +++ b/packages/opie-examples/opie-examples_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb index 795b813608..a468b68ec4 100644 --- a/packages/opie-examples/opie-examples_cvs.bb +++ b/packages/opie-examples/opie-examples_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-eye/opie-eye_1.2.2.bb b/packages/opie-eye/opie-eye_1.2.2.bb index 0fc47e6b10..f67489075a 100644 --- a/packages/opie-eye/opie-eye_1.2.2.bb +++ b/packages/opie-eye/opie-eye_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index ffe7e770ff..9997125ac9 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-fifteen/opie-fifteen_1.2.2.bb b/packages/opie-fifteen/opie-fifteen_1.2.2.bb index d80333bada..1463d942ee 100644 --- a/packages/opie-fifteen/opie-fifteen_1.2.2.bb +++ b/packages/opie-fifteen/opie-fifteen_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb index e342fa69c3..0a2b7e078e 100644 --- a/packages/opie-fifteen/opie-fifteen_cvs.bb +++ b/packages/opie-fifteen/opie-fifteen_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-formatter/opie-formatter_1.2.2.bb b/packages/opie-formatter/opie-formatter_1.2.2.bb index f8020d60a0..9665187811 100644 --- a/packages/opie-formatter/opie-formatter_1.2.2.bb +++ b/packages/opie-formatter/opie-formatter_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb index 99af13112a..8b83f84df1 100644 --- a/packages/opie-formatter/opie-formatter_cvs.bb +++ b/packages/opie-formatter/opie-formatter_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-freetype/opie-freetype_1.2.2.bb b/packages/opie-freetype/opie-freetype_1.2.2.bb index 81996992a2..a3fae4aba8 100644 --- a/packages/opie-freetype/opie-freetype_1.2.2.bb +++ b/packages/opie-freetype/opie-freetype_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype" diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb index 4788f044e9..0453a7f283 100644 --- a/packages/opie-freetype/opie-freetype_cvs.bb +++ b/packages/opie-freetype/opie-freetype_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-ftp/opie-ftp_1.2.2.bb b/packages/opie-ftp/opie-ftp_1.2.2.bb index 7a7335ca67..f74b9eefcf 100644 --- a/packages/opie-ftp/opie-ftp_1.2.2.bb +++ b/packages/opie-ftp/opie-ftp_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb index d8ce8c7334..0217273ef6 100644 --- a/packages/opie-ftp/opie-ftp_cvs.bb +++ b/packages/opie-ftp/opie-ftp_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-ftplib/opie-ftplib_1.2.2.bb b/packages/opie-ftplib/opie-ftplib_1.2.2.bb index 0339703a5d..d614b14595 100644 --- a/packages/opie-ftplib/opie-ftplib_1.2.2.bb +++ b/packages/opie-ftplib/opie-ftplib_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb index 2025ea084c..29d9a5e8fe 100644 --- a/packages/opie-ftplib/opie-ftplib_cvs.bb +++ b/packages/opie-ftplib/opie-ftplib_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-go/opie-go_1.2.2.bb b/packages/opie-go/opie-go_1.2.2.bb index 4c9f590e9e..fa01fa9b04 100644 --- a/packages/opie-go/opie-go_1.2.2.bb +++ b/packages/opie-go/opie-go_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb index 3985f619cf..62609e923c 100644 --- a/packages/opie-go/opie-go_cvs.bb +++ b/packages/opie-go/opie-go_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb index 19d2a29213..a322ae5301 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb index 3cb2c37810..72349585ad 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-handwriting/opie-handwriting_1.2.2.bb b/packages/opie-handwriting/opie-handwriting_1.2.2.bb index ba3da45f95..46f832bc8d 100644 --- a/packages/opie-handwriting/opie-handwriting_1.2.2.bb +++ b/packages/opie-handwriting/opie-handwriting_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb index ada35ece86..aaeaf94489 100644 --- a/packages/opie-handwriting/opie-handwriting_cvs.bb +++ b/packages/opie-handwriting/opie-handwriting_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-help-en/opie-help-en_1.2.2.bb b/packages/opie-help-en/opie-help-en_1.2.2.bb index 64d98bd6e7..f1b3dc5f47 100644 --- a/packages/opie-help-en/opie-help-en_1.2.2.bb +++ b/packages/opie-help-en/opie-help-en_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PR = "r1" diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index 09c56ae9f4..445963634c 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb index f2e144d3ca..bc31fcdf72 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb index 5e4bdd9eb0..a9089f0ffc 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb index b80e85ac52..91c462268b 100644 --- a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb +++ b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb index 120f4bbab8..22447dd621 100644 --- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb +++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-i18n/opie-i18n_1.2.2.bb b/packages/opie-i18n/opie-i18n_1.2.2.bb index b5011c0501..ed4ac3aff5 100644 --- a/packages/opie-i18n/opie-i18n_1.2.2.bb +++ b/packages/opie-i18n/opie-i18n_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb index 93183b79a3..3e269e73ef 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.2.bb b/packages/opie-i18n/opie-lrelease-native_1.2.2.bb index 699a72256c..ce4d83f1b6 100644 --- a/packages/opie-i18n/opie-lrelease-native_1.2.2.bb +++ b/packages/opie-i18n/opie-lrelease-native_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \ diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index be811dd010..94401fab78 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.2.bb b/packages/opie-i18n/opie-lupdate-native_1.2.2.bb index d4e7f18284..04e9728ee5 100644 --- a/packages/opie-i18n/opie-lupdate-native_1.2.2.bb +++ b/packages/opie-i18n/opie-lupdate-native_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \ diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index 2628d23224..5f2d834b74 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb index c541bc78ed..52118fe625 100644 --- a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb +++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb index a8fb137b9e..b61a4df306 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc #Remove the dash below when 1.2.1 changes PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-irc/opie-irc_1.2.2.bb b/packages/opie-irc/opie-irc_1.2.2.bb index a186316b10..374c388ecf 100644 --- a/packages/opie-irc/opie-irc_1.2.2.bb +++ b/packages/opie-irc/opie-irc_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb index feabe89d68..4a8aa181f4 100644 --- a/packages/opie-irc/opie-irc_cvs.bb +++ b/packages/opie-irc/opie-irc_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb index 2d05c1fbf4..b86eaf4c10 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \ diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index 4fde5d8591..539d4555e1 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-jumpx/opie-jumpx_1.2.2.bb b/packages/opie-jumpx/opie-jumpx_1.2.2.bb index 24b86582c5..0e8284c672 100644 --- a/packages/opie-jumpx/opie-jumpx_1.2.2.bb +++ b/packages/opie-jumpx/opie-jumpx_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb index cd5a25c39a..61ef6a73e2 100644 --- a/packages/opie-jumpx/opie-jumpx_cvs.bb +++ b/packages/opie-jumpx/opie-jumpx_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-kbill/opie-kbill_1.2.2.bb b/packages/opie-kbill/opie-kbill_1.2.2.bb index 90f2a1c1b8..38c9276ce1 100644 --- a/packages/opie-kbill/opie-kbill_1.2.2.bb +++ b/packages/opie-kbill/opie-kbill_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb index 20522f3968..d0856b9648 100644 --- a/packages/opie-kbill/opie-kbill_cvs.bb +++ b/packages/opie-kbill/opie-kbill_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb index 868d99e868..f1b74f25a1 100644 --- a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb +++ b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb index 445ad42970..e5329f28cc 100644 --- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb +++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-keyboard/opie-keyboard_1.2.2.bb b/packages/opie-keyboard/opie-keyboard_1.2.2.bb index ec608f70d9..c2b29cd64a 100644 --- a/packages/opie-keyboard/opie-keyboard_1.2.2.bb +++ b/packages/opie-keyboard/opie-keyboard_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb index 2ec7441ce2..b3ed6e71eb 100644 --- a/packages/opie-keyboard/opie-keyboard_cvs.bb +++ b/packages/opie-keyboard/opie-keyboard_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-keypebble/opie-keypebble_1.2.2.bb b/packages/opie-keypebble/opie-keypebble_1.2.2.bb index ec7979ea82..5a8e3c5508 100644 --- a/packages/opie-keypebble/opie-keypebble_1.2.2.bb +++ b/packages/opie-keypebble/opie-keypebble_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb index 37e32da01c..92faa6c52c 100644 --- a/packages/opie-keypebble/opie-keypebble_cvs.bb +++ b/packages/opie-keypebble/opie-keypebble_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-keytabs/opie-keytabs_1.2.2.bb b/packages/opie-keytabs/opie-keytabs_1.2.2.bb index 71588448ee..b07033a4ce 100644 --- a/packages/opie-keytabs/opie-keytabs_1.2.2.bb +++ b/packages/opie-keytabs/opie-keytabs_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb index 853405f2fd..d18339a046 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-keyview/opie-keyview_1.2.2.bb b/packages/opie-keyview/opie-keyview_1.2.2.bb index f922d2f629..0f8c1c7cd4 100644 --- a/packages/opie-keyview/opie-keyview_1.2.2.bb +++ b/packages/opie-keyview/opie-keyview_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb index d819cd45da..f59904d193 100644 --- a/packages/opie-keyview/opie-keyview_cvs.bb +++ b/packages/opie-keyview/opie-keyview_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb index 6b29e8833d..ddba3e4cfe 100644 --- a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb +++ b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb index 1ac78ad3fd..2e8bb23ab7 100644 --- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb +++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-kpacman/opie-kpacman_1.2.2.bb b/packages/opie-kpacman/opie-kpacman_1.2.2.bb index b8372fbbad..7ae8b103c7 100644 --- a/packages/opie-kpacman/opie-kpacman_1.2.2.bb +++ b/packages/opie-kpacman/opie-kpacman_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb index f48122d5ea..d86df42d17 100644 --- a/packages/opie-kpacman/opie-kpacman_cvs.bb +++ b/packages/opie-kpacman/opie-kpacman_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-language/opie-language_1.2.2.bb b/packages/opie-language/opie-language_1.2.2.bb index 891999851d..77a4908293 100644 --- a/packages/opie-language/opie-language_1.2.2.bb +++ b/packages/opie-language/opie-language_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb index 77af7c1b68..8af7b7ea3f 100644 --- a/packages/opie-language/opie-language_cvs.bb +++ b/packages/opie-language/opie-language_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb index 4590f81108..c886229397 100644 --- a/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb +++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb index 8b8f30b77d..b436240328 100644 --- a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb +++ b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb index 884cce4a93..1a13c13720 100644 --- a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb +++ b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb index cd5c0573c5..d529b6e7c5 100644 --- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb +++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb index c881fdcf41..1f0f54d7eb 100644 --- a/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb +++ b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb index 5d0222401a..92c78e5c2e 100644 --- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb +++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb index a903dbde2e..e50f37e05a 100644 --- a/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb +++ b/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \ diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb index d9dcb81fd0..6195ed07ac 100644 --- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb +++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-login/opie-login_1.2.2.bb b/packages/opie-login/opie-login_1.2.2.bb index a8753f95ce..29be64cc81 100644 --- a/packages/opie-login/opie-login_1.2.2.bb +++ b/packages/opie-login/opie-login_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb index a5141716e7..d5c65b70ac 100644 --- a/packages/opie-login/opie-login_cvs.bb +++ b/packages/opie-login/opie-login_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb index 0da3119e9d..b2fe4f905b 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb index 5e12de96fa..8a51c37040 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mail/opie-mail_1.2.2.bb b/packages/opie-mail/opie-mail_1.2.2.bb index 9d322d38b7..058e949a56 100644 --- a/packages/opie-mail/opie-mail_1.2.2.bb +++ b/packages/opie-mail/opie-mail_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb index 026970805a..3da24143c3 100644 --- a/packages/opie-mail/opie-mail_cvs.bb +++ b/packages/opie-mail/opie-mail_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb index fdea7ee361..ac7c6d311b 100644 --- a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb +++ b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb index e906bf2058..ad7bcfc5c1 100644 --- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb +++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb index 44f420ce08..be7dd3f433 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index 0ca2b3fd39..97ca074890 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb index 47adefb1a8..d145c140d7 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index 618d3b6a59..cfccd3db0e 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb index 3cbb3caba8..c929d7c0a5 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index 01141f2eac..46f8851741 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb index 47adefb1a8..d145c140d7 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index 618d3b6a59..cfccd3db0e 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index e6e8fa3762..7654ebd9a3 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb index d182973f87..16d71b2333 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb index 1dcf37adae..2e6c7ec517 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 19c16f8e10..2badc15abd 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-mediummount/opie-mediummount_1.2.2.bb b/packages/opie-mediummount/opie-mediummount_1.2.2.bb index a4a432c193..fe92ea53b0 100644 --- a/packages/opie-mediummount/opie-mediummount_1.2.2.bb +++ b/packages/opie-mediummount/opie-mediummount_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb index 51d7a1fc77..a78f5679b4 100644 --- a/packages/opie-mediummount/opie-mediummount_cvs.bb +++ b/packages/opie-mediummount/opie-mediummount_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb index cb1d51f468..b7f88392b1 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \ diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb index f15720105b..3b686324f6 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb index 1955e77482..82c879a392 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb index 0ccb32b59e..25cc6d4523 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-minesweep/opie-minesweep_1.2.2.bb b/packages/opie-minesweep/opie-minesweep_1.2.2.bb index a88f61e387..f67fb457f1 100644 --- a/packages/opie-minesweep/opie-minesweep_1.2.2.bb +++ b/packages/opie-minesweep/opie-minesweep_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb index e7315a5a60..6292c661e8 100644 --- a/packages/opie-minesweep/opie-minesweep_cvs.bb +++ b/packages/opie-minesweep/opie-minesweep_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb index 307a92f100..41f2c79cf7 100644 --- a/packages/opie-multikey/opie-multikey_1.2.2.bb +++ b/packages/opie-multikey/opie-multikey_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index 9bd8b3ca36..38eccd4a33 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb index e287e321c8..3f52293df1 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \ diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb index fb7346513f..4c26c30395 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb index aae7d373b1..786efe8d21 100644 --- a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb +++ b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb index f1bc9b2ceb..72975f88f2 100644 --- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb +++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-networksettings/opie-networksettings_1.2.2.bb b/packages/opie-networksettings/opie-networksettings_1.2.2.bb index e652b48e36..c1d5ecfcf9 100644 --- a/packages/opie-networksettings/opie-networksettings_1.2.2.bb +++ b/packages/opie-networksettings/opie-networksettings_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb index c14f18881b..accde9871b 100644 --- a/packages/opie-networksettings/opie-networksettings_cvs.bb +++ b/packages/opie-networksettings/opie-networksettings_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-notes/opie-notes_0.4.bb b/packages/opie-notes/opie-notes_0.4.bb index 55a5c51d49..fe0a9ba9be 100644 --- a/packages/opie-notes/opie-notes_0.4.bb +++ b/packages/opie-notes/opie-notes_0.4.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRCDATE = 20051027 diff --git a/packages/opie-notes/opie-notes_cvs.bb b/packages/opie-notes/opie-notes_cvs.bb index 6d2cb27b8c..6b293d2876 100644 --- a/packages/opie-notes/opie-notes_cvs.bb +++ b/packages/opie-notes/opie-notes_cvs.bb @@ -1,3 +1,3 @@ -include ${PN}.inc +require ${PN}.inc PV = "0.3+cvs${SRCDATE}" diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb index b0b468ec69..49b176d432 100644 --- a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb +++ b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb index 73f5b6e9d4..0a11f79919 100644 --- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb +++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-odict/opie-odict_1.2.2.bb b/packages/opie-odict/opie-odict_1.2.2.bb index eb9b93180d..d7f85ef55c 100644 --- a/packages/opie-odict/opie-odict_1.2.2.bb +++ b/packages/opie-odict/opie-odict_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb index d21ab62be3..907ef18c9e 100644 --- a/packages/opie-odict/opie-odict_cvs.bb +++ b/packages/opie-odict/opie-odict_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-oxygen/opie-oxygen_1.2.2.bb b/packages/opie-oxygen/opie-oxygen_1.2.2.bb index da2e79c01d..d94985dc6f 100644 --- a/packages/opie-oxygen/opie-oxygen_1.2.2.bb +++ b/packages/opie-oxygen/opie-oxygen_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb index 147aff9c73..99dae6e239 100644 --- a/packages/opie-oxygen/opie-oxygen_cvs.bb +++ b/packages/opie-oxygen/opie-oxygen_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb index 41e557f09f..bc6264d383 100644 --- a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb +++ b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb index ef624083ba..51269ca473 100644 --- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb +++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb index 385ca61fdb..0b8f44981d 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb index f376326bf2..8f162caa09 100644 --- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb +++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-parashoot/opie-parashoot_1.2.2.bb b/packages/opie-parashoot/opie-parashoot_1.2.2.bb index 60816499b8..655282ca67 100644 --- a/packages/opie-parashoot/opie-parashoot_1.2.2.bb +++ b/packages/opie-parashoot/opie-parashoot_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb index ad2164a50b..85fc6cff9a 100644 --- a/packages/opie-parashoot/opie-parashoot_cvs.bb +++ b/packages/opie-parashoot/opie-parashoot_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb index ff6f2a337a..bf73361ebf 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb index 95c80f47e5..ec2bc0230e 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-pickboard/opie-pickboard_1.2.2.bb b/packages/opie-pickboard/opie-pickboard_1.2.2.bb index 9737c8d192..227e179f0a 100644 --- a/packages/opie-pickboard/opie-pickboard_1.2.2.bb +++ b/packages/opie-pickboard/opie-pickboard_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb index 4b940922d2..ec86d1c169 100644 --- a/packages/opie-pickboard/opie-pickboard_cvs.bb +++ b/packages/opie-pickboard/opie-pickboard_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-pics/opie-pics_1.2.2.bb b/packages/opie-pics/opie-pics_1.2.2.bb index 95c945ffd0..7638dc9ce2 100644 --- a/packages/opie-pics/opie-pics_1.2.2.bb +++ b/packages/opie-pics/opie-pics_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 7574464e02..593ea5bf9c 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb index 011d9bfdbd..a0638649fc 100644 --- a/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb +++ b/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \ diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb index 671a37401f..75c223af90 100644 --- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb +++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-powerchord/opie-powerchord_1.2.2.bb b/packages/opie-powerchord/opie-powerchord_1.2.2.bb index 81edc26a73..756d2cf170 100644 --- a/packages/opie-powerchord/opie-powerchord_1.2.2.bb +++ b/packages/opie-powerchord/opie-powerchord_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb index bb20df9975..2825308e51 100644 --- a/packages/opie-powerchord/opie-powerchord_cvs.bb +++ b/packages/opie-powerchord/opie-powerchord_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb index 247a163f67..56fe35ce52 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb index dc7e3c78ef..5099ef8e48 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb index 19ed04a4ec..91c09fa8e9 100644 --- a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb +++ b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb index d2d783e432..f4a52e68c6 100644 --- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb +++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-qcop/opie-qcop_1.2.2.bb b/packages/opie-qcop/opie-qcop_1.2.2.bb index bcde99c437..945811abd1 100644 --- a/packages/opie-qcop/opie-qcop_1.2.2.bb +++ b/packages/opie-qcop/opie-qcop_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb index b240e74d0f..9f97581b8c 100644 --- a/packages/opie-qcop/opie-qcop_cvs.bb +++ b/packages/opie-qcop/opie-qcop_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-qss/opie-qss_1.2.2.bb b/packages/opie-qss/opie-qss_1.2.2.bb index 1ef8cb4c29..3db0f278be 100644 --- a/packages/opie-qss/opie-qss_1.2.2.bb +++ b/packages/opie-qss/opie-qss_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb index 014f5fb451..19b7b8da7c 100644 --- a/packages/opie-qss/opie-qss_cvs.bb +++ b/packages/opie-qss/opie-qss_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb index bda2b41f8d..9d54ec91ed 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb index 3500fab721..e3a7155a6a 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb index 57991916f4..75c6686ce2 100644 --- a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb +++ b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb index ea29f97790..d2a73bcfbf 100644 --- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb +++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-reader/opie-reader_1.2.2.bb b/packages/opie-reader/opie-reader_1.2.2.bb index 6765f70718..6568b79ee9 100644 --- a/packages/opie-reader/opie-reader_1.2.2.bb +++ b/packages/opie-reader/opie-reader_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index c4edc7043e..2f844d8dfd 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-recorder/opie-recorder_1.2.2.bb b/packages/opie-recorder/opie-recorder_1.2.2.bb index 7bc13602bc..a71079f7c9 100644 --- a/packages/opie-recorder/opie-recorder_1.2.2.bb +++ b/packages/opie-recorder/opie-recorder_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb index 04b4d44618..7e09748f10 100644 --- a/packages/opie-recorder/opie-recorder_cvs.bb +++ b/packages/opie-recorder/opie-recorder_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-remote/opie-remote_1.2.2.bb b/packages/opie-remote/opie-remote_1.2.2.bb index a71e0657aa..f988f29125 100644 --- a/packages/opie-remote/opie-remote_1.2.2.bb +++ b/packages/opie-remote/opie-remote_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb index 9276829349..cf9afb6bf0 100644 --- a/packages/opie-remote/opie-remote_cvs.bb +++ b/packages/opie-remote/opie-remote_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb index c4473724bd..97520564a1 100644 --- a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb +++ b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb index 255ab53a36..f8d5b7d564 100644 --- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb index f1bdf5299a..450eab5b24 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb index 912cea6cbb..107d2fc348 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb index 48674b9dce..c8c986d687 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb index f74599cd43..5b7377f4ec 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb index 3df01b4a55..1bc3b5249b 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \ diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb index e06983da74..227fed2d0c 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-search/opie-search_1.2.2.bb b/packages/opie-search/opie-search_1.2.2.bb index f2682401f0..202e925aaa 100644 --- a/packages/opie-search/opie-search_1.2.2.bb +++ b/packages/opie-search/opie-search_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb index 020d315a7a..5141028b54 100644 --- a/packages/opie-search/opie-search_cvs.bb +++ b/packages/opie-search/opie-search_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-security/opie-security_1.2.2.bb b/packages/opie-security/opie-security_1.2.2.bb index ecdf14a187..8b39f0b2e7 100644 --- a/packages/opie-security/opie-security_1.2.2.bb +++ b/packages/opie-security/opie-security_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \ diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 7f68f03cad..43d8f431cc 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb index 65de7b78ec..3f6d9d1673 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-blueping.inc +require opie-securityplugin-blueping.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb index 52bcbe6d16..0360e8555d 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-blueping.inc +require opie-securityplugin-blueping.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb index 4a5bc3c2e0..bc6aa4fcd8 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-dummy.inc +require opie-securityplugin-dummy.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb index b0d1e8d49e..3584c11c48 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-dummy.inc +require opie-securityplugin-dummy.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb index 08bd1b13c0..331a35f0ac 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-notice.inc +require opie-securityplugin-notice.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb index 5223edbaf8..47e85bd1bb 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-notice.inc +require opie-securityplugin-notice.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb index c5ccde6b5c..8807bef0d2 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-pin.inc +require opie-securityplugin-pin.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb index bf2a607650..38e9933293 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb @@ -1,4 +1,4 @@ -include opie-securityplugin-pin.inc +require opie-securityplugin-pin.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-sfcave/opie-sfcave_1.2.2.bb b/packages/opie-sfcave/opie-sfcave_1.2.2.bb index fda3aae425..db57345b94 100644 --- a/packages/opie-sfcave/opie-sfcave_1.2.2.bb +++ b/packages/opie-sfcave/opie-sfcave_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb index b383491746..a5f3a6b2da 100644 --- a/packages/opie-sfcave/opie-sfcave_cvs.bb +++ b/packages/opie-sfcave/opie-sfcave_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb index c541bc78ed..52118fe625 100644 --- a/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb +++ b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index a8fb137b9e..b61a4df306 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc #Remove the dash below when 1.2.1 changes PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-sh/opie-sh_1.2.2.bb b/packages/opie-sh/opie-sh_1.2.2.bb index 69de686ed0..6843ad7aac 100644 --- a/packages/opie-sh/opie-sh_1.2.2.bb +++ b/packages/opie-sh/opie-sh_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \ diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb index efa04a2178..27a8d3a8b3 100644 --- a/packages/opie-sh/opie-sh_cvs.bb +++ b/packages/opie-sh/opie-sh_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-sheet/opie-sheet_1.2.2.bb b/packages/opie-sheet/opie-sheet_1.2.2.bb index a231ee9a90..bc90e3709d 100644 --- a/packages/opie-sheet/opie-sheet_1.2.2.bb +++ b/packages/opie-sheet/opie-sheet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb index 629457892a..c695558c3f 100644 --- a/packages/opie-sheet/opie-sheet_cvs.bb +++ b/packages/opie-sheet/opie-sheet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-snake/opie-snake_1.2.2.bb b/packages/opie-snake/opie-snake_1.2.2.bb index 9bff0ac043..8d422568f5 100644 --- a/packages/opie-snake/opie-snake_1.2.2.bb +++ b/packages/opie-snake/opie-snake_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb index c2a9e9b47d..cee76c6c70 100644 --- a/packages/opie-snake/opie-snake_cvs.bb +++ b/packages/opie-snake/opie-snake_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-solitaire/opie-solitaire_1.2.2.bb b/packages/opie-solitaire/opie-solitaire_1.2.2.bb index 5cd42c8d53..5074934c63 100644 --- a/packages/opie-solitaire/opie-solitaire_1.2.2.bb +++ b/packages/opie-solitaire/opie-solitaire_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb index 184bec3f73..b9428ef04c 100644 --- a/packages/opie-solitaire/opie-solitaire_cvs.bb +++ b/packages/opie-solitaire/opie-solitaire_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-sounds/opie-sounds_1.2.2.bb b/packages/opie-sounds/opie-sounds_1.2.2.bb index 8053e4f26e..9bd0cfa80f 100644 --- a/packages/opie-sounds/opie-sounds_1.2.2.bb +++ b/packages/opie-sounds/opie-sounds_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index f430ca0aee..818a1c48f1 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc # Remove the dash below when 1.2.1 changes in PV PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb index f04ccf5609..a731009a7c 100644 --- a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb +++ b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb index bb1c458f9f..b669870373 100644 --- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb +++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-stumbler/opie-stumbler_1.2.2.bb b/packages/opie-stumbler/opie-stumbler_1.2.2.bb index 93b3c1ff67..5201d108e4 100644 --- a/packages/opie-stumbler/opie-stumbler_1.2.2.bb +++ b/packages/opie-stumbler/opie-stumbler_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opiestumbler \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-stumbler/opie-stumbler_cvs.bb b/packages/opie-stumbler/opie-stumbler_cvs.bb index 0c772b23af..fc22e53268 100644 --- a/packages/opie-stumbler/opie-stumbler_cvs.bb +++ b/packages/opie-stumbler/opie-stumbler_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-flat/opie-style-flat_1.2.2.bb b/packages/opie-style-flat/opie-style-flat_1.2.2.bb index 5e55870851..91641bfd6d 100644 --- a/packages/opie-style-flat/opie-style-flat_1.2.2.bb +++ b/packages/opie-style-flat/opie-style-flat_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb index 02e203f24b..ac045b599e 100644 --- a/packages/opie-style-flat/opie-style-flat_cvs.bb +++ b/packages/opie-style-flat/opie-style-flat_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb index 9e56bb2750..223e7067f7 100644 --- a/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb +++ b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb index 8e82eb2010..6e571ef451 100644 --- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb +++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb index fd1e93900f..ea307ee9a5 100644 --- a/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb +++ b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb index d3110b062b..1b76a1fb66 100644 --- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb +++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-metal/opie-style-metal_1.2.2.bb b/packages/opie-style-metal/opie-style-metal_1.2.2.bb index 014734d8b3..9fadf8ab7f 100644 --- a/packages/opie-style-metal/opie-style-metal_1.2.2.bb +++ b/packages/opie-style-metal/opie-style-metal_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb index 70e8511995..b21797e5bd 100644 --- a/packages/opie-style-metal/opie-style-metal_cvs.bb +++ b/packages/opie-style-metal/opie-style-metal_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-phase/opie-style-phase_1.2.2.bb b/packages/opie-style-phase/opie-style-phase_1.2.2.bb index ee41eb027c..47235dd14d 100644 --- a/packages/opie-style-phase/opie-style-phase_1.2.2.bb +++ b/packages/opie-style-phase/opie-style-phase_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb index 1a4370c959..cd047a2254 100644 --- a/packages/opie-style-phase/opie-style-phase_cvs.bb +++ b/packages/opie-style-phase/opie-style-phase_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-style-web/opie-style-web_1.2.2.bb b/packages/opie-style-web/opie-style-web_1.2.2.bb index dda9db378c..b92edb8804 100644 --- a/packages/opie-style-web/opie-style-web_1.2.2.bb +++ b/packages/opie-style-web/opie-style-web_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb index 7a62ed8340..a43db5557c 100644 --- a/packages/opie-style-web/opie-style-web_cvs.bb +++ b/packages/opie-style-web/opie-style-web_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb index e88f417b7c..46fe78b358 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb index 62b2920441..f517498690 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-symlinker/opie-symlinker_1.2.2.bb b/packages/opie-symlinker/opie-symlinker_1.2.2.bb index 682493bafd..ac98fb73f9 100644 --- a/packages/opie-symlinker/opie-symlinker_1.2.2.bb +++ b/packages/opie-symlinker/opie-symlinker_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb index 8a525c069b..31c3954ffa 100644 --- a/packages/opie-symlinker/opie-symlinker_cvs.bb +++ b/packages/opie-symlinker/opie-symlinker_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 6aa27a6242..780559ab57 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb index 800fdb998f..e75c4e73d9 100644 --- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb +++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-systemtime/opie-systemtime_1.2.2.bb b/packages/opie-systemtime/opie-systemtime_1.2.2.bb index 97fa149a56..78e22ae536 100644 --- a/packages/opie-systemtime/opie-systemtime_1.2.2.bb +++ b/packages/opie-systemtime/opie-systemtime_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb index 4b9d2ea7ac..c58c5509d1 100644 --- a/packages/opie-systemtime/opie-systemtime_cvs.bb +++ b/packages/opie-systemtime/opie-systemtime_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb index 3d9158d616..35397627d1 100644 --- a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb +++ b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb index 7e5995836e..b97f7265d7 100644 --- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb +++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index e8701eefa1..9b1cd8c461 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 7724c756fc..799d8a1d30 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" PR = "r1" diff --git a/packages/opie-tetrix/opie-tetrix_1.2.2.bb b/packages/opie-tetrix/opie-tetrix_1.2.2.bb index 25435cb30a..c3a36f09de 100644 --- a/packages/opie-tetrix/opie-tetrix_1.2.2.bb +++ b/packages/opie-tetrix/opie-tetrix_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb index 32ecabb861..dfb057879c 100644 --- a/packages/opie-tetrix/opie-tetrix_cvs.bb +++ b/packages/opie-tetrix/opie-tetrix_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-textedit/opie-textedit_1.2.2.bb b/packages/opie-textedit/opie-textedit_1.2.2.bb index f2e144d3ca..bc31fcdf72 100644 --- a/packages/opie-textedit/opie-textedit_1.2.2.bb +++ b/packages/opie-textedit/opie-textedit_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb index 5e4bdd9eb0..a9089f0ffc 100644 --- a/packages/opie-textedit/opie-textedit_cvs.bb +++ b/packages/opie-textedit/opie-textedit_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-theme/opie-theme_1.2.2.bb b/packages/opie-theme/opie-theme_1.2.2.bb index e79214dc88..5aa0a4315f 100644 --- a/packages/opie-theme/opie-theme_1.2.2.bb +++ b/packages/opie-theme/opie-theme_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb index dd00a68b1a..31e66d220b 100644 --- a/packages/opie-theme/opie-theme_cvs.bb +++ b/packages/opie-theme/opie-theme_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-tictac/opie-tictac_1.2.2.bb b/packages/opie-tictac/opie-tictac_1.2.2.bb index e8c07ccf64..6d018524ee 100644 --- a/packages/opie-tictac/opie-tictac_1.2.2.bb +++ b/packages/opie-tictac/opie-tictac_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb index 5e0147450a..2ee752587c 100644 --- a/packages/opie-tictac/opie-tictac_cvs.bb +++ b/packages/opie-tictac/opie-tictac_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb index 70b03dfdd1..3618a15804 100644 --- a/packages/opie-tinykate/opie-tinykate_1.2.2.bb +++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb index 237bbe4623..1f49465a5a 100644 --- a/packages/opie-tinykate/opie-tinykate_cvs.bb +++ b/packages/opie-tinykate/opie-tinykate_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb index 5e3bc26ae3..2648340536 100644 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb index 4bb9617da5..10b53b92a6 100644 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb index a52ba48ef4..f05a82c1cd 100644 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb index 91cb7e428b..7abf53e4d7 100644 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb index 90eec22eca..558cb028cd 100644 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb index 3a756a7a35..bde03ddfa8 100644 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb index d9fa557397..7be824499f 100644 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb index 462a1f77fa..ae38b4acf4 100644 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb index b98d8170a6..993d247cd3 100644 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb index 42896a07ed..2fd397e8c8 100644 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb index 73bd121a45..53ca61146b 100644 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb index c1c27599a8..6ccc6481a4 100644 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb index 6da83c79dc..878ac811b1 100644 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb index 5cc9e2bc1e..5bda2fa8ae 100644 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-today/opie-today_1.2.2.bb b/packages/opie-today/opie-today_1.2.2.bb index 6200f9e4e8..8cdd4e4cd6 100644 --- a/packages/opie-today/opie-today_1.2.2.bb +++ b/packages/opie-today/opie-today_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb index 5135a334cb..d0730ac974 100644 --- a/packages/opie-today/opie-today_cvs.bb +++ b/packages/opie-today/opie-today_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-todo/opie-todo_1.2.2.bb b/packages/opie-todo/opie-todo_1.2.2.bb index 21151ae14a..ea24060b02 100644 --- a/packages/opie-todo/opie-todo_1.2.2.bb +++ b/packages/opie-todo/opie-todo_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb index 6ae1079847..525ab0ee8d 100644 --- a/packages/opie-todo/opie-todo_cvs.bb +++ b/packages/opie-todo/opie-todo_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb index f24f4864d3..f471360ced 100644 --- a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb +++ b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb index 77dcd1c8db..7536f8db7e 100644 --- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb +++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb index d83f21559f..c505e360de 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb index e31427c256..d173bd7de7 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-usermanager/opie-usermanager_1.2.2.bb b/packages/opie-usermanager/opie-usermanager_1.2.2.bb index a37dc07e42..ccc9c52cbe 100644 --- a/packages/opie-usermanager/opie-usermanager_1.2.2.bb +++ b/packages/opie-usermanager/opie-usermanager_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb index 648caeb97c..10f1528934 100644 --- a/packages/opie-usermanager/opie-usermanager_cvs.bb +++ b/packages/opie-usermanager/opie-usermanager_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb index 0ae8478846..9bcf900b85 100644 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb index 5ea8b91fba..2965355f57 100644 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-vmemo/opie-vmemo_1.2.2.bb b/packages/opie-vmemo/opie-vmemo_1.2.2.bb index e7a2703c24..fcb988f085 100644 --- a/packages/opie-vmemo/opie-vmemo_1.2.2.bb +++ b/packages/opie-vmemo/opie-vmemo_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb index 9f66e5864e..5d17175393 100644 --- a/packages/opie-vmemo/opie-vmemo_cvs.bb +++ b/packages/opie-vmemo/opie-vmemo_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb index 112ad749ae..d600242cbd 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \ diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb index 0d4c369198..806f7b77fc 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb index 44a61cccd1..423f676470 100644 --- a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb +++ b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb index 4b73250b50..cf7a023c5c 100644 --- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb +++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb index b2e3975f7a..ea09149bce 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb index e223d11a73..13e10e9dfa 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb index b20c5f5f73..62e07c3a1e 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb index fd5f3f584c..1928692898 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-wordgame/opie-wordgame_1.2.2.bb b/packages/opie-wordgame/opie-wordgame_1.2.2.bb index faf4d44ef8..694822c3ab 100644 --- a/packages/opie-wordgame/opie-wordgame_1.2.2.bb +++ b/packages/opie-wordgame/opie-wordgame_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb index 3f143e1dc4..e827b5bb05 100644 --- a/packages/opie-wordgame/opie-wordgame_cvs.bb +++ b/packages/opie-wordgame/opie-wordgame_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-write/opie-write_1.2.2.bb b/packages/opie-write/opie-write_1.2.2.bb index 8a4cc0ebc5..eb2011e5f3 100644 --- a/packages/opie-write/opie-write_1.2.2.bb +++ b/packages/opie-write/opie-write_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb index b552bf6152..2d365c68a6 100644 --- a/packages/opie-write/opie-write_cvs.bb +++ b/packages/opie-write/opie-write_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb index 95216c7570..cec152e3fe 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb index 91167ca860..f861726632 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-zlines/opie-zlines_1.2.2.bb b/packages/opie-zlines/opie-zlines_1.2.2.bb index 8a1ad20373..4f65bb9537 100644 --- a/packages/opie-zlines/opie-zlines_1.2.2.bb +++ b/packages/opie-zlines/opie-zlines_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb index 4e99318420..00956b4a0c 100644 --- a/packages/opie-zlines/opie-zlines_cvs.bb +++ b/packages/opie-zlines/opie-zlines_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-zsafe/opie-zsafe_1.2.2.bb b/packages/opie-zsafe/opie-zsafe_1.2.2.bb index 7e2c2a020b..d9c5e75c68 100644 --- a/packages/opie-zsafe/opie-zsafe_1.2.2.bb +++ b/packages/opie-zsafe/opie-zsafe_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb index 5e58e8e544..8b7aaacbc0 100644 --- a/packages/opie-zsafe/opie-zsafe_cvs.bb +++ b/packages/opie-zsafe/opie-zsafe_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/opie-zsame/opie-zsame_1.2.2.bb b/packages/opie-zsame/opie-zsame_1.2.2.bb index 0c4691b578..bb18cc23bd 100644 --- a/packages/opie-zsame/opie-zsame_1.2.2.bb +++ b/packages/opie-zsame/opie-zsame_1.2.2.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb index 8e9011b806..5dc7427fb5 100644 --- a/packages/opie-zsame/opie-zsame_cvs.bb +++ b/packages/opie-zsame/opie-zsame_cvs.bb @@ -1,4 +1,4 @@ -include ${PN}.inc +require ${PN}.inc PV = "${OPIE_CVS_PV}" diff --git a/packages/p4/p4_04.2.bb b/packages/p4/p4_04.2.bb index 7e1ac53785..def797726c 100644 --- a/packages/p4/p4_04.2.bb +++ b/packages/p4/p4_04.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -include p4.inc +require p4.inc diff --git a/packages/p4/p4_05.2.bb b/packages/p4/p4_05.2.bb index 7e1ac53785..def797726c 100644 --- a/packages/p4/p4_05.2.bb +++ b/packages/p4/p4_05.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -include p4.inc +require p4.inc diff --git a/packages/patch/patch_2.5.9.bb b/packages/patch/patch_2.5.9.bb index 682e3d3645..103337b4c9 100644 --- a/packages/patch/patch_2.5.9.bb +++ b/packages/patch/patch_2.5.9.bb @@ -1,4 +1,4 @@ -include patch.inc +require patch.inc SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \ file://2.5.9.patch;patch=1 \ diff --git a/packages/pcre/pcre-native_4.4.bb b/packages/pcre/pcre-native_4.4.bb index d1a99b2914..ba2645c5d3 100644 --- a/packages/pcre/pcre-native_4.4.bb +++ b/packages/pcre/pcre-native_4.4.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include pcre_${PV}.bb +require pcre_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pcre-${PV}" diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb index be4ddc6da0..55bae665b5 100644 --- a/packages/perl/libxml-parser-perl-native_2.34.bb +++ b/packages/perl/libxml-parser-perl-native_2.34.bb @@ -1,4 +1,5 @@ SECTION = "libs" -include libxml-parser-perl_${PV}.bb +require libxml-parser-perl_${PV}.bb inherit native DEPENDS = "perl-native expat-native" +EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'" diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb index a4065e999b..4ec0c0f494 100644 --- a/packages/perl/perl-native_5.8.4.bb +++ b/packages/perl/perl-native_5.8.4.bb @@ -13,9 +13,9 @@ S = "${WORKDIR}/perl-${PV}" do_configure () { ./Configure \ - -Dcc="${BUILD_CC}" \ - -Dcflags="${BUILD_CFLAGS}" \ - -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}" \ + -Dcc="${CC}" \ + -Dcflags="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ -Dusethreads \ -Duselargefiles \ -Dprefix=${prefix} \ diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index 170a0ebf8d..ebe6ac9507 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -18,9 +18,9 @@ PARALLEL_MAKE = "" do_configure () { ./Configure \ - -Dcc="${BUILD_CC}" \ - -Dcflags="${BUILD_CFLAGS}" \ - -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}" \ + -Dcc="${CC}" \ + -Dcflags="${CFLAGS}" \ + -Dldflags="$LDFLAGS}" \ -Dusethreads \ -Duselargefiles \ -Dprefix=${prefix} \ diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 70ac74a3f6..4d176fb194 100644 --- a/packages/perl/perl_5.8.4.bb +++ b/packages/perl/perl_5.8.4.bb @@ -1,3 +1,3 @@ -include perl.inc +require perl.inc PR = "r2" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 510505abb5..11f002f676 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -1,6 +1,6 @@ MAINTAINER="David Karlstrom <daka@thg.se>" -include perl.inc +require perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ @@ -71,7 +71,7 @@ RRECOMMENDS_perl-modules = "${PACKAGES}" RPROVIDES_perl-lib = "perl-lib" -include perl-rdepends_${PV}.inc +require perl-rdepends_${PV}.inc # To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc): # daka@DaKa2:/home/slug/slugos/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc diff --git a/packages/php/php-native_4.3.10.bb b/packages/php/php-native_4.3.10.bb index f4089207a4..c90aa83c01 100644 --- a/packages/php/php-native_4.3.10.bb +++ b/packages/php/php-native_4.3.10.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include php_${PV}.bb +require php_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native" diff --git a/packages/php/php-native_4.3.6.bb b/packages/php/php-native_4.3.6.bb index f4089207a4..c90aa83c01 100644 --- a/packages/php/php-native_4.3.6.bb +++ b/packages/php/php-native_4.3.6.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include php_${PV}.bb +require php_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native" diff --git a/packages/php/php_4.3.10.bb b/packages/php/php_4.3.10.bb index 496e90c78a..c15a9ee486 100644 --- a/packages/php/php_4.3.10.bb +++ b/packages/php/php_4.3.10.bb @@ -1 +1 @@ -include php.inc +require php.inc diff --git a/packages/php/php_4.3.6.bb b/packages/php/php_4.3.6.bb index 496e90c78a..c15a9ee486 100644 --- a/packages/php/php_4.3.6.bb +++ b/packages/php/php_4.3.6.bb @@ -1 +1 @@ -include php.inc +require php.inc diff --git a/packages/pkgconfig/pkgconfig-native_0.15.0.bb b/packages/pkgconfig/pkgconfig-native_0.15.0.bb index d8e47c5d09..daab8ab422 100644 --- a/packages/pkgconfig/pkgconfig-native_0.15.0.bb +++ b/packages/pkgconfig/pkgconfig-native_0.15.0.bb @@ -1,5 +1,5 @@ SECTION = "console/utils" -include pkgconfig_${PV}.bb +require pkgconfig_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" S = "${WORKDIR}/pkgconfig-${PV}" diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb index da39fb8bb2..f8644f1425 100644 --- a/packages/popt/popt-native_1.7.bb +++ b/packages/popt/popt-native_1.7.bb @@ -1,5 +1,5 @@ SECTION = "unknown" -include popt_${PV}.bb +require popt_${PV}.bb inherit native S = "${WORKDIR}/popt-${PV}" diff --git a/packages/postfix/postfix-native_2.0.20.bb b/packages/postfix/postfix-native_2.0.20.bb index bf00fd832d..dbbad9b450 100644 --- a/packages/postfix/postfix-native_2.0.20.bb +++ b/packages/postfix/postfix-native_2.0.20.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -include postfix_${PV}.bb +require postfix_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/postfix-${PV}" DEPENDS = "virtual/db-native pcre-native" diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb index 098bd028cb..8a7804b554 100644 --- a/packages/prboom/prboom-opie_2.2.6.bb +++ b/packages/prboom/prboom-opie_2.2.6.bb @@ -1,4 +1,4 @@ -include prboom_${PV}.bb +require prboom_${PV}.bb PR = "r6" diff --git a/packages/prism54/prism54-module_cvs.bb b/packages/prism54/prism54-module_cvs.bb index 7953eb46b3..bb40f25a45 100644 --- a/packages/prism54/prism54-module_cvs.bb +++ b/packages/prism54/prism54-module_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" PV = "1.2+cvs${SRCDATE}" -include prism54-module_1.2.bb +require prism54-module_1.2.bb SRC_URI = "http://prism54.org/pub/linux/snapshot/tars/prism54-cvs-latest.tar.bz2" S = "${WORKDIR}/prism54-cvs-latest" diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb index 085ee18a77..abbcc28987 100644 --- a/packages/psmisc/psmisc_21.8.bb +++ b/packages/psmisc/psmisc_21.8.bb @@ -1,3 +1,3 @@ -include psmisc.inc +require psmisc.inc PR = "r1" SRC_URI += "file://signames-header-fix.patch;patch=1" diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb index 6bf1780582..4f0d7f219d 100644 --- a/packages/psmisc/psmisc_22.2.bb +++ b/packages/psmisc/psmisc_22.2.bb @@ -1,2 +1,2 @@ -include psmisc.inc +require psmisc.inc PR = "r0" diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch new file mode 100644 index 0000000000..3db0b2c9d6 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 +--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 +*************** +*** 57,66 **** + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install + + else + +--- 57,66 ---- + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb new file mode 100644 index 0000000000..ab22c521f3 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>" +LICENSE = "GPL" +PR = "r1" +RRECOMMENDS = "kernel-module-tveeprom \ + kernel-module-firmware-class \ + kernel-module-tuner \ + kernel-module-msp3400 \ + kernel-module-saa7115 \ + kernel-module-tda9887 \ + kernel-module-v4l1-compat \ + kernel-module-v4l2-common \ + kernel-module-videodev" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://hotplug.functions \ + file://firmware.hotplug \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + mkdir -p ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware +} diff --git a/packages/python/python-native-2.3.3/bindir-libdir.patch b/packages/python/python-native-2.3.3/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python-native-2.3.3/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.3.3/cross-distutils.patch b/packages/python/python-native-2.3.3/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python-native-2.3.3/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch new file mode 100644 index 0000000000..54109afd62 --- /dev/null +++ b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/packages/python/python-native_2.3.3.bb b/packages/python/python-native_2.3.3.bb deleted file mode 100644 index 8f2e782a7b..0000000000 --- a/packages/python/python-native_2.3.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "" -PR = "r1" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' - -do_configure () { - oe_runconf -} - -do_stage_append() { - # install pgen for later usage with non-native builds - install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ -} - diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 00092d1e15..4f5db82569 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -5,13 +5,14 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "" -PR = "r0" +PR = "r1" EXCLUDE_FROM_WORLD = "1" SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1" S = "${WORKDIR}/Python-2.4" inherit autotools native @@ -20,7 +21,8 @@ EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx -- --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' -do_configure () { +do_configure() { + # the autofoo stuff is too old to allow regenerating oe_runconf } diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb index 6cd91e68ec..7550e2314d 100644 --- a/packages/python/python-pyqt4_4.0.bb +++ b/packages/python/python-pyqt4_4.0.bb @@ -63,7 +63,7 @@ do_install() { echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so done - cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ } diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb index f06f6388a6..d7ec81fd8e 100644 --- a/packages/python/python-pyrex-native_0.9.3.bb +++ b/packages/python/python-pyrex-native_0.9.3.bb @@ -1,4 +1,4 @@ -include python-pyrex_${PV}.bb +require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS = "" diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.96.90.bb index c106440ed7..31bce5583d 100644 --- a/packages/python/python-scons-native_0.96.90.bb +++ b/packages/python/python-scons-native_0.96.90.bb @@ -1,4 +1,4 @@ -include python-scons_${PV}.bb +require python-scons_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS = "" diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb index caa6f6abc0..acb5543a90 100644 --- a/packages/qemu/qemu-native_0.7.0.bb +++ b/packages/qemu/qemu-native_0.7.0.bb @@ -1,4 +1,4 @@ -include qemu_${PV}.bb +require qemu_${PV}.bb inherit native S = "${WORKDIR}/qemu-${PV}" prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_0.8.0.bb b/packages/qemu/qemu-native_0.8.0.bb index caa6f6abc0..acb5543a90 100644 --- a/packages/qemu/qemu-native_0.8.0.bb +++ b/packages/qemu/qemu-native_0.8.0.bb @@ -1,4 +1,4 @@ -include qemu_${PV}.bb +require qemu_${PV}.bb inherit native S = "${WORKDIR}/qemu-${PV}" prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_0.8.1.bb b/packages/qemu/qemu-native_0.8.1.bb index caa6f6abc0..acb5543a90 100644 --- a/packages/qemu/qemu-native_0.8.1.bb +++ b/packages/qemu/qemu-native_0.8.1.bb @@ -1,4 +1,4 @@ -include qemu_${PV}.bb +require qemu_${PV}.bb inherit native S = "${WORKDIR}/qemu-${PV}" prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_cvs.bb b/packages/qemu/qemu-native_cvs.bb index 976d2d664f..49d6c17b64 100644 --- a/packages/qemu/qemu-native_cvs.bb +++ b/packages/qemu/qemu-native_cvs.bb @@ -1,4 +1,4 @@ -include qemu_cvs.bb +require qemu_cvs.bb inherit native prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index 0b8c3e84ec..2a4408ad2a 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -39,7 +39,7 @@ do_compile() { do_stage() { install -m 0755 bin/qmake ${STAGING_BINDIR} install -d ${QMAKE_MKSPEC_PATH} - cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH} + cp -fPR mkspecs/* ${QMAKE_MKSPEC_PATH} } do_install() { diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 744588ed27..9f1af8fef2 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -42,7 +42,7 @@ do_compile() { do_stage() { install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -dfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ + cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ } do_install() { diff --git a/packages/qpf-fonts/qpf-dejavusans_2.7.bb b/packages/qpf-fonts/qpf-dejavusans_2.7.bb index 3428d98a89..7673efe936 100644 --- a/packages/qpf-fonts/qpf-dejavusans_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusans_2.7.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Sans font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb index 7494374023..0a753d90a8 100644 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Sans Condensed font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb index 51c9e1b925..e2b07e4015 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Sans Mono font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb index 81009e8a8c..863d6a3e45 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Serif font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb index db31216907..d84cdff195 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Serif Condensed font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/quagga/quagga_0.99.2.bb b/packages/quagga/quagga_0.99.2.bb index ead4bf786d..a14ef1ad1a 100644 --- a/packages/quagga/quagga_0.99.2.bb +++ b/packages/quagga/quagga_0.99.2.bb @@ -1,4 +1,4 @@ QUAGGASUBDIR = "/attic" -include quagga.inc +require quagga.inc PR = "r2" SRC_URI += "file://ospfd-no-opaque-lsa-fix.patch;patch=1" diff --git a/packages/quagga/quagga_0.99.3.bb b/packages/quagga/quagga_0.99.3.bb index 8a55e8b73e..9f76edb5e3 100644 --- a/packages/quagga/quagga_0.99.3.bb +++ b/packages/quagga/quagga_0.99.3.bb @@ -1,2 +1,2 @@ -include quagga.inc +require quagga.inc PR = "r2" diff --git a/packages/quagga/quagga_0.99.4.bb b/packages/quagga/quagga_0.99.4.bb index e61c80d651..cba544fdfd 100644 --- a/packages/quagga/quagga_0.99.4.bb +++ b/packages/quagga/quagga_0.99.4.bb @@ -1,2 +1,2 @@ -include quagga.inc +require quagga.inc PR = "r1" diff --git a/packages/quilt/quilt-0.39/.mtn2git_empty b/packages/quilt/quilt-0.39/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/quilt/quilt-0.39/.mtn2git_empty diff --git a/packages/quilt/files/non-gnu.patch b/packages/quilt/quilt-0.39/non-gnu.patch index 8b07bc2923..8b07bc2923 100644 --- a/packages/quilt/files/non-gnu.patch +++ b/packages/quilt/quilt-0.39/non-gnu.patch diff --git a/packages/quilt/files/nostrip.patch b/packages/quilt/quilt-0.39/nostrip.patch index 4dedad96d4..4dedad96d4 100644 --- a/packages/quilt/files/nostrip.patch +++ b/packages/quilt/quilt-0.39/nostrip.patch diff --git a/packages/quilt/quilt-0.45/.mtn2git_empty b/packages/quilt/quilt-0.45/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/quilt/quilt-0.45/.mtn2git_empty diff --git a/packages/quilt/quilt-0.45/aclocal.patch b/packages/quilt/quilt-0.45/aclocal.patch new file mode 100644 index 0000000000..03d99ed785 --- /dev/null +++ b/packages/quilt/quilt-0.45/aclocal.patch @@ -0,0 +1,71 @@ +Add the aclocal.m4 as acinclude.m4 + +Index: quilt-0.45/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ quilt-0.45/acinclude.m4 2006-08-06 23:18:56.000000000 +0200 +@@ -0,0 +1,64 @@ ++dnl Allow configure to specify a specific binary ++dnl 1: Environment variable ++dnl 2: binary name ++dnl 3: optional list of alternative binary names ++dnl 4: optional list of additional search directories ++AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ ++ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) ++ ++ AC_ARG_WITH($2, AC_HELP_STRING( ++ [--with-$2], [name of the $2 executable to use] ++ m4_if(internal_$2_cmd,[],[],[ (use --without-$2 ++ to use an internal mechanism)])), ++ [ ++ if test x"$withval" = xnone; then ++ AC_MSG_ERROR([Invalid configure argument. use --without-$2]) ++ fi ++ if test x"$withval" != xno; then ++ AC_MSG_CHECKING(for $2) ++ $1="$withval" ++ if test -e "$$1"; then ++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then ++ AC_MSG_ERROR([$$1 is not an executable file]) ++ fi ++ fi ++ AC_MSG_RESULT([$$1]) ++ if test ! -e "$$1"; then ++ AC_MSG_WARN([$$1 does not exist]) ++ fi ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ fi ++ ],[ ++ m4_if([$3],[],[ ++ AC_PATH_PROG($1,$2,,$PATH:$4) ++ ],[ ++ AC_PATH_PROGS($1,$3,,$PATH:$4) ++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ fi ++ ]) ++ m4_if([$4],[],[],[ ++ if test -n "$$1"; then ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for dir in "$4"; do ++ if test "`dirname $$1`" = "$dir"; then ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ break ++ fi ++ done ++ IFS="$as_save_IFS" ++ fi ++ ]) ++ ]) ++ if test -z "$$1"; then ++ m4_if(internal_$2_cmd,[],[ ++ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2']) ++ ],[ ++ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override]) ++ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2" ++ $1=$2 ++ INTERNAL_$1=1 ++ ]) ++ fi ++ AC_SUBST($1) ++]) diff --git a/packages/quilt/quilt-0.45/non-gnu.patch b/packages/quilt/quilt-0.45/non-gnu.patch new file mode 100644 index 0000000000..c1cbfb3983 --- /dev/null +++ b/packages/quilt/quilt-0.45/non-gnu.patch @@ -0,0 +1,223 @@ +Patch is from the Fink projetc (http://fink.sf.net) + +diff -r 7b51c215fc54 Makefile.in +--- a/Makefile.in Sat Mar 4 17:16:21 2006 -0800 ++++ b/Makefile.in Sat Mar 4 17:59:09 2006 -0800 +@@ -256,7 +256,7 @@ bin/guards.1 : bin/guards + -e 's:@VERSION''@:$(VERSION):g' \ + -e 's:@RELEASE''@:$(RELEASE):g' \ + -e 's:@LOCALEDIR''@:$(localedir):g' \ +- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ ++ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \ + $< > $@ + @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) + +@@ -320,11 +320,11 @@ endif + $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) + $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ + +- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ + $(INSTALL) -m 644 doc/README \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ + $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ + + $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 + $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ +@@ -367,7 +367,7 @@ uninstall :: + $(notdir $(MAN1))) \ + $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \ + $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ + + check: $(TESTS:test/%.test=test/.%.ok) + check-all: $(TESTS:test/%.test=check-%) +diff -r 7b51c215fc54 configure +--- a/configure Sat Mar 4 17:16:21 2006 -0800 ++++ b/configure Sat Mar 4 17:59:09 2006 -0800 +@@ -3882,29 +3882,6 @@ echo "$as_me: error: Please specify the + fi + + +-echo "$as_me:$LINENO: checking whether $CP -l works" >&5 +-echo $ECHO_N "checking whether $CP -l works... $ECHO_C" >&6 +-touch conftest.1 +-if $CP -l conftest.1 conftest.2 2>/dev/null; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +- { { echo "$as_me:$LINENO: error: no +- +-You appear to have a \`cp' that does not support hard links. +-You can download GNU fileutils from ftp.gnu.org +-" >&5 +-echo "$as_me: error: no +- +-You appear to have a \`cp' that does not support hard links. +-You can download GNU fileutils from ftp.gnu.org +-" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- +- + + # Check whether --with-date or --without-date was given. + if test "${with_date+set}" = set; then +@@ -3999,32 +3976,6 @@ echo "$as_me: WARNING: Using internal da + INTERNAL_DATE=1 + + fi +- +- +- +-if test -z "$INTERNAL_DATE"; then +- echo "$as_me:$LINENO: checking whether $DATE --rfc-822 works" >&5 +-echo $ECHO_N "checking whether $DATE --rfc-822 works... $ECHO_C" >&6 +- if $DATE --rfc-822 >/dev/null 2>/dev/null; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- else +- { { echo "$as_me:$LINENO: error: no +- +-If you don't have a version of \`date' that supports --rfc-822, you +-can specify '--without-date' and $PACKAGE_NAME will use its own +-internal date. +-" >&5 +-echo "$as_me: error: no +- +-If you don't have a version of \`date' that supports --rfc-822, you +-can specify '--without-date' and $PACKAGE_NAME will use its own +-internal date. +-" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi +- + + + +diff -r 7b51c215fc54 quilt/diff.in +--- a/quilt/diff.in Sat Mar 4 17:16:21 2006 -0800 ++++ b/quilt/diff.in Sat Mar 4 17:59:09 2006 -0800 +@@ -303,7 +303,7 @@ then + + if [ ${#files[@]} -gt 0 ] \ + && ! ( cd $QUILT_PC/$last_patch && +- cp -l --parents "${files[@]}" $workdir/ ) ++ mycpl $workdir/ "${files[@]}" ) + then + printf $"Failed to copy files to temporary directory\n" >&2 + die 1 +diff -r 7b51c215fc54 quilt/mail.in +--- a/quilt/mail.in Sat Mar 4 17:16:21 2006 -0800 ++++ b/quilt/mail.in Sat Mar 4 17:59:09 2006 -0800 +@@ -64,7 +64,7 @@ with a template for the introduction. Pl + + msgid() + { +- local timestamp=$(date --utc "+%Y%m%d%H%M%S.%N") ++ local timestamp=$(date -u "+%Y%m%d%H%M%S.000000000") + echo "$timestamp@${opt_sender#*@}" + } + +@@ -334,7 +334,7 @@ introduction="$(gen_tempfile)" + cat <<-EOF + Message-Id: <$(msgid)> + User-Agent: quilt/@VERSION@-@RELEASE@ +- Date: $(date --rfc-822) ++ Date: $(date '+%a, %d %b %Y %H:%M:%S %z') + From: ${opt_from:-$opt_sender} + To: $(IFS=,; echo "${opt_to[*]}") + Cc: $(IFS=,; echo "${opt_cc[*]}") +@@ -401,7 +401,11 @@ fi + # increment the timestamp by one second and wait with sending until + # that time has arrived. This allows MUAs to show the messages in the + # correct order. +-last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)") ++#last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)") ++# fink has no date available that does -d, so we fudge with the time now. ++# If the user edits the date field in the message patch 0 could end up ++# out of order wrt the actual patches. just a minor cosmetic nit. ++last_ts=$(date '+%s') + + num=1 + for patch in "${patches[@]}"; do +@@ -412,7 +416,7 @@ for patch in "${patches[@]}"; do + # sleep 1 + #done + ((last_ts++)) +- new_date="$(date --rfc-822 -d "1970/01/01 UTC $last_ts seconds")" ++ new_date="$(date -r $last_ts '+%a, %d %b %Y %H:%M:%S %z')" + + modify="$(awk ' + sub(/^Recipient-/, "") { r = $0 +diff -r 7b51c215fc54 quilt/pop.in +--- a/quilt/pop.in Sat Mar 4 17:16:21 2006 -0800 ++++ b/quilt/pop.in Sat Mar 4 17:59:09 2006 -0800 +@@ -93,7 +93,7 @@ check_for_pending_changes() + if [ -d $QUILT_PC/$patch ] + then + if ! rmdir $workdir || # note that this is racey... +- ! cp -rl $QUILT_PC/$patch $workdir ++ ! (for i in "$(find "$QUILT_PC/$patch" -type f)"; do mycpl $workdir $i; done) + then + printf $"Failed to copy files to temporary directory\n" >&2 + rm -rf $workdir +diff -r 7b51c215fc54 quilt/scripts/patchfns.in +--- a/quilt/scripts/patchfns.in Sat Mar 4 17:16:21 2006 -0800 ++++ b/quilt/scripts/patchfns.in Sat Mar 4 17:59:09 2006 -0800 +@@ -45,6 +45,28 @@ fi + fi + + # ======================================================== ++ ++dater() ++{ ++ ts=$(perl -e '@st = stat($ARGV[0]); print $st[9];' "$1") ++ fmt=$(date -r $ts "$2") ++ ++ echo $fmt ++} ++ ++mycpl () ++{ ++ target=$1 ++ shift; ++ ++ for src in "$@" ++ do ++ srcdir="${src%/*}" ++ test -n "$srcdir" && mkdir -p "$target/$srcdir" ++ ln $src "$target/$src" ++ done ++} ++ + + #declare -a exit_handlers + # +@@ -669,8 +691,7 @@ diff_file() + || old_date=$'\t'"1970-01-01 00:00:00.000000000 +0000" + else + [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \ +- || old_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \ +- -r "$old_file") ++ || old_date=$'\t'$(dater "$old_file" +'%Y-%m-%d %H:%M:%S.000000000 %z') + fi + if ! [ -s "$new_file" ] + then +@@ -682,8 +703,7 @@ diff_file() + || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000" + else + [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \ +- || new_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \ +- -r "$new_file") ++ || new_date=$'\t'$(dater "$new_file" +'%Y-%m-%d %H:%M:%S.000000000 %z') + fi + + diff $QUILT_DIFF_OPTS $old_file $new_file \ diff --git a/packages/quilt/quilt-native_0.42.bb b/packages/quilt/quilt-native.inc index d9bdc0e00c..d19d864904 100644 --- a/packages/quilt/quilt-native_0.42.bb +++ b/packages/quilt/quilt-native.inc @@ -1,5 +1,8 @@ -include quilt.inc +require quilt_${PV}.inc + +SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 " RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/quilt-${PV}" INHIBIT_AUTOTOOLS_DEPS = "1" diff --git a/packages/quilt/quilt-native_0.39.bb b/packages/quilt/quilt-native_0.39.bb index d9bdc0e00c..7caa9f620c 100644 --- a/packages/quilt/quilt-native_0.39.bb +++ b/packages/quilt/quilt-native_0.39.bb @@ -1,14 +1,2 @@ -include quilt.inc -RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native" - -INHIBIT_AUTOTOOLS_DEPS = "1" - -inherit autotools native - -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" -EXTRA_OECONF = "--disable-nls" - -do_configure () { - oe_runconf -} +PV="0.39" +require quilt-native.inc diff --git a/packages/quilt/quilt-native_0.45.bb b/packages/quilt/quilt-native_0.45.bb new file mode 100644 index 0000000000..033f323a13 --- /dev/null +++ b/packages/quilt/quilt-native_0.45.bb @@ -0,0 +1,2 @@ +PV="0.45" +require quilt-native.inc diff --git a/packages/quilt/quilt.inc b/packages/quilt/quilt.inc index cd5e85c3d8..387ec8f057 100644 --- a/packages/quilt/quilt.inc +++ b/packages/quilt/quilt.inc @@ -4,10 +4,6 @@ SECTION = "devel" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "GPL" -SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ - file://install.patch;patch=1 \ - file://nostrip.patch;patch=1" - -SRC_URI_append_build-darwin = " file://non-gnu.patch;patch=1 " +SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz " S = "${WORKDIR}/quilt-${PV}" diff --git a/packages/quilt/quilt_0.39.bb b/packages/quilt/quilt_0.39.bb index 51bfa7a469..9a08b19abd 100644 --- a/packages/quilt/quilt_0.39.bb +++ b/packages/quilt/quilt_0.39.bb @@ -1,7 +1,7 @@ RDEPENDS_${PN} += "patch diffstat bzip2" -include quilt.inc +require quilt_${PV}.inc inherit autotools gettext -include quilt-package.inc +require quilt-package.inc diff --git a/packages/quilt/quilt_0.39.inc b/packages/quilt/quilt_0.39.inc new file mode 100644 index 0000000000..4fbbb03316 --- /dev/null +++ b/packages/quilt/quilt_0.39.inc @@ -0,0 +1,5 @@ +require quilt.inc + +SRC_URI += "file://install.patch;patch=1 \ + file://nostrip.patch;patch=1" + diff --git a/packages/quilt/quilt_0.42.bb b/packages/quilt/quilt_0.42.bb deleted file mode 100644 index 51bfa7a469..0000000000 --- a/packages/quilt/quilt_0.42.bb +++ /dev/null @@ -1,7 +0,0 @@ -RDEPENDS_${PN} += "patch diffstat bzip2" - -include quilt.inc - -inherit autotools gettext - -include quilt-package.inc diff --git a/packages/quilt/quilt_0.45.bb b/packages/quilt/quilt_0.45.bb new file mode 100644 index 0000000000..cf96cc9bc9 --- /dev/null +++ b/packages/quilt/quilt_0.45.bb @@ -0,0 +1,9 @@ +RDEPENDS_${PN} += "patch diffstat bzip2" + +require quilt_${PV}.inc + +SRC_URI += "file://aclocal.patch;patch=1" + +inherit autotools gettext + +require quilt-package.inc diff --git a/packages/quilt/quilt_0.45.inc b/packages/quilt/quilt_0.45.inc new file mode 100644 index 0000000000..bf6267b56c --- /dev/null +++ b/packages/quilt/quilt_0.45.inc @@ -0,0 +1,3 @@ +require quilt.inc + +SRC_URI += "file://install.patch;patch=1" diff --git a/packages/radlib/radlib-mysql_2.6.2.bb b/packages/radlib/radlib-mysql_2.6.2.bb index 61b5b8c5ef..3b05f1f40a 100644 --- a/packages/radlib/radlib-mysql_2.6.2.bb +++ b/packages/radlib/radlib-mysql_2.6.2.bb @@ -1,3 +1,3 @@ -include radlib-common.inc -include radlib-mysql.inc +require radlib-common.inc +require radlib-mysql.inc PR = "r1" diff --git a/packages/radlib/radlib_2.6.2.bb b/packages/radlib/radlib_2.6.2.bb index a123adc785..1296a659a9 100644 --- a/packages/radlib/radlib_2.6.2.bb +++ b/packages/radlib/radlib_2.6.2.bb @@ -1,3 +1,3 @@ -include radlib-common.inc -include radlib.inc +require radlib-common.inc +require radlib.inc PR = "r1" diff --git a/packages/rdiff-backup/rdiff-backup_1.0.4.bb b/packages/rdiff-backup/rdiff-backup_1.0.4.bb index 6cc6e28276..05aa686a02 100644 --- a/packages/rdiff-backup/rdiff-backup_1.0.4.bb +++ b/packages/rdiff-backup/rdiff-backup_1.0.4.bb @@ -1,2 +1,2 @@ -include rdiff-backup.inc +require rdiff-backup.inc PR = "r0" diff --git a/packages/rdiff-backup/rdiff-backup_1.1.5.bb b/packages/rdiff-backup/rdiff-backup_1.1.5.bb index 99ddc95a9d..a8cf1876ec 100644 --- a/packages/rdiff-backup/rdiff-backup_1.1.5.bb +++ b/packages/rdiff-backup/rdiff-backup_1.1.5.bb @@ -1,4 +1,4 @@ -include rdiff-backup.inc +require rdiff-backup.inc PR = "r0" # 1.1.x added the use of sha which we get from python-crypt diff --git a/packages/readline/readline-native_4.3.bb b/packages/readline/readline-native_4.3.bb index e9cede7cd1..c3ce970b4c 100644 --- a/packages/readline/readline-native_4.3.bb +++ b/packages/readline/readline-native_4.3.bb @@ -1,4 +1,4 @@ -include readline_${PV}.bb +require readline_${PV}.bb inherit native DEPENDS = "ncurses-native" FILESPATH = "${FILE_DIRNAME}/readline-${PV}:${FILE_DIRNAME}/readline:${FILE_DIRNAME}/files:${FILE_DIRNAME}" diff --git a/packages/recode/recode-native_3.6.bb b/packages/recode/recode-native_3.6.bb index 961d294f2c..af51f2c663 100644 --- a/packages/recode/recode-native_3.6.bb +++ b/packages/recode/recode-native_3.6.bb @@ -1,4 +1,4 @@ -include recode_${PV}.bb +require recode_${PV}.bb inherit native diff --git a/packages/regina-rexx/regina-rexx-native_3.3.bb b/packages/regina-rexx/regina-rexx-native_3.3.bb index d2f68cab43..dda059de8f 100644 --- a/packages/regina-rexx/regina-rexx-native_3.3.bb +++ b/packages/regina-rexx/regina-rexx-native_3.3.bb @@ -1,4 +1,4 @@ -include regina-rexx_${PV}.bb +require regina-rexx_${PV}.bb inherit native DEPENDS = "" diff --git a/packages/rtaudio/rtaudio-tests_3.0.1.bb b/packages/rtaudio/rtaudio-tests_3.0.1.bb index 53752b73c0..991f55d574 100644 --- a/packages/rtaudio/rtaudio-tests_3.0.1.bb +++ b/packages/rtaudio/rtaudio-tests_3.0.1.bb @@ -1,4 +1,4 @@ -include librtaudio_${PV}.bb +require librtaudio_${PV}.bb inherit autotools diff --git a/packages/ruby/ruby-native_1.8.4.bb b/packages/ruby/ruby-native_1.8.4.bb index d5ccae8262..c73e905ef4 100644 --- a/packages/ruby/ruby-native_1.8.4.bb +++ b/packages/ruby/ruby-native_1.8.4.bb @@ -1,3 +1,3 @@ -include ruby_${PV}.bb +require ruby_${PV}.bb inherit native DEPENDS = "" diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index 4cee9541bd..c98fa2082a 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -14,7 +14,7 @@ S := ${WORKDIR}/samba-${PV}/source RCONFILCTS = samba -include samba-essential.inc +require samba-essential.inc inherit update-rc.d INITSCRIPT_NAME = "samba" diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb index 7c7bce0f49..e7514c57df 100644 --- a/packages/samba/samba_3.0.10.bb +++ b/packages/samba/samba_3.0.10.bb @@ -3,4 +3,4 @@ SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://${FILESDIR}/cifs.patch;patch=1" S := ${WORKDIR}/${P}/source -include samba.inc +require samba.inc diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 321ec1230d..4daf98bfc8 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -9,7 +9,7 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ " S = ${WORKDIR}/${P}/source -include samba.inc +require samba.inc inherit update-rc.d INITSCRIPT_NAME = "samba" diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb index 6b52878a09..7f5bd3dffa 100644 --- a/packages/samba/samba_3.0.20.bb +++ b/packages/samba/samba_3.0.20.bb @@ -9,7 +9,7 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ " S = ${WORKDIR}/${P}/source -include samba.inc +require samba.inc inherit update-rc.d INITSCRIPT_NAME = "samba" diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb index 7c7bce0f49..e7514c57df 100644 --- a/packages/samba/samba_3.0.5.bb +++ b/packages/samba/samba_3.0.5.bb @@ -3,4 +3,4 @@ SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://${FILESDIR}/cifs.patch;patch=1" S := ${WORKDIR}/${P}/source -include samba.inc +require samba.inc diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb index 7c7bce0f49..e7514c57df 100644 --- a/packages/samba/samba_3.0.9.bb +++ b/packages/samba/samba_3.0.9.bb @@ -3,4 +3,4 @@ SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://${FILESDIR}/cifs.patch;patch=1" S := ${WORKDIR}/${P}/source -include samba.inc +require samba.inc diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 82623d8fdc..f23cccae70 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,4 +1,4 @@ -include scummvm.inc +require scummvm.inc DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2" S="${WORKDIR}/scummvm-${PV}/" diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 313737bc92..67762708a9 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,4 +1,4 @@ -include scummvm.inc +require scummvm.inc DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" SRC_URI += " file://mouse.patch;patch=1 \ file://gcc-4.x.x-accept.patch;patch=1 \ diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index 2f8e9382bb..7cfd6ac0d0 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -1,4 +1,4 @@ -include scummvm.inc +require scummvm.inc DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" diff --git a/packages/sdcc/sdcc-native_2.5.0.bb b/packages/sdcc/sdcc-native_2.5.0.bb index 2a05d5e628..85c3d5b0fd 100644 --- a/packages/sdcc/sdcc-native_2.5.0.bb +++ b/packages/sdcc/sdcc-native_2.5.0.bb @@ -1,4 +1,4 @@ -include sdcc_${PV}.bb +require sdcc_${PV}.bb inherit native diff --git a/packages/sed/sed-native_4.1.1.bb b/packages/sed/sed-native_4.1.1.bb index e2e2b229e8..3bfacd88a3 100644 --- a/packages/sed/sed-native_4.1.1.bb +++ b/packages/sed/sed-native_4.1.1.bb @@ -1,3 +1,3 @@ SECTION = "console/utils" -include sed_${PV}.bb +require sed_${PV}.bb inherit native diff --git a/packages/sed/sed-native_4.1.2.bb b/packages/sed/sed-native_4.1.2.bb index e2e2b229e8..3bfacd88a3 100644 --- a/packages/sed/sed-native_4.1.2.bb +++ b/packages/sed/sed-native_4.1.2.bb @@ -1,3 +1,3 @@ SECTION = "console/utils" -include sed_${PV}.bb +require sed_${PV}.bb inherit native diff --git a/packages/sgml-common/sgml-common-native_0.6.3.bb b/packages/sgml-common/sgml-common-native_0.6.3.bb index fa70ac8244..749e26a500 100644 --- a/packages/sgml-common/sgml-common-native_0.6.3.bb +++ b/packages/sgml-common/sgml-common-native_0.6.3.bb @@ -1,5 +1,5 @@ SECTION = "base" -include sgml-common_${PV}.bb +require sgml-common_${PV}.bb inherit native DEPENDS = "" diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb index 14a1ab5d64..81328ae414 100644 --- a/packages/slugimage/slugimage-native.bb +++ b/packages/slugimage/slugimage-native.bb @@ -1,5 +1,5 @@ # slugimage - a program to construct NSLU2 image files -include slugimage.bb +require slugimage.bb # slugimage depends on perl, we assume that this is installed. RDEPENDS = "" diff --git a/packages/slugtool/slugtool-native.bb b/packages/slugtool/slugtool-native.bb index 6152de8024..2d1fe918de 100644 --- a/packages/slugtool/slugtool-native.bb +++ b/packages/slugtool/slugtool-native.bb @@ -1,5 +1,5 @@ SECTION = "unknown" -include slugtool.bb +require slugtool.bb inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb index 958fab46d5..cdb2996986 100644 --- a/packages/slutils/slutils_0.1.0.bb +++ b/packages/slutils/slutils_0.1.0.bb @@ -21,7 +21,7 @@ do_fetch() { for u in ${UTILS} do install -d ${S}/$u - cp -dfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/ + cp -PfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/ done } diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb index 5bb5af8598..2423e47e77 100644 --- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb @@ -1,4 +1,4 @@ -include squashfs-tools_${PV}.bb +require squashfs-tools_${PV}.bb DEPENDS = "lzma-native" PN_BASE = "squashfs-tools" diff --git a/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb index c78f00c540..b6ee6e7a22 100644 --- a/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb +++ b/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb @@ -1,4 +1,4 @@ -include squashfs-tools_${PV}.bb +require squashfs-tools_${PV}.bb DEPENDS = "lzma-native" diff --git a/packages/stat/stat-native_3.3.bb b/packages/stat/stat-native_3.3.bb index 2234fb85a2..cb97119fb3 100644 --- a/packages/stat/stat-native_3.3.bb +++ b/packages/stat/stat-native_3.3.bb @@ -1,5 +1,5 @@ SECTION = "console/utils" -include stat_${PV}.bb +require stat_${PV}.bb inherit native S = "${WORKDIR}/stat-${PV}" diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb index d76b68488a..5f61b1c125 100644 --- a/packages/stunnel/stunnel_4.05.bb +++ b/packages/stunnel/stunnel_4.05.bb @@ -1,4 +1,4 @@ -include stunnel.inc +require stunnel.inc PR = "r1" SRC_URI = "ftp://stunnel.mirt.net/stunnel/OBSOLETE/stunnel-${PV}.tar.gz \ diff --git a/packages/stunnel/stunnel_4.09.bb b/packages/stunnel/stunnel_4.09.bb index 31711aa355..275c8f2a74 100644 --- a/packages/stunnel/stunnel_4.09.bb +++ b/packages/stunnel/stunnel_4.09.bb @@ -1,4 +1,4 @@ -include stunnel.inc +require stunnel.inc SRC_URI = "http://www.stunnel.org/download/stunnel/src/stunnel-${PV}.tar.gz \ file://configure.patch;patch=1 \ diff --git a/packages/sudo/sudo_1.6.8p12.bb b/packages/sudo/sudo_1.6.8p12.bb index f9d55411f8..fa20fc6feb 100644 --- a/packages/sudo/sudo_1.6.8p12.bb +++ b/packages/sudo/sudo_1.6.8p12.bb @@ -4,4 +4,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ file://noexec-link.patch;patch=1" -include sudo.inc +require sudo.inc diff --git a/packages/swig/swig-native_1.3.24.bb b/packages/swig/swig-native_1.3.24.bb index 3a5ed61c81..8210bb9cfb 100644 --- a/packages/swig/swig-native_1.3.24.bb +++ b/packages/swig/swig-native_1.3.24.bb @@ -1,4 +1,4 @@ -include swig_${PV}.bb +require swig_${PV}.bb inherit native do_stage() { diff --git a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.1_2.3.0.bb b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.1_2.3.0.bb index 4145408fc4..4047aea1c3 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.1_2.3.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.1_2.3.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " gtkhtml2" diff --git a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb index d574fc8482..47d15645e6 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " gtkhtml2" diff --git a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.3.0.bb b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.3.0.bb index c616cfb8ff..2fb1c5f1dc 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.3.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.3.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " db" diff --git a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.4.0.bb b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.4.0.bb index c616cfb8ff..2fb1c5f1dc 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.4.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.4.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " db" diff --git a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.5_2.3.0.bb b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.5_2.3.0.bb index 7cb0c16238..7b898ad918 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.5_2.3.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.5_2.3.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " libxml2 curl glib-2.0 gtk+" diff --git a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.6_2.4.0.bb b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.6_2.4.0.bb index dbbe115e86..7c68da1ea8 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.6_2.4.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.6_2.4.0.bb @@ -1,4 +1,4 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " libxml2 curl glib-2.0 gtk+" diff --git a/packages/tar/tar-native_1.13.93.bb b/packages/tar/tar-native_1.13.93.bb index 7cb2262e3b..4a7aae3282 100644 --- a/packages/tar/tar-native_1.13.93.bb +++ b/packages/tar/tar-native_1.13.93.bb @@ -1,5 +1,5 @@ SECTION = "base" -include tar_${PV}.bb +require tar_${PV}.bb inherit native S = "${WORKDIR}/tar-${PV}" diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 57def09e49..d35f07f30a 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages for Opie and GPE" -PR = "r4" +PR = "r5" LICENSE = MIT ALLOW_EMPTY = "1" @@ -107,6 +107,7 @@ RDEPENDS_task-sdk-x11-ext := "\ # libxss-dev \ RDEPENDS_task-sdk-gpe := "\ + libcontactsdb-dev \ esound-gpe-dev \ libeventdb-dev \ libgpepimc-dev \ diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/tetex/tetex-native_3.0.bb index a85dae8ea6..ed487452bf 100644 --- a/packages/tetex/tetex-native_3.0.bb +++ b/packages/tetex/tetex-native_3.0.bb @@ -1,4 +1,4 @@ -include tetex_${PV}.bb +require tetex_${PV}.bb inherit native DEPENDS = "" PR = "r1" diff --git a/packages/time/time_1.7.bb b/packages/time/time_1.7.bb index a7df734e71..1030489b6f 100644 --- a/packages/time/time_1.7.bb +++ b/packages/time/time_1.7.bb @@ -1,4 +1,4 @@ -include time.inc +require time.inc SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ file://debian.patch;patch=1" diff --git a/packages/treecc/treecc-native_0.3.6.bb b/packages/treecc/treecc-native_0.3.6.bb index 06524f1cb7..fac326db1c 100644 --- a/packages/treecc/treecc-native_0.3.6.bb +++ b/packages/treecc/treecc-native_0.3.6.bb @@ -1,4 +1,4 @@ -include treecc_${PV}.bb +require treecc_${PV}.bb SECTION = "devel" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/treecc-${PV}" MAINTAINER = "Kirill Kononenko <krokas@aport.ru" diff --git a/packages/ttf-fonts/ttf-dejavu_2.7.bb b/packages/ttf-fonts/ttf-dejavu_2.7.bb index ca84ccbe8e..4599e6e016 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.7.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.7.bb @@ -5,7 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" -include ttf.inc +require ttf.inc S = "${WORKDIR}/dejavu-ttf-${PV}" diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb index c9ad78448c..1515edab9d 100644 --- a/packages/ttf-fonts/ttf-gentium_1.02.bb +++ b/packages/ttf-fonts/ttf-gentium_1.02.bb @@ -6,7 +6,7 @@ LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id= SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ file://OFL.gz" -include ttf.inc +require ttf.inc S = "${WORKDIR}/ttf-sil-gentium-${PV}" diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb index 1be97422ef..0cceb51ff5 100644 --- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" S = "${WORKDIR}/hunkyfonts-${PV}/TTF/" -include ttf.inc +require ttf.inc PACKAGES = "ttf-hunky-sans ttf-hunky-serif" diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index 6ba0cea850..f52d5c18cd 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://sourceforge.jp/projects/efont/" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" -include ttf.inc +require ttf.inc PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index fd12180ac6..121dfdbad3 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -20,6 +20,6 @@ do_configure_prepend() { do_install() { install -d ${D}${palmtopdir} - cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ + cp -Pfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ install -D -m 755 txdrug ${D}${palmtopdir}/bin/txdrug } diff --git a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb index 32d5a2fe67..a41d5d7082 100644 --- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb +++ b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb @@ -1,4 +1,4 @@ -include uboot_cvs.bb +require uboot_cvs.bb UBOOT_MACHINE = "pxa255_idp_config" SRC_URI += "ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1" diff --git a/packages/uclibc/uclibc-initial_0.9.26.bb b/packages/uclibc/uclibc-initial_0.9.26.bb index a2b8b77e40..840acafeac 100644 --- a/packages/uclibc/uclibc-initial_0.9.26.bb +++ b/packages/uclibc/uclibc-initial_0.9.26.bb @@ -1,5 +1,5 @@ SECTION = "base" -include uclibc_${PV}.bb +require uclibc_${PV}.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/uclibc/uclibc-initial_0.9.27.bb b/packages/uclibc/uclibc-initial_0.9.27.bb index a2b8b77e40..840acafeac 100644 --- a/packages/uclibc/uclibc-initial_0.9.27.bb +++ b/packages/uclibc/uclibc-initial_0.9.27.bb @@ -1,5 +1,5 @@ SECTION = "base" -include uclibc_${PV}.bb +require uclibc_${PV}.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/uclibc/uclibc-initial_0.9.28.bb b/packages/uclibc/uclibc-initial_0.9.28.bb index a2b8b77e40..840acafeac 100644 --- a/packages/uclibc/uclibc-initial_0.9.28.bb +++ b/packages/uclibc/uclibc-initial_0.9.28.bb @@ -1,5 +1,5 @@ SECTION = "base" -include uclibc_${PV}.bb +require uclibc_${PV}.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb index d3bb03a972..b85dd0e18d 100644 --- a/packages/uclibc/uclibc-initial_svn.bb +++ b/packages/uclibc/uclibc-initial_svn.bb @@ -1,5 +1,5 @@ SECTION = "base" -include uclibc_svn.bb +require uclibc_svn.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index a29232ce37..40ac5cc69e 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,6 +1,6 @@ PR = "r7" -include uclibc.inc +require uclibc.inc SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ file://26headers.patch;patch=1 \ diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index a7e39088b4..4731ec5392 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "1" PR = "r7" -include uclibc.inc +require uclibc.inc # This patch removes the typedef of __kernel_key_t from # include/bits/ipc.h. Because this removes a typedef some diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 9214b64c0b..6f5d81c9e5 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "1" PR = "r3" -include uclibc.inc +require uclibc.inc # This is the correct KERNEL_SOURCE location, if the uClibc # fix_includes.sh script is run (see nokernelheader.patch below) diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 48576d6363..a12b9b99c6 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -12,7 +12,7 @@ PR = "r2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. -include uclibc.inc +require uclibc.inc FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/udev/udev-092/local.rules b/packages/udev/udev-092/local.rules index 661922dda3..2308b52c4a 100644 --- a/packages/udev/udev-092/local.rules +++ b/packages/udev/udev-092/local.rules @@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc" ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" # Create a symlink to any touchscreen input device -SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*k*14A,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
\ No newline at end of file +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb index 0c24e363ed..a6b4849e4c 100644 --- a/packages/udev/udev_058.bb +++ b/packages/udev/udev_058.bb @@ -5,7 +5,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://permissions.rules \ file://init" -include udev.inc +require udev.inc PR = "r8" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/" diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb index 912d3725ba..817da2d022 100644 --- a/packages/udev/udev_063.bb +++ b/packages/udev/udev_063.bb @@ -5,7 +5,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://fix-alignment.patch;patch=1 \ file://tty-symlinks.patch;patch=1" -include udev.inc +require udev.inc PR = "r7" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb index 8d186023c8..8c6d1866fb 100644 --- a/packages/udev/udev_065.bb +++ b/packages/udev/udev_065.bb @@ -4,7 +4,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://tty-symlinks.patch;patch=1" -include udev.inc +require udev.inc PR = "r5" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb index 937462de85..efd67a5b6a 100644 --- a/packages/udev/udev_070.bb +++ b/packages/udev/udev_070.bb @@ -4,7 +4,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://tty-symlinks.patch;patch=1" -include udev.inc +require udev.inc PR = "r8" diff --git a/packages/udev/udev_071.bb b/packages/udev/udev_071.bb index c1db91d692..98784804f0 100644 --- a/packages/udev/udev_071.bb +++ b/packages/udev/udev_071.bb @@ -4,7 +4,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://tty-symlinks.patch;patch=1" -include udev.inc +require udev.inc PR = "r10" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 71c8e048ff..81a14eaf86 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -11,7 +11,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ file://udev_network_queue.sh" -include udev.inc +require udev.inc INITSCRIPT_PARAMS = "start 03 S ." diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb index 62bc43d48f..faa2ab6d62 100644 --- a/packages/udev/udev_089.bb +++ b/packages/udev/udev_089.bb @@ -12,7 +12,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udevsynthesize.sh \ file://mount.blacklist" -include udev.inc +require udev.inc INITSCRIPT_PARAMS = "start 03 S ." diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 081269404e..802b1e6246 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES = "hotplug" -PR = "r6" +PR = "r7" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -13,7 +13,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://arm_inotify_fix.patch;patch=1 \ file://mount.blacklist" -include udev.inc +require udev.inc INITSCRIPT_PARAMS = "start 03 S ." diff --git a/packages/unionfs/unionfs-modules_1.0.11.bb b/packages/unionfs/unionfs-modules_1.0.11.bb index 5858b7994f..a6920de009 100644 --- a/packages/unionfs/unionfs-modules_1.0.11.bb +++ b/packages/unionfs/unionfs-modules_1.0.11.bb @@ -1,2 +1,2 @@ -include unionfs-modules.inc -include unionfs_${PV}.inc +require unionfs-modules.inc +require unionfs.inc diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb index cbc00b8f4a..6a7d880720 100644 --- a/packages/unionfs/unionfs-modules_1.0.13.bb +++ b/packages/unionfs/unionfs-modules_1.0.13.bb @@ -1,7 +1,7 @@ PR = "r1" PARALLEL_MAKE = "" -include unionfs-modules.inc +require unionfs-modules.inc KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}" diff --git a/packages/unionfs/unionfs-utils_1.0.11.bb b/packages/unionfs/unionfs-utils_1.0.11.bb index bbca67a3b7..6bea01a892 100644 --- a/packages/unionfs/unionfs-utils_1.0.11.bb +++ b/packages/unionfs/unionfs-utils_1.0.11.bb @@ -1,2 +1,2 @@ -include unionfs-utils.inc -include unionfs_${PV}.inc +require unionfs-utils.inc +require unionfs.inc diff --git a/packages/unionfs/unionfs-utils_1.0.13.bb b/packages/unionfs/unionfs-utils_1.0.13.bb index be08882810..f22be6c391 100644 --- a/packages/unionfs/unionfs-utils_1.0.13.bb +++ b/packages/unionfs/unionfs-utils_1.0.13.bb @@ -1,2 +1,2 @@ -include unionfs-utils.inc +require unionfs-utils.inc diff --git a/packages/unzip/unzip-native_552.bb b/packages/unzip/unzip-native_552.bb index 9df1c81cca..1d4b18cf42 100644 --- a/packages/unzip/unzip-native_552.bb +++ b/packages/unzip/unzip-native_552.bb @@ -1,6 +1,6 @@ SECTION = "console/utils" inherit native -include unzip_${PV}.bb +require unzip_${PV}.bb do_stage() { install -d ${STAGING_BINDIR} diff --git a/packages/upslug/upslug2-native_11.bb b/packages/upslug/upslug2-native_11.bb index e9ece6a426..51b660b4f3 100644 --- a/packages/upslug/upslug2-native_11.bb +++ b/packages/upslug/upslug2-native_11.bb @@ -1,2 +1,2 @@ -include upslug2_${PV}.bb +require upslug2_${PV}.bb inherit native diff --git a/packages/upslug/upslug2-native_8.bb b/packages/upslug/upslug2-native_8.bb index 4cfa8a299b..42d2c64dcb 100644 --- a/packages/upslug/upslug2-native_8.bb +++ b/packages/upslug/upslug2-native_8.bb @@ -1,2 +1,2 @@ -include upslug2_8.bb +require upslug2_8.bb inherit native diff --git a/packages/upslug/upslug2_10.bb b/packages/upslug/upslug2_10.bb index de9c427303..e4f834083d 100644 --- a/packages/upslug/upslug2_10.bb +++ b/packages/upslug/upslug2_10.bb @@ -1 +1 @@ -include upslug2.inc +require upslug2.inc diff --git a/packages/upslug/upslug2_11.bb b/packages/upslug/upslug2_11.bb index de9c427303..e4f834083d 100644 --- a/packages/upslug/upslug2_11.bb +++ b/packages/upslug/upslug2_11.bb @@ -1 +1 @@ -include upslug2.inc +require upslug2.inc diff --git a/packages/upslug/upslug2_8.bb b/packages/upslug/upslug2_8.bb index de9c427303..e4f834083d 100644 --- a/packages/upslug/upslug2_8.bb +++ b/packages/upslug/upslug2_8.bb @@ -1 +1 @@ -include upslug2.inc +require upslug2.inc diff --git a/packages/util-linux/util-linux_2.12.bb b/packages/util-linux/util-linux_2.12.bb index 27d80e085b..5e85330c35 100644 --- a/packages/util-linux/util-linux_2.12.bb +++ b/packages/util-linux/util-linux_2.12.bb @@ -1,6 +1,6 @@ PR = "r3" -include util-linux.inc +require util-linux.inc SRC_URI = "http://ftp.cwi.nl/aeb/util-linux/util-linux-${PV}.tar.gz \ file://MCONFIG \ diff --git a/packages/util-linux/util-linux_2.12o.bb b/packages/util-linux/util-linux_2.12o.bb index 0d8f7649b5..ded31fb578 100644 --- a/packages/util-linux/util-linux_2.12o.bb +++ b/packages/util-linux/util-linux_2.12o.bb @@ -1,3 +1,3 @@ -include util-linux.inc +require util-linux.inc PR = "r6" diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb index d419547c5f..2ab3099f4f 100644 --- a/packages/util-linux/util-linux_2.12q.bb +++ b/packages/util-linux/util-linux_2.12q.bb @@ -2,6 +2,6 @@ #FIXME: remove this ARM_INSTRUCTION_SET = "arm" -include util-linux.inc +require util-linux.inc PR = "r5" diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index 0d8f7649b5..ded31fb578 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -1,3 +1,3 @@ -include util-linux.inc +require util-linux.inc PR = "r6" diff --git a/packages/vim/gvim_7.0.bb b/packages/vim/gvim_7.0.bb index d0185815e1..8511b30a84 100644 --- a/packages/vim/gvim_7.0.bb +++ b/packages/vim/gvim_7.0.bb @@ -1,6 +1,6 @@ VIMVER = "70" -include vim.inc +require vim.inc DEPENDS += "gtk+" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/vim/vim-tiny_6.2.bb b/packages/vim/vim-tiny_6.2.bb index 897e40dddd..caf215ea21 100644 --- a/packages/vim/vim-tiny_6.2.bb +++ b/packages/vim/vim-tiny_6.2.bb @@ -1,5 +1,5 @@ SECTION = "console/utils" -include vim_${PV}.bb +require vim_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vim-${PV}" LICENSE = "vim" EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ diff --git a/packages/vim/vim-tiny_6.4.bb b/packages/vim/vim-tiny_6.4.bb index 16f60693fa..6fbcd605c8 100644 --- a/packages/vim/vim-tiny_6.4.bb +++ b/packages/vim/vim-tiny_6.4.bb @@ -1,4 +1,4 @@ -include vim_${PV}.bb +require vim_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vim-${PV}" diff --git a/packages/vim/vim-tiny_7.0.bb b/packages/vim/vim-tiny_7.0.bb index 16f60693fa..6fbcd605c8 100644 --- a/packages/vim/vim-tiny_7.0.bb +++ b/packages/vim/vim-tiny_7.0.bb @@ -1,4 +1,4 @@ -include vim_${PV}.bb +require vim_${PV}.bb FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vim-${PV}" diff --git a/packages/vim/vim_6.4.bb b/packages/vim/vim_6.4.bb index b53c752529..4cf6591a66 100644 --- a/packages/vim/vim_6.4.bb +++ b/packages/vim/vim_6.4.bb @@ -1,6 +1,6 @@ VIMVER = "64" -include vim.inc +require vim.inc EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ --disable-xim --with-features=normal \ diff --git a/packages/vim/vim_7.0.bb b/packages/vim/vim_7.0.bb index 1f618a8050..8a5e91211f 100644 --- a/packages/vim/vim_7.0.bb +++ b/packages/vim/vim_7.0.bb @@ -1,6 +1,6 @@ VIMVER = "70" -include vim.inc +require vim.inc EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ --disable-xim --with-features=normal \ diff --git a/packages/whois/whois_4.5.25.bb b/packages/whois/whois_4.5.25.bb index d3af7bac04..22952b0d8c 100644 --- a/packages/whois/whois_4.5.25.bb +++ b/packages/whois/whois_4.5.25.bb @@ -1,4 +1,4 @@ -include whois.inc +require whois.inc SRC_URI = "${DEBIAN_MIRROR}/main/w/whois/whois_${PV}.tar.gz" S = "${WORKDIR}/whois-${PV}" diff --git a/packages/wiggle/wiggle-native_0.6.bb b/packages/wiggle/wiggle-native_0.6.bb index a51c3110c9..e6d86dbe0d 100644 --- a/packages/wiggle/wiggle-native_0.6.bb +++ b/packages/wiggle/wiggle-native_0.6.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include wiggle_${PV}.bb +require wiggle_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/wiggle-${PV}" diff --git a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb index c3044355fb..8a39503073 100644 --- a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb +++ b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb @@ -4,4 +4,4 @@ PR = "r1" inherit module -include wlags-modules_${PV}.inc +require wlags-modules_${PV}.inc diff --git a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb index 4d48490636..0906d05eb0 100644 --- a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb +++ b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb @@ -4,4 +4,4 @@ PR = "r1" inherit module -include wlags-modules_${PV}.inc +require wlags-modules_${PV}.inc diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb index d8e8826fa6..2157a29fa2 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb @@ -1,4 +1,4 @@ -include wlan-ng-modules.inc +require wlan-ng-modules.inc PR = "r3" SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb index 4fa16c4de8..e932ee7df0 100644 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -1,4 +1,4 @@ -include wlan-ng-modules.inc +require wlan-ng-modules.inc PR = "r0" PV = "0.2.3+svn${SRCDATE}" diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb index 2e9e1b879f..fe1a30b58b 100644 --- a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb +++ b/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb @@ -4,4 +4,4 @@ with the AP and to generate dynamic encryption keys (TKIP or CCMP)." PR = "r3" -include wpa-supplicant_${PV}.inc +require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb index 85cdbb3379..34f370a10e 100644 --- a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb +++ b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb @@ -6,4 +6,4 @@ PR = "r3" EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'" -include wpa-supplicant_${PV}.inc +require wpa-supplicant_${PV}.inc diff --git a/packages/wview/wview-sim-mysql_3.1.3.bb b/packages/wview/wview-sim-mysql_3.1.3.bb index bc389691b0..99f2f7ad70 100644 --- a/packages/wview/wview-sim-mysql_3.1.3.bb +++ b/packages/wview/wview-sim-mysql_3.1.3.bb @@ -1,3 +1,3 @@ -include wview-common.inc -include wview-mysql.inc +require wview-common.inc +require wview-mysql.inc EXTRA_OECONF += " --enable-station-sim" diff --git a/packages/wview/wview-sim_3.1.3.bb b/packages/wview/wview-sim_3.1.3.bb index 3f07aecc82..86ccf00458 100644 --- a/packages/wview/wview-sim_3.1.3.bb +++ b/packages/wview/wview-sim_3.1.3.bb @@ -1,4 +1,4 @@ -include wview-common.inc -include wview.inc +require wview-common.inc +require wview.inc EXTRA_OECONF += " --enable-station-sim" PR = "r1" diff --git a/packages/wview/wview-vpro-mysql_3.1.3.bb b/packages/wview/wview-vpro-mysql_3.1.3.bb index 6ef4148662..f6f63eab3e 100644 --- a/packages/wview/wview-vpro-mysql_3.1.3.bb +++ b/packages/wview/wview-vpro-mysql_3.1.3.bb @@ -1,3 +1,3 @@ -include wview-common.inc -include wview-mysql.inc +require wview-common.inc +require wview-mysql.inc EXTRA_OECONF += " --enable-station-vpro" diff --git a/packages/wview/wview-vpro_3.1.3.bb b/packages/wview/wview-vpro_3.1.3.bb index 4c84152f3b..ae72f6a286 100644 --- a/packages/wview/wview-vpro_3.1.3.bb +++ b/packages/wview/wview-vpro_3.1.3.bb @@ -1,4 +1,4 @@ -include wview-common.inc -include wview.inc +require wview-common.inc +require wview.inc EXTRA_OECONF += " --enable-station-vpro" PR = "r1" diff --git a/packages/wview/wview-wxt510-mysql_3.1.3.bb b/packages/wview/wview-wxt510-mysql_3.1.3.bb index e842aae4d6..4e7c712500 100644 --- a/packages/wview/wview-wxt510-mysql_3.1.3.bb +++ b/packages/wview/wview-wxt510-mysql_3.1.3.bb @@ -1,3 +1,3 @@ -include wview-common.inc -include wview-mysql.inc +require wview-common.inc +require wview-mysql.inc EXTRA_OECONF += " --enable-station-wxt510" diff --git a/packages/wview/wview-wxt510_3.1.3.bb b/packages/wview/wview-wxt510_3.1.3.bb index 84f175f1d8..0c8bb5b5da 100644 --- a/packages/wview/wview-wxt510_3.1.3.bb +++ b/packages/wview/wview-wxt510_3.1.3.bb @@ -1,4 +1,4 @@ -include wview-common.inc -include wview.inc +require wview-common.inc +require wview.inc EXTRA_OECONF += " --enable-station-wxt510" PR = "r1" diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb index 2a41fdfa65..748d738c1c 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxbase/wxbase_2.6.2.bb @@ -23,11 +23,11 @@ do_configure() { do_stage() { install -d ${STAGING_INCDIR}/wx-2.6/wx - cp -pr include/wx ${STAGING_INCDIR}/wx-2.6 - cp -pr lib/libwx* ${STAGING_LIBDIR} - cp -pr lib/wx ${STAGING_LIBDIR} - cp -pr build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile - cp -pr wxwin.m4 ${STAGING_DATADIR}/aclocal + cp -pR include/wx ${STAGING_INCDIR}/wx-2.6 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb index efc04b6f8c..a813788eee 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxbase/wxbase_2.7+cvs.bb @@ -24,11 +24,11 @@ do_configure() { do_stage() { install -d ${STAGING_INCDIR}/wx-2.7/wx - cp -pr include/wx ${STAGING_INCDIR}/wx-2.7 - cp -pr lib/libwx* ${STAGING_LIBDIR} - cp -pr lib/wx ${STAGING_LIBDIR} - cp -pr build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile - cp -pr wxwin.m4 ${STAGING_DATADIR}/aclocal + cp -pR include/wx ${STAGING_INCDIR}/wx-2.7 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ diff --git a/packages/xextensions/xextensions-native_1.0.1.bb b/packages/xextensions/xextensions-native_1.0.1.bb index bbbfd934ce..732ced4584 100644 --- a/packages/xextensions/xextensions-native_1.0.1.bb +++ b/packages/xextensions/xextensions-native_1.0.1.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xextensions_${PV}.bb +require xextensions_${PV}.bb inherit native PROVIDES = "" diff --git a/packages/xextensions/xextensions-native_cvs.bb b/packages/xextensions/xextensions-native_cvs.bb index 3e1f87d1c9..8ccf2ce84f 100644 --- a/packages/xextensions/xextensions-native_cvs.bb +++ b/packages/xextensions/xextensions-native_cvs.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xextensions_cvs.bb +require xextensions_cvs.bb inherit native PROVIDES = "" diff --git a/packages/xfcalendar/xfcalendar_4.2.2.bb b/packages/xfcalendar/xfcalendar_4.2.2.bb index a740947082..41b0db2a51 100644 --- a/packages/xfcalendar/xfcalendar_4.2.2.bb +++ b/packages/xfcalendar/xfcalendar_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfcalendar/xfcalendar_4.2.3.bb b/packages/xfcalendar/xfcalendar_4.2.3.bb index 66913349b8..ebab53efcd 100644 --- a/packages/xfcalendar/xfcalendar_4.2.3.bb +++ b/packages/xfcalendar/xfcalendar_4.2.3.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc PACKAGES += " ${PN}-mcs-plugins" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb index c768b4e760..de5cf2b012 100644 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb +++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb index c768b4e760..de5cf2b012 100644 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb +++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb index 7be8fc6924..02ad97e860 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb index 7be8fc6924..02ad97e860 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce-utils/xfce-utils_4.2.2.bb b/packages/xfce-utils/xfce-utils_4.2.2.bb index 37f93625f3..57909f2c2d 100644 --- a/packages/xfce-utils/xfce-utils_4.2.2.bb +++ b/packages/xfce-utils/xfce-utils_4.2.2.bb @@ -3,4 +3,4 @@ # Released under the MIT license (see packages/COPYING) PR = "r1" -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb index 824f9d62e2..f7c97970d5 100644 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb +++ b/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb index 6695684cd6..6dd3c0565b 100644 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb +++ b/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfce4-panel/xfce4-panel_4.2.2.bb b/packages/xfce4-panel/xfce4-panel_4.2.2.bb index 36f4c49553..18dce6fa3c 100644 --- a/packages/xfce4-panel/xfce4-panel_4.2.2.bb +++ b/packages/xfce4-panel/xfce4-panel_4.2.2.bb @@ -3,4 +3,4 @@ # Released under the MIT license (see packages/COPYING) PR="r1" -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfdesktop/xfdesktop_4.2.2.bb b/packages/xfdesktop/xfdesktop_4.2.2.bb index 535fe72da3..d7af836791 100644 --- a/packages/xfdesktop/xfdesktop_4.2.2.bb +++ b/packages/xfdesktop/xfdesktop_4.2.2.bb @@ -3,4 +3,4 @@ # Released under the MIT license (see packages/COPYING) PR = "r1" -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xffm/xffm_4.2.2.bb b/packages/xffm/xffm_4.2.2.bb index 660fc299a8..c098e1c96b 100644 --- a/packages/xffm/xffm_4.2.2.bb +++ b/packages/xffm/xffm_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xffm/xffm_4.2.3.bb b/packages/xffm/xffm_4.2.3.bb index 660fc299a8..c098e1c96b 100644 --- a/packages/xffm/xffm_4.2.3.bb +++ b/packages/xffm/xffm_4.2.3.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb index 8225e546cf..9f67ad2ed9 100644 --- a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb +++ b/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfwm4/xfwm4_4.2.2.bb b/packages/xfwm4/xfwm4_4.2.2.bb index cc4a554757..2fc47e641e 100644 --- a/packages/xfwm4/xfwm4_4.2.2.bb +++ b/packages/xfwm4/xfwm4_4.2.2.bb @@ -3,4 +3,4 @@ # Released under the MIT license (see packages/COPYING) PR="r1" -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xfwm4/xfwm4_4.2.3.2.bb b/packages/xfwm4/xfwm4_4.2.3.2.bb index 0ef14a97e0..e1feff01f1 100644 --- a/packages/xfwm4/xfwm4_4.2.3.2.bb +++ b/packages/xfwm4/xfwm4_4.2.3.2.bb @@ -2,4 +2,4 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -include ${PN}.inc +require ${PN}.inc diff --git a/packages/xmame/xmame-tiny_0.100.bb b/packages/xmame/xmame-tiny_0.100.bb index 0aa85533b3..8e3c0bcaa1 100644 --- a/packages/xmame/xmame-tiny_0.100.bb +++ b/packages/xmame/xmame-tiny_0.100.bb @@ -1,4 +1,4 @@ -include xmame_${PV}.bb +require xmame_${PV}.bb DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL (tiny version)" TINY = 1 diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb index 0e58c4e833..5805a0fe04 100644 --- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The appres program prints the resources seen by an application." diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb index 4eefa72194..d9f37daf1a 100644 --- a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb index 95ef0cc62c..5a64332d48 100644 --- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb index 2c723fc720..c933d4f718 100644 --- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb index a38e28f0b0..4d9a7f53de 100644 --- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb index 8007aca6b7..281a33c4bd 100644 --- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb index 5d268a7f76..fb84802ca6 100644 --- a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb index 5cdde24099..0257648e20 100644 --- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb index 5cdde24099..0257648e20 100644 --- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb index 5cdde24099..0257648e20 100644 --- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb index 2093e75f68..5f94b334be 100644 --- a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb index a96ac9d325..b9aa49f4ab 100644 --- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \ extension to X (LBX) must make their connections to an lbxproxy." diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb index 9a36345429..61fb362e23 100644 --- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb index e4d89bfe77..dd599b3ad7 100644 --- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb index 8b33179a51..d2974045c2 100644 --- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb index 62c088314f..556afd2867 100644 --- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb index 62c088314f..556afd2867 100644 --- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb index ac452f9edc..2f5eab7d63 100644 --- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb index d995da2a40..f275cc94d4 100644 --- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb index 5d23a1afe7..ea4a1ad78d 100644 --- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb index f9d4b86f9f..1c46d69a0b 100644 --- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb index 87194c44b8..59dd8abd27 100644 --- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc PR = "r1" #DESCRIPTION = "" diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb index 3c5bf5f926..00bfde0620 100644 --- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb index f03ed310dd..8001d661e7 100644 --- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb index f03ed310dd..8001d661e7 100644 --- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb index 46efe223ef..165202b2da 100644 --- a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb index a8533a377a..843541dc77 100644 --- a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb index a8533a377a..843541dc77 100644 --- a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb index f5fa5fb952..3cbab36e9b 100644 --- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "tiny window manager" diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb index 2a03dcb18c..50c6a97949 100644 --- a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb index 3e6143ab01..905f3cdced 100644 --- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb index bcaa28942c..8581abd43c 100644 --- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb +++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb index 64a9284f01..b891ff90ef 100644 --- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb index 0c5c6ed540..5e21a9e590 100644 --- a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb index c3ecef6037..7ad19bb1bb 100644 --- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb index c3ecef6037..7ad19bb1bb 100644 --- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb index 2a03dcb18c..50c6a97949 100644 --- a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb index 4f77cad470..2dbb5b76ce 100644 --- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb index 4f77cad470..2dbb5b76ce 100644 --- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb index 7bf0a43a95..37d37250df 100644 --- a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb index 8d424ad08a..d2c87b6a57 100644 --- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display manager" diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb index 2d78de5f08..955fd33732 100644 --- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb +++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display manager" diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb index c152ca7884..d212bc1422 100644 --- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display information utility" LICENSE = "MIT" diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb index a07f6e2f2e..61e5837b9e 100644 --- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb index a07f6e2f2e..61e5837b9e 100644 --- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb index ae2da418b0..c4008cc579 100644 --- a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb index ae2da418b0..c4008cc579 100644 --- a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb index a300e62b1a..20cb06c4cd 100644 --- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Event Viewer" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb index e568238673..de9861c60e 100644 --- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb index 3d1abfda69..6a5f12d484 100644 --- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb index 4487df1c6e..1751f4bdf7 100644 --- a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb index 6e2c3eb9ca..bf8ad7904b 100644 --- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb index bb5dbb18e3..9567be7a12 100644 --- a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X fontserver" diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb index bb5dbb18e3..9567be7a12 100644 --- a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X fontserver" diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb index 5cdde24099..0257648e20 100644 --- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb index 3673395ba4..b9dc35b367 100644 --- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb index 45331d67ee..7549d9902f 100644 --- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb index 370cdbbf54..a08ad7184d 100644 --- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb index 370cdbbf54..a08ad7184d 100644 --- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb index 3c5bf5f926..00bfde0620 100644 --- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb index df579023fb..025a578370 100644 --- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb index f1f76411bc..f6b9503cd8 100644 --- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb index f1f76411bc..f6b9503cd8 100644 --- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb index f03ed310dd..8001d661e7 100644 --- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb index f03ed310dd..8001d661e7 100644 --- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb index f03ed310dd..8001d661e7 100644 --- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb index ef238cf69f..15ce7e6011 100644 --- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb index 3e6143ab01..905f3cdced 100644 --- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xload_X11R7.0-1.0.1.bb b/packages/xorg-app/xload_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xload_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xload_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb index 1c68e539a6..b328683361 100644 --- a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb index 3e6143ab01..905f3cdced 100644 --- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb index 3e6143ab01..905f3cdced 100644 --- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb index 16364e3ddc..7559ace10c 100644 --- a/packages/xorg-app/xman_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xman_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb index 16364e3ddc..7559ace10c 100644 --- a/packages/xorg-app/xman_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xman_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb index 457946bcf3..da0a1896b3 100644 --- a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "xmessage displays a message or query in a window." diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb index 413aa7d029..9ef50b8ffd 100644 --- a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb index 3b04dfe71d..b671beb07b 100644 --- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb index f99627cf8f..4fe4c0c4cc 100644 --- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb index 3d53264fba..88b90afb05 100644 --- a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb index c62dffdc84..2153dfd459 100644 --- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb index 695554764b..79f4194c48 100644 --- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb index 642a459965..2dd7807ec5 100644 --- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb index d820b6924f..0718958efe 100644 --- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb index 642a459965..2dd7807ec5 100644 --- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb index 93d96293c3..4b878cc32e 100644 --- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb index 93d96293c3..4b878cc32e 100644 --- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb index a0ea3b223f..bad78d3873 100644 --- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb index 0b53593c9f..d73890cc15 100644 --- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb index 7782b3c4b1..d956f3aecd 100644 --- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb index f737bcbd9a..b8b204e657 100644 --- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb index f737bcbd9a..b8b204e657 100644 --- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb index de6b894fac..d473975d5e 100644 --- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb index de6b894fac..d473975d5e 100644 --- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb index 4f2db234b2..d5ddbadb49 100644 --- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb index 57d80cc75c..6c22106e5a 100644 --- a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "X Session Manager" diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb index 642a459965..2dd7807ec5 100644 --- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb index 114b732ff7..91933be884 100644 --- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb index 114b732ff7..91933be884 100644 --- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb index 06f2b5115f..66fa7fff7f 100644 --- a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb index eb59db6922..e0fe5605bc 100644 --- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb index 642a459965..2dd7807ec5 100644 --- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb index 55f97cb8cb..71fb6f0ca4 100644 --- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb index 55f97cb8cb..71fb6f0ca4 100644 --- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb index 558ed4643b..d584483e44 100644 --- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb index 3071a71a5b..502b3c1419 100644 --- a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb +++ b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-data-common.inc +require xorg-data-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb index bc09132a05..8d765a1bb7 100644 --- a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb +++ b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-data-common.inc +require xorg-data-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb index b3e3a92ac6..dc02f163f6 100644 --- a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb +++ b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-data-common.inc +require xorg-data-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb index 44bd16051a..069f25ad10 100644 --- a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb +++ b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-doc-common.inc +require xorg-doc-common.inc DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \ source tree." diff --git a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb index 44bd16051a..069f25ad10 100644 --- a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb +++ b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb @@ -1,4 +1,4 @@ -include xorg-doc-common.inc +require xorg-doc-common.inc DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \ source tree." diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb index 75163dba22..45dd0d692d 100644 --- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb +++ b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-doc-common.inc +require xorg-doc-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb index 75163dba22..45dd0d692d 100644 --- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb +++ b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb @@ -1,4 +1,4 @@ -include xorg-doc-common.inc +require xorg-doc-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb +++ b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb +++ b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb +++ b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb index 0e81a3f8d2..47acb760d2 100644 --- a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb +++ b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb index 0e81a3f8d2..47acb760d2 100644 --- a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb index 0e81a3f8d2..47acb760d2 100644 --- a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb index 9c46cfa21e..a76eec5e1f 100644 --- a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb +++ b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc DESCRIPTION = "Mouse Support in X11" diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb index f13e8eadc1..c880358819 100644 --- a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc DESCRIPTION = "Mouse Support in X11 diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb index f5b0021a24..7942a3ab2e 100644 --- a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb +++ b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protocol \ that is provided by VMware virtual machines to give absolute pointer \ diff --git a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb index 7b542e2342..ee92f6c162 100644 --- a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-input.inc +require xorg-driver-input.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb index 40cec21467..63e473c720 100644 --- a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb +++ b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb index 40cec21467..63e473c720 100644 --- a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb +++ b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb +++ b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb +++ b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb +++ b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb index 9cd4f894ff..c811bf888a 100644 --- a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb +++ b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb index 9cd4f894ff..c811bf888a 100644 --- a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb +++ b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb +++ b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb +++ b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb +++ b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb +++ b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb +++ b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb index dec2e1fa70..4b57f17b9e 100644 --- a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb index dec2e1fa70..4b57f17b9e 100644 --- a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb +++ b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb index 1b7a1e077a..3b867c9c56 100644 --- a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb +++ b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "Number Nine I128 for X11" diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb index 1b7a1e077a..3b867c9c56 100644 --- a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb +++ b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "Number Nine I128 for X11" diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb index 0782229fc7..4935a006cd 100644 --- a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I740 for X11" diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb index 0782229fc7..4935a006cd 100644 --- a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I740 for X11" diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb index d76388cfe4..8dc577aeaa 100644 --- a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb +++ b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I810 for X11" diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb index d76388cfe4..8dc577aeaa 100644 --- a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb +++ b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I810 for X11" diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb index 3d1d2c12f6..a66e410315 100644 --- a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb +++ b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb index 3d1d2c12f6..a66e410315 100644 --- a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb +++ b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb index 3aebbad1d9..e5f997e0fa 100644 --- a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb index 41df689fd7..4c2a45f05e 100644 --- a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb +++ b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb index 0751631ce7..956a2021c1 100644 --- a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb +++ b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb index 0751631ce7..956a2021c1 100644 --- a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb +++ b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb index dd8b202256..1dad571e13 100644 --- a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb +++ b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb index dd8b202256..1dad571e13 100644 --- a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb +++ b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb +++ b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb +++ b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb index 30f11e4a0f..84edd97fd3 100644 --- a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb +++ b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb index 30f11e4a0f..84edd97fd3 100644 --- a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb +++ b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb +++ b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb +++ b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb +++ b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb +++ b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb index ce50ce0e1e..d05a26bddd 100644 --- a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb +++ b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb index 7e2c424649..f898676111 100644 --- a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb +++ b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb +++ b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb +++ b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb index ec4ba0e0b4..2cd161cec2 100644 --- a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb +++ b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb index ec4ba0e0b4..2cd161cec2 100644 --- a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb +++ b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb index 204a22a1e8..9e662ff6bb 100644 --- a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb +++ b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb index 204a22a1e8..9e662ff6bb 100644 --- a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb +++ b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb index 2a74356190..f005c731ef 100644 --- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb index ce50ce0e1e..d05a26bddd 100644 --- a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb index 7e2c424649..f898676111 100644 --- a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb index 7e2c424649..f898676111 100644 --- a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb +++ b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb index 7e2c424649..f898676111 100644 --- a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb +++ b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb index aae1ba8c83..3ede51328b 100644 --- a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "DEC 21030 X11 driver" diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb index aae1ba8c83..3ede51328b 100644 --- a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "DEC 21030 X11 driver" diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb +++ b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb index 2bdc1e2e3a..92216d1e4a 100644 --- a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb +++ b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb index 40f713f729..ae5f660b08 100644 --- a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb +++ b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "Video 4 Linux adaptor driver for X11" diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb index 40f713f729..ae5f660b08 100644 --- a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb +++ b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "Video 4 Linux adaptor driver for X11" diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb +++ b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb +++ b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb index 5575f1866d..a87a5f7a56 100644 --- a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb +++ b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb index 5cec7e3d5f..e202a0d54e 100644 --- a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb +++ b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb index 5cec7e3d5f..e202a0d54e 100644 --- a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb +++ b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc #DESCRIPTION = "" diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb index 0c0201ba93..c8898e462b 100644 --- a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb +++ b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for VMware SVGA Device" diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb index 0c0201ba93..c8898e462b 100644 --- a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb +++ b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for VMware SVGA Device" diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb index ce469e0bc9..db2545c9c3 100644 --- a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb +++ b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for Voodoo/Voodoo2" diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb index ce469e0bc9..db2545c9c3 100644 --- a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb +++ b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "X11 driver for Voodoo/Voodoo2" diff --git a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb index 00aafda3bf..f25d150d61 100644 --- a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb index 5ad12ba000..94e4a48083 100644 --- a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb index 7020e75d8c..536a3f6e60 100644 --- a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb +++ b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "Adobe typeface software" diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb index 1a385e386e..cd9773cc61 100644 --- a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb +++ b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "Adobe typeface software" diff --git a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb index 1a385e386e..cd9773cc61 100644 --- a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb +++ b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "Adobe typeface software" diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb index 1a061d9bf5..12f8c63088 100644 --- a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb +++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "X font aliases." diff --git a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb index 8fcecc96be..8b8f914f4f 100644 --- a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \ of the Arabic characters available in Unicode." diff --git a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb index 9b876fb953..82d6f5350e 100644 --- a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb index f932b30872..5ab5967ab6 100644 --- a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "These fonts are designed for the display of Syriac text." diff --git a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb index c2812649ff..216c123346 100644 --- a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \ the glyphs needed for Unicode text." diff --git a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb index 17986ecffe..fea5089e2d 100644 --- a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "X font utils." diff --git a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb index 9142776cfd..9074beb55a 100644 --- a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb +++ b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "X font utils." diff --git a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb index 8f3721cab8..e929e911ec 100644 --- a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-font-common.inc +require xorg-font-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/diet-x11_20050226.bb b/packages/xorg-lib/diet-x11_20050226.bb index cab8c5d570..1220806052 100644 --- a/packages/xorg-lib/diet-x11_20050226.bb +++ b/packages/xorg-lib/diet-x11_20050226.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_${PV}.bb +require libx11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" diff --git a/packages/xorg-lib/diet-x11_6.2.1.bb b/packages/xorg-lib/diet-x11_6.2.1.bb index 643e658412..96d63aa0ee 100644 --- a/packages/xorg-lib/diet-x11_6.2.1.bb +++ b/packages/xorg-lib/diet-x11_6.2.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_${PV}.bb +require libx11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb index 272dbd6f96..b30098c850 100644 --- a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_${PV}.bb +require libx11_${PV}.bb EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb index 8a44835502..33e50df13a 100644 --- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_${PV}.bb +require libx11_${PV}.bb EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/diet-x11_cvs.bb b/packages/xorg-lib/diet-x11_cvs.bb index eea73f0964..968764b500 100644 --- a/packages/xorg-lib/diet-x11_cvs.bb +++ b/packages/xorg-lib/diet-x11_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_cvs.bb +require libx11_cvs.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb index f5acc7a670..28abffa735 100644 --- a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb index d26cad95b1..a612982a95 100644 --- a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb index d26cad95b1..a612982a95 100644 --- a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb index 72164c0415..a4badc38ce 100644 --- a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X fontenc library (used by libxfont)." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb index 72164c0415..a4badc38ce 100644 --- a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X fontenc library (used by libxfont)." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb index 9156ab01cb..5c07ce682c 100644 --- a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = " " diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb index 2d16be34b8..da40983162 100644 --- a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 ICE library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb index 2d16be34b8..da40983162 100644 --- a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 ICE library" PRIORITY = "optional" diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb index 7ce88dfe74..df8b267601 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "XFIXES Extension" diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb index 7ce88dfe74..df8b267601 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "XFIXES Extension" diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb index 99be60d038..2a380a65f6 100644 --- a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb index 2683d0042b..383e29e743 100644 --- a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Session management library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb index 2683d0042b..383e29e743 100644 --- a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Session management library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb index da595182f4..90b8aeca49 100644 --- a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libx11-native_6.2.1.bb b/packages/xorg-lib/libx11-native_6.2.1.bb index 9513c4237e..54bb4486e7 100644 --- a/packages/xorg-lib/libx11-native_6.2.1.bb +++ b/packages/xorg-lib/libx11-native_6.2.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -include libx11_${PV}.bb +require libx11_${PV}.bb inherit native DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xorg-lib/libx11-native_cvs.bb b/packages/xorg-lib/libx11-native_cvs.bb index 5b221122d3..c76d4dce8b 100644 --- a/packages/xorg-lib/libx11-native_cvs.bb +++ b/packages/xorg-lib/libx11-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include libx11_cvs.bb +require libx11_cvs.bb inherit native DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xorg-lib/libx11_20050226.bb b/packages/xorg-lib/libx11_20050226.bb index 0bc30a42cc..2fa9e995b8 100644 --- a/packages/xorg-lib/libx11_20050226.bb +++ b/packages/xorg-lib/libx11_20050226.bb @@ -1,6 +1,6 @@ SRCDATE = "20050226" -include libx11_cvs.bb +require libx11_cvs.bb DEFAULT_PREFERENCE = "0" diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb index 784f1c65b6..b31ed72998 100644 --- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Base X libs." diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 784f1c65b6..b31ed72998 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Base X libs." diff --git a/packages/xorg-lib/libxau-native_0.1.1.bb b/packages/xorg-lib/libxau-native_0.1.1.bb index ecb71ce3d6..f5acbee736 100644 --- a/packages/xorg-lib/libxau-native_0.1.1.bb +++ b/packages/xorg-lib/libxau-native_0.1.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_${PV}.bb +require libxau_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxau-native_cvs.bb b/packages/xorg-lib/libxau-native_cvs.bb index cd070033ce..685f849bd5 100644 --- a/packages/xorg-lib/libxau-native_cvs.bb +++ b/packages/xorg-lib/libxau-native_cvs.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_cvs.bb +require libxau_cvs.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb index 1767424320..5ad793c9b8 100644 --- a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "A Sample Authorization Protocol for X" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb index 1767424320..5ad793c9b8 100644 --- a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "A Sample Authorization Protocol for X" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb index dcb73a19ea..3961042a2d 100644 --- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb index dcb73a19ea..3961042a2d 100644 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb index a9ee4190c2..4cab60a531 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index a9ee4190c2..4cab60a531 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb index 65f8432a21..2b13c4213c 100644 --- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb +++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb index 65f8432a21..2b13c4213c 100644 --- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb +++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb index a6105f07a6..6bb9c39f60 100644 --- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb +++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb index a6105f07a6..6bb9c39f60 100644 --- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxdmcp-native_0.1.1.bb b/packages/xorg-lib/libxdmcp-native_0.1.1.bb index bd6d990f53..41b772376e 100644 --- a/packages/xorg-lib/libxdmcp-native_0.1.1.bb +++ b/packages/xorg-lib/libxdmcp-native_0.1.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/libs" -include libxdmcp_${PV}.bb +require libxdmcp_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxdmcp-native_0.1.3.bb b/packages/xorg-lib/libxdmcp-native_0.1.3.bb index 8d7162b351..87db29c799 100644 --- a/packages/xorg-lib/libxdmcp-native_0.1.3.bb +++ b/packages/xorg-lib/libxdmcp-native_0.1.3.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" -include libxdmcp_${PV}.bb +require libxdmcp_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb index 74c4b6e35d..c0139498c5 100644 --- a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Display Manager Control Protocol library." PRIORITY = "optional" diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb index 74c4b6e35d..c0139498c5 100644 --- a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Display Manager Control Protocol library." PRIORITY = "optional" diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb index 36af0189df..4c3a134633 100644 --- a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb index 36af0189df..4c3a134633 100644 --- a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb index bdf33d354d..82360db00d 100644 --- a/packages/xorg-lib/libxext-native_cvs.bb +++ b/packages/xorg-lib/libxext-native_cvs.bb @@ -1,6 +1,6 @@ SECTION = "unknown" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" -include libxext_${PV}.bb +require libxext_${PV}.bb inherit native DEPENDS = "virtual/libx11-native xextensions-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb index 1a794e161d..fc2061514a 100644 --- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb index 1a794e161d..fc2061514a 100644 --- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb index 594675b115..b63633dea2 100644 --- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb +++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb index 594675b115..b63633dea2 100644 --- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb +++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb index 68148a3657..a3a28d6578 100644 --- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc PR = "r1" SRC_URI += "file://no-scalable-crash.patch;patch=1" diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb index 07fbf5f9a6..748a71f1ae 100644 --- a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X font library (used by the X server)." LICENSE= "BSD-X" diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb index af511be866..8739822a07 100644 --- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc PR = "r1" diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb index 498bdac0ac..c75278ecb0 100644 --- a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb index 498bdac0ac..c75278ecb0 100644 --- a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb index 88d850401e..2c46849fd2 100644 --- a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb +++ b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb index b8bdbe970e..af5e4008eb 100644 --- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Input extension library." diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb index b8bdbe970e..af5e4008eb 100644 --- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Input extension library." diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb index 3a11ea9854..8f72c20898 100644 --- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xinerama library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb index c02dca34b7..715dcd0554 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb index c02dca34b7..715dcd0554 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb index 1d841e4913..e094728c2f 100644 --- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb index 1d841e4913..e094728c2f 100644 --- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb index 3b82bb0218..02df24cd9f 100644 --- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb index 3b82bb0218..02df24cd9f 100644 --- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb index fc01924819..fc7ecb5778 100644 --- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X print extension library." diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb index 263a24db1f..3ff582a8e3 100644 --- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb +++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Pixmap library." PRIORITY = "optional" diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb index 263a24db1f..3ff582a8e3 100644 --- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb +++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Pixmap library." PRIORITY = "optional" diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb index 9431f9fbfa..077ac40a0a 100644 --- a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb index c03e569e4f..f965b9a2bc 100644 --- a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb index 22ae2a5f6c..363550fade 100644 --- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb +++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb index 22ae2a5f6c..363550fade 100644 --- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb +++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb index 865cf02d42..32ba95721d 100644 --- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb +++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb index 865cf02d42..32ba95721d 100644 --- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb +++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb index 98da017f09..282947e7fe 100644 --- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resource usage library." diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb index 98da017f09..282947e7fe 100644 --- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resource usage library." diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb index d6b13a8c6c..2f0168e2b5 100644 --- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb index d6b13a8c6c..2f0168e2b5 100644 --- a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb +++ b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb index 33787e3482..b8bbe4dea3 100644 --- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb index 33787e3482..b8bbe4dea3 100644 --- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb index 0c87974979..f9ebac47f9 100644 --- a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb index 9aeda79540..802ea2836d 100644 --- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb index 8680f050e3..0d045940e3 100644 --- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video extension library." LICENSE = "GPL" diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb index 42bb0062ab..a0f9f7be25 100644 --- a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb index 42bb0062ab..a0f9f7be25 100644 --- a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb index a5eca04252..e067190b84 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb index a5eca04252..e067190b84 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb index 6c55f11a97..3af4acba96 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb index 6c55f11a97..3af4acba96 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb index b9268ddaf9..b85e2d2477 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb index b9268ddaf9..b85e2d2477 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." diff --git a/packages/xorg-lib/xtrans-native_0.1.bb b/packages/xorg-lib/xtrans-native_0.1.bb index 80de95c869..db1e6e4673 100644 --- a/packages/xorg-lib/xtrans-native_0.1.bb +++ b/packages/xorg-lib/xtrans-native_0.1.bb @@ -1,3 +1,3 @@ SECTION = "x11/base" -include xtrans_${PV}.bb +require xtrans_${PV}.bb inherit native diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb index 2fe92245c2..1ab38ad838 100644 --- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "network API translation layer to \ insulate X applications and libraries from OS \ diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb index c03b079d65..1f4cf97e70 100644 --- a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb +++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb index c03b079d65..1f4cf97e70 100644 --- a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb index 9a566e7e7d..59eae3a0bb 100644 --- a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb +++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb index 9a566e7e7d..59eae3a0bb 100644 --- a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb +++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb index 4104de91df..a05558f979 100644 --- a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb +++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb +++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb index 63361612db..16ff0441b5 100644 --- a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb +++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb index 63361612db..16ff0441b5 100644 --- a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb +++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb +++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb +++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb +++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb +++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb +++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb index 8501865871..813143995d 100644 --- a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb +++ b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" S = "${WORKDIR}/${XORG_PN}-1.0.3" diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb +++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb index 19287d7a75..ffdbf51ebf 100644 --- a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb +++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb index 262ea04c9b..255ab83609 100644 --- a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb +++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb index 8dec781fda..881eed5240 100644 --- a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb +++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb index 414c7e2a2a..231eb0b37f 100644 --- a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb +++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb +++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb +++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb +++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb +++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb index 4b73dc7da2..3b35a020e4 100644 --- a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb +++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc PROVIDES = "xextensions" diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb +++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb index 08a45da203..18207c0307 100644 --- a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb +++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb +++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb +++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb +++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb index cfe5bf18a1..d3acf1f590 100644 --- a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb +++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb +++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb index 44ccb5f035..6645f592bd 100644 --- a/packages/xorg-proto/xproto-native_6.6.2.bb +++ b/packages/xorg-proto/xproto-native_6.6.2.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xproto_${PV}.bb +require xproto_${PV}.bb inherit native PROVIDES = "" diff --git a/packages/xorg-proto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb index 7b768a8079..a34db98ab9 100644 --- a/packages/xorg-proto/xproto-native_cvs.bb +++ b/packages/xorg-proto/xproto-native_cvs.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xproto_cvs.bb +require xproto_cvs.bb inherit native PROVIDES = "" diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb +++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb index f9017b560e..d7cd7c8c86 100644 --- a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb +++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb index 836af65108..b265a53346 100644 --- a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb +++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-proto-common.inc +require xorg-proto-common.inc PROVIDES="xproxymngproto" #DESCRIPTION = "" diff --git a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb index de3c2ee99a..f9dc1f3d3e 100644 --- a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb +++ b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb index de3c2ee99a..f9dc1f3d3e 100644 --- a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb +++ b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/packages/xorg-util/imake_X11R7.0-1.0.1.bb index f6f5451846..b2b11cf038 100644 --- a/packages/xorg-util/imake_X11R7.0-1.0.1.bb +++ b/packages/xorg-util/imake_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc DESCRIPTION = "imake utility" diff --git a/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/packages/xorg-util/imake_X11R7.1-1.0.2.bb index f6f5451846..b2b11cf038 100644 --- a/packages/xorg-util/imake_X11R7.1-1.0.2.bb +++ b/packages/xorg-util/imake_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc DESCRIPTION = "imake utility" diff --git a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb index 6738184b92..09a7787ee3 100644 --- a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb +++ b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb index b3d52356ce..1b8476be47 100644 --- a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb +++ b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc inherit native #DESCRIPTION = "" diff --git a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb index 6738184b92..09a7787ee3 100644 --- a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb +++ b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb index 79e5dbaa08..4e2ddece48 100644 --- a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb +++ b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc DESCRIPTION = "X autotools macros" diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb index 79e5dbaa08..4e2ddece48 100644 --- a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb +++ b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc DESCRIPTION = "X autotools macros" diff --git a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb index 991fc05326..f1b6b0d4f7 100644 --- a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb +++ b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb index 991fc05326..f1b6b0d4f7 100644 --- a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb +++ b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb @@ -1,4 +1,4 @@ -include xorg-util-common.inc +require xorg-util-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb index bfde2f732e..2a7ba03431 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb @@ -1,4 +1,4 @@ -include xorg-xserver-common.inc +require xorg-xserver-common.inc #DESCRIPTION = "" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 42b5bb918d..3db5c640c7 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -1,4 +1,4 @@ -include xorg-xserver-common.inc +require xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index 1b294475a4..cde82c3f4a 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -75,7 +75,7 @@ do_configure() { do_compile() { export TOPDIR=${TOPDIR} mkdir -p programs/Xserver/hw/xqt - #cp -r ../xqt-driver/* programs/Xserver/hw/xqt + #cp -R ../xqt-driver/* programs/Xserver/hw/xqt (cd programs/Xserver/hw/xqt && ln -s ../../../../../xqt2/xfree86/xqt-driver/* .) unset CC make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake diff --git a/packages/zaurus-updater/encdec-updater-native.bb b/packages/zaurus-updater/encdec-updater-native.bb index d6593193f7..3bf49d5010 100644 --- a/packages/zaurus-updater/encdec-updater-native.bb +++ b/packages/zaurus-updater/encdec-updater-native.bb @@ -1,4 +1,4 @@ -include encdec-updater.bb +require encdec-updater.bb inherit native do_stage() { diff --git a/packages/zip/zip-native_2.31.bb b/packages/zip/zip-native_2.31.bb index 7cd0261827..fde61efcb7 100644 --- a/packages/zip/zip-native_2.31.bb +++ b/packages/zip/zip-native_2.31.bb @@ -1,6 +1,6 @@ SECTION = "console/utils" inherit native -include zip_${PV}.bb +require zip_${PV}.bb S = "${WORKDIR}/zip-${PV}" do_stage() { diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb index 7cd0261827..fde61efcb7 100644 --- a/packages/zip/zip-native_2.32.bb +++ b/packages/zip/zip-native_2.32.bb @@ -1,6 +1,6 @@ SECTION = "console/utils" inherit native -include zip_${PV}.bb +require zip_${PV}.bb S = "${WORKDIR}/zip-${PV}" do_stage() { diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb index d10bb4312e..b8c4ae9da0 100644 --- a/packages/zip/zip_2.31.bb +++ b/packages/zip/zip_2.31.bb @@ -1,2 +1,2 @@ -include zip.inc +require zip.inc PR="r0" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb index d10bb4312e..b8c4ae9da0 100644 --- a/packages/zip/zip_2.32.bb +++ b/packages/zip/zip_2.32.bb @@ -1,2 +1,2 @@ -include zip.inc +require zip.inc PR="r0" diff --git a/packages/zlib/zlib-1.2.3/autotools.patch b/packages/zlib/zlib-1.2.3/autotools.patch new file mode 100644 index 0000000000..722a20d499 --- /dev/null +++ b/packages/zlib/zlib-1.2.3/autotools.patch @@ -0,0 +1,649 @@ +diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure +--- zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 ++++ zlib-1.2.3new/configure 1970-01-01 01:00:00.000000000 +0100 +@@ -1,459 +0,0 @@ +-#!/bin/sh +-# configure script for zlib. This script is needed only if +-# you wish to build a shared library and your system supports them, +-# of if you need special compiler, flags or install directory. +-# Otherwise, you can just use directly "make test; make install" +-# +-# To create a shared library, use "configure --shared"; by default a static +-# library is created. If the primitive shared library support provided here +-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz +-# +-# To impose specific compiler or flags or install directory, use for example: +-# prefix=$HOME CC=cc CFLAGS="-O4" ./configure +-# or for csh/tcsh users: +-# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) +-# LDSHARED is the command to be used to create a shared library +- +-# Incorrect settings of CC or CFLAGS may prevent creating a shared library. +-# If you have problems, try without defining CC and CFLAGS before reporting +-# an error. +- +-LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" +-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` +-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +-AR=${AR-"ar rc"} +-RANLIB=${RANLIB-"ranlib"} +-prefix=${prefix-/usr/local} +-exec_prefix=${exec_prefix-'${prefix}'} +-libdir=${libdir-'${exec_prefix}/lib'} +-includedir=${includedir-'${prefix}/include'} +-mandir=${mandir-'${prefix}/share/man'} +-shared_ext='.so' +-shared=0 +-gcc=0 +-old_cc="$CC" +-old_cflags="$CFLAGS" +- +-while test $# -ge 1 +-do +-case "$1" in +- -h* | --h*) +- echo 'usage:' +- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- exit 0;; +- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --p*) prefix="$2"; shift; shift;; +- -e* | --e*) exec_prefix="$2"; shift; shift;; +- -l* | --l*) libdir="$2"; shift; shift;; +- -i* | --i*) includedir="$2"; shift; shift;; +- -s* | --s*) shared=1; shift;; +- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; +- esac +-done +- +-test=ztest$$ +-cat > $test.c <<EOF +-extern int getchar(); +-int hello() {return getchar();} +-EOF +- +-test -z "$CC" && echo Checking for gcc... +-cc=${CC-gcc} +-cflags=${CFLAGS-"-O3"} +-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure +-case "$cc" in +- *gcc*) gcc=1;; +-esac +- +-if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then +- CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} +- CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; +- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 +- # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; +- HP-UX*) +- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' +- SHAREDLIB=libz$shared_ext +- SHAREDLIBV=libz.$VER$shared_ext +- SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; +- esac +-else +- # find system name and corresponding cc options +- CC=${CC-cc} +- case `(uname -sr || echo unknown) 2>/dev/null` in +- HP-UX*) SFLAGS=${CFLAGS-"-O +z"} +- CFLAGS=${CFLAGS-"-O"} +-# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} +- LDSHARED=${LDSHARED-"ld -b"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} +- CFLAGS=${CFLAGS-"-ansi -O2"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; +- OSF1*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- QNX*) SFLAGS=${CFLAGS-"-4 -O"} +- CFLAGS=${CFLAGS-"-4 -O"} +- LDSHARED=${LDSHARED-"cc"} +- RANLIB=${RANLIB-"true"} +- AR="cc -A";; +- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} +- CFLAGS=${CFLAGS-"-O3"} +- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; +- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} +- CFLAGS=${CFLAGS-"-O2"} +- LDSHARED=${LDSHARED-"ld"};; +- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} +- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} +- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; +- UNIX_System_V\ 4.2.0) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- UNIX_SV\ 4.2MP) +- SFLAGS=${CFLAGS-"-Kconform_pic -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- OpenUNIX\ 5) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- AIX*) # Courtesy of dbakker@arrayasolutions.com +- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- LDSHARED=${LDSHARED-"xlc -G"};; +- # send working options for other systems to support@gzip.org +- *) SFLAGS=${CFLAGS-"-O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- esac +-fi +- +-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} +-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} +-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} +- +-if test $shared -eq 1; then +- echo Checking for shared library support... +- # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && +- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then +- CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. +- elif test -z "$old_cc" -a -z "$old_cflags"; then +- echo No shared library support. +- shared=0; +- else +- echo 'No shared library support; try without defining CC and CFLAGS' +- shared=0; +- fi +-fi +-if test $shared -eq 0; then +- LDSHARED="$CC" +- echo Building static library $LIBS version $VER with $CC. +-else +- LDFLAGS="-L. ${SHAREDLIBV}" +-fi +- +-cat > $test.c <<EOF +-#include <unistd.h> +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- echo "Checking for unistd.h... Yes." +-else +- cp -p zconf.in.h zconf.h +- echo "Checking for unistd.h... No." +-fi +- +-cat > $test.c <<EOF +-#include <stdio.h> +-#include <stdarg.h> +-#include "zconf.h" +- +-int main() +-{ +-#ifndef STDC +- choke me +-#endif +- +- return 0; +-} +-EOF +- +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" +- +- cat > $test.c <<EOF +-#include <stdio.h> +-#include <stdarg.h> +- +-int mytest(char *fmt, ...) +-{ +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return 0; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for vsnprintf() in stdio.h... Yes." +- +- cat >$test.c <<EOF +-#include <stdio.h> +-#include <stdarg.h> +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsnprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" +- echo "Checking for return value of vsnprintf()... No." +- echo " WARNING: apparently vsnprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_vsnprintf" +- echo "Checking for vsnprintf() in stdio.h... No." +- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c <<EOF +-#include <stdio.h> +-#include <stdarg.h> +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsprintf(buf, fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsprintf_void" +- echo "Checking for return value of vsprintf()... No." +- echo " WARNING: apparently vsprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-else +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" +- +- cat >$test.c <<EOF +-#include <stdio.h> +- +-int mytest() +-{ +- char buf[20]; +- +- snprintf(buf, sizeof(buf), "%s", "foo"); +- return 0; +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for snprintf() in stdio.h... Yes." +- +- cat >$test.c <<EOF +-#include <stdio.h> +- +-int mytest() +-{ +- char buf[20]; +- +- return snprintf(buf, sizeof(buf), "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of snprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_snprintf_void" +- echo "Checking for return value of snprintf()... No." +- echo " WARNING: apparently snprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_snprintf" +- echo "Checking for snprintf() in stdio.h... No." +- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c <<EOF +-#include <stdio.h> +- +-int mytest() +-{ +- char buf[20]; +- +- return sprintf(buf, "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of sprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_sprintf_void" +- echo "Checking for return value of sprintf()... No." +- echo " WARNING: apparently sprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-fi +- +-cat >$test.c <<EOF +-#include <errno.h> +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for errno.h... Yes." +-else +- echo "Checking for errno.h... No." +- CFLAGS="$CFLAGS -DNO_ERRNO_H" +-fi +- +-cat > $test.c <<EOF +-#include <sys/types.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-caddr_t hello() { +- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); +-} +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- CFLAGS="$CFLAGS -DUSE_MMAP" +- echo Checking for mmap support... Yes. +-else +- echo Checking for mmap support... No. +-fi +- +-CPP=${CPP-"$CC -E"} +-case $CFLAGS in +- *ASMV*) +- if test "`nm $test.o | grep _hello`" = ""; then +- CPP="$CPP -DNO_UNDERLINE" +- echo Checking for underline in external names... No. +- else +- echo Checking for underline in external names... Yes. +- fi;; +-esac +- +-rm -f $test.[co] $test $test$shared_ext +- +-# udpate Makefile +-sed < Makefile.in " +-/^CC *=/s#=.*#=$CC# +-/^CFLAGS *=/s#=.*#=$CFLAGS# +-/^CPP *=/s#=.*#=$CPP# +-/^LDSHARED *=/s#=.*#=$LDSHARED# +-/^LIBS *=/s#=.*#=$LIBS# +-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# +-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# +-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# +-/^AR *=/s#=.*#=$AR# +-/^RANLIB *=/s#=.*#=$RANLIB# +-/^EXE *=/s#=.*#=$EXE# +-/^prefix *=/s#=.*#=$prefix# +-/^exec_prefix *=/s#=.*#=$exec_prefix# +-/^libdir *=/s#=.*#=$libdir# +-/^includedir *=/s#=.*#=$includedir# +-/^mandir *=/s#=.*#=$mandir# +-/^LDFLAGS *=/s#=.*#=$LDFLAGS# +-" > Makefile +diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac +--- zlib-1.2.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/configure.ac 2006-08-07 20:38:31.612402750 +0200 +@@ -0,0 +1,14 @@ ++AC_INIT(zlib,1.2.3) ++AC_CONFIG_SRCDIR(adler32.c) ++AM_INIT_AUTOMAKE(zlibs,1.2.3) ++ ++AC_PREREQ([2.59]) ++ ++AC_PROG_CC([gcc]) ++AC_PROG_LIBTOOL ++ ++AC_HEADER_STDC ++ ++AC_CONFIG_FILES([Makefile]) ++ ++AC_OUTPUT +diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am +--- zlib-1.2.3/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/Makefile.am 2006-08-07 19:57:26.522344250 +0200 +@@ -0,0 +1,6 @@ ++lib_LTLIBRARIES = libz.la ++ ++libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ ++ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c ++ ++libz_la_LDFLAGS = -version-number 1:2:3 +diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in +--- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 ++++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,154 +0,0 @@ +-# Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. +-# For conditions of distribution and use, see copyright notice in zlib.h +- +-# To compile and test, type: +-# ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s +- +-# To use the asm code, type: +-# cp contrib/asm?86/match.S ./match.S +-# make LOC=-DASMV OBJA=match.o +- +-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: +-# make install +-# To install in $HOME instead of /usr/local, use: +-# make install prefix=$HOME +- +-CC=cc +- +-CFLAGS=-O +-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +-#CFLAGS=-g -DDEBUG +-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +-# -Wstrict-prototypes -Wmissing-prototypes +- +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- +-LIBS=libz.a +-SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBM=libz.so.1 +- +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh +-EXE= +- +-prefix = /usr/local +-exec_prefix = ${prefix} +-libdir = ${exec_prefix}/lib +-includedir = ${prefix}/include +-mandir = ${prefix}/share/man +-man3dir = ${mandir}/man3 +- +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o +- +-OBJA = +-# to use the asm code: make OBJA=match.o +- +-TEST_OBJS = example.o minigzip.o +- +-all: example$(EXE) minigzip$(EXE) +- +-check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ +- echo ' *** zlib test OK ***'; \ +- else \ +- echo ' *** zlib test FAILED ***'; \ +- fi +- +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) +- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 +- +-match.o: match.S +- $(CPP) match.S > _match.s +- $(CC) -c _match.s +- mv _match.o match.o +- rm -f _match.s +- +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) +- rm -f $(SHAREDLIB) $(SHAREDLIBM) +- ln -s $@ $(SHAREDLIB) +- ln -s $@ $(SHAREDLIBM) +- +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) +- +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) +- +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ +- fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 +-# The ranlib in install is needed on NeXTSTEP which checks file times +-# ldconfig is for Linux +- +-uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ +- fi +- cd $(man3dir); rm -f zlib.3 +- +-mostlyclean: clean +-clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- libz.* foo.gz so_locations \ +- _match.s maketree contrib/infback9/*.o +- +-maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store +- +-tags: +- etags *.[ch] +- +-depend: +- makedepend -- $(CFLAGS) -- *.[ch] +- +-# DO NOT DELETE THIS LINE -- make depend depends on it. +- +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h +-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h +-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h diff --git a/packages/zlib/zlib-1.2.3/libtool_staging.patch b/packages/zlib/zlib-1.2.3/libtool_staging.patch deleted file mode 100644 index f52e036108..0000000000 --- a/packages/zlib/zlib-1.2.3/libtool_staging.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- zlib-1.2.3/Makefile.in.sav 2006-06-13 09:09:53.000000000 -0600 -+++ zlib-1.2.3/Makefile.in 2006-06-13 09:24:48.861200464 -0600 -@@ -24,11 +24,13 @@ - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - # -Wstrict-prototypes -Wmissing-prototypes - -+LIBTOOL=libtool - LDFLAGS=libz.a - LDSHARED=$(CC) - CPP=$(CC) -E - - LIBS=libz.a -+LIBTOOLLIB=libz.la - SHAREDLIB=libz.so - SHAREDLIBV=libz.so.1.2.3 - SHAREDLIBM=libz.so.1 -@@ -67,7 +69,10 @@ - echo ' *** zlib test FAILED ***'; \ - fi - --libz.a: $(OBJS) $(OBJA) -+$(LIBTOOLLIB): $(OBJS) $(OBJA) -+ $(LIBTOOL) --tag='CC' --mode=link $(CC) -o $@ $(OBJS) $(OBJA) -+ -+libz.a: $(OBJS) $(OBJA) $(LIBTOOLLIB) - $(AR) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - diff --git a/packages/zlib/zlib-native_1.1.4.bb b/packages/zlib/zlib-native_1.1.4.bb index 5edd4b0b28..eb551364ac 100644 --- a/packages/zlib/zlib-native_1.1.4.bb +++ b/packages/zlib/zlib-native_1.1.4.bb @@ -1,4 +1,4 @@ SECTION = "libs" -include zlib_${PV}.bb +require zlib_${PV}.bb inherit native DEPENDS = "" diff --git a/packages/zlib/zlib-native_1.2.2.bb b/packages/zlib/zlib-native_1.2.2.bb index 5edd4b0b28..eb551364ac 100644 --- a/packages/zlib/zlib-native_1.2.2.bb +++ b/packages/zlib/zlib-native_1.2.2.bb @@ -1,4 +1,4 @@ SECTION = "libs" -include zlib_${PV}.bb +require zlib_${PV}.bb inherit native DEPENDS = "" diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb index c93f7a329a..1716707148 100644 --- a/packages/zlib/zlib-native_1.2.3.bb +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -1,5 +1,6 @@ SECTION = "libs" -include zlib_${PV}.bb +require zlib_${PV}.bb +ZLIB_EXTRA = "" inherit native DEPENDS = "libtool-native" diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index c7a72c9107..507b32eff9 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -1,34 +1,24 @@ DESCRIPTION = "Zlib Compression Library" SECTION = "libs" PRIORITY = "required" -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +MAINTAINER = "Henning Heinold <heinold@inf.fu-berlin.de>" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" +PR="r1" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ - file://libtool_staging.patch;patch=1" + file://autotools.patch;patch=1 " S = "${WORKDIR}/zlib-${PV}" DEPENDS = "libtool-cross" -export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" -LDFLAGS_append = " -L. -lz" -CFLAGS_prepend = "-fPIC -DZLIB_DLL " -AR_append = " rc" -EXTRA_OEMAKE = " LIBTOOL=${TARGET_SYS}-libtool" - -do_compile() { - ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} - oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a -} +inherit autotools do_stage() { install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - - mv libz.la ${STAGING_LIBDIR}/ oe_libinstall -a -so libz ${STAGING_LIBDIR} } |