diff options
2178 files changed, 17297 insertions, 6881 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 49d6260090..56a13ff309 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,3 +1,4 @@ +BB_DEFAULT_TASK = "build" PATCHES_DIR="${S}" def base_dep_prepend(d): @@ -172,7 +173,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 @@ -323,7 +324,6 @@ python base_do_mrproper() { addtask fetch do_fetch[dirs] = "${DL_DIR}" -do_fetch[nostamp] = "1" python base_do_fetch() { import sys @@ -398,8 +398,15 @@ def oe_unpack_file(file, data, url = None): destdir = "." bb.mkdirhier("%s/%s" % (os.getcwd(), destdir)) cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir) + if not cmd: return True + + dest = os.path.join(os.getcwd(), os.path.basename(file)) + if os.path.exists(dest): + if os.path.samefile(file, dest): + return True + cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) bb.note("Unpacking %s to %s/" % (file, os.getcwd())) ret = os.system(cmd) @@ -577,6 +584,7 @@ python base_eventhandler() { addtask configure after do_unpack do_patch do_configure[dirs] = "${S} ${B}" do_configure[bbdepcmd] = "do_populate_staging" +do_configure[deptask] = "do_populate_staging" base_do_configure() { : } 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/classes/debian.bbclass b/classes/debian.bbclass index 5688dad93b..698d917b51 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -6,6 +6,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" # depends are correct BUILD_ALL_DEPS = "1" +# Better expressed as ensure all RDEPENDS package before we package +# This means we can't have circular RDEPENDS/RRECOMMENDS +do_package[rdeptask] = "do_package" + python debian_package_name_hook () { import glob, copy, stat, errno, re diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 7dfcfc29a4..66a5bf79e3 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -1,9 +1,17 @@ # IceCream distributed compiling support -# +# # We need to create a tar.bz2 of our toolchain and set # ICECC_VERSION, ICECC_CXX and ICEC_CC # +def icc_determine_gcc_version(gcc): + """ + Hack to determine the version of GCC + + 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' + """ + return os.popen("%s --version" % gcc ).readline()[2] + def create_env(bb,d): """ Create a tar.bz of the current toolchain @@ -13,7 +21,7 @@ def create_env(bb,d): # host prefix is empty (let us duplicate the query for ease) prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "" + return "" import tarfile import socket @@ -23,51 +31,66 @@ def create_env(bb,d): prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) - #float = bb.data.getVar('${TARGET_FPU}', d) - float = "anyfloat" + float = bb.data.getVar('${TARGET_FPU}', d) or "hard" name = socket.gethostname() + # Stupid check to determine if we have built a libc and a cross + # compiler. try: - os.stat(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') - os.stat(ice_dir + '/' + target_sys + '/bin/g++') + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) + os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: - return "" + return "" - VERSION = '3.4.3' + VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") ) cross_name = prefix + distro + target_sys + float +VERSION+ name - tar_file = ice_dir + '/ice/' + cross_name + '.tar.bz2' + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2') try: os.stat(tar_file) return tar_file except: - try: - os.makedirs(ice_dir+'/ice') - except: - pass + try: + os.makedirs(os.path.join(ice_dir,'ice')) + except: + pass # FIXME find out the version of the compiler + # Consider using -print-prog-name={cc1,cc1plus} + # and -print-file-name=specs + + # We will use the GCC to tell us which tools to use + # What we need is: + # -gcc + # -g++ + # -as + # -cc1 + # -cc1plus + # and we add them to /usr/bin + tar = tarfile.open(tar_file, 'w:bz2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-linux.so.2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc-2.3.3.so', - target_sys + 'cross/lib/libc-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc.so.6', - target_sys + 'cross/lib/libc.so.6') - tar.add(ice_dir + '/' + target_sys + '/bin/gcc', - target_sys + 'cross/usr/bin/gcc') - tar.add(ice_dir + '/' + target_sys + '/bin/g++', - target_sys + 'cross/usr/bin/g++') - tar.add(ice_dir + '/' + target_sys + '/bin/as', - target_sys + 'cross/usr/bin/as') - tar.add(ice_dir + '/lib/gcc/' + target_sys +'/'+ VERSION + '/specs', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/specs') - tar.add(ice_dir + '/libexec/gcc/'+target_sys+'/' + VERSION + '/cc1', - target_sys + 'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1') - tar.add(ice_dir + '/libexec/gcc/arm-linux/' + VERSION + '/cc1plus', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1plus') + + # Now add the required files + tar.add(os.path.join(ice_dir,target_sys,'bin','gcc'), + os.path.join("usr","bin","gcc") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join("usr","bin","g++") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join("usr","bin","as") ) + + # Now let us find cc1 and cc1plus + cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d, True)).read()[:-1] + cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d, True)).read()[:-1] + spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d, True)).read()[:-1] + + # CC1 and CC1PLUS should be there... + tar.add(cc1, os.path.join('usr', 'bin', 'cc1')) + tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus')) + + # spec - if it exists + if os.path.exists(spec): + tar.add(spec) + tar.close() return tar_file @@ -78,7 +101,7 @@ def create_path(compilers, type, bb, d): """ import os - staging = bb.data.expand('${STAGING_DIR}', d) + "/ice/" + type + staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) icecc = bb.data.getVar('ICECC_PATH', d) # Create the dir if necessary @@ -89,7 +112,7 @@ def create_path(compilers, type, bb, d): for compiler in compilers: - gcc_path = staging + "/" + compiler + gcc_path = os.path.join(staging, compiler) try: os.stat(gcc_path) except: @@ -102,15 +125,14 @@ def use_icc_version(bb,d): # Constin native native prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "no" - - - native = bb.data.expand('${PN}', d) - blacklist = [ "-cross", "-native" ] + return "no" + + + blacklist = [ "cross", "native" ] for black in blacklist: - if black in native: - return "no" + if bb.data.inherits_class(black, d): + return "no" return "yes" @@ -118,13 +140,13 @@ def icc_path(bb,d,compile): native = bb.data.expand('${PN}', d) blacklist = [ "ulibc", "glibc", "ncurses" ] for black in blacklist: - if black in native: - return "" + if black in native: + return "" - if "-native" in native: - compile = False - if "-cross" in native: - compile = False + blacklist = [ "cross", "native" ] + for black in blacklist: + if bb.data.inherits_class(black, d): + compile = False prefix = bb.data.expand('${HOST_PREFIX}', d) if compile and len(prefix) != 0: @@ -151,6 +173,6 @@ do_compile_prepend() { export ICECC_CXX="${HOST_PREFIX}g++" if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - export ICECC_VERSION="${@icc_version(bb,d)}" + export ICECC_VERSION="${@icc_version(bb,d)}" fi } diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index d3923f06a2..83e9acf315 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,7 +1,8 @@ inherit rootfs_ipk -# We need to follow RDEPENDS and RRECOMMENDS for images +# We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" +do_rootfs[recrdeptask] = "do_package" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 629d0e82b0..395f124572 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -1,24 +1,21 @@ # # BB Class inspired by ebuild.sh # -# As I will be copying code from from ebuild.sh this is -# Copyright Gentoo Foundation 1999-2006 -# GPLv2 -# # This class will test files after installation for certain # security issues and other kind of issues. # # Checks we do: # -Check the ownership and permissions # -Check the RUNTIME path for the $TMPDIR +# -Check if .la files wrongly point to workdir +# -Check if .pc files wrongly point to workdir +# -Check if packages contains .dbg or .so files where they should be in -dev or -dbg # -# Checks that are planned: -# -Check installed and stages .la files # # We need to have the scanelf utility as soon as -# possible. +# possible and this is contained within the pax-utils-native # # We play a special package function @@ -26,7 +23,40 @@ inherit package PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " +def package_qa_check_rpath(path): + pass + +def package_qa_check_devdbg(path, name): + pass + +def package_qa_check_perm(path): + pass + +def package_qa_check_staged(path): + pass + + +# The PACKAGE FUNC to scan each package python do_package_qa () { + bb.note("DO PACKAGE QA") + workdir = bb.data.getVar('WORKDIR', d, True) + packages = bb.data.getVar('PACKAGES',d, True) + + # no packages should be scanned + if not packages: + return + + for package in packages.split(): + bb.note("Package: %s" % package) + path = "%s/install/%s" % (workdir, package) + package_qa_check_rpath(path) + package_qa_check_devdbg(path,package) + package_qa_check_perm(path) } +# The Staging Func, to check all staging +addtask qa_staging after do_populate_staging before do_build +python do_qa_staging() { + bb.note("Staged!") +} diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index e08b4ec412..c81112ede7 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -214,7 +214,7 @@ fi if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} else - depmod -A + depmod -a fi } @@ -222,7 +222,7 @@ pkg_postinst_modules () { if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} else - depmod -A + depmod -a update-modules || true fi } diff --git a/classes/module.bbclass b/classes/module.bbclass index 8a13f1f858..6089f90462 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -38,7 +38,7 @@ pkg_postinst_append () { if [ -n "$D" ]; then exit 1 fi - depmod -A + depmod -a update-modules || true } diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 2248f326cc..01dec648c3 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,6 +1,6 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. diff --git a/classes/package.bbclass b/classes/package.bbclass index eb3a0349cb..0d6a7734af 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -177,10 +177,12 @@ runstrip() { ro=1 chmod +w "$1" } - '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg" + mkdir $(dirname "$1")/.debug + debugfile="$(dirname "$1")/.debug/$(basename "$1")" + '${OBJCOPY}' --only-keep-debug "$1" "$debugfile" '${STRIP}' "$1" st=$? - '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1" + '${OBJCOPY}' --add-gnu-debuglink="$debugfile" "$1" test -n "$ro" && chmod -w "$1" if test $st -ne 0 then @@ -723,7 +725,7 @@ python package_do_split_locales() { bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d) } -PACKAGEFUNCS = "do_install package_do_split_locales \ +PACKAGEFUNCS ?= " do_install package_do_split_locales \ populate_packages package_do_shlibs \ package_do_pkgconfig read_shlibdeps" python package_do_package () { @@ -732,6 +734,8 @@ python package_do_package () { } do_package[dirs] = "${D}" +# shlibs requires any DEPENDS to have already packaged for the *.list files +do_package[deptask] = "do_package" populate_packages[dirs] = "${D}" EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook addtask package before do_build after do_populate_staging diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 2b92415b58..25738e8cb1 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -31,6 +31,7 @@ real_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/dev if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + touch ${DEPLOY_DIR_IPK}/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} fi mkdir -p ${T} diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index f544c203fe..d36ef0b343 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -240,8 +240,8 @@ def tinder_tinder_start(d, event): output.append( "---> TINDERBOX BUILDING '%(packages)s'" ) output.append( "<--- TINDERBOX STARTING BUILD NOW" ) - output.append( "" ) - + output.append( "" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): @@ -255,6 +255,14 @@ def tinder_do_tinder_report(event): information immediately. The caching/queuing needs to be implemented. Also sending more or less information is not implemented yet. + + We have two temporary files stored in the TMP directory. One file + contains the assigned machine id for the tinderclient. This id gets + assigned when we connect the box and start the build process the second + file is used to workaround an EventHandler limitation. If BitBake is ran + with the continue option we want the Build to fail even if we get the + BuildCompleted Event. In this case we have to look up the status and + send it instead of 100/success. """ from bb.event import getName from bb import data, mkdirhier, build @@ -264,7 +272,6 @@ def tinder_do_tinder_report(event): name = getName(event) log = "" status = 1 - #print asd # Check what we need to do Build* shows we start or are done if name == "BuildStarted": tinder_build_start(event.data) @@ -272,9 +279,18 @@ def tinder_do_tinder_report(event): try: # truncate the tinder log file - f = file(data.getVar('TINDER_LOG', event.data, True), 'rw+') - f.truncate(0) + f = file(data.getVar('TINDER_LOG', event.data, True), 'w') + f.write("") f.close() + except: + pass + + try: + # write a status to the file. This is needed for the -k option + # of BitBake + g = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + g.write("") + g.close() except IOError: pass @@ -295,16 +311,27 @@ def tinder_do_tinder_report(event): elif name == "TaskFailed": log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task elif name == "PkgStarted": - log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True) + log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) elif name == "PkgSucceeded": - log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": - build.exec_task('do_clean', event.data) - log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) + if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": + build.exec_task('do_clean', event.data) + log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 + # remember the failure for the -k case + h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + h.write("200") elif name == "BuildCompleted": log += "Build Completed\n" status = 100 + # Check if we have a old status... + try: + h = file(data.getVar('TMPDIR',event.data,True)+'/tinder-status', 'r') + status = int(h.read()) + except: + pass + elif name == "MultipleProviders": log += "---> TINDERBOX Multiple Providers\n" log += "multiple providers are available (%s);\n" % ", ".join(event.getCandidates()) @@ -315,6 +342,9 @@ def tinder_do_tinder_report(event): log += "Error: No Provider for: %s\n" % event.getItem() log += "Error:Was Runtime: %d\n" % event.isRuntime() status = 200 + # remember the failure for the -k case + h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + h.write("200") # now post the log if len(log) == 0: diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d446d40b8f..0a141f883e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -51,7 +51,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}" TARGET_ARCH = "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" @@ -104,9 +104,9 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ + /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" @@ -118,8 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" FILES_${PN}-locale = "${datadir}/locale" -FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \ - /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg" +FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ + /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" # File manifest @@ -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/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 4827e458d1..66dc4fb0a6 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -53,7 +53,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index fbb2814453..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -22,13 +22,15 @@ FEED_URIS += " \ perl##${ANGSTROM_URI}/unstable/feed/perl \ python##${ANGSTROM_URI}/unstable/feed/python \ debug##${ANGSTROM_URI}/unstable/feed/debug \ - ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}" + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" +SRCDATE_gnome-vfs-dbus = "20060803" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -44,12 +46,23 @@ require conf/distro/include/preferred-opie-versions.inc # GPE require conf/distro/include/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + PREFERRED_VERSION_fontconfig = "2.3.95" 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-kdrive" + +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" + # E require conf/distro/include/preferred-e-versions.inc @@ -74,10 +87,14 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus +PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp = "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" #EABI stuff PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" @@ -103,11 +120,11 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4" # Busybox <1.1.0 doesn't have EABI support -PREFERRED_VERSION_busybox = "1.2.0" +PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.61" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -123,18 +140,27 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" +PCMCIA_MANAGER_tosa = "pcmciautils" +PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" +# add altboot to compatible models, will be replaced with angstrom-bootmanager +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" - -#### GPE section ### +### GPE section ### #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf index 1e156dd363..5b12b6f93b 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/ezx.conf @@ -72,7 +72,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index a04b526f5f..6ae4e9ddc3 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -71,7 +71,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf index 52659b75e2..80fd25ae19 100644 --- a/conf/distro/generic-unstable.conf +++ b/conf/distro/generic-unstable.conf @@ -49,6 +49,12 @@ PREFERRED_VERSION_glibc-intermediate = "2.4" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib + +# # GPE # require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index fb38785add..d416842d9d 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -35,8 +35,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_tslib ?= tslib - PREFERRED_VERSION_gcc = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" @@ -60,9 +58,16 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" require conf/distro/include/sane-srcdates.inc # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib +require conf/distro/include/preferred-x-versions-pre-X11R7.inc + +# # GPE # -require conf/distro/include/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions-2.7.inc # # Opie diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8203c000f7..9c2679aff1 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom" ANGSTROM_URI = "http://www.angstrom-distribution.org" #Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" +MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index b7f456320f..264cceecfd 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +# Set minimal version of BitBake needed +BB_MIN_VERSION = "1.4.4" +INHERIT += "sanity" diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 1d09ae6051..3bbc6be01a 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -20,6 +20,7 @@ PREFERRED_VERSION_matchbox-wm ?= "0.9.3" PREFERRED_VERSION_matchbox-panel ?= "0.9.1" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_gtk+ ?= "2.6.3" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.97" PREFERRED_VERSION_libgpepimc ?= "0.4" PREFERRED_VERSION_libgpevtype ?= "0.11" @@ -32,6 +33,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_PROVIDER_xextensions = "xextensions" #PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 933195977d..36702025c1 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -21,6 +21,7 @@ PREFERRED_VERSION_atk ?= "1.9.0" PREFERRED_VERSION_cairo ?= "0.5.2" PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.10" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.109" @@ -37,6 +38,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_PROVIDER_xextensions = "xextensions" PREFERRED_VERSION_xextensions ?= "1.0.1" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 676e0ee9f9..180ca47b17 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus #PREFERRED_VERSION_matchbox-panel ?= "0.9.1" #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" #PREFERRED_VERSION_gtk+ ?= "2.6.3" +#PREFERRED_VERSION_gtk-engines ?= "2.6.5" #PREFERRED_VERSION_libgpewidget ?= "0.97" #PREFERRED_VERSION_libgpepimc ?= "0.4" #PREFERRED_VERSION_libgpevtype ?= "0.11" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 8c6b122585..6db9d92f71 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext" PREFERRED_PROVIDER_xext = "libxext" PREFERRED_PROVIDER_libxi = "libxi" PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" PREFERRED_PROVIDER_libxpm = "libxpm" PREFERRED_PROVIDER_xpm = "libxpm" PREFERRED_PROVIDER_libxt = "libxt" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 4371fae61d..27a6164e54 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -1,185 +1,185 @@ -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_libxext = "libxext" -PREFERRED_PROVIDER_xext = "libxext" -PREFERRED_PROVIDER_libxi = "libxi" -PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_libx11 = "libx11" -PREFERRED_PROVIDER_libxpm = "libxpm" -PREFERRED_PROVIDER_xpm = "libxpm" -PREFERRED_PROVIDER_libxt = "libxt" -PREFERRED_PROVIDER_libxaw = "libxaw" -PREFERRED_PROVIDER_libice = "libice" -PREFERRED_PROVIDER_libxrender = "libxrender" -PREFERRED_PROVIDER_libxcursor = "libxcursor" -PREFERRED_PROVIDER_xextensions = "xextensions" -PREFERRED_PROVIDER_xproto = "xproto" -PREFERRED_PROVIDER_x11 = "libx11" -PREFERRED_PROVIDER_libxv = "libxv" -PREFERRED_PROVIDER_xft = "libxft" -PREFERRED_PROVIDER_libxrandr = "libxrandr" -PREFERRED_PROVIDER_libxdamage = "libxdamage" -PREFERRED_PROVIDER_libxcomposite = "libxcomposite" -PREFERRED_PROVIDER_libxfixes = "libxfixes" -PREFERRED_PROVIDER_libxinerama = "libxinerama" -PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm" -PREFERRED_PROVIDER_libxmu = "libxmu" -PREFERRED_PROVIDER_libsm = "libsm" -PREFERRED_PROVIDER_xrandr = "xrandr" -PREFERRED_PROVIDER_xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg" +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" -PREFERRED_VERSION_task-xorg = "X11R7.1" +PREFERRED_VERSION_task-xorg ?= "X11R7.1" -PREFERRED_VERSION_bitmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_fstobdf = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir = "X11R7.1-1.0.2" -PREFERRED_VERSION_rgb = "X11R7.1-1.0.1" -PREFERRED_VERSION_rstart = "X11R7.1-1.0.2" -PREFERRED_VERSION_setxkbmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_smproxy = "X11R7.1-1.0.2" -PREFERRED_VERSION_x11perf = "X11R7.1-1.4.1" -PREFERRED_VERSION_xclock = "X11R7.1-1.0.2" -PREFERRED_VERSION_xconsole = "X11R7.1-1.0.2" -PREFERRED_VERSION_xcursorgen = "X11R7.1-1.0.1" -PREFERRED_VERSION_xdm = "X11R7.1-1.0.4" -PREFERRED_VERSION_xdriinfo = "X11R7.1-1.0.1" -PREFERRED_VERSION_xedit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xfs = "X11R7.1-1.0.2" -PREFERRED_VERSION_xhost = "X11R7.1-1.0.1" -PREFERRED_VERSION_xinit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbcomp = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbevd = "X11R7.1-1.0.2" -PREFERRED_VERSION_xman = "X11R7.1-1.0.2" -PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" -PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrefresh = "X11R7.1-1.0.2" -PREFERRED_VERSION_xset = "X11R7.1-1.0.2" -PREFERRED_VERSION_xtrap = "X11R7.1-1.0.2" -PREFERRED_VERSION_xwininfo = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-docs = "X11R7.1-1.2" -PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.1-1.1" -PREFERRED_VERSION_xf86-input-acecad = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-aiptek = "X11R7.1-1.0.1" -PREFERRED_VERSION_xf86-input-calcomp = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-citron = "X11R7.1-2.2.0" -PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dmc = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dynapro = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-evdev = "X11R7.1-1.1.2" -PREFERRED_VERSION_xf86-input-fpit = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-joystick = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-keyboard = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magellan = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magictouch = "X11R7.1-1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mouse = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mutouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-palmax = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-penmount = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-summa = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-ur98 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse = "X11R7.1-12.4.0" -PREFERRED_VERSION_xf86-input-void = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-apm = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-ark = "X11R7.1-0.6.0" -PREFERRED_VERSION_xf86-video-ast = "X11R7.1-0.81.0" -PREFERRED_VERSION_xf86-video-ati = "X11R7.1-6.6.0" -PREFERRED_VERSION_xf86-video-chips = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-cirrus = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-cyrix = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-dummy = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-fbdev = "X11R7.1-0.3.0" -PREFERRED_VERSION_xf86-video-glint = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-i128 = "X11R7.1-1.1.0.5" -PREFERRED_VERSION_xf86-video-i740 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-i810 = "X11R7.1-1.6.0" -PREFERRED_VERSION_xf86-video-imstt = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-mga = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-neomagic = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-newport = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-nsc = "X11R7.1-2.8.1" -PREFERRED_VERSION_xf86-video-nv = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-rendition = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-s3 = "X11R7.1-0.4.1" -PREFERRED_VERSION_xf86-video-s3virge = "X11R7.1-1.9.1" -PREFERRED_VERSION_xf86-video-savage = "X11R7.1-2.1.1" -PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-sis = "X11R7.1-0.9.1" -PREFERRED_VERSION_xf86-video-sisusb = "X11R7.1-0.8.1" -PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunffb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunleo = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suntcx = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-tdfx = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tga = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-trident = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tseng = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-v4l = "X11R7.1-0.1.1" -PREFERRED_VERSION_xf86-video-vesa = "X11R7.1-1.2.0" -PREFERRED_VERSION_xf86-video-vga = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-via = "X11R7.1-0.2.1" -PREFERRED_VERSION_xf86-video-vmware = "X11R7.1-10.13.0" -PREFERRED_VERSION_xf86-video-voodoo = "X11R7.1-1.1.0" -PREFERRED_VERSION_font-util-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_font-util = "X11R7.1-1.0.1" -PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libice = "X11R7.1-1.0.1" -PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1" -PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3" -PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6" -PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1" -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_libxfontcache = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxi = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5" -PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1" -PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1" -PREFERRED_VERSION_libxres = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxt = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1" -PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" -PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" -PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" -PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" -PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" -PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" -PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" -PREFERRED_VERSION_imake = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_setxkbmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdm ?= "X11R7.1-1.0.4" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xfs ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbcomp ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmodmap ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "X11R7.1-1.1" +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "X11R7.1-6.6.0" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "X11R7.1-0.3.0" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "X11R7.1-1.1.0.5" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "X11R7.1-1.6.0" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-nsc ?= "X11R7.1-2.8.1" +PREFERRED_VERSION_xf86-video-nv ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-rendition ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-s3 ?= "X11R7.1-0.4.1" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "X11R7.1-2.1.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-sis ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tseng ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "X11R7.1-1.2.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "X11R7.1-0.2.1" +PREFERRED_VERSION_xf86-video-vmware ?= "X11R7.1-10.13.0" +PREFERRED_VERSION_xf86-video-voodoo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_diet-x11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "X11R7.1-0.3" +PREFERRED_VERSION_libxcursor ?= "X11R7.1-1.1.6" +PREFERRED_VERSION_libxdamage ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" +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.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" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxpm ?= "X11R7.1-3.5.5" +PREFERRED_VERSION_libxrandr ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_libxrender ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_libxres ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxscrnsaver ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxt ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxvmc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "X11R7.1-1.4.7" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_xproto ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a88449e07..b9cc82e1d3 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,17 +1,29 @@ # Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version -SRCDATE_gconf-dbus ?= "20060119" -SRCDATE_gnome-vfs-dbus ?= "20060119" +# Kernel modules +SRCDATE_at76c503a-modules ?= "20060814" +SRCDATE_prism54-module ?= "20060814" + +# X11 libs, extentions and protos +SRCDATE_xcalibrate ?= "20060804" +SRCDATE_compositeext ?= "20060814" +SRCDATE_drm ?= "20060814" +SRCDATE_drm-kernel ?= "20060814" +SRCDATE_fixesext ?= "20060814" +SRCDATE_libxext-native ?= "20060814" +SRCDATE_libxss ?= "20060814" +SRCDATE_recordext ?= "20060814" +SRCDATE_renderext ?= "20060814" +SRCDATE_xcalibrate ?= "20060814" +SRCDATE_xcalibrateext ?= "20060814" +SRCDATE_xxf86dgaext ?= "20060814" +SRCDATE_xxf86vmext ?= "20060814" + +# Matchbox / O-hand SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" -SRCDATE_gtkhtml2 ?= "20060323" SRCDATE_web ?= "20060613" SRCDATE_eds-dbus ?= "20060707" -SRCDATE_minimo ?= "20050401" -SRCDATE_ipkg-utils-native ?= "20050930" -SRCDATE_ipkg-link-1 ?= "20050930" -SRCDATE_ipkg-utils ?= "20050930" -SRCDATE_ipkg-link ?= "20050930" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" @@ -22,8 +34,52 @@ SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" -SRCDATE_tslib ?= "20051101" SRCDATE_libfakekey ?= "20051101" -SRCDATE_qemu-native ?= "20060526" -SRCDATE_oprofile ?= "20060214" SRCDATE_zaurusd ?= "20060628" + +# GPE +SRCDATE_dasher-gpe ?= "20060814" +SRCDATE_rosetta ?= "20060804" + +# GNOME +SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gtkhtml2 ?= "20060323" + +#Misc apps, sorted by alphabet +SRCDATE_avetanabt ?= "20060814" +SRCDATE_bl ?= "20060814" +SRCDATE_dvbstream ?= "20060814" +SRCDATE_dvbtraffic ?= "20060814" +SRCDATE_dvbtune ?= "20060814" +SRCDATE_fdclock ?= "20060814" +SRCDATE_fltk ?= "20060814" +SRCDATE_ipkg-link ?= "20050930" +SRCDATE_ipkg-link-1 ?= "20050930" +SRCDATE_ipkg-utils ?= "20050930" +SRCDATE_ipkg-utils-native ?= "20050930" +SRCDATE_kaffe-qt ?= "20060814" +SRCDATE_kbdd ?= "20060814" +SRCDATE_led ?= "20060814" +SRCDATE_linux-input ?= "20060814" +SRCDATE_madwifi-modules ?= "20060814" +SRCDATE_mileage ?= "20060814" +SRCDATE_minimo ?= "20050401" +SRCDATE_mystun-server ?= "20060814" +SRCDATE_olsrd ?= "20060814" +SRCDATE_opencvs ?= "20060814" +SRCDATE_oprofile ?= "20060214" +SRCDATE_portaudio ?= "20060814" +SRCDATE_putty ?= "20060814" +SRCDATE_python-cairo ?= "20060814" +SRCDATE_qemu-native ?= "20060526" +SRCDATE_roadster ?= "20060814" +SRCDATE_sctzap ?= "20060814" +SRCDATE_tslib ?= "20051101" +SRCDATE_waimea ?= "20060814" +SRCDATE_xcompmgr ?= "20060814" +SRCDATE_xirssi ?= "20060814" +SRCDATE_xsvg ?= "20060814" +SRCDATE_yamonenv ?= "20060814" +SRCDATE_zroadmap ?= "20060814" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2b169106f..5e7947f866 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -179,7 +179,7 @@ PREFERRED_VERSION_ixp-osal ?= "2.1" PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_libx11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" # Latest wpa-supplicant which supports madwifi-ng diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 3c2d8e560b..e668c3ce38 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -6,111 +6,147 @@ DISTRO_NAME = "jlime" DISTRO_VERSION = "donkey" -export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey/${TARGET_ARCH}/feed/" +export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" -# No uniroot +#<>-----------------------------------------------------------------> +#<> No uniroot +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -#<> + +#<>-----------------------------------------------------------------> #<> We will set CVS DATE when things are known to work. -#<> -PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +#<>-----------------------------------------------------------------< +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +#<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 #<> Also, select version of modules (and kernel) -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" -#<> + +#<>-----------------------------------------------------------------> #<>We want kdrive as our default X-Server. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDERS_virtual/xserver += "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0" +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> + +#<>-----------------------------------------------------------------> #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers -#<> -PREFERRED_VERSION_binutils = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1" +#<>-----------------------------------------------------------------< +PREFERRED_VERSION_binutils = "2.17" +PREFERRED_VERSION_binutils-cross = "2.17" +PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7" PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" -#<> -#<>Setting Preferred glib-2.0,glib-1.2 -#<> + +#<>------------------------------------------------------------------> +#<>Setting Preferred glib, dbus, db-native +#<>------------------------------------------------------------------< PREFERRED_VERSION_glib-2.0-native = "2.6.5" PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.10.0" +PREFERRED_VERSION_glib-2.0 = "2.12.0" PREFERRED_VERSION_glib-1.2 = "1.2.10" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_dbus = "0.61" +PREFERRED_VERSION_dbus-native = "0.61" +PREFERRED_PROVIDER_dbus-glib = "dbus" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +#<>------------------------------------------------------------------> #<> #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. -#<> +#<>------------------------------------------------------------------< PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" -PREFERRED_PROVIDER_libx11 = "x11" PREFERRED_PROVIDER_tslib = "tslib" -PREFRRED_VERSION_cairo = "1.0.4" -#<> + + +#<>------------------------------------------------------------------> #<>Other Specific stuff. #<> #<> #<>We want to be able to build this for all jornadas so #<>to not mess up the folders we need to make them dynamic. #<>It will use different folders depending on Arch (set in local.conf) +#<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" INHERIT += "package_ipk package_tar multimachine src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" + +#<>------------------------------------------------------------------> #<>What we want on the bootstrap image (extra) #<> -#<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \ - e2tools e2fsprogs kernel-modules spectrum-fw keymaps" +#<>------------------------------------------------------------------< +BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ + udev e2tools e2fsprogs kernel-modules keymaps \ + wget" -#<> + +#<>------------------------------------------------------------------> #<>What Qte, libqte.. versions should we use. -#<> +#<>------------------------------------------------------------------< QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" OPIE_VERSION = "1.2.2" require conf/distro/include/preferred-opie-versions.inc -#<> + +#<>------------------------------------------------------------------> #<> Lets decide on a GPE versipns -#<> +#<> And lets override GTK to something that builds +#<>------------------------------------------------------------------< require conf/distro/include/preferred-gpe-versions-2.7.inc +PREFERRED_VERSION_gtk+ = "2.8.16" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_cairo = "1.2.2" +PREFERRED_VERSION_gtk-engines = "2.7.4" -#<> + +#<>------------------------------------------------------------------> #<> We want pcmciautils, not pcmcia-cs -#<> +#<>------------------------------------------------------------------< PCMCIA_MANAGER = "pcmciautils" -#<> + +#<>------------------------------------------------------------------> #<> We are using gcc 4.1.1 so lets keep optimizations low -#<> +#<>------------------------------------------------------------------< FULL_OPTIMIZATION = "-O1" -#<> + +#<>------------------------------------------------------------------> #<>Our Image files should look abit better. #<> -#<> +#<>------------------------------------------------------------------< IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" + +#<>------------------------------------------------------------------> #<> #<> +#<> General non-essential programs with known working versions #<> -#<> General non-essential programs -#<> -#<> -PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file +#<>------------------------------------------------------------------< +PREFERRED_VERSION_irssi = "0.8.10" +PREFERRED_VERSION_mc = "4.6.1" +PREFERRED_VERSION_nano = "1.3.9" +PREFERRED_VERSION_ncurses = "5.4" +PREFERRED_VERSION_ncftp = "3.1.9"
\ No newline at end of file diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index 900f24dd03..b8592fdf68 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -8,9 +8,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" - + " #SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -29,7 +27,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 14372b5b9e..43492944ff 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -10,6 +10,8 @@ CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ http://www.oesources.org/source/current/" + +require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc DISTRO_TYPE = "debug" @@ -50,8 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" # # Opie @@ -65,7 +67,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 873e047009..81d5ea7397 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -10,6 +10,10 @@ DISTRO_TYPE = "beta" SLUGOS_IMAGENAME = "ucslugc" SLUGOS_IMAGESEX = "big-endian" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc = "3.4.4" + # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this # directory diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 89c0d031ee..005a70e664 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -4,5 +4,6 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 103bd13e4b..2faf6ebed9 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -2,7 +2,6 @@ #@Name: Genisi EFIKA Development Platform #@DESCRIPTION: Machine configuration for teh EFIKA development platform: http://www.pegasosppc.com/efika.php -INHERIT += "linux_modules" TARGET_ARCH = "powerpc" IPKG_EXTRA_ARCHS = "ppc" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 4b044e838d..955344344a 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -2,7 +2,6 @@ #@Name: Cirrus Logic EP-93xx Development Platform #@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform -INHERIT += "linux_modules" TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4t" @@ -15,10 +14,11 @@ USE_VT = "0" #ship in rootfs: -EP93XX_MODULES = "apm \ - pcmcia-core \ - ipv6 " -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${EP93XX_MODULES}', d)}" +EP93XX_MODULES = "kernel-module-apm \ + kernel-module-pcmcia-core \ + kernel-module-ipv6 " + +BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 1611ed431a..65cce6ce81 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,10 +1,12 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices +#@NAME: Compaq iPAQ 39xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx KERNEL ?= "kernel24" #KERNEL ?= "kernel26" +INHERIT += "linux_modules" + OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" @@ -17,11 +19,10 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380" -H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core" +H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380" +H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core" # pxa2xx_udc is built in to the kernel SERIAL_CONSOLE = "115200 tts/0 vt100" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index bf653d9e97..410de9a100 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,13 +2,16 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx +INHERIT += "linux_modules" + TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" +PCMCIA_MANAGER = "pcmciautils" BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}" @@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" -SERIAL_CONSOLE = "115200 tts/0 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 758793f7a7..32e9304cdb 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -7,6 +7,8 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" +INHERIT += "linux_modules" + TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -32,4 +34,4 @@ USE_VT = "0" GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 8ce77e7449..dac9a84aff 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -1,22 +1,27 @@ #@TYPE: Machine #@NAME: HTC Universal -#@DESCRIPTION: Machine configuration for the HTC Universal with a pxa27x CPU devices +#@DESCRIPTION: Machine configuration for the HTC Universal TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal" +IPKG_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt" + #use this for a HTC Universal PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +XSERVER = "xserver-kdrive-fbdev" MODUTILS = "26" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor" +PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \ + snd_pcm_oss snd_mixer_oss \ + hidp bluetooth bfusb hci_usb \ + irtty-sir pxaficp_ir sir-dev \ + " include conf/machine/include/smartphone-common.conf @@ -28,23 +33,10 @@ 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 -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = " htcuniversal_acx acx" - +UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio" -#module_autoload_htcuniversal_power = "htcuniversal_power" -#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" -#module_autoload_snd-pcm-oss = "snd-pcm-oss" -#module_autoload_snd-mixer-oss = "snd-mixer-oss" -#module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" -module_autoload_htcuniversal-acx = "htcuniversal_acx" -#module_autoload_htcuniversal-bt = "htcuniversal_bt" -#module_autoload_htcuniversal-power = "htcuniversal_power" - -#module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_htcuniversal_acx = "htcuniversal_acx" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" - -#GPE_EXTRA_INSTALL += " gomunicator" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index da6c28c6e2..f85c2a1221 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -12,9 +12,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" # add a summary to the jffs2 file to make it mount a lot faster -#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \ -# -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \ -# --eraseblock=0x4000" +EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=0x4000 -l -p" +IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 359f8296d8..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 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/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index b5f8606cf5..c1f918f662 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -10,8 +10,6 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" -USE_DEVFS = "1" - SERIAL_CONSOLE = "115200 ttySA0" include conf/machine/include/handheld-common.conf diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index e4c108c071..fb8b521a3c 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -12,7 +12,8 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" #don't try to access tty1 USE_VT = "0" - +#use the epson xserver +XSERVER = "xserver-kdrive-epson" #ship in rootfs: NBP_MODULES = " apm \ @@ -21,7 +22,7 @@ NBP_MODULES = " apm \ BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -GPE_EXTRA_INSTALL += "gpe-mini-browser tinymail" +GPE_EXTRA_INSTALL += "gpe-mini-browser" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" @@ -34,6 +35,7 @@ udevdir = "/dev" GUI_MACHINE_CLASS = "bigscreen" - +#The initrd needs /initrd present to be able to do pivot_root +ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; " include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index f78dd7a3b9..3d80a41486 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -5,6 +5,8 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" + PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 2652004f82..a6b4caf6fd 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb index 8b1ed52d8a..8f6c3adeb6 100644 --- a/packages/abiword/abiword_2.4.4.bb +++ b/packages/abiword/abiword_2.4.4.bb @@ -1,6 +1,6 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi <koen@handhelds.org>" +MAINTAINER="Koen Kooi <koen@linuxtogo.org>" LICENSE="GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb index 8b1ed52d8a..8f6c3adeb6 100644 --- a/packages/abiword/abiword_2.4.5.bb +++ b/packages/abiword/abiword_2.4.5.bb @@ -1,6 +1,6 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi <koen@handhelds.org>" +MAINTAINER="Koen Kooi <koen@linuxtogo.org>" LICENSE="GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" diff --git a/packages/base-files/base-files/jornada720/.mtn2git_empty b/packages/acct/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/base-files/base-files/jornada720/.mtn2git_empty +++ b/packages/acct/.mtn2git_empty diff --git a/packages/acct/acct_6.3.99+6.4pre1.bb b/packages/acct/acct_6.3.99+6.4pre1.bb new file mode 100644 index 0000000000..078013c39b --- /dev/null +++ b/packages/acct/acct_6.3.99+6.4pre1.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +DESCRIPTION = "GNU Accounting Utilities - user and process accounting." + +SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \ + file://cross-compile.patch;patch=1" + +S = "${WORKDIR}/acct-6.4-pre1" + +inherit autotools diff --git a/packages/busybox/busybox-1.2.0/openmn/.mtn2git_empty b/packages/acct/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/busybox-1.2.0/openmn/.mtn2git_empty +++ b/packages/acct/files/.mtn2git_empty diff --git a/packages/acct/files/cross-compile.patch b/packages/acct/files/cross-compile.patch new file mode 100644 index 0000000000..78b57104c7 --- /dev/null +++ b/packages/acct/files/cross-compile.patch @@ -0,0 +1,34 @@ +diff -ur acct-6.4-pre1.org/configure.in acct-6.4-pre1/configure.in +--- acct-6.4-pre1.org/configure.in 2006-01-07 23:56:46.000000000 +0200 ++++ acct-6.4-pre1/configure.in 2006-08-03 21:16:17.000000000 +0300 +@@ -87,6 +87,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_DEFINE(HAVE_ACUTIME, , + [Define if <sys/acct.h> has the AC_UTIME field.]) + AC_DEFINE(ACUTIME_COMPT, , +@@ -130,6 +134,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_HEADER_EGREP(ac_utime, sys/acct.h, + AC_DEFINE(HAVE_ACUTIME, , + [Define if <sys/acct.h> has the AC_UTIME field.]) +@@ -277,7 +285,7 @@ + } + ], . ./locs; rm locs, + echo "Error -- could not locate your wtmp and acct files."; exit 1, +- echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ) ++ echo "Cross-compiling - cannot find out accounting file locations - using Linux defaults."; ) + AC_TYPE_PID_T dnl for sys/acct.h + AC_TYPE_UID_T dnl same as above + AC_TYPE_SIZE_T diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 0da364071b..fbf1442771 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -25,7 +25,8 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES_DYNAMIC = "libasound*" FILES_libasound = "${libdir}/libasound.so*" FILES_alsa-server = "${bindir}" FILES_alsa-conf = "${datadir}" 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/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index b604da188a..83382f57a0 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -21,7 +21,7 @@ RDEPENDS_${PN} = "${PN}-conf" ###################################################################################### -PR = "r44" +PR = "r45" ###################################################################################### diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 9a0b139bfb..7457f66822 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -77,7 +77,7 @@ check_target() { if test "$real_fs_found" != 1 -a "$image_found" != 1 then - die "Nothing to do!" + mdie "No direct-install or loop-images found. Nothing to do!" fi } diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg index f55e77b8f0..d976ee3a20 100644 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ b/packages/altboot/files/poodle/altboot-2.6.cfg @@ -10,7 +10,7 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" -ENABLE_SOUND="no" +ENABLE_SOUND="yes" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" @@ -20,7 +20,7 @@ ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" -USB_HOST_AVAILABLE="yes" +USB_HOST_AVAILABLE="no" USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" diff --git a/packages/angstrom/angstrom-bootmanager.bb b/packages/angstrom/angstrom-bootmanager.bb index 3f7abe5c4b..a863256910 100644 --- a/packages/angstrom/angstrom-bootmanager.bb +++ b/packages/angstrom/angstrom-bootmanager.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" MAINTAINER = "${AUTHOR}" SECTION = "base" DEPENDS = "evas-fb ecore-fb esmart-fb imlib2-fb edje efl++-fb" -RDEPENDS = "libefl++0" +#RDEPENDS = "libefl++0" ALLOW_EMPTY = "1" diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index b2b5565eb6..88ace3c1ba 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,7 +1,7 @@ #Angstrom bootstrap image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r0" +PR = "r2" DEPENDS = "task-angstrom" RDEPENDS = "angstrom-base-depends" diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index e6dc88dffb..4eea0ab1bb 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -1,12 +1,13 @@ #Angstrom GPE image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r1" +PR = "r3" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" ANGSTROM_EXTRA_INSTALL ?= "" XSERVER ?= "xserver-kdrive-fbdev" @@ -18,7 +19,7 @@ RDEPENDS = "\ ${XSERVER} \ angstrom-base-depends \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ ${ANGSTROM_EXTRA_INSTALL}" @@ -26,6 +27,7 @@ RDEPENDS = "\ export IPKG_INSTALL = "${RDEPENDS}" -#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' inherit image_ipk diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index f4322e06f1..34422da237 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PV = ${DISTRO_VERSION} do_compile() { diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index d050add3a5..c8c84c3e5e 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,18 +1,24 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r4" +PR = "r17" ALLOW_EMPTY = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + BOOTMODULES_RRECOMMENDS ?= "" +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb procps",d)}' +EXTRA_STUFF ?= "" +PCMCIA_MANAGER ?= "pcmciautils" PACKAGES = "\ angstrom-base-depends \ angstrom-base-wifi \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ angstrom-gpe-task-apps \ - angstgrom-gpe-task-games \ + angstrom-gpe-task-games \ angstrom-task-office \ angstrom-task-printing \ angstrom-task-sectest" @@ -22,15 +28,29 @@ RDEPENDS_angstrom-base-depends = "\ base-passwd tinylogin \ busybox \ udev \ - update-modules module-init-tools \ + update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ netbase dropbear \ angstrom-version \ - ipkg \ - " + ipkg ipkg-collateral \ + wireless-tools \ + tslib-tests tslib-calibrate \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + ${PCMCIA_MANAGER} \ +" + +RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " + RRECOMMENDS_angstrom-base-depends = "\ ${BOOTMODULES_RRECOMMENDS} \ + kernel-module-evdev \ + kernel-module-uinput \ + kernel-module-g-ether \ + kernel-module-hostap-cs \ + kernel-module-af-packet \ " RDEPENDS_angstrom-base-wifi = "\ @@ -44,8 +64,11 @@ RDEPENDS_angstrom-base-wifi = "\ " RDEPENDS_angstrom-x11-base-depends := "\ - libx11 \ - virtual/xserver" + virtual/libx11 \ + virtual/xserver \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + " RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ @@ -56,7 +79,6 @@ RDEPENDS_angstrom-gpe-task-base := "\ xhost \ xrdb \ gpe-soundserver \ - ttf-dejavu \ gpe-dm \ gpe-login \ gpe-session-scripts \ 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/aspell-native_0.50.5.bb b/packages/aspell/aspell-native_0.50.5.bb new file mode 100644 index 0000000000..e87c6c6fd5 --- /dev/null +++ b/packages/aspell/aspell-native_0.50.5.bb @@ -0,0 +1,16 @@ +SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz \ + file://mk-dirs_h.py \ + file://makefile.patch;patch=1" +DESCRIPTION = "GNU Aspell spell-checker" +SECTION = "console/utils" +LICENSE="LGPL" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/aspell-${PV}" + +inherit autotools native + +S = "${WORKDIR}/aspell-${PV}" + +do_compile_prepend() { + install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h +} + diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb index fb13e24bdf..568e692ab9 100644 --- a/packages/aspell/aspell5-en_6.0-0.bb +++ b/packages/aspell/aspell5-en_6.0-0.bb @@ -1,4 +1,14 @@ +LICENSE = "Copyright file" SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2" +PR="r1" -include aspell-lang.inc +require aspell-lang.inc + +FILES_${PN} += "${docdir}/Copyright" +FILES_${PN}-doc = "" + +do_install_append() { + install -d ${D}${docdir} + install ${S}/Copyright ${D}${docdir} +} diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index 46f24c0e35..00da4ab33f 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r5" +PR = "r6" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ @@ -15,8 +15,8 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR}" export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" export CROSS_ARCH="Linux" -export CROSS_PROC="arm" -export SUB_PROC="xscale" + +export CROSS_PROC="${TARGET_ARCH}" export MAKECMDGOALS="dont-optimize" 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/dbus/dbus-0.90/.mtn2git_empty b/packages/base-files/base-files/jornada7xx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-0.90/.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/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd index 40931ee8e9..8c80044167 100644 --- a/packages/base-files/base-files/tosa/usbd +++ b/packages/base-files/base-files/tosa/usbd @@ -1 +1,5 @@ -usbdmodule=pxa_bi +# I know that this was created for usb-client stuff +# but tosa/2.6 need (un)loading USB Host module +# on suspend/resume and this way is simplest one ;) + +usbdmodule=ohci-hcd diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 85c0e84d6e..d4c03bdefe 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r53" +PR = "r54" LICENSE = "GPL" SRC_URI = " \ 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-2.17/warning-free.patch b/packages/binutils/binutils-2.17/warning-free.patch new file mode 100644 index 0000000000..e6424ff59f --- /dev/null +++ b/packages/binutils/binutils-2.17/warning-free.patch @@ -0,0 +1,94 @@ +Index: binutils-2.17/gas/read.c +=================================================================== +--- binutils-2.17.orig/gas/read.c 2006-08-08 11:25:56.000000000 +0200 ++++ binutils-2.17/gas/read.c 2006-08-10 11:19:24.000000000 +0200 +@@ -1283,7 +1283,7 @@ + unsigned int align_limit = ALIGN_LIMIT; + unsigned int align; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + offsetT fill = 0; + int max; + int fill_p; +@@ -1427,7 +1427,7 @@ + offsetT temp, size; + symbolS *symbolP = NULL; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + expressionS exp; + + if (flag_mri) +@@ -1542,7 +1542,7 @@ + symbolS *sym; + offsetT align; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + if (!flag_mri) + { +@@ -1811,7 +1811,7 @@ + { + offsetT temp; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + if (flag_mri) + stop = mri_comment_field (&stopc); +@@ -1933,7 +1933,7 @@ + int c; + symbolS *symbolP; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + if (flag_mri) + stop = mri_comment_field (&stopc); +@@ -2885,7 +2885,7 @@ + expressionS val; + char *p = 0; + char *stop = NULL; +- char stopc; ++ char stopc=0; + int bytes; + + #ifdef md_flush_pending_output +@@ -3061,7 +3061,7 @@ + int flen; + char temp[MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT]; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + if (flag_mri) + stop = mri_comment_field (&stopc); +@@ -3138,7 +3138,7 @@ + s_struct (int ignore ATTRIBUTE_UNUSED) + { + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + if (flag_mri) + stop = mri_comment_field (&stopc); +@@ -3518,7 +3518,7 @@ + int c; + expressionS exp; + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + #ifdef md_flush_pending_output + md_flush_pending_output (); +@@ -5014,7 +5014,7 @@ + equals (char *sym_name, int reassign) + { + char *stop = NULL; +- char stopc; ++ char stopc = 0; + + input_line_pointer++; + if (*input_line_pointer == '=') 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..d9e167f051 100644 --- a/packages/binutils/binutils_2.17.bb +++ b/packages/binutils/binutils_2.17.bb @@ -22,8 +22,11 @@ SRC_URI += "\ file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \ " +# Zecke's OSX fixes +SRC_URI += " file://warning-free.patch;patch=1 " + 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.inc b/packages/bitbake/bitbake.inc index e454db2f40..1c5c7ad2a6 100644 --- a/packages/bitbake/bitbake.inc +++ b/packages/bitbake/bitbake.inc @@ -9,4 +9,3 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/" LICENSE = "GPL MIT" SECTION = "devel" SUMMARY = "BitBake build tool" -PACKAGE_ARCH = "all" diff --git a/packages/bitbake/bitbake_1.0.bb b/packages/bitbake/bitbake_1.0.bb deleted file mode 100644 index 9f8f054355..0000000000 --- a/packages/bitbake/bitbake_1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -include bitbake.inc - -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" - -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" -S = "${WORKDIR}/bitbake-${PV}" - -inherit distutils - -include bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.1.bb b/packages/bitbake/bitbake_1.1.bb deleted file mode 100644 index 9f8f054355..0000000000 --- a/packages/bitbake/bitbake_1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -include bitbake.inc - -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" - -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" -S = "${WORKDIR}/bitbake-${PV}" - -inherit distutils - -include bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.4.2.bb b/packages/bitbake/bitbake_1.6.0.bb index 0727eafd41..4289c49a04 100644 --- a/packages/bitbake/bitbake_1.4.2.bb +++ b/packages/bitbake/bitbake_1.6.0.bb @@ -1,17 +1,16 @@ -include bitbake.inc +require bitbake.inc + +PR = "r1" # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" +SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz" + S = "${WORKDIR}/bitbake-${PV}" inherit distutils -include bitbake-package.inc +require bitbake-package.inc RDEPENDS += "python-shell python-lang python-textutils python-pickle" - -PR = "r1" - - 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..87068c9ab1 100644 --- a/packages/bluez/bluez-utils-nodbus_2.25.bb +++ b/packages/bluez/bluez-utils-nodbus_2.25.bb @@ -1,5 +1,6 @@ -include bluez-utils.inc +require bluez-utils.inc -PR = "r0" +PR = "r1" +SRC_URI += " file://hciattach-ti-bts.patch;patch=1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb index b9b4029590..abbdda4488 100644 --- a/packages/bootchart/bootchart_0.9.bb +++ b/packages/bootchart/bootchart_0.9.bb @@ -2,28 +2,27 @@ DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of LICENSE = "GPLv2" HOMEPAGE = "http://www.bootchart.org/" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" - +PR = "r1" #this only installs the loggers, you will need to run the renderers on your workstation #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging #needed for a real /bin/sh and /bin/sleep -DEPENDS = "bash coreutils" -RDEPENDS = "bash coreutils" +DEPENDS = "bash coreutils acct" +RDEPENDS = "bash coreutils acct" #this is a plain shell script PACKAGE_ARCH = "all" -SRC_URI = "file://bootchart \ - file://bootchartd \ - file://bootchartd.conf" +SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\ + file://handheld.patch;patch=1" do_install() { install -d ${D}/sbin install -d ${D}/etc - install -m 755 ${WORKDIR}/bootchart ${D}/sbin - install -m 755 ${WORKDIR}/bootchartd ${D}/sbin - install -m 644 ${WORKDIR}/bootchart ${D}/etc + install -d ${D}/bootchart + install -m 755 ${S}/script/bootchartd ${D}/sbin + install -m 644 ${S}/script/bootchartd.conf ${D}/etc } diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/bootchart/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-python/.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/busybox/busybox-1.2.0/defconfig b/packages/busybox/busybox-1.2.0/defconfig index dfd594f747..981b7d7c71 100644 --- a/packages/busybox/busybox-1.2.0/defconfig +++ b/packages/busybox/busybox-1.2.0/defconfig @@ -4,32 +4,51 @@ HAVE_DOT_CONFIG=y # +# Busybox Settings +# + +# # General Configuration # -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -CROSS_COMPILER_PREFIX="" -EXTRA_CFLAGS_OPTIONS="" -CONFIG_FEATURE_SUSv2=y -CONFIG_FEATURE_SUSv2_OBSOLETE=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options @@ -41,6 +60,15 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y PREFIX="./_install" # +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# # Archival Utilities # CONFIG_AR=y @@ -58,13 +86,16 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # @@ -73,6 +104,7 @@ CONFIG_UNZIP=y # CONFIG_FEATURE_UNARCHIVE_TAPE is not set # CONFIG_FEATURE_DEB_TAR_GZ is not set # CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -80,31 +112,37 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set # CONFIG_CMP is not set # CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# # CONFIG_FEATURE_DATE_ISOFMT is not set CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -112,13 +150,14 @@ CONFIG_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y -# CONFIG_FEATURE_LS_RECURSIVE is not set +CONFIG_FEATURE_LS_RECURSIVE=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y @@ -126,22 +165,24 @@ CONFIG_FEATURE_LS_COLOR=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set # CONFIG_NICE is not set # CONFIG_NOHUP is not set CONFIG_OD=y # CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y # CONFIG_STAT is not set @@ -154,20 +195,16 @@ CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y CONFIG_TR=y -# CONFIG_FEATURE_TR_CLASSES is not set +CONFIG_FEATURE_TR_CLASSES=y # CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -# CONFIG_USLEEP is not set +CONFIG_USLEEP=y # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set CONFIG_WATCH=y @@ -182,7 +219,7 @@ CONFIG_YES=y # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -194,7 +231,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Common options for md5sum, sha1sum # -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities @@ -208,7 +245,9 @@ CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities @@ -218,27 +257,19 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_WHICH=y # -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -CONFIG_E2FSCK=y -CONFIG_FSCK=y -# CONFIG_LSATTR is not set -CONFIG_MKE2FS=y -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# # Editors # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set +# CONFIG_ED is not set +CONFIG_PATCH=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_COLON=y @@ -256,7 +287,9 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y @@ -277,15 +310,14 @@ CONFIG_XARGS=y # Init Utilities # # CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set # CONFIG_HALT is not set # CONFIG_MESG is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # # Login/Password Management Utilities @@ -308,11 +340,104 @@ CONFIG_FEATURE_UTMP=y # CONFIG_VLOCK is not set # +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set CONFIG_DC=y @@ -320,6 +445,7 @@ CONFIG_DC=y # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set # CONFIG_EJECT is not set # CONFIG_LAST is not set CONFIG_LESS=y @@ -340,54 +466,35 @@ CONFIG_FEATURE_LESS_FLAGS=y # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set -# BB_APPLET_RUNLEVEL is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y # CONFIG_SETSID is not set -# CONFIG_TIME is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y # CONFIG_WATCHDOG is not set # -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -CONFIG_FEATURE_INSMOD_LOAD_MAP=y -CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# # Networking Utilities # CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set +# CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set # CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set # CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set # CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y @@ -404,23 +511,25 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set CONFIG_FEATURE_IFUPDOWN_MAPPING=y # CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set CONFIG_NC=y # CONFIG_NC_GAPING_SECURITY_HOLE is not set @@ -440,41 +549,42 @@ CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set +# CONFIG_DEBUG_TFTP is not set CONFIG_TRACEROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client # CONFIG_APP_UDHCPD=y CONFIG_APP_UDHCPC=y -# CONFIG_DUMPLEASES is not set +CONFIG_APP_DUMPLEASES=y CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_ZCIP is not set # # Process Utilities # CONFIG_FREE=y -# CONFIG_FUSER is not set +CONFIG_FUSER=y CONFIG_KILL=y CONFIG_KILLALL=y -# CONFIG_PIDOF is not set +CONFIG_PIDOF=y # CONFIG_FEATURE_PIDOF_SINGLE is not set # CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_FEATURE_PS_WIDE=y CONFIG_RENICE=y -# CONFIG_BB_SYSCTL is not set +CONFIG_BB_SYSCTL=y CONFIG_TOP=y CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_UPTIME=y @@ -499,12 +609,13 @@ CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -526,72 +637,11 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y -# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_RDATE=y -# CONFIG_READPROFILE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_UMOUNT=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set diff --git a/packages/lftp/lftp-3.0.1/.mtn2git_empty b/packages/busybox/busybox-1.2.0/mnci/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/lftp/lftp-3.0.1/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.0/mnci/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.0/mnci/defconfig b/packages/busybox/busybox-1.2.0/mnci/defconfig new file mode 100644 index 0000000000..ccf9e279a2 --- /dev/null +++ b/packages/busybox/busybox-1.2.0/mnci/defconfig @@ -0,0 +1,643 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_SHOW_USAGE is not set +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-linux-" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +CONFIG_CMP=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +# CONFIG_FEATURE_FANCY_TAIL is not set +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +CONFIG_WC=y +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +# CONFIG_PATCH is not set +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_DELGROUP=y +CONFIG_ADDUSER=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +CONFIG_LOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_SU=y +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +# CONFIG_LOSETUP is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +# CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +# CONFIG_APP_DUMPLEASES is not set +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_ZCIP=y + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +# CONFIG_UPTIME is not set + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=15 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.2.0/nylon/defconfig b/packages/busybox/busybox-1.2.0/nylon/defconfig deleted file mode 100644 index 866b8ec94d..0000000000 --- a/packages/busybox/busybox-1.2.0/nylon/defconfig +++ /dev/null @@ -1,458 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -CONFIG_DPKG=y -CONFIG_DPKG_DEB=y -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_UNCOMPRESS=y -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Common options for dpkg and dpkg_deb -# -CONFIG_FEATURE_DEB_TAR_GZ=y -CONFIG_FEATURE_DEB_TAR_BZ2=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CMP=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_STTY=y -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -# CONFIG_TEST is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WATCH=y -CONFIG_WC=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls and more -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -CONFIG_CLEAR=y -# CONFIG_DEALLOCVT is not set -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -# CONFIG_LOADFONT is not set -CONFIG_LOADKMAP=y -# CONFIG_OPENVT is not set -CONFIG_RESET=y -CONFIG_SETKEYCODES=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -CONFIG_FEATURE_U_W_TMP=y -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -CONFIG_CROND=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -CONFIG_WATCHDOG=y - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_ARPING=y -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -CONFIG_HTTPD=y -# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFUPDOWN=y -# CONFIG_FEATURE_IFUPDOWN_IP is not set -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_INETD=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN=y -# CONFIG_IP is not set -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -CONFIG_NAMEIF=y -CONFIG_NC=y -CONFIG_NETSTAT=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING6=y -CONFIG_ROUTE=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_FEATURE_TFTP_DEBUG is not set -CONFIG_TRACEROUTE=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y - -# -# udhcp Server/Client -# -CONFIG_APP_UDHCPD=y -CONFIG_APP_UDHCPC=y -CONFIG_DUMPLEASES=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -CONFIG_SYSCTL=y - -# -# Another Bourne-like Shell -# -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -# CONFIG_ASH is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -# CONFIG_MORE is not set -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.2.0/wrt54/defconfig b/packages/busybox/busybox-1.2.0/wrt54/defconfig deleted file mode 100644 index 60a8883069..0000000000 --- a/packages/busybox/busybox-1.2.0/wrt54/defconfig +++ /dev/null @@ -1,476 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="mipsel-uclibc-" -EXTRA_CFLAGS_OPTIONS="-Os " - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -# CONFIG_AR is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNZIP is not set - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CMP is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -# CONFIG_INSTALL is not set -CONFIG_LENGTH=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -# CONFIG_MKNOD is not set -CONFIG_MV=y -# CONFIG_OD is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -# CONFIG_STTY is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -CONFIG_WC=y -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls and more -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -CONFIG_CLEAR=y -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_GETKEY is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -CONFIG_RESET=y -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -# CONFIG_FEATURE_FIND_MTIME is not set -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -# CONFIG_FEATURE_INITRD is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -CONFIG_REBOOT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_U_W_TMP is not set -CONFIG_LOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Common options for adduser, deluser, login, su -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -CONFIG_CROND=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_2_6_MODULES is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -CONFIG_LSMOD=y -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y -# CONFIG_MODPROBE is not set -CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_ARPING=y -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_HOSTNAME is not set -CONFIG_HTTPD=y -# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y -# CONFIG_FEATURE_HTTPD_SETUID is not set -CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFUPDOWN=y -# CONFIG_FEATURE_IFUPDOWN_IP is not set -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_IP is not set -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -CONFIG_NETSTAT=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING6=y -CONFIG_ROUTE=y -# CONFIG_TELNET is not set -# CONFIG_TELNETD is not set -# CONFIG_TFTP is not set -CONFIG_TRACEROUTE=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -CONFIG_APP_UDHCPC=y -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -# CONFIG_RENICE is not set -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -CONFIG_SYSCTL=y - -# -# Another Bourne-like Shell -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_PIPE_OPTIMIZATION=y -CONFIG_FEATURE_BUILTIN_TEST=y -CONFIG_FEATURE_BUILTIN_ECHO=y -CONFIG_FEATURE_BUILTIN_PIDOF=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -CONFIG_FEATURE_COMMAND_HISTORY=15 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -CONFIG_FEATURE_SH_FANCY_PROMPT=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_LOSETUP is not set -# CONFIG_MKSWAP is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -# CONFIG_SWAPONOFF is not set -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/lftp/lftp-3.0.11/.mtn2git_empty b/packages/busybox/busybox-1.2.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/lftp/lftp-3.0.11/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.1/add-getkey-applet.patch b/packages/busybox/busybox-1.2.1/add-getkey-applet.patch new file mode 100644 index 0000000000..a75cf823c7 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/add-getkey-applet.patch @@ -0,0 +1,167 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: busybox-1.1.0/console-tools/getkey.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.1.0/console-tools/getkey.c 2006-03-14 17:17:28.000000000 +0100 +@@ -0,0 +1,94 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * getkey.c - Michael 'Mickey' Lauer ++ * ++ * Version 0.1 ++ * ++ * A simple keygrapper. Displays a configurable message and waits a dedicated number ++ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress). ++ */ ++#include <stdio.h> ++#include <fcntl.h> ++#include <memory.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <sys/types.h> ++#include <errno.h> ++#include <sys/ioctl.h> ++#include <sys/kd.h> ++#include "busybox.h" ++ ++extern int getkey_main(int argc, char **argv) ++{ ++ int status = EXIT_FAILURE; ++ ++ if ( argc < 2 ) ++ { ++ bb_show_usage(); ++ } ++ ++ /* ++ * If no terminal is attached it is quite useless ++ * to treat it like one. ++ */ ++ if( !isatty(STDIN_FILENO) ) ++ { ++ goto error_hard; ++ } ++ ++ //bb_printf( "DEBUG: time = '%s'\n", argv[1] ); ++ //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] ); ++ ++ struct termios orig; ++ struct termios attr; ++ ++ if ( tcgetattr(STDIN_FILENO, &orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ attr = orig; ++ attr.c_cc[VMIN] = 0; ++ attr.c_cc[VTIME] = 0; ++ attr.c_iflag |= INLCR; ++ attr.c_oflag |= OPOST|ONLCR; ++ attr.c_cflag &= ~PARENB; ++ attr.c_lflag &= ~(ICANON/*|ECHO*/); ++ if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ fd_set rfds; ++ struct timeval tv; ++ int retval; ++ ++ FD_ZERO(&rfds); ++ FD_SET(0, &rfds); ++ ++ tv.tv_sec = atoi( argv[1] ); ++ tv.tv_usec = 0; ++ ++ if ( argc == 3 ) ++ { ++ bb_printf( argv[2], tv.tv_sec ); ++ bb_printf( "\n" ); ++ fflush(stdout); ++ } ++ retval = select(1, &rfds, NULL, NULL, &tv); ++ if (retval > 0) ++ { ++ status = EXIT_SUCCESS; ++ } ++ ++ if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ return status; ++ ++error_hard : ++ return EXIT_FAILURE; ++}; ++ +Index: busybox-1.1.0/console-tools/Makefile.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Makefile.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Makefile.in 2006-03-14 17:18:18.000000000 +0100 +@@ -21,6 +21,7 @@ + CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o + CONSOLETOOLS_DIR-$(CONFIG_RESET) += reset.o + CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES) += setkeycodes.o ++CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o + + libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR) + +Index: busybox-1.1.0/console-tools/Config.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Config.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Config.in 2006-03-14 17:17:28.000000000 +0100 +@@ -31,6 +31,14 @@ + This program dumps the kernel's keyboard translation table to + stdout, in binary format. You can then use loadkmap to load it. + ++config CONFIG_GETKEY ++ bool "getkey" ++ default n ++ help ++ This program displays a configurable message and waits ++ a dedicated number of seconds for a keypress. It sets ++ the exit code accordingly, i.e. SUCCESS if there was a keypress. ++ + config CONFIG_LOADFONT + bool "loadfont" + default n +Index: busybox-1.1.0/include/applets.h +=================================================================== +--- busybox-1.1.0.orig/include/applets.h 2006-01-11 06:44:14.000000000 +0100 ++++ busybox-1.1.0/include/applets.h 2006-03-14 17:17:28.000000000 +0100 +@@ -261,6 +261,9 @@ + #ifdef CONFIG_FUSER + APPLET(fuser, fuser_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + #endif ++#ifdef CONFIG_GETKEY ++ APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER) ++#endif + #ifdef CONFIG_GETOPT + APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER) + #endif +Index: busybox-1.1.0/include/usage.h +=================================================================== +--- busybox-1.1.0.orig/include/usage.h 2006-01-11 06:44:14.000000000 +0100 ++++ busybox-1.1.0/include/usage.h 2006-03-14 17:19:11.000000000 +0100 +@@ -841,6 +841,13 @@ + "\t-p, --password Password to be used\n" \ + "\t-P, --port Port number to be used" + ++#define getkey_trivial_usage \ ++ "time [message]" ++#define getkey_full_usage \ ++ "Display a message and wait for a keypress." ++#define getkey_example_usage \ ++ "$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'" ++ + #define fuser_trivial_usage \ + "[options] file OR port/proto" + #define fuser_full_usage \ diff --git a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty b/packages/busybox/busybox-1.2.1/angstrom/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/angstrom/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.0/sparc/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig index 329c7796fd..981b7d7c71 100644 --- a/packages/busybox/busybox-1.2.0/sparc/defconfig +++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig @@ -4,35 +4,71 @@ HAVE_DOT_CONFIG=y # +# Busybox Settings +# + +# # General Configuration # -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options # # CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set PREFIX="./_install" # +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# # Archival Utilities # CONFIG_AR=y @@ -41,6 +77,7 @@ CONFIG_BUNZIP2=y CONFIG_CPIO=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y @@ -49,19 +86,25 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # # Common options for cpio and tar # # CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -69,29 +112,37 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set # CONFIG_CMP is not set +# CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# # CONFIG_FEATURE_DATE_ISOFMT is not set CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -99,52 +150,61 @@ CONFIG_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y -# CONFIG_FEATURE_LS_RECURSIVE is not set +CONFIG_FEATURE_LS_RECURSIVE=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set CONFIG_OD=y +# CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y +# CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -# CONFIG_USLEEP is not set +CONFIG_USLEEP=y # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set CONFIG_WATCH=y @@ -159,7 +219,7 @@ CONFIG_YES=y # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -171,7 +231,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Common options for md5sum, sha1sum # -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities @@ -180,12 +240,14 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y CONFIG_LOADFONT=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities @@ -193,8 +255,12 @@ CONFIG_RESET=y CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_WHICH=y # @@ -202,7 +268,8 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set +# CONFIG_ED is not set +CONFIG_PATCH=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_COLON=y @@ -220,12 +287,15 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_NEWER=y # CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -240,61 +310,193 @@ CONFIG_XARGS=y # Init Utilities # # CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set # CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # CONFIG_MESG is not set # # Login/Password Management Utilities # +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_ADDGROUP is not set # CONFIG_DELGROUP is not set # CONFIG_ADDUSER is not set # CONFIG_DELUSER is not set # CONFIG_GETTY is not set -CONFIG_FEATURE_U_W_TMP=y +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_SU is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set # +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set CONFIG_DC=y # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set # CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set # CONFIG_HDPARM is not set -CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y -# CONFIG_TIME is not set +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y # CONFIG_WATCHDOG is not set # -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# # Networking Utilities # CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -307,20 +509,30 @@ CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y # CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y @@ -332,39 +544,53 @@ CONFIG_TELNET=y # CONFIG_FEATURE_TELNET_TTYPE is not set CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_TELNETD is not set -# CONFIG_TFTP is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set CONFIG_TRACEROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # # udhcp Server/Client # -# CONFIG_UDHCPD is not set +CONFIG_APP_UDHCPD=y CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set # # Process Utilities # CONFIG_FREE=y +CONFIG_FUSER=y CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set @@ -377,14 +603,19 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -395,6 +626,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set CONFIG_FEATURE_COMMAND_HISTORY=63 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y @@ -405,63 +637,11 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y -# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -# CONFIG_LOSETUP is not set -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -# CONFIG_FEATURE_MOUNT_LOOP is not set -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.2.1/below.patch b/packages/busybox/busybox-1.2.1/below.patch new file mode 100644 index 0000000000..95e8376e46 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/below.patch @@ -0,0 +1,46 @@ +Index: busybox-1.1.0/modutils/modprobe.c +=================================================================== +--- busybox-1.1.0.orig/modutils/modprobe.c 2006-01-11 06:43:56.000000000 +0100 ++++ busybox-1.1.0/modutils/modprobe.c 2006-03-14 16:36:54.000000000 +0100 +@@ -509,6 +509,41 @@ + } + } + } ++ else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) { ++ char *mod, *deps; ++ if (parse_tag_value (buffer + 6, &mod, &deps)) { ++ struct dep_t *dt; ++ ++ for (dt = first; dt; dt = dt->m_next) { ++ if (strcmp (dt->m_name, mod) == 0) ++ break; ++ } ++ if (dt) { ++ char *pp; ++ char *name; ++ ++ pp = name = deps; ++ ++ for (;;) { ++ while (*pp != 0 && !isspace (*pp)) ++ pp++; ++ if (isspace (*pp)) ++ *(pp++) = 0; ++ ++ dt->m_depcnt++; ++ dt->m_deparr = (char **) xrealloc (dt->m_deparr, ++ sizeof (char *) * dt->m_depcnt); ++ dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name); ++ ++ while (isspace (*pp)) ++ pp++; ++ name = pp; ++ if (*pp == 0) ++ break; ++ } ++ } ++ } ++ } + } + } + close ( fd ); diff --git a/packages/busybox/busybox-1.2.0/openslug/defconfig b/packages/busybox/busybox-1.2.1/defconfig index 011e5c896f..981b7d7c71 100644 --- a/packages/busybox/busybox-1.2.0/openslug/defconfig +++ b/packages/busybox/busybox-1.2.1/defconfig @@ -4,43 +4,80 @@ HAVE_DOT_CONFIG=y # +# Busybox Settings +# + +# # General Configuration # +# CONFIG_NITPICK is not set # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options # # CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set PREFIX="./_install" # +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# # Archival Utilities # CONFIG_AR=y # CONFIG_FEATURE_AR_LONG_FILENAMES is not set CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set +CONFIG_CPIO=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y @@ -49,19 +86,25 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # # Common options for cpio and tar # # CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -69,29 +112,37 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set # CONFIG_CMP is not set +# CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# # CONFIG_FEATURE_DATE_ISOFMT is not set CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -99,6 +150,7 @@ CONFIG_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y CONFIG_LOGNAME=y @@ -110,41 +162,49 @@ CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set CONFIG_OD=y +# CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y +# CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -# CONFIG_USLEEP is not set +CONFIG_USLEEP=y # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set CONFIG_WATCH=y @@ -159,7 +219,7 @@ CONFIG_YES=y # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -171,7 +231,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Common options for md5sum, sha1sum # -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities @@ -180,12 +240,14 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y CONFIG_LOADFONT=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities @@ -195,7 +257,10 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_WHICH=y # @@ -203,7 +268,8 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set +# CONFIG_ED is not set +CONFIG_PATCH=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_COLON=y @@ -220,72 +286,217 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # # Finding Utilities # -# CONFIG_FIND is not set +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y -# CONFIG_XARGS is not set +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities # # CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set # CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # CONFIG_MESG is not set # # Login/Password Management Utilities # +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_ADDGROUP is not set # CONFIG_DELGROUP is not set # CONFIG_ADDUSER is not set # CONFIG_DELUSER is not set # CONFIG_GETTY is not set -CONFIG_FEATURE_U_W_TMP=y +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_SU is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set # +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set CONFIG_DC=y # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set # CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set # CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set CONFIG_TIME=y # CONFIG_WATCHDOG is not set # -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# # Networking Utilities # CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -298,20 +509,30 @@ CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y # CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y @@ -323,43 +544,53 @@ CONFIG_TELNET=y # CONFIG_FEATURE_TELNET_TTYPE is not set CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set +# CONFIG_DEBUG_TFTP is not set CONFIG_TRACEROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # # udhcp Server/Client # -# CONFIG_UDHCPD is not set +CONFIG_APP_UDHCPD=y CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set # # Process Utilities # CONFIG_FREE=y +CONFIG_FUSER=y CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set @@ -372,18 +603,19 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_PIPE_OPTIMIZATION=y -CONFIG_FEATURE_BUILTIN_TEST=y -CONFIG_FEATURE_BUILTIN_ECHO=y -CONFIG_FEATURE_BUILTIN_PIDOF=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -394,6 +626,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set CONFIG_FEATURE_COMMAND_HISTORY=63 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y @@ -404,58 +637,11 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y -# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.2.1/dhcp-hostname.patch b/packages/busybox/busybox-1.2.1/dhcp-hostname.patch new file mode 100644 index 0000000000..e0adea662e --- /dev/null +++ b/packages/busybox/busybox-1.2.1/dhcp-hostname.patch @@ -0,0 +1,30 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- busybox-1.01/networking/udhcp/dhcpc.c~dhcp-hostname ++++ busybox-1.01/networking/udhcp/dhcpc.c +@@ -193,6 +193,7 @@ + int max_fd; + int sig; + int no_clientid = 0; ++ char hostbuf[256]; /* SUSv2: hostnames are <= 255 bytes */ + + static const struct option arg_options[] = { + {"clientid", required_argument, 0, 'c'}, +@@ -211,6 +212,14 @@ + {0, 0, 0, 0} + }; + ++ if (gethostname (hostbuf, sizeof (hostbuf)) == 0) { ++ len = strlen (hostbuf); ++ client_config.hostname = xmalloc (len + 2); ++ client_config.hostname[OPT_CODE] = DHCP_HOST_NAME; ++ client_config.hostname[OPT_LEN] = len; ++ strncpy(client_config.hostname + 2, hostbuf, len); ++ } ++ + /* get options */ + while (1) { + int option_index = 0; diff --git a/packages/busybox/busybox-1.2.1/dhcpretrytime.patch b/packages/busybox/busybox-1.2.1/dhcpretrytime.patch new file mode 100644 index 0000000000..893e346acf --- /dev/null +++ b/packages/busybox/busybox-1.2.1/dhcpretrytime.patch @@ -0,0 +1,85 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: busybox-1.1.0/networking/udhcp/dhcpc.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/dhcpc.c 2006-03-14 17:19:31.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/dhcpc.c 2006-03-14 17:20:45.000000000 +0100 +@@ -48,6 +48,7 @@ + static unsigned long requested_ip; /* = 0 */ + static unsigned long server_addr; + static unsigned long timeout; ++static unsigned long retrytime = 60; + static int packet_num; /* = 0 */ + static int fd = -1; + +@@ -95,6 +96,7 @@ + " -r, --request=IP IP address to request (default: none)\n" + " -s, --script=file Run file at dhcp events (default:\n" + " " DEFAULT_SCRIPT ")\n" ++" -t, --retrytime time to retry DHCP request (default 60s)\n") + " -v, --version Display version\n" + ); + exit(0); +@@ -214,6 +216,7 @@ + {"quit", no_argument, 0, 'q'}, + {"request", required_argument, 0, 'r'}, + {"script", required_argument, 0, 's'}, ++ {"retrytime", required_argument, 0, 't'}, + {"version", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; +@@ -229,7 +232,7 @@ + /* get options */ + while (1) { + int option_index = 0; +- c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index); ++ c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:t:v", arg_options, &option_index); + if (c == -1) break; + + switch (c) { +@@ -305,6 +308,9 @@ + case 's': + client_config.script = optarg; + break; ++ case 't': ++ retrytime = atol(optarg); ++ break; + case 'v': + printf("udhcpcd, version %s\n\n", VERSION); + return 0; +@@ -394,7 +400,7 @@ + } + /* wait to try again */ + packet_num = 0; +- timeout = now + 60; ++ timeout = now + retrytime; + } + break; + case RENEW_REQUESTED: +Index: busybox-1.1.0/networking/ifupdown.c +=================================================================== +--- busybox-1.1.0.orig/networking/ifupdown.c 2006-01-11 06:43:51.000000000 +0100 ++++ busybox-1.1.0/networking/ifupdown.c 2006-03-14 17:19:41.000000000 +0100 +@@ -506,7 +506,7 @@ + static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) + { + if (execable("/sbin/udhcpc")) { +- return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i " ++ return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i " + "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)); + } else if (execable("/sbin/pump")) { + return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)); +@@ -526,8 +526,8 @@ + /* SIGUSR2 forces udhcpc to release the current lease and go inactive, + * and SIGTERM causes udhcpc to exit. Signals are queued and processed + * sequentially so we don't need to sleep */ +- result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); +- result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); ++ result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); ++ result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); + } else if (execable("/sbin/pump")) { + result = execute("pump -i %iface% -k", ifd, exec); + } else if (execable("/sbin/dhclient")) { diff --git a/packages/busybox/busybox-1.2.1/fbset.patch b/packages/busybox/busybox-1.2.1/fbset.patch new file mode 100644 index 0000000000..d0609ce6f7 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/fbset.patch @@ -0,0 +1,24 @@ +--- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100 ++++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000 +@@ -337,7 +337,7 @@ + { + struct fb_var_screeninfo var, varset; + int fh, i; +- char *fbdev = DEFAULTFBDEV; ++ char *fbdev = NULL; + char *modefile = DEFAULTFBMODE; + char *thisarg, *mode = NULL; + +@@ -404,7 +404,12 @@ + } + } + ++ if (fbdev == NULL) ++ fbdev = DEFAULTFBDEV; + if ((fh = open(fbdev, O_RDONLY)) < 0) ++#ifdef CONFIG_FEATURE_DEVFS ++ if ((fh = open("/dev/fb0", O_RDONLY)) < 0) ++#endif + bb_perror_msg_and_die("fbset(open)"); + if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) + bb_perror_msg_and_die("fbset(ioctl)"); diff --git a/packages/busybox/busybox-1.2.1/hdparm_M.patch b/packages/busybox/busybox-1.2.1/hdparm_M.patch new file mode 100644 index 0000000000..9adcd36f92 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/hdparm_M.patch @@ -0,0 +1,47 @@ +Index: busybox-1.1.0/miscutils/hdparm.c +=================================================================== +--- busybox-1.1.0.orig/miscutils/hdparm.c 2006-01-11 06:44:13.000000000 +0100 ++++ busybox-1.1.0/miscutils/hdparm.c 2006-03-14 17:22:22.000000000 +0100 +@@ -1255,6 +1255,7 @@ + static unsigned long set_sleepnow, get_sleepnow; + static unsigned long get_powermode; + static unsigned long set_apmmode, get_apmmode, apmmode; ++static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0; + #endif + #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY + static int get_IDentity; +@@ -2124,6 +2125,20 @@ + } + bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); + } ++ if (set_acoustic) ++ { ++ no_scsi(); ++ acoustic=check_if_min_and_set_val(acoustic,0); ++ acoustic=check_if_maj_and_set_val(acoustic,254); ++ if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic); ++ bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC"); ++ } ++ if (get_acoustic) ++ { ++ no_scsi(); ++ bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC"); ++ printf(" acoustic = %2ld (128=quiet ... 254=fast)\n", parm); ++ } + if (set_wcache) + { + #ifdef DO_FLUSHCACHE +@@ -2832,6 +2847,13 @@ + p = *argv++, --argc; + p=GET_NUMBER(p,&set_readahead,&Xreadahead); + break; ++ case 'M': ++ get_acoustic = noisy; ++ noisy = 1; ++ if (!*p && argc && isalnum(**argv)) ++ p = *argv++, --argc; ++ p=GET_NUMBER(p,&set_acoustic,&acoustic); ++ break; + case 'B': + get_apmmode = noisy; + noisy = 1; diff --git a/packages/busybox/busybox-1.2.1/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.2.1/ifupdown-spurious-environ.patch new file mode 100644 index 0000000000..8753315f2c --- /dev/null +++ b/packages/busybox/busybox-1.2.1/ifupdown-spurious-environ.patch @@ -0,0 +1,12 @@ +--- busybox-1.00/networking/ifupdown.c.old 2005-06-11 19:51:59.000000000 +0100 ++++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100 +@@ -148,6 +148,9 @@ + struct mapping_defn_t *mappings; + }; + ++/* XXX */ ++#define environ local_environ ++ + static char no_act = 0; + static char verbose = 0; + static char **environ = NULL; diff --git a/packages/busybox/busybox-1.2.1/iproute-flush-cache.patch b/packages/busybox/busybox-1.2.1/iproute-flush-cache.patch new file mode 100644 index 0000000000..f8becc3390 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/iproute-flush-cache.patch @@ -0,0 +1,23 @@ +Index: networking/libiproute/iproute.c +=================================================================== +RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v +retrieving revision 1.14 +diff -u -r1.14 iproute.c +--- networking/libiproute/iproute.c 11 Aug 2004 08:10:58 -0000 1.14 ++++ networking/libiproute/iproute.c 30 Nov 2004 20:43:44 -0000 +@@ -537,6 +537,15 @@ + } else if (matches(*argv, "match") == 0) { + NEXT_ARG(); + get_prefix(&filter.mdst, *argv, do_ipv6); ++ } else if (matches(*argv, "table") == 0) { ++ NEXT_ARG(); ++ if (matches(*argv, "cache") == 0) { ++ filter.tb = -1; ++ } else if (matches(*argv, "main") != 0) { ++ invarg("invalid \"table\"", *argv); ++ } ++ } else if (matches(*argv, "cache") == 0) { ++ filter.tb = -1; + } else { + if (matches(*argv, "exact") == 0) { + NEXT_ARG(); diff --git a/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty b/packages/busybox/busybox-1.2.1/mnci/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/mnci/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.0/openmn/defconfig b/packages/busybox/busybox-1.2.1/mnci/defconfig index 007f3a69b1..6a04803f18 100644 --- a/packages/busybox/busybox-1.2.0/openmn/defconfig +++ b/packages/busybox/busybox-1.2.1/mnci/defconfig @@ -4,37 +4,71 @@ HAVE_DOT_CONFIG=y # +# Busybox Settings +# + +# # General Configuration # -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_SHOW_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set # CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set +CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set # CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-linux-" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options # # CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set PREFIX="./_install" # +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# # Archival Utilities # CONFIG_AR=y @@ -43,6 +77,7 @@ CONFIG_BUNZIP2=y CONFIG_CPIO=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y @@ -51,19 +86,25 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # # Common options for cpio and tar # # CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -71,29 +112,37 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set CONFIG_CMP=y +# CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -101,26 +150,33 @@ CONFIG_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y -CONFIG_LOGNAME=y +# CONFIG_LOGNAME is not set CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set CONFIG_FEATURE_LS_RECURSIVE=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y # CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y CONFIG_OD=y +# CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y @@ -128,20 +184,22 @@ CONFIG_SEQ=y CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y +# CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_TAIL=y # CONFIG_FEATURE_FANCY_TAIL is not set CONFIG_TEE=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y @@ -149,10 +207,10 @@ CONFIG_UNIQ=y CONFIG_USLEEP=y # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set -CONFIG_WATCH=y +# CONFIG_WATCH is not set CONFIG_WC=y -CONFIG_WHO=y -CONFIG_WHOAMI=y +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set CONFIG_YES=y # @@ -161,7 +219,7 @@ CONFIG_YES=y # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -182,12 +240,14 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y CONFIG_LOADFONT=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y # # Debian Utilities @@ -197,7 +257,10 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set CONFIG_WHICH=y # @@ -205,6 +268,7 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set # CONFIG_PATCH is not set CONFIG_SED=y CONFIG_VI=y @@ -223,16 +287,19 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_NEWER=y # CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set @@ -243,75 +310,189 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # Init Utilities # # CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set # CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # CONFIG_MESG is not set # # Login/Password Management Utilities # +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set CONFIG_ADDGROUP=y CONFIG_DELGROUP=y CONFIG_ADDUSER=y CONFIG_DELUSER=y CONFIG_GETTY=y -CONFIG_FEATURE_U_W_TMP=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set CONFIG_LOGIN=y # CONFIG_FEATURE_SECURETTY is not set CONFIG_PASSWD=y CONFIG_SU=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set # -# Common options for adduser, deluser, login, su +# Linux Ext2 FS Progs # -CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +# CONFIG_LOSETUP is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities # -# CONFIG_ADJTIMEX is not set +CONFIG_ADJTIMEX=y +# CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set CONFIG_DC=y # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set # CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set # CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set CONFIG_TIME=y # CONFIG_WATCHDOG is not set # -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -CONFIG_FEATURE_INSMOD_LOAD_MAP=y -CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y -CONFIG_LSMOD=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set - -# # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set -CONFIG_FTPPUT=y +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -326,60 +507,86 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set # CONFIG_INETD is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set # CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set CONFIG_ROUTE=y CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set # CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # # udhcp Server/Client # # CONFIG_APP_UDHCPD is not set CONFIG_APP_UDHCPC=y +# CONFIG_APP_DUMPLEASES is not set CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_ZCIP=y # # Process Utilities # CONFIG_FREE=y +# CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +# CONFIG_UPTIME is not set # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set @@ -392,14 +599,19 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -410,7 +622,8 @@ CONFIG_ASH_GETOPTS=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y -CONFIG_FEATURE_COMMAND_HISTORY=31 +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=15 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set @@ -428,48 +641,3 @@ CONFIG_LOGREAD=y # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -# FDISK_SUPPORT_LARGE_DISKS is not set -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_SWAPONOFF is not set -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.2.1/mount-all-type.patch b/packages/busybox/busybox-1.2.1/mount-all-type.patch new file mode 100644 index 0000000000..476094a804 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/mount-all-type.patch @@ -0,0 +1,84 @@ +--- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c 2004-08-02 17:14:02.000000000 -0700 ++++ busybox-1.00/util-linux/mount.c 2005-05-13 00:17:19.054232796 -0700 +@@ -364,6 +364,56 @@ + exit(EXIT_SUCCESS); + } + ++/* Does this file system type, from /etc/fstab, match the given ++ * -t option value? ++ */ ++static int match_fs(const char *option, const char *type) ++{ ++ const int len = strlen(type); ++ const int no = option[0] == 'n' && option[1] == 'o'; ++ const char *optp = option; ++ ++ if (len > 0) do { ++ const char *match = strstr(optp, type); ++ ++ if (match == NULL) { ++ /* No match, but if the option string starts 'no' no match ++ * means yes. ++ */ ++ return no; ++ } ++ ++ /* Match, may be partial, check for end-of-type in option string. */ ++ if (match[len] == 0 || match[len] == ',') { ++ /* Ok, check for type or notype. */ ++ if (match == option) { ++ /* Exact match at start (can't be 'no') */ ++ return 1; ++ } ++ if (match > option+1) { ++ if (match[-1] == ',') { ++ /* Exact match in middle, might be 'no' */ ++ return !no; ++ } ++ if (match == option+2 && no) { ++ /* Exact match to 'notype' at start. */ ++ return 0; ++ } ++ if (match > option+2 && match[-3] == ',' && ++ match[-2] == 'n' && match[-1] == 'o') { ++ return 0; ++ } ++ } ++ } ++ ++ /* Look for another match. */ ++ optp = match+1; ++ } while (1); ++ ++ /* zero length type in fstab (impossible?), don't match it. */ ++ return 0; ++} ++ + extern int mount_main(int argc, char **argv) + { + struct stat statbuf; +@@ -371,6 +421,7 @@ + char *extra_opts; + int flags = 0; + char *filesystemType = "auto"; ++ char *filesystemOption = 0; + int got_filesystemType = 0; + char *device = xmalloc(PATH_MAX); + char *directory = xmalloc(PATH_MAX); +@@ -393,6 +444,7 @@ + break; + case 't': + filesystemType = optarg; ++ filesystemOption = optarg; + got_filesystemType = 1; + break; + case 'w': +@@ -460,6 +512,8 @@ + + strcpy(device, m->mnt_fsname); + strcpy(directory, m->mnt_dir); ++ if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type)) ++ continue; + filesystemType = bb_xstrdup(m->mnt_type); + singlemount: + extra_opts = string_flags; diff --git a/packages/nonworking/xlibs/.mtn2git_empty b/packages/busybox/busybox-1.2.1/nylon/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/xlibs/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/nylon/.mtn2git_empty diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/busybox/busybox-1.2.1/openmn/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/php/php-5.0.5/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/openmn/.mtn2git_empty diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/busybox/busybox-1.2.1/openslug/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-native-2.3.3/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/openslug/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch b/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch new file mode 100644 index 0000000000..010f64a53f --- /dev/null +++ b/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch @@ -0,0 +1,133 @@ +--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 ++++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 +@@ -1,40 +1,101 @@ + #!/bin/sh ++# openslug UDHCP client script ++# this must set the HW address (MAC) on the interface ++# ++. /etc/default/functions + +-# udhcpc script edited by Tim Riker <Tim@Rikers.org> + +-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 ++echodns(){ ++ local dns ++ if test $# -gt 0 ++ then ++ for dns in "$@" ++ do ++ echo "nameserver $dns" ++ done ++ fi ++} ++ ++# Output the correct contents for resolv.conf ++mkresolv() { ++ test -n "$domain" && echo "search $domain" ++ echodns $dns ++} ++ ++# checksum of a file (or stdin if -) ++md5strm() { ++ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' ++} ++ ++bind() { ++ local B N metric i olddomain ++ B= ++ test -n "$broadcast" && B="broadcast $broadcast" ++ N= ++ test -n "$subnet" && N="netmask $subnet" ++ ifconfig "$interface" "$ip" $B $N up ++ ++ # If given router information delete the old information and ++ # enter new stuff, routers get metrics incremented by 1 ++ # between each (this is somewhat arbitrary) ++ if test -n "$router" ++ then ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ++ do ++ : ++ done + +-RESOLV_CONF="/etc/resolv.conf" +-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +-[ -n "$subnet" ] && NETMASK="netmask $subnet" ++ metric=0 ++ for i in $router ++ do ++ route add default gw "$i" dev "$interface" metric $((metric++)) ++ done ++ fi ++ ++ olddomain= ++ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" ++ if test -n "$domain" -a "$domain" != "$olddomain" ++ then ++ echo "$domain" >/etc/defaultdomain ++ # and update the kernel view too ++ echo "$domain" >/proc/sys/kernel/domainname ++ fi ++ ++ # Update /etc/resolv.conf to reflect domain and dns information, ++ # this always clears resolv.conf if none is given ++ md5old="$(md5strm /etc/resolv.conf)" ++ md5new="$(mkresolv | md5strm -)" ++ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf ++} + + case "$1" in +- deconfig) +- /sbin/ifconfig $interface 0.0.0.0 +- ;; +- +- renew|bound) +- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK +- +- if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do +- : +- done +- +- metric=0 +- for i in $router ; do +- route add default gw $i dev $interface metric $((metric++)) +- done ++deconfig) ++ # Bring the interface up (without inet at this point) ++ ifconfig "$interface" up;; ++ ++renew|bound) ++ bind;; ++ ++leasefail) ++ # Pull the values from the config data if (only only if) this ++ # is the config interface ++ if test "$interface" = "$(config iface)" ++ then ++ ip="$(config ip)" ++ if test -n "$ip" ++ then ++ router="$(config gateway)" ++ subnet="$(config netmask)" ++ broadcast="$(config broadcast)" ++ domain="$(config domain)" ++ dns="$(config dns)" ++ ++ bind + fi ++ fi;; + +- echo -n > $RESOLV_CONF +- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF +- for i in $dns ; do +- echo adding dns $i +- echo nameserver $i >> $RESOLV_CONF +- done +- ;; ++*) echo "udhcpc: $*: unknown command" >&2 ++ exit 1;; + esac + + exit 0 diff --git a/packages/busybox/busybox-1.2.1/readlink.patch b/packages/busybox/busybox-1.2.1/readlink.patch new file mode 100644 index 0000000000..0c5431085a --- /dev/null +++ b/packages/busybox/busybox-1.2.1/readlink.patch @@ -0,0 +1,85 @@ +diff -p -u -r1.7 Config.in +--- busybox-1.00/debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7 ++++ busybox-1.00-patched/debianutils/Config.in 16 Nov 2004 11:46:41 -0000 +@@ -24,6 +24,13 @@ config CONFIG_READLINK + This program reads a symbolic link and returns the name + of the file it points to + ++config CONFIG_FEATURE_READLINK_FOLLOW ++ bool " Enable canonicalization by following all symlinks (-f)" ++ default n ++ depends on CONFIG_READLINK ++ help ++ Enable the readlink option (-f). ++ + config CONFIG_RUN_PARTS + bool "run-parts" + default n +diff -p -u -r1.2 readlink.c +--- busybox-1.00/debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2 ++++ busybox-1.00-patched/debianutils/readlink.c 16 Nov 2004 11:46:41 -0000 +@@ -23,18 +23,38 @@ + #include <errno.h> + #include <unistd.h> + #include <stdlib.h> ++#include <getopt.h> + #include "busybox.h" + ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++# define READLINK_FOLLOW "f" ++# define READLINK_FLAG_f (1 << 0) ++#else ++# define READLINK_FOLLOW "" ++#endif ++ ++static const char readlink_options[] = READLINK_FOLLOW; ++ + int readlink_main(int argc, char **argv) + { + char *buf = NULL; ++ unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options); ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++ RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX); ++#endif + + /* no options, no getopt */ + +- if (argc != 2) ++ if (optind + 1 != argc) + bb_show_usage(); + +- buf = xreadlink(argv[1]); ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++ if (opt & READLINK_FLAG_f) { ++ buf = realpath(argv[optind], resolved_path); ++ } else ++#endif ++ buf = xreadlink(argv[optind]); ++ + if (!buf) + return EXIT_FAILURE; + puts(buf); +diff -p -u -r1.222 usage.h +--- busybox-1.00/include/usage.h 14 Sep 2004 16:23:56 -0000 1.222 ++++ busybox-1.00-patched/include/usage.h 16 Nov 2004 11:46:42 -0000 +@@ -1985,10 +1985,18 @@ + "\t-s\tSet the system date and time (default).\n" \ + "\t-p\tPrint the date and time." + ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++#define USAGE_READLINK_FOLLOW(a) a ++#else ++#define USAGE_READLINK_FOLLOW(a) ++#endif ++ + #define readlink_trivial_usage \ +- "" ++ USAGE_READLINK_FOLLOW("[-f] ") "FILE" + #define readlink_full_usage \ +- "Displays the value of a symbolic link." ++ "Displays the value of a symbolic link." \ ++ USAGE_READLINK_FOLLOW("\n\nOptions:\n" \ ++ "\t-f\tcanonicalize by following all symlinks") + + #define realpath_trivial_usage \ + "pathname ..." diff --git a/packages/busybox/busybox-1.2.1/rmmod.patch b/packages/busybox/busybox-1.2.1/rmmod.patch new file mode 100644 index 0000000000..20770e0dc4 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/rmmod.patch @@ -0,0 +1,40 @@ +Index: busybox-1.1.0/modutils/rmmod.c +=================================================================== +--- busybox-1.1.0.orig/modutils/rmmod.c 2006-01-11 06:43:56.000000000 +0100 ++++ busybox-1.1.0/modutils/rmmod.c 2006-03-14 16:42:14.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <string.h> + #include <sys/utsname.h> + #include <sys/syscall.h> ++#include <sys/utsname.h> + #include "busybox.h" + + #ifdef CONFIG_FEATURE_2_6_MODULES +@@ -64,6 +65,16 @@ + but must get */ + size_t bufsize = sizeof(bb_common_bufsiz1); + #endif ++#ifdef CONFIG_FEATURE_2_6_MODULES ++ int k_version = 0; ++ struct utsname myuname; ++ ++ if (uname(&myuname) == 0) { ++ if (myuname.release[0] == '2') { ++ k_version = myuname.release[2] - '0'; ++ } ++ } ++#endif + + /* Parse command line. */ + n = bb_getopt_ulflags(argc, argv, "wfa"); +@@ -109,6 +120,10 @@ + afterslash++; + module_name = alloca(strlen(afterslash) + 1); + filename2modname(module_name, afterslash); ++ if (k_version != 4) ++ filename2modname(module_name, afterslash); ++ else ++ strcpy(module_name, afterslash); + #else + #define module_name argv[n] + #endif diff --git a/packages/udev/udev-058/.mtn2git_empty b/packages/busybox/busybox-1.2.1/sparc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-058/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/sparc/.mtn2git_empty diff --git a/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch b/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch new file mode 100644 index 0000000000..031274908b --- /dev/null +++ b/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch @@ -0,0 +1,57 @@ +--- busybox-1.00/networking/udhcp/common.c~udhcppidfile2 ++++ busybox-1.00/networking/udhcp/common.c +@@ -74,7 +74,7 @@ + + if (pid > 0) { + /* parent */ +- if (pidfile_reassign(pidfile, pid) < 0) { ++ if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) { + (void)kill(pid, SIGKILL); + exit(1); + } else +@@ -119,7 +119,7 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- if (pidfile_acquire(pidfile) < 0) ++ if (pidfile != NULL && pidfile_acquire(pidfile) < 0) + exit(1); + + /* equivelent of doing a fflush after every \n */ +@@ -166,7 +166,7 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- if (pidfile_acquire(pidfile) < 0) ++ if (pidfile != NULL && pidfile_acquire(pidfile) < 0) + exit(1); + + /* equivelent of doing a fflush after every \n */ +--- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2 ++++ busybox-1.00/networking/udhcp/pidfile.c +@@ -141,7 +141,11 @@ + int pidfile_acquire(const char *pidfile) + { + int fd, result; +- if (!pidfile) return (-1); ++ ++ if (pidfile == NULL) { ++ LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n"); ++ return (-1); ++ } + + if ((fd = pidfile_open(pidfile)) < 0) + return (-1); +@@ -170,7 +174,11 @@ + int pidfile_reassign(const char *pidfile, int pid) + { + int fd, result; +- if (!pidfile) return (-1); ++ ++ if (pidfile == NULL) { ++ LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n"); ++ return (-1); ++ } + + if ((fd = pidfile_open(pidfile)) < 0) + return (-1); diff --git a/packages/busybox/busybox-1.2.1/udhcppidfile.patch b/packages/busybox/busybox-1.2.1/udhcppidfile.patch new file mode 100644 index 0000000000..b4b86b8775 --- /dev/null +++ b/packages/busybox/busybox-1.2.1/udhcppidfile.patch @@ -0,0 +1,274 @@ +Index: busybox-1.1.0/networking/udhcp/pidfile.h +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/pidfile.h 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/pidfile.h 2006-03-14 17:15:45.000000000 +0100 +@@ -21,5 +21,5 @@ + + + int pidfile_acquire(const char *pidfile); +-void pidfile_write_release(int pid_fd); ++int pidfile_reassign(const char *pidfile, int newpid); + +Index: busybox-1.1.0/networking/udhcp/pidfile.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/pidfile.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/pidfile.c 2006-03-14 17:15:45.000000000 +0100 +@@ -25,6 +25,7 @@ + #include <unistd.h> + #include <stdio.h> + #include <stdlib.h> ++#include <errno.h> + + #include "pidfile.h" + #include "common.h" +@@ -37,39 +38,146 @@ + } + + +-int pidfile_acquire(const char *pidfile) ++static int pidfile_open(const char *pidfile) + { +- int pid_fd; +- if (!pidfile) return -1; ++ int fd; + +- pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644); +- if (pid_fd < 0) { +- LOG(LOG_ERR, "Unable to open pidfile %s: %m\n", pidfile); +- } else { +- lockf(pid_fd, F_LOCK, 0); +- if (!saved_pidfile) +- atexit(pidfile_delete); +- saved_pidfile = (char *) pidfile; ++ if ((fd = open(pidfile, O_CREAT | O_RDWR, 0644)) < 0) { ++ LOG(LOG_ERR, "pidfile_open: open %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ /* NOTE: lockf is not inherited by child after fork */ ++ if (lockf(fd, F_LOCK, 0) < 0) { ++ LOG(LOG_ERR, "pidfile_open: lock %s failed: %m\n", pidfile); ++ close(fd); ++ return (-1); ++ } ++ ++ return (fd); ++} ++ ++ ++static int pidfile_check(int fd, const char *pidfile) ++{ ++ int len, pid; ++ char buf[20]; ++ ++ if (lseek(fd, 0L, SEEK_SET) < 0) { ++ LOG(LOG_ERR, "pidfile_check: lseek %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ if ((len = read(fd, buf, sizeof buf - 1)) < 0) { ++ LOG(LOG_ERR, "pidfile_check: read %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ if (len == 0) ++ return (0); ++ ++ buf[len] = '\0'; ++ ++ if ((pid = atoi(buf)) <= 1) { ++ LOG(LOG_WARNING, ++ "pidfile_check: ignoring bogus pid (%s) in %s\n", ++ buf, pidfile); ++ return (0); ++ } ++ ++ if (kill((pid_t)pid, 0) == 0) { ++ LOG(LOG_ERR, "pidfile_check: process %d exists (%s)\n", ++ pid, pidfile); ++ return (-1); ++ } ++ ++ if (errno != ESRCH) { ++ LOG(LOG_ERR, "pidfile_check: kill %d failed (%s): %m\n", ++ pid, pidfile); ++ return (-1); ++ } ++ ++ return (0); ++} ++ ++ ++static int pidfile_store(int fd, const char *pidfile, int pid) ++{ ++ int len; ++ char buf[20]; ++ ++ if (lseek(fd, 0L, SEEK_SET) < 0) { ++ LOG(LOG_ERR, "pidfile_store: lseek %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ len = snprintf(buf, sizeof buf - 1, "%d\n", pid); ++ buf[len] = '\0'; ++ ++ if (write(fd, buf, len) < 0) { ++ LOG(LOG_ERR, "pidfile_store: write %s failed: %m\n", ++ pidfile); ++ return (-1); ++ } ++ ++ if (ftruncate(fd, len) < 0) { ++ LOG(LOG_ERR, "pidfile_store: ftruncate %d failed (%s): %m\n", ++ len, pidfile); ++ return (-1); + } + +- return pid_fd; ++ return (0); + } + + +-void pidfile_write_release(int pid_fd) ++static void pidfile_close(int fd) + { +- FILE *out; ++ (void)lseek(fd, 0L, SEEK_SET); ++ (void)lockf(fd, F_ULOCK, 0); ++ (void)close(fd); ++} + +- if (pid_fd < 0) return; + +- if ((out = fdopen(pid_fd, "w")) != NULL) { +- fprintf(out, "%d\n", getpid()); +- fclose(out); ++int pidfile_acquire(const char *pidfile) ++{ ++ int fd, result; ++ if (!pidfile) return (-1); ++ ++ if ((fd = pidfile_open(pidfile)) < 0) ++ return (-1); ++ ++ if ((result = pidfile_check(fd, pidfile)) == 0) ++ result = pidfile_store(fd, pidfile, getpid()); ++ ++ pidfile_close(fd); ++ ++ if (result == 0) { ++ saved_pidfile = (char *) pidfile; ++ atexit(pidfile_delete); + } +- lockf(pid_fd, F_UNLCK, 0); +- close(pid_fd); ++ ++ return (result); + } + + ++/* ++ * reassign the pid in a pidfile - used just after a fork so a parent ++ * can store the pid of its child into the file without any window ++ * where the pid in the file is a dead process (which might let another ++ * instance of the program start). Note the parent must use _exit() to ++ * avoid triggering the unlink scheduled above in pidfile_acquire() ++ */ ++int pidfile_reassign(const char *pidfile, int pid) ++{ ++ int fd, result; ++ if (!pidfile) return (-1); ++ ++ if ((fd = pidfile_open(pidfile)) < 0) ++ return (-1); + ++ result = pidfile_store(fd, pidfile, pid); + ++ pidfile_close(fd); ++ ++ return (result); ++} +Index: busybox-1.1.0/networking/udhcp/common.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/common.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/common.c 2006-03-14 17:15:45.000000000 +0100 +@@ -64,16 +64,34 @@ + #ifdef __uClinux__ + LOG(LOG_ERR, "Cannot background in uclinux (yet)"); + #else /* __uClinux__ */ +- int pid_fd; ++ int pid, fd; + +- /* hold lock during fork. */ +- pid_fd = pidfile_acquire(pidfile); +- if (daemon(0, 0) == -1) { ++ /* NOTE: lockf is not inherited by the child after fork */ ++ if ((pid = fork()) < 0) { + perror("fork"); + exit(1); + } ++ ++ if (pid > 0) { ++ /* parent */ ++ if (pidfile_reassign(pidfile, pid) < 0) { ++ (void)kill(pid, SIGKILL); ++ exit(1); ++ } else ++ _exit(0); ++ } ++ ++ /* child */ ++ (void)chdir("/"); ++ if ((fd = open("/dev/null", O_RDWR)) >= 0) { ++ (void)dup2(fd, 0); ++ (void)dup2(fd, 1); ++ (void)dup2(fd, 2); ++ (void)close(fd); ++ } ++ (void)setsid(); ++ + daemonized++; +- pidfile_write_release(pid_fd); + #endif /* __uClinux__ */ + } + +@@ -97,14 +115,12 @@ + + void start_log_and_pid(const char *client_server, const char *pidfile) + { +- int pid_fd; +- + /* Make sure our syslog fd isn't overwritten */ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- pid_fd = pidfile_acquire(pidfile); +- pidfile_write_release(pid_fd); ++ if (pidfile_acquire(pidfile) < 0) ++ exit(1); + + /* equivelent of doing a fflush after every \n */ + setlinebuf(stdout); +@@ -150,8 +166,8 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- pid_fd = pidfile_acquire(pidfile); +- pidfile_write_release(pid_fd); ++ if (pidfile_acquire(pidfile) < 0) ++ exit(1); + + /* equivelent of doing a fflush after every \n */ + setlinebuf(stdout); +Index: busybox-1.1.0/networking/udhcp/script.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/script.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/script.c 2006-03-14 17:15:45.000000000 +0100 +@@ -229,6 +229,6 @@ + execle(client_config.script, client_config.script, + name, NULL, envp); + LOG(LOG_ERR, "script %s failed: %m", client_config.script); +- exit(1); ++ _exit(1); + } + } diff --git a/packages/busybox/busybox-1.2.1/udhcpscript.patch b/packages/busybox/busybox-1.2.1/udhcpscript.patch new file mode 100644 index 0000000000..fc21d440cd --- /dev/null +++ b/packages/busybox/busybox-1.2.1/udhcpscript.patch @@ -0,0 +1,17 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript ++++ busybox-1.00-rc3/examples/udhcp/simple.script +@@ -17,8 +17,7 @@ + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + + if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + diff --git a/packages/busybox/busybox-1.2.1/wget-long-options.patch b/packages/busybox/busybox-1.2.1/wget-long-options.patch new file mode 100644 index 0000000000..3c5920a3cb --- /dev/null +++ b/packages/busybox/busybox-1.2.1/wget-long-options.patch @@ -0,0 +1,20 @@ +--- busybox-1.2.1.orig/networking/wget.c ++++ busybox-1.2.1/networking/wget.c +@@ -136,7 +136,7 @@ + #define WGET_OPT_PREFIX 32 + #define WGET_OPT_PROXY 64 + +-#if ENABLE_WGET_LONG_OPTIONS ++#if CONFIG_FEATURE_WGET_LONG_OPTIONS + static const struct option wget_long_options[] = { + { "continue", 0, NULL, 'c' }, + { "quiet", 0, NULL, 'q' }, +@@ -180,7 +180,7 @@ + * Crack command line. + */ + bb_opt_complementally = "-1:\203::"; +-#if ENABLE_WGET_LONG_OPTIONS ++#if CONFIG_FEATURE_WGET_LONG_OPTIONS + bb_applet_long_options = wget_long_options; + #endif + opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", diff --git a/packages/udev/udev-063/.mtn2git_empty b/packages/busybox/busybox-1.2.1/wrt54/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-063/.mtn2git_empty +++ b/packages/busybox/busybox-1.2.1/wrt54/.mtn2git_empty diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb index 29c6924b9d..75e4bab9df 100644 --- a/packages/busybox/busybox_1.2.0.bb +++ b/packages/busybox/busybox_1.2.0.bb @@ -12,8 +12,6 @@ SECTION = "base" PRIORITY = "required" PR = "r1" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ # file://udhcppidfile.patch;patch=1 \ # file://udhcppidfile-breakage.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb new file mode 100644 index 0000000000..8b399f1626 --- /dev/null +++ b/packages/busybox/busybox_1.2.1.bb @@ -0,0 +1,159 @@ +DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \ +small executable. It provides minimalist replacements for most of the \ +utilities you usually find in GNU fileutils, shellutils, etc. The utilities \ +in BusyBox generally have fewer options than their full-featured GNU \ +cousins; however, the options that are included provide the expected \ +functionality and behave very much like their GNU counterparts. BusyBox \ +provides a fairly complete POSIX environment for any small or embedded \ +system." +HOMEPAGE = "http://www.busybox.net" +LICENSE = "GPL" +SECTION = "base" +PRIORITY = "required" +PR = "r1" + +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://dhcp-hostname.patch;patch=1 \ + file://ifupdown-spurious-environ.patch;patch=1 \ + file://udhcpscript.patch;patch=1 \ + file://wget-long-options.patch;patch=1 \ + file://defconfig \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://syslog \ + file://hwclock.sh \ + file://default.script \ + file://syslog.conf \ + file://mount.busybox \ + file://umount.busybox" + +export EXTRA_CFLAGS = "${CFLAGS}" +EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" + +FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" +FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" + +FILES_${PN} += " ${datadir}/udhcpc" + +INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" +INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" +INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME_${PN} = "syslog" +CONFFILES_${PN} = "${sysconfdir}/syslog.conf" + +# This disables the syslog startup links in openslug (see openslug-init) +INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." + +inherit cml1 update-rc.d + +do_configure () { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config + echo "USING_CROSS_COMPILER=y" >> ${S}/.config + + sed -e '/CROSS_COMPILER_PREFIX/d' \ + -e '/USING_CROSS_COMPILER/d' \ + '${S}/.config.oe' >>'${S}/.config' + cml1_do_configure +} + +do_compile () { + unset CFLAGS + base_do_compile +} + +do_install () { + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + mv ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + +pkg_postinst_${PN} () { + # If we are not making an image we create links for the utilities that doesn't exist + # so the update-alternatives script will get the utilities it needs + # (update-alternatives have no problem replacing links later anyway) + test -n 2> /dev/null || alias test='busybox test' + if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi + + # This adds the links, remember that this has to work when building an image too, hence the $D + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links +} + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links +} diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig index c297988ea5..f1fe0d6d2d 100644 --- a/packages/busybox/slingbox-1.1.3/defconfig +++ b/packages/busybox/slingbox-1.1.3/defconfig @@ -352,9 +352,9 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set +CONFIG_FDISK=y FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set +CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb index 5fc31dec41..8cd85ce540 100644 --- a/packages/busybox/slingbox_1.1.3.bb +++ b/packages/busybox/slingbox_1.1.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ @@ -40,6 +40,8 @@ do_configure () { do_compile () { unset CFLAGS base_do_compile + # Just in case fdisk is compiled in, do not overwrite the Linksys one + sed -i -e '/fdisk/d' ${S}/busybox.links } do_install () { diff --git a/packages/bzflag/bzflag_1.10.6.20040515.bb b/packages/bzflag/bzflag_1.10.6.20040515.bb index a3a24fae31..62d5394171 100644 --- a/packages/bzflag/bzflag_1.10.6.20040515.bb +++ b/packages/bzflag/bzflag_1.10.6.20040515.bb @@ -1,4 +1,4 @@ -DEPENDS = "adns ncurses virtual/x11" +DEPENDS = "adns ncurses virtual/libx11" SECTION = "x11/games" LICENSE = "LGPL" SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2" diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb index 214fb07ca8..c819b2ef46 100644 --- a/packages/cairo/cairo_0.5.0.bb +++ b/packages/cairo/cairo_0.5.0.bb @@ -1,8 +1,8 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb index 214fb07ca8..c819b2ef46 100644 --- a/packages/cairo/cairo_0.5.2.bb +++ b/packages/cairo/cairo_0.5.2.bb @@ -1,8 +1,8 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb index c34a429607..d414a35019 100644 --- a/packages/cairo/cairo_0.9.2.bb +++ b/packages/cairo/cairo_0.9.2.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb index 09e8fa81b6..9f8425c03f 100644 --- a/packages/cairo/cairo_1.0.0.bb +++ b/packages/cairo/cairo_1.0.0.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb index 101a3e418e..cef51d2212 100644 --- a/packages/cairo/cairo_1.0.2.bb +++ b/packages/cairo/cairo_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb index c6ad012a24..700f425113 100644 --- a/packages/cairo/cairo_1.0.4.bb +++ b/packages/cairo/cairo_1.0.4.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" diff --git a/packages/cairo/cairo_1.2.0.bb b/packages/cairo/cairo_1.2.2.bb index c6ad012a24..700f425113 100644 --- a/packages/cairo/cairo_1.2.0.bb +++ b/packages/cairo/cairo_1.2.2.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb index 45e277ef82..2498b585f9 100644 --- a/packages/cairo/cairo_cvs.bb +++ b/packages/cairo/cairo_cvs.bb @@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r2" 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/db/db_4.2.52.bb b/packages/db/db_4.2.52.bb index 9e5978fe16..544f199427 100644 --- a/packages/db/db_4.2.52.bb +++ b/packages/db/db_4.2.52.bb @@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r3" +PR = "r5" SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" @@ -49,7 +49,7 @@ FILES_${PN}-bin = "${bindir}" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/*" #configuration - set in local.conf to override DB4_CONFIG ?= " --disable-cryptography --disable-queue --disable-replication --disable-verify --enable-hash" diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb index 8671efe02a..cf1bd00acd 100644 --- a/packages/db/db_4.3.29.bb +++ b/packages/db/db_4.3.29.bb @@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r3" +PR = "r6" SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" @@ -49,10 +49,11 @@ FILES_${PN}-bin = "${bindir}" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/*" #configuration - set in local.conf to override -DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild --enable-compat185" +# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) +DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185" EXTRA_OECONF = "${DB4_CONFIG}" # Override the MUTEX setting here, the POSIX library is diff --git a/packages/dbus/dbus-0.6x/fix-segfault.patch b/packages/dbus/dbus-0.6x/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.6x/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/udev/udev-065/.mtn2git_empty b/packages/dbus/dbus-0.91/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-065/.mtn2git_empty +++ b/packages/dbus/dbus-0.91/.mtn2git_empty diff --git a/packages/dbus/dbus-0.90/dbus-1.init b/packages/dbus/dbus-0.91/dbus-1.init index 60440b7223..60440b7223 100644 --- a/packages/dbus/dbus-0.90/dbus-1.init +++ b/packages/dbus/dbus-0.91/dbus-1.init diff --git a/packages/dbus/dbus-0.91/fix-segfault.patch b/packages/dbus/dbus-0.91/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.91/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/udev/udev-070/.mtn2git_empty b/packages/dbus/dbus-0.92/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-070/.mtn2git_empty +++ b/packages/dbus/dbus-0.92/.mtn2git_empty diff --git a/packages/dbus/dbus-0.92/dbus-1.init b/packages/dbus/dbus-0.92/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.92/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-0.92/fix-install-daemon.patch b/packages/dbus/dbus-0.92/fix-install-daemon.patch new file mode 100644 index 0000000000..0cfe5db650 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-install-daemon.patch @@ -0,0 +1,11 @@ +--- dbus-0.92/bus/Makefile.am.orig 2006-08-20 14:37:07.393810316 +0200 ++++ dbus-0.92/bus/Makefile.am 2006-08-20 14:38:01.509274554 +0200 +@@ -107,7 +107,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-0.92/fix-segfault.patch b/packages/dbus/dbus-0.92/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb new file mode 100644 index 0000000000..81a15c9b35 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.71.bb @@ -0,0 +1,22 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ + file://cross.patch;patch=1" + +inherit autotools pkgconfig gettext native + +S = "${WORKDIR}/dbus-glib-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib" +DEPENDS = "glib-2.0-native" + +do_stage() { + oe_runmake install + install -d ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus +} diff --git a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch deleted file mode 100644 index 68edc54038..0000000000 --- a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- dbus-glib-0.70/dbus/Makefile.am.fix_includes 2006-07-17 13:00:39.000000000 -0400 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-17 20:09:00.000000000 -0400 -@@ -38,13 +38,13 @@ - dbus-gvalue.c \ - dbus-gvalue.h \ - dbus-gthread.c \ -- dbus-glib.h \ -- dbus-glib-lowlevel.h \ -- dbus-glib-error-enum.h \ - $(DBUS_GLIB_INTERNALS) - - libdbus_glib_HEADERS = \ -- dbus-gtype-specialized.h -+ dbus-gtype-specialized.h \ -+ dbus-glib.h \ -+ dbus-glib-lowlevel.h \ -+ dbus-glib-error-enum.h - - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - - diff --git a/packages/dbus/dbus-glib_0.70.bb b/packages/dbus/dbus-glib_0.71.bb index 304e7aca48..6bb69ba316 100644 --- a/packages/dbus/dbus-glib_0.70.bb +++ b/packages/dbus/dbus-glib_0.71.bb @@ -7,7 +7,6 @@ DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ - file://dbus-glib-0.70-fix-includes.patch;patch=1 \ file://no-examples.patch;patch=1 \ file://no-introspect.patch;patch=1" 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-native_0.91.bb b/packages/dbus/dbus-native_0.91.bb new file mode 100644 index 0000000000..e176787d91 --- /dev/null +++ b/packages/dbus/dbus-native_0.91.bb @@ -0,0 +1,26 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1" + +inherit autotools pkgconfig gettext native + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_runmake install + autotools_stage_all +} diff --git a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch deleted file mode 100644 index 17b78d938a..0000000000 --- a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- dbus-python-0.70/setup.py.fix-binary-modules-dir 2006-07-17 20:30:07.000000000 -0400 -+++ dbus-python-0.70/setup.py 2006-07-17 20:30:22.000000000 -0400 -@@ -92,12 +92,12 @@ - "dbus/_util", - ], - ext_modules=[ -- Extension("dbus_bindings", ["dbus/dbus_bindings.pyx"], -+ Extension("dbus/dbus_bindings", ["dbus/dbus_bindings.pyx"], - include_dirs=dbus_includes, - libraries=["dbus-1"], - - ), -- Extension("dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], -+ Extension("dbus/dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], - include_dirs=dbus_glib_includes, - libraries=["dbus-glib-1", "dbus-1", "glib-2.0"], - define_macros=[ - diff --git a/packages/dbus/dbus-python_0.70.bb b/packages/dbus/dbus-python_0.71.bb index 7bfbc931ed..7c80a1be3c 100644 --- a/packages/dbus/dbus-python_0.70.bb +++ b/packages/dbus/dbus-python_0.71.bb @@ -9,7 +9,6 @@ PR = "r0" DEPENDS = "python-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://dbus-python-0.70-fix-binary-modules-dir.patch;patch=1" + file://cross.patch;patch=1" inherit distutils diff --git a/packages/dbus/dbus_0.20.bb b/packages/dbus/dbus_0.20.bb index 0a08862f10..6d0a777fef 100644 --- a/packages/dbus/dbus_0.20.bb +++ b/packages/dbus/dbus_0.20.bb @@ -2,6 +2,7 @@ SECTION = "base" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb index abd234712f..d7b164e8cc 100644 --- a/packages/dbus/dbus_0.21.bb +++ b/packages/dbus/dbus_0.21.bb @@ -3,6 +3,7 @@ PR = "r4" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb index 424c27908b..8eacbeca27 100644 --- a/packages/dbus/dbus_0.22.bb +++ b/packages/dbus/dbus_0.22.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index b2fc9c44ac..1cb72cb792 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -5,6 +5,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb index dc3f6f2e72..6fd86ae1aa 100644 --- a/packages/dbus/dbus_0.23.4.bb +++ b/packages/dbus/dbus_0.23.4.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.bb b/packages/dbus/dbus_0.23.bb index c0faeec1a6..de224f307e 100644 --- a/packages/dbus/dbus_0.23.bb +++ b/packages/dbus/dbus_0.23.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ 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..57a1c10242 100644 --- a/packages/dbus/dbus_0.60.bb +++ b/packages/dbus/dbus_0.60.bb @@ -1,7 +1,8 @@ -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" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb index f8e16815e7..57a1c10242 100644 --- a/packages/dbus/dbus_0.61.bb +++ b/packages/dbus/dbus_0.61.bb @@ -1,7 +1,8 @@ -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" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb index f8e16815e7..57a1c10242 100644 --- a/packages/dbus/dbus_0.62.bb +++ b/packages/dbus/dbus_0.62.bb @@ -1,7 +1,8 @@ -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" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.62.inc b/packages/dbus/dbus_0.62.inc index c1dcc0e4a3..3b0f24f408 100644 --- a/packages/dbus/dbus_0.62.inc +++ b/packages/dbus/dbus_0.62.inc @@ -1,15 +1,19 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" + +FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" + SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ file://no-examples.patch;patch=1 \ + file://fix-segfault.patch;patch=1 \ ${SRC_URI_EXTRA}" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/dbus/dbus_0.90.bb b/packages/dbus/dbus_0.91.bb index e48b09e4ff..9eec6c86c7 100644 --- a/packages/dbus/dbus_0.90.bb +++ b/packages/dbus/dbus_0.91.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE="-1" SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" @@ -10,7 +10,8 @@ DEPENDS = "expat glib-2.0 virtual/libintl" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ - file://dbus-1.init" + file://dbus-1.init \ + file://fix-segfault.patch;patch=1" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb new file mode 100644 index 0000000000..a4ab61322f --- /dev/null +++ b/packages/dbus/dbus_0.92.bb @@ -0,0 +1,64 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r1" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://fix-segfault.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} 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/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb index 75833b606e..00b7209fee 100644 --- a/packages/detect-stylus/detect-stylus_0.10.bb +++ b/packages/detect-stylus/detect-stylus_0.10.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" PR = "r2" -DEPENDS = "virtual/x11 xrdb xcursor-transparent-theme" +DEPENDS = "virtual/libx11 xrdb xcursor-transparent-theme" RDEPENDS = "xrdb xcursor-transparent-theme" SECTION = "gpe" diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb index 729a15de74..2203363b7b 100644 --- a/packages/detect-stylus/detect-stylus_0.13.bb +++ b/packages/detect-stylus/detect-stylus_0.13.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" PR = "r2" -DEPENDS = "virtual/x11 xcursor-transparent-theme xrdb" +DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" SECTION = "gpe" RDEPENDS = "xrdb" 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/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb index 0ddaec5637..64de9fcbf3 100644 --- a/packages/devmem2/devmem2.bb +++ b/packages/devmem2/devmem2.bb @@ -1,4 +1,4 @@ -SRC_URI = "http://www.lart.tudelft.nl/lartware/port/devmem2.c" +SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c" LICENSE = "GPL" S = "${WORKDIR}" diff --git a/packages/dia/dia_0.94+0.95pre3.bb b/packages/dia/dia_0.94+0.95pre3.bb index 41366a335b..2905a598ce 100644 --- a/packages/dia/dia_0.94+0.95pre3.bb +++ b/packages/dia/dia_0.94+0.95pre3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the GPL license." LICENSE = "GPL" DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR = "r1" inherit autotools pkgconfig 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/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 55cd5aa631..0c235a3adb 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -3,11 +3,11 @@ LICENSE = "MIT" SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" PV = "0.0+cvs${SRCDATE}" -PR = "r2" +PR = "r3" S = "${WORKDIR}/drm" -inherit autotools +inherit autotools pkgconfig do_compile() { oe_runmake -C libdrm 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.027.bb b/packages/e17/e-wm_0.16.999.032.bb index 5089ce23a4..78c1c1aa26 100644 --- a/packages/e17/e-wm_0.16.999.027.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 e" +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/engage_20060128.bb b/packages/e17/engage_20060128.bb index 0bf9f80895..d181d57ffd 100644 --- a/packages/e17/engage_20060128.bb +++ b/packages/e17/engage_20060128.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" +DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e-wm" LICENSE = "MIT" PR = "r2" 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/eel/eel_2.12.2.bb b/packages/eel/eel_2.12.2.bb index e10fde14e8..92bfc88f46 100644 --- a/packages/eel/eel_2.12.2.bb +++ b/packages/eel/eel_2.12.2.bb @@ -7,7 +7,7 @@ inherit gnome LICENSE="GPL" SRC_URI += "file://configure.patch;patch=1" -DEPENDS = "gnome-vfs gnome-menus libgnomeui gail" +DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail" EXTRA_OECONF = "--disable-gtk-doc" 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/e_0.16.999.027.bb b/packages/efl/e_0.16.999.027.bb deleted file mode 100644 index 5078c71365..0000000000 --- a/packages/efl/e_0.16.999.027.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "virtual/evas virtual/ecore edje eet embryo" -LICENSE = "MIT" -PR = "r2" - -inherit efl - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -do_compile() { - oe_runmake -C src/lib -} - -headers = "E_Lib.h ../bin/e*.h" - -do_install() { - oe_runmake -C src/lib install DESTDIR=${D} -} diff --git a/packages/efl/ecore-fb_0.9.9.027.bb b/packages/efl/ecore-fb_0.9.9.032.bb index a957c5dd8c..8eb0017d26 100644 --- a/packages/efl/ecore-fb_0.9.9.027.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.027.bb b/packages/efl/ecore-native_0.9.9.032.bb index 299470841c..7d7ed2370a 100644 --- a/packages/efl/ecore-native_0.9.9.027.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.027.bb b/packages/efl/ecore-x11_0.9.9.032.bb index 3a88ad229b..78d0a66b38 100644 --- a/packages/efl/ecore-x11_0.9.9.027.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/ecore/configure.patch b/packages/efl/ecore/configure.patch index cd38cb7218..1e4ec58f56 100644 --- a/packages/efl/ecore/configure.patch +++ b/packages/efl/ecore/configure.patch @@ -1,15 +1,15 @@ -diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in ---- ecore-0.9.9.015~/configure.in 2005-09-26 16:59:23.000000000 -0700 -+++ ecore-0.9.9.015/configure.in 2005-09-26 17:01:02.000000000 -0700 +diff -Nur ecore-0.9.9.032~/configure.in ecore-0.9.9.032/configure.in +--- ecore-0.9.9.032~/configure.in 2006-08-03 12:12:43.000000000 -0700 ++++ ecore-0.9.9.032/configure.in 2006-08-03 12:13:30.000000000 -0700 @@ -16,7 +16,6 @@ AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED AM_PROG_LIBTOOL -AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then -@@ -262,9 +261,7 @@ + + dnl Set PACKAGE_DATA_DIR in config.h. + if test "x${prefix}" = "xNONE"; then +@@ -205,10 +204,8 @@ AM_CONDITIONAL(BUILD_ECORE_X, true) AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) have_ecore_x="yes" @@ -20,3 +20,4 @@ diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in + x_libs="-lX11 -lXext" ecore_x_libs="-lecore_x"; ],[ + AM_CONDITIONAL(BUILD_ECORE_X, false) 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.027.bb b/packages/efl/edje-native_0.5.0.032.bb index 5eb077922a..9909811448 100644 --- a/packages/efl/edje-native_0.5.0.027.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/edje-utils_0.5.0.027.bb b/packages/efl/edje-utils_0.5.0.032.bb index f8eb917e4d..f8eb917e4d 100644 --- a/packages/efl/edje-utils_0.5.0.027.bb +++ b/packages/efl/edje-utils_0.5.0.032.bb diff --git a/packages/efl/edje_0.5.0.027.bb b/packages/efl/edje_0.5.0.032.bb index d51dd119e4..d51dd119e4 100644 --- a/packages/efl/edje_0.5.0.027.bb +++ b/packages/efl/edje_0.5.0.032.bb diff --git a/packages/efl/eet-native_0.9.10.027.bb b/packages/efl/eet-native_0.9.10.032.bb index fa20c9fb30..7369adc915 100644 --- a/packages/efl/eet-native_0.9.10.027.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/eet_0.9.10.027.bb b/packages/efl/eet_0.9.10.032.bb index 6e6032e098..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.027.bb +++ b/packages/efl/eet_0.9.10.032.bb diff --git a/packages/efl/embryo-native_0.9.1.027.bb b/packages/efl/embryo-native_0.9.1.032.bb index a33adb7bd2..76fe80fe3d 100644 --- a/packages/efl/embryo-native_0.9.1.027.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/embryo-utils_0.9.1.027.bb b/packages/efl/embryo-utils_0.9.1.032.bb index d507c53cce..d507c53cce 100644 --- a/packages/efl/embryo-utils_0.9.1.027.bb +++ b/packages/efl/embryo-utils_0.9.1.032.bb diff --git a/packages/efl/embryo_0.9.1.027.bb b/packages/efl/embryo_0.9.1.032.bb index 0009c0a149..0009c0a149 100644 --- a/packages/efl/embryo_0.9.1.027.bb +++ b/packages/efl/embryo_0.9.1.032.bb diff --git a/packages/efl/esmart-fb_0.9.0.007.bb b/packages/efl/esmart-fb_0.9.0.007.bb index 35bef239ee..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" @@ -7,12 +7,12 @@ myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ esmart_text_entry/Esmart_Text_Entry.h \ - esmart_textarea/Esmart_Textarea.h \ +# esmart_textarea/Esmart_Textarea.h esmart_thumb/Esmart_Thumb.h" mylibraries = "esmart_container \ esmart_draggies \ esmart_file_dialog \ esmart_text_entry \ - esmart_textarea \ +# esmart_textarea esmart_thumb" 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/esmart/disable-x-only-features.patch b/packages/efl/esmart/disable-x-only-features.patch index 54638841ee..68dd363f74 100644 --- a/packages/efl/esmart/disable-x-only-features.patch +++ b/packages/efl/esmart/disable-x-only-features.patch @@ -3,20 +3,21 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- esmart-0.9.0.004/src/lib/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/lib/Makefile.am -@@ -1,8 +1,5 @@ +--- esmart-0.9.0.007/src/lib/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/lib/Makefile.am +@@ -1,9 +1,7 @@ SUBDIRS = \ esmart_container \ - esmart_draggies \ esmart_text_entry \ esmart_file_dialog \ - esmart_thumb \ -- esmart_trans_x11 \ -- esmart_textarea +- esmart_trans_x11 + esmart_thumb ---- esmart-0.9.0.004/src/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/Makefile.am + + # esmart_textarea +--- esmart-0.9.0.007/src/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in diff --git a/packages/efl/evas-fb_0.9.9.027.bb b/packages/efl/evas-fb_0.9.9.032.bb index 3f7847874c..3e29b80cc0 100644 --- a/packages/efl/evas-fb_0.9.9.027.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.027.bb b/packages/efl/evas-native_0.9.9.032.bb index cbcbe304e9..68dacbc809 100644 --- a/packages/efl/evas-native_0.9.9.027.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.027.bb b/packages/efl/evas-x11_0.9.9.032.bb index b5318093a9..7555ecb2b0 100644 --- a/packages/efl/evas-x11_0.9.9.027.bb +++ b/packages/efl/evas-x11_0.9.9.032.bb @@ -1,5 +1,5 @@ -include evas.inc -DEPENDS += "edb virtual/x11 libxext freetype" +require evas.inc +DEPENDS += "edb virtual/libx11 libxext freetype" PR = "r7" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ 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 38a9541fdf..e7814971c3 100644 --- a/packages/efl/imlib2-x11_1.2.2.001.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb @@ -1,5 +1,5 @@ -include imlib2.inc -DEPENDS += "virtual/x11 libxext" +require imlib2.inc +DEPENDS += "virtual/libx11 libxext" PR = "r1" EXTRA_OECONF = "--disable-mmx \ 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 new file mode 100644 index 0000000000..8b598bf21f --- /dev/null +++ b/packages/emacs/emacs-x11_20060801.bb @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000000..8fdba95742 --- /dev/null +++ b/packages/emacs/emacs-x11_cvs.bb @@ -0,0 +1,5 @@ +require emacs_cvs.bb +# full X (non-diet) is needed for X support +DEPENDS += "libx11" +EXTRA_OECONF = "--without-sound" +RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb new file mode 100644 index 0000000000..aa72944eca --- /dev/null +++ b/packages/emacs/emacs_20060801.bb @@ -0,0 +1,3 @@ +require emacs_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index e1ab949d0a..4e7255e61c 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -3,27 +3,36 @@ HOMEPAGE = "http://www.gnu.org/software/emacs/" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "editor" -# full X (non-diet) is needed for X support -DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" -PR = "r2" +#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 = "r7" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \ file://use-qemu.patch;patch=1" -# http://fabrice.bellard.free.fr/qemu/qemu-gnemul-0.5.3.tar.gz" S = "${WORKDIR}/emacs" inherit autotools -#EXTRA_OECONF = "--without-x" +PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" -#QEMU = "/usr/bin/qemu-arm -L ${WORKDIR}/usr/local/gnemul/qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" -QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" +FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ + ${datadir}/emacs/22.0.50/*/*/*.el.gz" +FILES_${PN} += "${datadir}/emacs" + +QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" -do_compile_prepend() { +EXTRA_OECONF = "--without-sound --without-x" + +do_bootstrap() { + cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h @@ -32,3 +41,11 @@ do_compile_prepend() { cd "${S}" make bootstrap } + +addtask bootstrap before do_compile after do_configure + +do_compile_prepend() { + cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" + export QEMU="${QEMU}" +} diff --git a/packages/emacs/files/use-qemu.patch b/packages/emacs/files/use-qemu.patch index b23f1d631e..f27c926e3e 100644 --- a/packages/emacs/files/use-qemu.patch +++ b/packages/emacs/files/use-qemu.patch @@ -34,6 +34,18 @@ diff -Nur emacs~/lib-src/Makefile.in emacs/lib-src/Makefile.in /* We need the following in order to create a <getopt.h> when the system doesn't have one that works with the given compiler. */ +diff -Nur emacs~/lisp/Makefile.in emacs/lisp/Makefile.in +--- emacs~/lisp/Makefile.in 2006-07-25 09:45:55.000000000 -0700 ++++ emacs/lisp/Makefile.in 2006-07-26 14:09:59.000000000 -0700 +@@ -28,7 +28,7 @@ + # You can specify a different executable on the make command line, + # e.g. "make EMACS=../src/emacs ...". + +-EMACS = ../src/emacs ++EMACS = ${QEMU} ../src/emacs + + # Command line flags for Emacs. This must include --multibyte, + # otherwise some files will not compile. diff -Nur emacs~/src/Makefile.in emacs/src/Makefile.in --- emacs~/src/Makefile.in 2006-07-25 09:46:16.000000000 -0700 +++ emacs/src/Makefile.in 2006-07-26 07:37:44.000000000 -0700 diff --git a/packages/esmtp/esmtp_0.4.1.bb b/packages/esmtp/esmtp_0.5.1.bb index 081c7ab208..2ab587a505 100644 --- a/packages/esmtp/esmtp_0.4.1.bb +++ b/packages/esmtp/esmtp_0.5.1.bb @@ -1,10 +1,10 @@ -SECTION = "console/network" -LICENSE = "GPL" -DEPENDS = "libesmtp" DESCRIPTION = "ESMTP is a user-configurable relay-only MTA \ with a sendmail-compatible syntax, based on libESMTP and \ supporting the AUTH (including the CRAM-MD5 and NTLM SASL \ mechanisms) and StartTLS SMTP extensions." +SECTION = "console/network" +LICENSE = "GPL" +DEPENDS = "libesmtp" SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2" 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/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb index 8ae7ca38be..6867a39c93 100644 --- a/packages/fakeroot/fakeroot_1.2.13.bb +++ b/packages/fakeroot/fakeroot_1.2.13.bb @@ -6,3 +6,9 @@ LICENSE = "GPL" SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz" inherit autotools + +do_stage() { + install -d ${STAGING_INCDIR}/fakeroot + install -m 644 *.h ${STAGING_INCDIR}/fakeroot + autotools_stage_all +} diff --git a/packages/familiar/familiar-version.bb b/packages/familiar/familiar-version.bb index cd25f7f78e..20d94dbf1c 100644 --- a/packages/familiar/familiar-version.bb +++ b/packages/familiar/familiar-version.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PV = ${DISTRO_VERSION} do_compile() { diff --git a/packages/farsight/farsight_20060322.bb b/packages/farsight/farsight_0.1.5.bb index 994569ac57..ee176dcacd 100644 --- a/packages/farsight/farsight_20060322.bb +++ b/packages/farsight/farsight_0.1.5.bb @@ -1,7 +1,6 @@ DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." HOMEPAGE = "http://farsight.sf.net" -SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2" -PR="r1" +SRC_URI = "http://telepathy.freedesktop.org/releases/farsight/${P}.tar.gz" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" @@ -9,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base" inherit autotools pkgconfig -S= "${WORKDIR}/${PN}" EXTRA_OECONF = " \ --disable-debug \ --disable-gtk-doc \ diff --git a/packages/farsight/gst-plugins-farsight_20060322.bb b/packages/farsight/gst-plugins-farsight_0.10.1.bb index 49f2d2a1f5..5fb44e07c2 100644 --- a/packages/farsight/gst-plugins-farsight_20060322.bb +++ b/packages/farsight/gst-plugins-farsight_0.10.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." HOMEPAGE = "http://farsight.sf.net" -SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2" +SRC_URI = "http://telepathy.freedesktop.org/releases/gst-plugins-farsight/${P}.tar.gz" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" @@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base" inherit autotools pkgconfig -S= "${WORKDIR}/${PN}" EXTRA_OECONF = " \ --disable-debug \ --disable-jrtplib \ diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb index ce0f510c85..2cdf8d53c4 100644 --- a/packages/feh/feh_1.2.6.bb +++ b/packages/feh/feh_1.2.6.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.patch;patch=1" diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb index ce0f510c85..2cdf8d53c4 100644 --- a/packages/feh/feh_1.2.7.bb +++ b/packages/feh/feh_1.2.7.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.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/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 0951d40626..e1cc319f16 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -7,9 +7,10 @@ SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://local.conf" -PR = "r7" +PR = "r8" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb index d12d57a3ff..220f11d1c9 100644 --- a/packages/fontconfig/fontconfig_2.3.91.bb +++ b/packages/fontconfig/fontconfig_2.3.91.bb @@ -6,11 +6,13 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ - file://local.conf" + file://one-j-too-many.patch;patch=1 \ + file://local.conf" -PR = "r1" +PR = "r3" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb index f314b13fc1..5609b10394 100644 --- a/packages/fontconfig/fontconfig_2.3.95.bb +++ b/packages/fontconfig/fontconfig_2.3.95.bb @@ -6,9 +6,10 @@ DEPENDS = "expat freetype freetype-native zlib" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://one-j-too-many.patch;patch=1" -PR = "r1" +PR = "r2" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" DEFAULT_PREFERENCE = "-1" 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/freetype/freetype_2.2.1.bb b/packages/freetype/freetype_2.2.1.bb index 7a3f99f063..6f033cc076 100644 --- a/packages/freetype/freetype_2.2.1.bb +++ b/packages/freetype/freetype_2.2.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Freetype font rendering library" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ @@ -14,6 +14,7 @@ DEFAULT_PREFERENCE = "-1" LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" do_configure() { cd builds/unix diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb index 8b8ca91eef..512f0453a1 100644 --- a/packages/fuse/fuse-module_2.4.2.bb +++ b/packages/fuse/fuse-module_2.4.2.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://fuse.sf.net" DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb index ae52ad0b03..94cd87c603 100644 --- a/packages/fuse/fuse-module_2.5.3.bb +++ b/packages/fuse/fuse-module_2.5.3.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://fuse.sf.net" DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb index 27abd3a898..a51c659153 100644 --- a/packages/fuse/fuse_2.4.2.bb +++ b/packages/fuse/fuse_2.4.2.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://fuse.sf.net" DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE_${PN} = "LGPL" diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index 229b38f2d7..8aa1f3578d 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://fuse.sf.net" DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE_${PN} = "LGPL" diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb index fbac857024..169b42d1f3 100644 --- a/packages/fuse/gmailfs_0.6.bb +++ b/packages/fuse/gmailfs_0.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium." HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html" -MAINTAINER = "koen Kooi <koen@handhelds.org>" +MAINTAINER = "koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" DEPENDS = "fuse libgmail python-fuse" diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb index d147d829b3..70c502be82 100644 --- a/packages/fuse/sshfs-fuse_1.3.bb +++ b/packages/fuse/sshfs-fuse_1.3.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE_${PN} = "LGPL" 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/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb index 22257b6f44..508c8c9323 100644 --- a/packages/galago/galago-daemon_0.3.4.bb +++ b/packages/galago/galago-daemon_0.3.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Galago is a desktop presence framework, designed to transmit presence information between programs." HOMEPAGE = "http://www.galago-project.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" DEPENDS = "gettext libgalago dbus glib-2.0" PR = "r1" diff --git a/packages/galago/libgalago_0.3.3.bb b/packages/galago/libgalago_0.3.3.bb index 85f4097806..63a0b8230a 100644 --- a/packages/galago/libgalago_0.3.3.bb +++ b/packages/galago/libgalago_0.3.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Galago is a desktop presence framework, designed to transmit presence information between programs." HOMEPAGE = "http://www.galago-project.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "LGPL" DEPENDS = "gettext dbus glib-2.0" PR = "r1" 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..4fccaf3888 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -1,9 +1,10 @@ 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']]}" PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" +PACKAGES = "" # This is intended to be a -very- basic config EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ 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/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 4b1f8f68e8..ea771a334b 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -7,6 +7,7 @@ OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" +PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*" PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index d15664549e..6260a51533 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -17,8 +17,8 @@ JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" # gcc4-build sets this to f95 -FORTRAN ?= "f77" -LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}" +FORTRAN ?= ",f77" +LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ --with-gnu-ld \ 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/gcc4-build.inc b/packages/gcc/gcc4-build.inc index a2061194d7..b8a214a590 100644 --- a/packages/gcc/gcc4-build.inc +++ b/packages/gcc/gcc4-build.inc @@ -1,4 +1,4 @@ -FORTRAN = "f95" +FORTRAN = ",f95" HAS_GFORTRAN ?= "yes" HAS_G2C = "no" 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 35124823a0..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 " @@ -37,7 +39,8 @@ HAS_G2C = "no" #Set the java bits JAVA_arm = "" -include gcc3-build.inc +LANGUAGES = "c,c++" +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/udev/udev-071/.mtn2git_empty b/packages/gdal/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-071/.mtn2git_empty +++ b/packages/gdal/.mtn2git_empty diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb new file mode 100644 index 0000000000..70f435603c --- /dev/null +++ b/packages/gdal/gdal_1.3.2.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "GDAL is a translator library for raster geospatial data formats" +HOMEPAGE = "http://www.gdal.org/" +LICENSE = "MIT" +DEPENDS = "zlib" + +SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +EXTRA_OECONF = "--without-perl \ + --without-python \ + --without-php \ + --without-ruby \ + --with-libz=internal \ + --with-png=internal \ + --with-jpeg=internal \ + --with-libtiff=internal \ + " + +do_configure_append() { + sed -i s:/usr/lib:${D}${libdir}: GDALmake.opt + sed -i s:/usr/bin:${D}${bindir}: GDALmake.opt + sed -i s:/usr/share:${D}${datadir}: GDALmake.opt + sed -i s:/usr/include:${D}${includedir}: GDALmake.opt +} + +do_compile() { + oe_runmake default +} + + +do_package_prepend() { + # the brokenness.... + 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/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb new file mode 100644 index 0000000000..9a290a3e67 --- /dev/null +++ b/packages/gdb/gdb_6.4.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" +MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" +DEPENDS = "ncurses readline" +RDEPENDS_openmn = "libthread-db1" + +PACKAGES =+ 'gdbserver ' +FILES_gdbserver = '${bindir}/gdbserver' + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ +#FIXME: file://uclibc.patch;patch=1 \ + file://kill_arm_map_symbols.patch;patch=1 \ + file://gdbserver-cflags-last.diff;patch=1;pnum=0" + +LDFLAGS_append = " -s" +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export CFLAGS_append=" -L${STAGING_LIBDIR}" +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" + +EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ + --with-curses --disable-multilib --with-readline --disable-sim \ + --program-prefix=''" + +S = "${WORKDIR}/gdb-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +do_install () { + make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 + oe_runmake DESTDIR='${D}' install + install -d ${D}${bindir} + install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} +} diff --git a/packages/geda/geda-gattrib_20050820.bb b/packages/geda/geda-gattrib_20050820.bb index 3267330764..fa73a2454a 100644 --- a/packages/geda/geda-gattrib_20050820.bb +++ b/packages/geda/geda-gattrib_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" FILES_${PN} += "${datadir}/gEDA" diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-gnetlist_20050820.bb index aec9007906..402ad0f56a 100644 --- a/packages/geda/geda-gnetlist_20050820.bb +++ b/packages/geda/geda-gnetlist_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" PR = "r0" diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-gschem_20050820.bb index 984e04e520..441acbd2d6 100644 --- a/packages/geda/geda-gschem_20050820.bb +++ b/packages/geda/geda-gschem_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" PR = "r1" diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-gsymcheck_20050820.bb index aec9007906..402ad0f56a 100644 --- a/packages/geda/geda-gsymcheck_20050820.bb +++ b/packages/geda/geda-gsymcheck_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" PR = "r0" diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb index aec9007906..402ad0f56a 100644 --- a/packages/geda/geda-symbols_20050820.bb +++ b/packages/geda/geda-symbols_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" PR = "r0" diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_20050820.bb index 27092492fe..a7a4d84826 100644 --- a/packages/geda/geda-utils_20050820.bb +++ b/packages/geda/geda-utils_20050820.bb @@ -1,5 +1,5 @@ DESCRIPTION = "gEDA/gaf's Utilities" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" FILES_${PN} += "${datadir}/gEDA" diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb index 84918d63b2..77a2765512 100644 --- a/packages/geda/geda_20050820.bb +++ b/packages/geda/geda_20050820.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GUI/Project Manager for teh gEDA suite" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" FILES_${PN} += "${datadir}/gEDA" diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb index 8bc1c7cd1a..8e8046ccef 100644 --- a/packages/geda/libgeda_20050820.bb +++ b/packages/geda/libgeda_20050820.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" PR = "r1" 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.inc b/packages/giblib/giblib.inc index 33f59d407c..05efc330ec 100644 --- a/packages/giblib/giblib.inc +++ b/packages/giblib/giblib.inc @@ -3,7 +3,7 @@ DESCRIPTION = "giblib is a utility library that incorporates doubly linked \ lists, some string functions, and a wrapper for imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "BSD" -DEPENDS = "imlib2" +DEPENDS = "virtual/imlib2" SRC_URI = "http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \ file://binconfig.patch;patch=1" 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/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb index 59fb0a0467..8a9c52a1ce 100644 --- a/packages/gimp/gimp_2.2.10.bb +++ b/packages/gimp/gimp_2.2.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2" diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index e469f3c101..eb760ec9d8 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ file://configure-libwmf.patch;patch=1" diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb index 89d9be3e8d..cca90f5355 100644 --- a/packages/gimp/gimp_2.3.7.bb +++ b/packages/gimp/gimp_2.3.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb index 84b35b1e8d..af1b91d03b 100644 --- a/packages/gimp/gimp_2.3.8.bb +++ b/packages/gimp/gimp_2.3.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ file://configure-libwmf.patch;patch=1" 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/xfonts/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xfonts/.mtn2git_empty +++ b/packages/glib-2.0/glib-2.0-2.12.1/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.12.1/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.1/configure-libtool.patch new file mode 100644 index 0000000000..478ef132af --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.1/configure-libtool.patch @@ -0,0 +1,20 @@ +--- glib-2.12.0/configure.in.orig 2006-07-07 09:21:56.000000000 +0100 ++++ glib-2.12.0/configure.in 2006-07-07 09:25:44.000000000 +0100 +@@ -1169,7 +1169,7 @@ + dnl No use for this on Win32 + G_MODULE_LDFLAGS= + else +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1234,7 +1234,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ diff --git a/packages/glib-2.0/glib-2.0_2.12.1.bb b/packages/glib-2.0/glib-2.0_2.12.1.bb new file mode 100644 index 0000000000..c796f08090 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.1.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r0" + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} + autotools_stage_includes + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} 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-package.bbclass b/packages/glibc/glibc-package.bbclass index 2b0a63af90..3ce10b54de 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -25,20 +25,21 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions BINARY_LOCALE_ARCHES ?= "arm.*" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*" +PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* libc6*" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" -FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" +FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "/lib/libSegFault*" FILES_glibc-extra-nss = "/lib/libnss*" FILES_sln = "/sbin/sln" FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" -FILES_glibc-utils = "${bindir} ${sbindir}" -FILES_glibc-gconv = "${libdir}/gconv" +FILES_glibc-utils = "${bindir}/* ${sbindir}/*" +FILES_glibc-gconv = "${libdir}/gconv/*" +FILES_${PN}-dbg += " ${libdir}/gconv/.debug" FILES_catchsegv = "${bindir}/catchsegv" RDEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" @@ -80,7 +81,7 @@ do_install() { rm -f ${D}/etc/rpc } -TMP_LOCALE="/tmp/locale/${libdir}/locale" +TMP_LOCALE="/tmp/locale${libdir}/locale" locale_base_postinst() { #!/bin/sh @@ -198,12 +199,7 @@ python package_do_split_gconvs () { if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='', aux_files_pattern_verbatim=binary_locales_dir + '/%s') - else: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') - bb.note("generation of binary locales disabled. this may break i18n!") + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") @@ -242,8 +238,12 @@ python package_do_split_gconvs () { target_arch = bb.data.getVar("TARGET_ARCH", d, 1) qemu = "qemu-%s" % target_arch pkgname = 'locale-base-' + legitimize_package_name(name) - - bb.data.setVar('RDEPENDS_%s' % pkgname, 'glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + m = re.match("(.*)\.(.*)", name) + if m: + glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + glibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: @@ -256,7 +256,7 @@ python package_do_split_gconvs () { path = bb.data.getVar("PATH", d, 1) i18npath = os.path.join(treedir, datadir, "i18n") - localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, locale) + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): @@ -275,20 +275,33 @@ python package_do_split_gconvs () { bb.build.exec_func("do_prep_locale_tree", d) # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] for l in encodings.keys(): if len(encodings[l]) == 1: output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) else: if "UTF-8" in encodings[l]: output_locale(l, l, "UTF-8") encodings[l].remove("UTF-8") + else: + non_utf8.append(l) for e in encodings[l]: - output_locale('%s-%s' % (l, e), l, e) + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) if use_bin: bb.note("collecting binary locales from locale tree") bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + } # We want to do this indirection so that we can safely 'return' diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 86f1aaa26d..d4bd52f89a 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r10" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" @@ -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 07b9abb27c..2857767774 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r17" +PR = "r22" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -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 9b7c10642a..f1c9c1ce69 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" -PR = "r6" +PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" @@ -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 2e10d21914..fdd91172c9 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r2" +PR = "r7" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -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 132c2a0b4c..092964e5ae 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r2" +PR = "r7" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -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 0abe8f5742..a5957c476e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r0" +PR = "r5" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -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 f5421139cf..1c0c0f9124 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r8" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" @@ -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 fbab2d7afc..31105c8adb 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r8" +PR = "r12" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -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://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \ file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \ file://etc/ld.so.conf \ @@ -186,4 +187,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 c45bd1b5e5..5d8df56280 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" DEFAULT_PREFERENCE = "-1" -PR = "r5" +PR = "r10" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" @@ -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 0390b87535..9dc41dd238 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r0" +PR = "r5" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" @@ -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/gnome/gnome-menus_2.10.2.bb b/packages/gnome/gnome-menus_2.10.2.bb index 9d7bc675f2..53b66a6e9b 100644 --- a/packages/gnome/gnome-menus_2.10.2.bb +++ b/packages/gnome/gnome-menus_2.10.2.bb @@ -1,7 +1,7 @@ DEPENDS = "gnome-vfs libxml2 gconf popt gtk+" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit gnome pkgconfig diff --git a/packages/gnome/gnome-menus_2.12.0.bb b/packages/gnome/gnome-menus_2.12.0.bb index 87f5a0d2b9..ff65f1f9ad 100644 --- a/packages/gnome/gnome-menus_2.12.0.bb +++ b/packages/gnome/gnome-menus_2.12.0.bb @@ -1,7 +1,7 @@ DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit gnome pkgconfig diff --git a/packages/gnome/gnome-panel_2.10.1.bb b/packages/gnome/gnome-panel_2.10.1.bb index 09e4259fc8..3d7ce2f392 100644 --- a/packages/gnome/gnome-panel_2.10.1.bb +++ b/packages/gnome/gnome-panel_2.10.1.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus" inherit gnome pkgconfig diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch new file mode 100644 index 0000000000..38480c21e1 --- /dev/null +++ b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch @@ -0,0 +1,78 @@ +--- trunk/dbus-daemon/vfs-daemon.c.orig 2006-08-09 10:43:26.000000000 +0100 ++++ trunk/dbus-daemon/vfs-daemon.c 2006-08-09 10:45:59.000000000 +0100 +@@ -91,7 +91,7 @@ + g_warning ("Failed to acquire vfs-daemon service: %s", error.message); + dbus_error_free (&error); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -101,7 +101,7 @@ + if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) { + g_printerr ("VFS daemon already running, exiting.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -111,7 +111,7 @@ + if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_printerr ("Not primary owner of the service, exiting.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -124,7 +124,7 @@ + NULL)) { + g_printerr ("Failed to register object with D-BUS.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -152,7 +152,7 @@ + return; + } + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + } + +--- trunk/dbus-daemon/daemon-connection.c.orig 2006-08-09 10:43:32.000000000 +0100 ++++ trunk/dbus-daemon/daemon-connection.c 2006-08-09 10:46:26.000000000 +0100 +@@ -321,7 +321,7 @@ + d(g_print ("Last unref\n")); + + if (dbus_connection_get_is_connected (conn->conn)) { +- dbus_connection_disconnect (conn->conn); ++ dbus_connection_close (conn->conn); + } + dbus_connection_unref (conn->conn); + +--- trunk/dbus-daemon/dbus-method.c.orig 2006-08-09 10:43:38.000000000 +0100 ++++ trunk/dbus-daemon/dbus-method.c 2006-08-09 10:46:57.000000000 +0100 +@@ -220,7 +220,7 @@ + if (!dbus_connection_add_filter (dbus_conn, message_handler, + NULL, NULL)) { + g_warning ("Failed to add filter to the connection."); +- dbus_connection_disconnect (dbus_conn); ++ dbus_connection_close (dbus_conn); + dbus_connection_unref (dbus_conn); + + dbus_conn = NULL; +@@ -1666,7 +1666,7 @@ + vfs_module_shutdown (GnomeVFSMethod* method) + { + if (dbus_conn) { +- dbus_connection_disconnect (dbus_conn); ++ dbus_connection_close (dbus_conn); + dbus_connection_unref (dbus_conn); + + dbus_conn = NULL; diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb index 466d52adbe..7a48fb6ca3 100644 --- a/packages/gnome/gnome-vfs-dbus_svn.bb +++ b/packages/gnome/gnome-vfs-dbus_svn.bb @@ -18,7 +18,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=htt file://glib-after-nameser.patch;patch=1;pnum=1 \ file://gtk-doc.m4 \ file://gtk-doc.make \ - file://werror_compile.patch;patch=1;pnum=1" + file://werror_compile.patch;patch=1;pnum=1 \ + file://dbus-api-change.patch;patch=1" EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc" S = "${WORKDIR}/trunk" diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 7ee1a1877e..33a4f16d06 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -7,11 +7,12 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "libsoup-2.2*" FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}" -FILES_${PN}-doc = "${datadir}" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" do_stage() { autotools_stage_all - install -m 0644 ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.96.bb new file mode 100644 index 0000000000..33a4f16d06 --- /dev/null +++ b/packages/gnome/libsoup_2.2.96.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +DESCRIPTION = "An HTTP library implementation in C" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" +DEPENDS = "glib-2.0 gnutls libxml2" +MAINTAINER = "Chris Lord <chris@openedhand.com>" + +inherit autotools pkgconfig + +PACKAGES_DYNAMIC = "libsoup-2.2*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" + +do_stage() { + autotools_stage_all + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc +} 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/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.6.3.bb index 0fc45bbd63..7fa400e6d8 100644 --- a/packages/gnumeric/gnumeric_1.6.3.bb +++ b/packages/gnumeric/gnumeric_1.6.3.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/utils" S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" DESCRIPTION = "Gnumeric spreadsheet for GNOME" 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/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index c742177499..948dc579b3 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -4,7 +4,7 @@ SECTION = "console/scientific" LICENSE = "BSD-4" PRIORITY = "optional" MAINTAINER = "Philip Frampton" -DEPENDS = "virtual/x11 libpng gd readline" +DEPENDS = "virtual/libx11 libpng gd readline" PR = "r3" SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb index 1e22617806..76dd844db8 100644 --- a/packages/gnutls/gnutls_1.0.23.bb +++ b/packages/gnutls/gnutls_1.0.23.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" DEPENDS = "zlib libgcrypt" -PR = "r5" +PR = "r6" LICENSE = "LGPL" @@ -26,5 +26,8 @@ do_stage() { oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} autotools_stage_includes + + install -d ${STAGING_DATADIR}/aclocal + cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/gnutls/gnutls_1.0.25.bb b/packages/gnutls/gnutls_1.0.25.bb index 3b169317de..4b4b63c63c 100644 --- a/packages/gnutls/gnutls_1.0.25.bb +++ b/packages/gnutls/gnutls_1.0.25.bb @@ -1,5 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" DEPENDS = "zlib libgcrypt" +PR = "r2" LICENSE = "LGPL" @@ -25,5 +26,8 @@ do_stage() { oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} autotools_stage_includes + + install -d ${STAGING_DATADIR}/aclocal + cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/gnutls/gnutls_1.3.5.bb b/packages/gnutls/gnutls_1.3.5.bb index df007739be..18b3b03ee2 100644 --- a/packages/gnutls/gnutls_1.3.5.bb +++ b/packages/gnutls/gnutls_1.3.5.bb @@ -3,7 +3,7 @@ DEPENDS = "zlib libgcrypt lzo" MAINTAINER = "Eric Shattow <lucent@gmail.com>" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-${PV}.tar.bz2 \ file://gnutls-openssl.patch;patch=1 \ @@ -32,5 +32,8 @@ do_stage() { oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} autotools_stage_includes + + install -d ${STAGING_DATADIR}/aclocal + cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb index 3c48bc95ff..a425c3498a 100644 --- a/packages/gnutls/gnutls_1.4.0.bb +++ b/packages/gnutls/gnutls_1.4.0.bb @@ -3,6 +3,7 @@ DEPENDS = "zlib libgcrypt lzo" MAINTAINER = "Eric Shattow <lucent@gmail.com>" HOMEPAGE = "http://www.gnu.org/software/gnutls/" LICENSE = "LGPL" +PR = "r1" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ file://gnutls-openssl.patch;patch=1 \ @@ -11,6 +12,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ inherit autotools binconfig PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" +PACKAGES_DYNAMIC = "libgnutls*" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" FILES_${PN} = "${libdir}/libgnutls.so.*" @@ -30,5 +32,8 @@ do_stage() { oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} autotools_stage_includes + + install -d ${STAGING_DATADIR}/aclocal + cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/gobby/net6_1.2.2.bb b/packages/gobby/net6_1.2.2.bb index c6197ace0a..daa7e9b5b9 100644 --- a/packages/gobby/net6_1.2.2.bb +++ b/packages/gobby/net6_1.2.2.bb @@ -1,6 +1,6 @@ LICENSE = "LGPL" HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libsigc++-2.0" inherit autotools pkgconfig diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index 365c81cafd..2189ef12fd 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -1,15 +1,15 @@ -DESCRIPTION = "Gomunicator is a GSM Voice and SMS application for GPE" -HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" +DESCRIPTION = "Gomunicator is a GSM Voice and SMS application for GPE" +HOMEPAGE = "http://projects.linuxtogo.org/projects/gomunicator" LICENSE = "GPLv2" AUTHOR = "Robert Woerle" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib" -#Remove the dash below when 0.1.3 changes in PV -PV = "0.1.3+cvs-${SRCDATE}" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" +DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib dbus-glib" + +PV = "0.1.3+cvs${SRCDATE}" inherit autotools pkgconfig -SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;module=gomunicator" +SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/gomunicator;module=gomunicator" S = "${WORKDIR}/${PN}" do_install_append() { diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb index 3cdd2b6b76..5f2ee4f122 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb @@ -1,5 +1,5 @@ SECTION = "gpe" -DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11" +DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" LICENSE = "GPL" diff --git a/packages/gpe-autostarter/gpe-autostarter_0.7.bb b/packages/gpe-autostarter/gpe-autostarter_0.7.bb index 1f6ef0f7cc..5e6fe34c10 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.7.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.7.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "gpe" -DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11" +DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" inherit gpe diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb index dc1b439d04..dcf8640611 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCIPTION = "Buttonbox for gpe" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libgpewidget libgpelaunch" diff --git a/packages/gpe-conf/gpe-conf_0.1.25.bb b/packages/gpe-conf/gpe-conf_0.1.25.bb deleted file mode 100644 index 533c0a0436..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.25.bb +++ /dev/null @@ -1,26 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" - -inherit gpe -PR="r0" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-conf/gpe-conf_0.1.26.bb b/packages/gpe-conf/gpe-conf_0.1.26.bb deleted file mode 100644 index 54b3ddabdd..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.26.bb +++ /dev/null @@ -1,27 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" - -inherit gpe -PR="r0" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-conf/gpe-conf_0.1.27.bb b/packages/gpe-conf/gpe-conf_0.1.27.bb deleted file mode 100644 index 54b3ddabdd..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.27.bb +++ /dev/null @@ -1,27 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" - -inherit gpe -PR="r0" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-conf/gpe-conf_0.1.28.bb b/packages/gpe-conf/gpe-conf_0.1.28.bb deleted file mode 100644 index b621796e89..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.28.bb +++ /dev/null @@ -1,27 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" - -inherit gpe -PR="r0" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-conf/gpe-conf_0.1.29.bb b/packages/gpe-conf/gpe-conf_0.1.29.bb deleted file mode 100644 index 16d776a88f..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.29.bb +++ /dev/null @@ -1,27 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" -MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" - -inherit gpe -PR="r0" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-conf/gpe-conf_0.2.1.bb b/packages/gpe-conf/gpe-conf_0.2.1.bb new file mode 100644 index 0000000000..9cb5b6b059 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.1.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +PR="r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" + +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + + diff --git a/packages/gpe-conf/gpe-conf_0.2.2.bb b/packages/gpe-conf/gpe-conf_0.2.2.bb new file mode 100644 index 0000000000..9cb5b6b059 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.2.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +PR="r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" + +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + + 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..dadb085f06 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" - -DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" SECTION = "gpe" + +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib" 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-edit/gpe-edit_0.21.bb b/packages/gpe-edit/gpe-edit_0.21.bb deleted file mode 100644 index 54bdcbe3b9..0000000000 --- a/packages/gpe-edit/gpe-edit_0.21.bb +++ /dev/null @@ -1,8 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" -FILES_${PN} = "/etc ${bindir} ${datadir}/pixmaps ${datadir}/applications" diff --git a/packages/gpe-edit/gpe-edit_0.22.bb b/packages/gpe-edit/gpe-edit_0.22.bb deleted file mode 100644 index 68d9f5a726..0000000000 --- a/packages/gpe-edit/gpe-edit_0.22.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -PR = "r1" - -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" - -SRC_URI = "${GPE_MIRROR}/gpe-edit-${PV}.tar.gz \ - file://toolbar.patch;patch=1;pnum=0" diff --git a/packages/gpe-edit/gpe-edit_0.23.bb b/packages/gpe-edit/gpe-edit_0.23.bb deleted file mode 100644 index d416ed96cb..0000000000 --- a/packages/gpe-edit/gpe-edit_0.23.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -PR = "r1" - -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" - -SRC_URI = "${GPE_MIRROR}/gpe-edit-${PV}.tar.gz \ - file://desktop-categories.patch;patch=1" - diff --git a/packages/gpe-edit/gpe-edit_0.28.bb b/packages/gpe-edit/gpe-edit_0.31.bb index 676e2e7cda..fe003fe338 100644 --- a/packages/gpe-edit/gpe-edit_0.28.bb +++ b/packages/gpe-edit/gpe-edit_0.31.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe -DEPENDS = "gtk+ libdisplaymigration libgpewidget" +DEPENDS = "gtk+ libgpewidget" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" DESCRIPTION = "Editor for the GPE Palmtop Environment" diff --git a/packages/gpe-fsi/gpe-fsi_0.1.bb b/packages/gpe-fsi/gpe-fsi_0.1.bb index 1fc604ff10..1092674485 100644 --- a/packages/gpe-fsi/gpe-fsi_0.1.bb +++ b/packages/gpe-fsi/gpe-fsi_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GPE frontend for libfsi-client" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "gpl" inherit gpe diff --git a/packages/gpe-icons/gpe-icons_0.22.bb b/packages/gpe-icons/gpe-icons_0.22.bb deleted file mode 100644 index 4b04474b9a..0000000000 --- a/packages/gpe-icons/gpe-icons_0.22.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "" -RDEPENDS = "gdk-pixbuf-loader-png" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Common icons for GPE" -FILES_${PN} = "${datadir}/gpe" diff --git a/packages/gpe-icons/gpe-icons_0.24.bb b/packages/gpe-icons/gpe-icons_0.24.bb deleted file mode 100644 index 6c5aa05934..0000000000 --- a/packages/gpe-icons/gpe-icons_0.24.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "gtk+" -RDEPENDS = "gdk-pixbuf-loader-png" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Common icons for GPE" -FILES_${PN} = "${datadir}/gpe" - diff --git a/packages/gpe-icons/gpe-icons_0.25.bb b/packages/gpe-icons/gpe-icons_0.25.bb index 6c5aa05934..8b57800f23 100644 --- a/packages/gpe-icons/gpe-icons_0.25.bb +++ b/packages/gpe-icons/gpe-icons_0.25.bb @@ -1,9 +1,16 @@ -inherit gpe +DESCRIPTION = "Common icons for GPE" LICENSE = "GPL" -DEPENDS = "gtk+" +SECTION = "gpe" + RDEPENDS = "gdk-pixbuf-loader-png" + MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Common icons for GPE" + +inherit gpe + +PR = "r1" + +#only icons present in the package +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}/gpe" diff --git a/packages/xhost/.mtn2git_empty b/packages/gpe-screenshot/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xhost/.mtn2git_empty +++ b/packages/gpe-screenshot/files/.mtn2git_empty diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch new file mode 100644 index 0000000000..dc185a9b51 --- /dev/null +++ b/packages/gpe-screenshot/files/fix-segfault.patch @@ -0,0 +1,36 @@ +Index: src/gpe-screenshot.c +=================================================================== +RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -r1.1 -r1.2 +--- src/gpe-screenshot.c 1 Nov 2005 20:54:38 -0000 1.1 ++++ src/gpe-screenshot.c 10 Aug 2006 15:07:21 -0000 1.2 +@@ -334,10 +334,9 @@ + { + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); + +- g_object_set (mainDlg->ok_button, "use-stock", FALSE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", "_Upload"); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_use_stock (mainDlg->ok_button, FALSE); ++ gtk_button_set_label (mainDlg->ok_button, "_Upload"); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE); +@@ -347,10 +346,9 @@ + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); + + /* for some odd reason use-stock doesn't have any effect. set the image manually...*/ +- g_object_set (mainDlg->ok_button, "use-stock", TRUE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE); ++ gtk_button_set_use_stock (mainDlg->ok_button, TRUE); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE); diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-screenshot/gpe-screenshot_0.4.bb index 283d28d5aa..b64bdceb04 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-screenshot/gpe-screenshot_0.4.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libglade" inherit gpe autotools + +SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 " diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb index 5f62983faa..8bd4260184 100644 --- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb +++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "gpe" inherit gpe -DEPENDS = "virtual/x11 esound-gpe" +DEPENDS = "virtual/libx11 esound-gpe" RDEPENDS_${PN} = "esd" SRC_URI += "file://makefile-breakage.patch;patch=1" 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-themes/gpe-theme-e17_0.1.bb b/packages/gpe-themes/gpe-theme-e17_0.1.bb new file mode 100644 index 0000000000..9ba24d595f --- /dev/null +++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GTK+ enlightenment theme adjusted for GPE" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" +LICENSE = "MIT + GPL" +PR= "r0" + +#it doesn't really depends on it, but it's nice to make OE build it +RDEPENDS = "gtk+" + +FILES_${PN} = "${datadir}/themes/" +SRC_URI = "http://linuxtogo.org/~koen/gpe/themes/${P}.tar.gz" + +do_install() { +install -d ${D}${datadir}/themes/ +cp -R ${WORKDIR}/usr/share/themes/e17-bling/ ${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 new file mode 100644 index 0000000000..b76e173d16 --- /dev/null +++ b/packages/gpe-todo/gpe-todo_0.56.bb @@ -0,0 +1,3 @@ +require gpe-todo.inc + +DEPENDS += "gtk+ libgpepimc" diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb index d9d800e38b..7744a9d2c0 100644 --- a/packages/gpe-what/gpe-what_0.30.bb +++ b/packages/gpe-what/gpe-what_0.30.bb @@ -3,7 +3,7 @@ SECTION = "gpe" inherit gpe DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" MAINTAINER = "Phil Blundell <pb@handhelds.org>" do_compile_prepend() { diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb index a82e6e26cb..6d902f6a2e 100644 --- a/packages/gpe-what/gpe-what_0.31.bb +++ b/packages/gpe-what/gpe-what_0.31.bb @@ -3,5 +3,5 @@ SECTION = "gpe" inherit gpe DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxpm libmatchbox" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb index ed72a37b1e..dcaa848124 100644 --- a/packages/gpe-what/gpe-what_0.33.bb +++ b/packages/gpe-what/gpe-what_0.33.bb @@ -5,5 +5,5 @@ inherit gpe SRC_URI += "file://makefile-fix.patch;patch=1" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxpm libmatchbox" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.41.bb +++ b/packages/gpe-what/gpe-what_0.41.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.42.bb +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.43.bb +++ b/packages/gpe-what/gpe-what_0.43.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb index e21769f33a..bd83a42c53 100644 --- a/packages/gpe-what/gpe-what_cvs.bb +++ b/packages/gpe-what/gpe-what_cvs.bb @@ -10,4 +10,4 @@ inherit autotools gpe SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb index 94ce44f30e..bafbfbb5ad 100644 --- a/packages/gpesyncd/gpesyncd_cvs.bb +++ b/packages/gpesyncd/gpesyncd_cvs.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "Sync daemon for GPE and OpenSync" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd" 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/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index a01f12d094..e1ea27cac0 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -9,7 +9,7 @@ PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb index 3ee6daf247..b7553b404d 100644 --- a/packages/gsoap/gsoap-native_2.7.7.bb +++ b/packages/gsoap/gsoap-native_2.7.7.bb @@ -1,4 +1,7 @@ require gsoap_${PV}.bb + +DEPENDS = "" + inherit native do_stage() { 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/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 6ebf6560d1..54af128fb4 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Plugins for GStreamer" SECTION = "multimedia" PRIORITY = "optional" MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>" -DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag" -PR = "r0" +DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe" +PR = "r1" # until we have decided for a final naming scheme, # keep using version 0.8 @@ -13,7 +13,7 @@ inherit autotools pkgconfig gconf SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-x --disable-aalib --disable-esd --disable-shout2 \ +EXTRA_OECONF = "--disable-x --disable-aalib --disable-shout2 \ --disable-sdl" acpaths = "-I ${S}/common/m4 -I ${S}/m4" @@ -28,8 +28,8 @@ python populate_packages_prepend () { do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') } -do_stage() { - autotools_stage_all -} +#do_stage() { +# autotools_stage_all +#} ALLOW_EMPTY = "1" diff --git a/packages/xlibs/.mtn2git_empty b/packages/gtk+/gtk+-2.10.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xlibs/.mtn2git_empty +++ b/packages/gtk+/gtk+-2.10.1/.mtn2git_empty diff --git a/packages/gtk+/gtk+-2.10.1/automake-lossage.patch b/packages/gtk+/gtk+-2.10.1/automake-lossage.patch new file mode 100644 index 0000000000..0d423ddbb9 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/automake-lossage.patch @@ -0,0 +1,24 @@ +--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 ++++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 +@@ -52,21 +52,5 @@ + + dist-hook: html + cp -Rp $(srcdir)/html $(distdir) +-else +-html: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-pdf: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-dist-hook: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "*** DISTRIBUTION IS INCOMPLETE" +- echo "***" + endif + diff --git a/packages/gtk+/gtk+-2.10.1/disable-print.patch b/packages/gtk+/gtk+-2.10.1/disable-print.patch new file mode 100644 index 0000000000..1067773f12 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/disable-print.patch @@ -0,0 +1,50 @@ +--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1539,26 +1539,27 @@ + # Printing system checks + ################################################################ + +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) ++#if test "x$CUPS_CONFIG" != "xno"; then ++# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` ++# CUPS_LIBS=`cups-config --libs` ++# ++# CUPS_API_VERSION=`cups-config --api-version` ++# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` ++# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` ++# ++# if test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then ++# AC_DEFINE(HAVE_CUPS_API_1_2) ++# fi ++# ++# AC_SUBST(CUPS_API_MAJOR) ++# AC_SUBST(CUPS_API_MINOR) ++# AC_SUBST(CUPS_CFLAGS) ++# AC_SUBST(CUPS_LIBS) ++#fi ++#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++AM_CONDITIONAL(HAVE_CUPS,false) + + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch new file mode 100644 index 0000000000..d71d839c3c --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch @@ -0,0 +1,11 @@ +--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 +@@ -118,7 +118,7 @@ + tooltips->tips_data_list = NULL; + + tooltips->delay = DEFAULT_DELAY; +- tooltips->enabled = TRUE; ++ tooltips->enabled = FALSE; + tooltips->timer_tag = 0; + tooltips->use_sticky_delay = FALSE; + tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch new file mode 100644 index 0000000000..20481f059b --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch @@ -0,0 +1,236 @@ +--- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 +@@ -29,7 +29,7 @@ + #include "gtkarrow.h" + #include "gtkintl.h" + +-#define MIN_ARROW_SIZE 15 ++#define MIN_ARROW_SIZE 7 + + enum { + PROP_0, +@@ -53,6 +53,8 @@ + guint prop_id, + GValue *value, + GParamSpec *pspec); ++static void gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition); + + GType + gtk_arrow_get_type (void) +@@ -111,6 +113,7 @@ + G_PARAM_READABLE | G_PARAM_WRITABLE)); + + widget_class->expose_event = gtk_arrow_expose; ++ widget_class->size_request = gtk_arrow_size_request; + } + + static void +@@ -166,13 +169,18 @@ + } + + static void ++gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition) ++{ ++ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; ++ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; ++} ++ ++static void + gtk_arrow_init (GtkArrow *arrow) + { + GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); + +- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; +- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; +- + arrow->arrow_type = GTK_ARROW_RIGHT; + arrow->shadow_type = GTK_SHADOW_OUT; + } +--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 +@@ -340,6 +340,9 @@ + static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar, + guint day); + ++static void gtk_calendar_do_select_day (GtkCalendar *calendar, ++ guint day); ++ + static void gtk_calendar_paint_arrow (GtkWidget *widget, + guint arrow); + static void gtk_calendar_paint_day_num (GtkWidget *widget, +@@ -861,13 +864,13 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else + { + if (calendar->selected_day < 0) + calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1]; +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + } + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); +@@ -908,10 +911,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -939,10 +942,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -974,10 +977,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -2480,9 +2483,9 @@ + return TRUE; + } + +-void +-gtk_calendar_select_day (GtkCalendar *calendar, +- guint day) ++static void ++gtk_calendar_do_select_day (GtkCalendar *calendar, ++ guint day) + { + g_return_if_fail (GTK_IS_CALENDAR (calendar)); + g_return_if_fail (day <= 31); +@@ -2499,6 +2502,13 @@ + if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) + gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day); + } ++} ++ ++void ++gtk_calendar_select_day (GtkCalendar *calendar, ++ guint day) ++{ ++ gtk_calendar_do_select_day (calendar, day); + + calendar->selected_day = day; + +--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000 ++++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000 +@@ -557,6 +557,15 @@ + 0.0, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("min_width", ++ _("Minimum width"), ++ _("Minimum width of the entry field"), ++ 0, ++ G_MAXINT, ++ MIN_ENTRY_WIDTH, ++ G_PARAM_READABLE)); ++ + signals[POPULATE_POPUP] = + g_signal_new ("populate_popup", + G_OBJECT_CLASS_TYPE (gobject_class), +@@ -1124,7 +1133,7 @@ + { + GtkEntry *entry = GTK_ENTRY (widget); + PangoFontMetrics *metrics; +- gint xborder, yborder; ++ gint xborder, yborder, min_width; + PangoContext *context; + + gtk_widget_ensure_style (widget); +@@ -1140,9 +1149,11 @@ + + xborder += INNER_BORDER; + yborder += INNER_BORDER; +- ++ ++ gtk_widget_style_get (widget, "min_width", &min_width, NULL); ++ + if (entry->width_chars < 0) +- requisition->width = MIN_ENTRY_WIDTH + xborder * 2; ++ requisition->width = min_width + xborder * 2; + else + { + gint char_width = pango_font_metrics_get_approximate_char_width (metrics); +--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000 +@@ -180,6 +180,7 @@ + static GtkWidgetClass *parent_class = NULL; + static guint signals[LAST_SIGNAL]; + ++static GdkAtom recognize_protocols_atom, atom_atom; + + GType + gtk_range_get_type (void) +@@ -220,6 +221,9 @@ + object_class = (GtkObjectClass*) class; + widget_class = (GtkWidgetClass*) class; + ++ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); ++ atom_atom = gdk_atom_intern ("ATOM", FALSE); ++ + parent_class = g_type_class_peek_parent (class); + + gobject_class->set_property = gtk_range_set_property; +@@ -815,6 +819,12 @@ + &attributes, attributes_mask); + gdk_window_set_user_data (range->event_window, range); + ++ gdk_property_change (range->event_window, ++ recognize_protocols_atom, ++ atom_atom, ++ 32, GDK_PROP_MODE_REPLACE, ++ NULL, 0); ++ + widget->style = gtk_style_attach (widget->style, widget->window); + } + +@@ -1186,7 +1196,7 @@ + + /* ignore presses when we're already doing something else. */ + if (range->layout->grab_location != MOUSE_OUTSIDE) +- return FALSE; ++ return TRUE; + + range->layout->mouse_x = event->x; + range->layout->mouse_y = event->y; +@@ -1364,7 +1374,7 @@ + return TRUE; + } + +- return FALSE; ++ return TRUE; + } + + /** diff --git a/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch new file mode 100644 index 0000000000..df29656343 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch @@ -0,0 +1,10 @@ +--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 +@@ -1623,6 +1623,7 @@ + + /* We have to clear the layout, fonts etc. may have changed */ + gtk_label_clear_layout (label); ++ gtk_widget_queue_resize (GTK_WIDGET (label)); + } + + static void diff --git a/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch new file mode 100644 index 0000000000..bdbdb32f97 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch @@ -0,0 +1,29 @@ +--- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 ++++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 +@@ -370,7 +370,7 @@ + AC_MSG_CHECKING([Whether to write dependencies into .pc files]) + case $enable_explicit_deps in + auto) +- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -768,7 +768,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" + pixbuf_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1600,7 +1600,7 @@ + # + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch new file mode 100644 index 0000000000..cfb8849e9f --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch @@ -0,0 +1,51 @@ +--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 +@@ -42,7 +42,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MENU_SHELL_TIMEOUT 500 ++#define MENU_SHELL_TIMEOUT 2000 + + #define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ +@@ -203,6 +203,8 @@ + + G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) + ++static int last_crossing_time; ++ + static void + gtk_menu_shell_class_init (GtkMenuShellClass *klass) + { +@@ -517,6 +519,7 @@ + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; ++ last_crossing_time = 0; + } + } + +@@ -669,6 +672,13 @@ + menu_shell->activate_time = 0; + deactivate = FALSE; + } ++ ++ if (last_crossing_time != 0 ++ && ((event->time - last_crossing_time) < 500)) ++ { ++ last_crossing_time = 0; ++ deactivate = FALSE; ++ } + + if (deactivate) + { +@@ -716,6 +726,8 @@ + { + menu_item = gtk_get_event_widget ((GdkEvent*) event); + ++ last_crossing_time = event->time; ++ + if (!menu_item || + (GTK_IS_MENU_ITEM (menu_item) && + !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.1/migration.patch b/packages/gtk+/gtk+-2.10.1/migration.patch new file mode 100644 index 0000000000..4850f85e4f --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/migration.patch @@ -0,0 +1,615 @@ +Index: configure.in +=================================================================== +RCS file: /cvs/gnome/gtk+/configure.in,v +retrieving revision 1.419.2.4 +diff -u -r1.419.2.4 configure.in +--- configure.in 8 Feb 2005 21:39:42 -0000 1.419.2.4 ++++ configure.in 27 Feb 2005 13:10:16 -0000 +@@ -1495,6 +1495,16 @@ + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + ++AC_ARG_ENABLE(display-migration, ++ [AC_HELP_STRING([--enable-display-migration], ++ [include support for GPE_CHANGE_DISPLAY protocol])], ++ enable_migration=yes, enable_migration=no) ++if test "$enable_migration" = "yes"; then ++ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) ++ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" ++fi ++AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") ++ + AC_SUBST(GTK_PACKAGES) + AC_SUBST(GTK_EXTRA_LIBS) + AC_SUBST(GTK_EXTRA_CFLAGS) +Index: gtk/Makefile.am +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v +retrieving revision 1.266.2.1 +diff -u -r1.266.2.1 Makefile.am +--- gtk/Makefile.am 13 Jan 2005 15:18:21 -0000 1.266.2.1 ++++ gtk/Makefile.am 27 Feb 2005 13:10:17 -0000 +@@ -520,6 +520,10 @@ + gtkwindow.c \ + xembed.h + ++if ENABLE_MIGRATION ++gtk_c_sources += gtkmigration.c ++endif ++ + if OS_UNIX + gtk_private_h_sources += gtkfilesystemunix.h + gtk_c_sources += gtkfilesystemunix.c +Index: gtk/gtkmain.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v +retrieving revision 1.255 +diff -u -r1.255 gtkmain.c +--- gtk/gtkmain.c 27 Dec 2004 05:25:15 -0000 1.255 ++++ gtk/gtkmain.c 27 Feb 2005 13:10:19 -0000 +@@ -491,6 +491,10 @@ + _gtk_accel_map_init (); + _gtk_rc_init (); + ++#ifdef ENABLE_MIGRATION ++ gtk_migration_init (); ++#endif ++ + /* Set the 'initialized' flag. + */ + gtk_initialized = TRUE; +--- /dev/null 2005-02-20 01:07:50.714416160 +0000 ++++ gtk/gtkmigration.c 2005-02-27 15:05:04.052757352 +0000 +@@ -0,0 +1,529 @@ ++/* ++ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include <stdlib.h> ++#include <ctype.h> ++#include <libintl.h> ++#include <string.h> ++#include <assert.h> ++ ++#include <X11/X.h> ++#include <X11/Xlib.h> ++#include <X11/Xatom.h> ++ ++#include <gcrypt.h> ++ ++#include "gtk.h" ++#include "gdk.h" ++#include "x11/gdkx.h" ++ ++#define _(x) gettext(x) ++ ++static GdkAtom string_gdkatom, display_change_gdkatom; ++static GdkAtom rsa_challenge_gdkatom; ++ ++#define DISPLAY_CHANGE_SUCCESS 0 ++#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 ++#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 ++#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 ++#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 ++ ++static gboolean no_auth; ++ ++static GSList *all_widgets; ++ ++static gboolean gtk_migration_initialised; ++ ++#define CHALLENGE_LEN 64 ++ ++gchar *gtk_migration_auth_challenge_string; ++ ++static unsigned char challenge_bytes[CHALLENGE_LEN]; ++static unsigned long challenge_seq; ++ ++#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') ++ ++struct rsa_key ++{ ++ gcry_mpi_t n, e, d, p, q, u; ++}; ++ ++static gcry_mpi_t ++mpi_from_sexp (gcry_sexp_t r, char *tag) ++{ ++ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); ++ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); ++} ++ ++static char * ++hex_from_mpi (gcry_mpi_t m) ++{ ++ char *buf; ++ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); ++ return buf; ++} ++ ++static void ++gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) ++{ ++ size_t dlen = strlen (display); ++ gchar *buf = g_malloc (dlen + 1 + len); ++ strcpy (buf, display); ++ memcpy (buf + dlen + 1, challenge, len); ++ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); ++ g_free (buf); ++} ++ ++static int ++do_encode_md (const unsigned char *digest, size_t digestlen, int algo, ++ unsigned int nbits, gcry_mpi_t *r_val) ++{ ++ int nframe = (nbits+7) / 8; ++ unsigned char *frame; ++ int i, n; ++ unsigned char asn[100]; ++ size_t asnlen; ++ ++ asnlen = sizeof(asn); ++ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) ++ return -1; ++ ++ if (digestlen + asnlen + 4 > nframe ) ++ return -1; ++ ++ /* We encode the MD in this way: ++ * ++ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) ++ * ++ * PAD consists of FF bytes. ++ */ ++ frame = g_malloc (nframe); ++ n = 0; ++ frame[n++] = 0; ++ frame[n++] = 1; /* block type */ ++ i = nframe - digestlen - asnlen -3 ; ++ assert ( i > 1 ); ++ memset ( frame+n, 0xff, i ); n += i; ++ frame[n++] = 0; ++ memcpy ( frame+n, asn, asnlen ); n += asnlen; ++ memcpy ( frame+n, digest, digestlen ); n += digestlen; ++ assert ( n == nframe ); ++ ++ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); ++ g_free (frame); ++ return 0; ++} ++ ++static gboolean ++gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) ++{ ++ gcry_mpi_t mpi, mpi2; ++ gcry_sexp_t data, sig, key; ++ int rc; ++ ++ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); ++ ++ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); ++ ++ gcry_mpi_release (mpi); ++ ++ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); ++ ++ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) ++ { ++ gcry_sexp_release (data); ++ return FALSE; ++ } ++ ++ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); ++ ++ rc = gcry_pk_verify (sig, data, key); ++ ++ gcry_sexp_release (data); ++ gcry_sexp_release (key); ++ gcry_sexp_release (sig); ++ gcry_mpi_release (mpi2); ++ ++ if (rc) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static void ++gtk_migration_auth_update_challenge (void) ++{ ++ int i; ++ unsigned char *p; ++ ++ if (gtk_migration_auth_challenge_string == NULL) ++ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); ++ ++ p = gtk_migration_auth_challenge_string; ++ ++ for (i = 0; i < CHALLENGE_LEN; i++) ++ { ++ *p++ = hexbyte (challenge_bytes[i] >> 4); ++ *p++ = hexbyte (challenge_bytes[i] & 15); ++ } ++ ++ sprintf (p, "%08lx", challenge_seq++); ++} ++ ++static void ++gtk_migration_auth_generate_challenge (void) ++{ ++ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); ++ gtk_migration_auth_update_challenge (); ++} ++ ++static struct rsa_key * ++parse_pubkey (char *s) ++{ ++ struct rsa_key *r; ++ gcry_mpi_t n, e; ++ gchar *sp; ++ ++ sp = strtok (s, " \n"); ++ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ sp = strtok (NULL, " \n"); ++ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ ++ r = g_malloc0 (sizeof (struct rsa_key)); ++ r->e = e; ++ r->n = n; ++ return r; ++} ++ ++static struct rsa_key * ++lookup_pubkey (u_int32_t id) ++{ ++ const gchar *home_dir = g_get_home_dir (); ++ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); ++ FILE *fp = fopen (filename, "r"); ++ struct rsa_key *r = NULL; ++ ++ if (fp) ++ { ++ while (!feof (fp)) ++ { ++ char buffer[4096]; ++ if (fgets (buffer, 4096, fp)) ++ { ++ char *p; ++ u_int32_t this_id = strtoul (buffer, &p, 16); ++ if (p != buffer && *p == ' ') ++ { ++#ifdef DEBUG ++ fprintf (stderr, "found id %x\n", this_id); ++#endif ++ if (this_id == id) ++ { ++ r = parse_pubkey (++p); ++ break; ++ } ++ } ++ } ++ } ++ fclose (fp); ++ } ++ ++ g_free (filename); ++ return r; ++} ++ ++static void ++free_pubkey (struct rsa_key *k) ++{ ++ gcry_mpi_release (k->n); ++ gcry_mpi_release (k->e); ++ ++ g_free (k); ++} ++ ++static gboolean ++gtk_migration_auth_validate_request (char *display, char *data) ++{ ++ u_int32_t key_id; ++ char *ep; ++ char *p; ++ struct rsa_key *k; ++ char hash[20]; ++ gboolean rc; ++ ++ p = strchr (data, ' '); ++ if (p == NULL) ++ return FALSE; ++ *p++ = 0; ++ ++ key_id = strtoul (data, &ep, 16); ++ if (*ep) ++ return FALSE; ++ ++ k = lookup_pubkey (key_id); ++ if (k == NULL) ++ return FALSE; ++ ++ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string), hash); ++ ++ rc = gtk_migration_crypt_check_signature (k, hash, p); ++ ++ free_pubkey (k); ++ ++ return rc; ++} ++ ++static int ++do_change_display (GtkWidget *w, char *display_name) ++{ ++ GdkDisplay *newdisplay; ++ guint screen_nr = 1; ++ guint i; ++ ++ if (display_name[0] == 0) ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++ ++ i = strlen (display_name) - 1; ++ while (i > 0 && isdigit (display_name[i])) ++ i--; ++ ++ if (display_name[i] == '.') ++ { ++ screen_nr = atoi (display_name + i + 1); ++ display_name[i] = 0; ++ } ++ ++ newdisplay = gdk_display_open (display_name); ++ if (newdisplay) ++ { ++ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); ++ if (screen) ++ { ++ gtk_window_set_screen (GTK_WINDOW (w), screen); ++ gdk_display_manager_set_default_display (gdk_display_manager_get (), ++ newdisplay); ++ return DISPLAY_CHANGE_SUCCESS; ++ } ++ else ++ return DISPLAY_CHANGE_NO_SUCH_SCREEN; ++ } ++ ++ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; ++} ++ ++static void ++set_challenge_on_window (GdkWindow *window) ++{ ++ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string)); ++} ++ ++static void ++update_challenge_on_windows (void) ++{ ++ GSList *i; ++ ++ gtk_migration_auth_update_challenge (); ++ ++ for (i = all_widgets; i; i = i->next) ++ { ++ GtkWidget *w = GTK_WIDGET (i->data); ++ if (w->window) ++ set_challenge_on_window (w->window); ++ } ++} ++ ++static void ++reset_state (GdkWindow *window) ++{ ++ gdk_property_change (window, display_change_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, NULL, 0); ++} ++ ++static void ++generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) ++{ ++ XClientMessageEvent ev; ++ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, ++ display_change_gdkatom); ++ ++ memset (&ev, 0, sizeof (ev)); ++ ++ ev.type = ClientMessage; ++ ev.window = window; ++ ev.message_type = atom; ++ ev.format = 32; ++ ++ ev.data.l[0] = window; ++ ev.data.l[1] = code; ++ ++ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); ++} ++ ++static int ++handle_request (GdkWindow *gwindow, char *prop) ++{ ++ GtkWidget *widget; ++ char *target, *auth_method, *auth_data; ++ char *p; ++ ++ target = prop; ++ auth_method = "NULL"; ++ auth_data = NULL; ++ ++ p = strchr (prop, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_method = ++p; ++ ++ p = strchr (p, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_data = ++p; ++ } ++ } ++ ++ if (no_auth == FALSE) ++ { ++ if (!strcasecmp (auth_method, "null")) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ else if (!strcasecmp (auth_method, "rsa-sig")) ++ { ++ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ else ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ ++ gdk_window_get_user_data (gwindow, (gpointer*) &widget); ++ ++ if (widget) ++ return do_change_display (widget, target); ++ ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++} ++ ++static GdkFilterReturn ++filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) ++{ ++ XPropertyEvent *xev = (XPropertyEvent *)xevp; ++ ++ if (xev->type == PropertyNotify) ++ { ++ GdkDisplay *gdisplay; ++ Atom atom; ++ ++ gdisplay = gdk_x11_lookup_xdisplay (xev->display); ++ if (gdisplay) ++ { ++ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); ++ ++ if (xev->atom == atom) ++ { ++ GdkWindow *gwindow; ++ ++ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); ++ ++ if (gwindow) ++ { ++ GdkAtom actual_type; ++ gint actual_format; ++ gint actual_length; ++ unsigned char *prop = NULL; ++ ++ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, ++ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, ++ &actual_length, &prop)) ++ { ++ if (actual_length != 0) ++ { ++ if (actual_type == string_gdkatom && actual_length > 8) ++ { ++ gchar *buf = g_malloc (actual_length + 1); ++ int rc; ++ ++ memcpy (buf, prop, actual_length); ++ buf[actual_length] = 0; ++ ++ rc = handle_request (gwindow, buf); ++ ++ g_free (buf); ++ generate_response (gdisplay, xev->display, xev->window, rc); ++ ++ if (rc == DISPLAY_CHANGE_SUCCESS) ++ update_challenge_on_windows (); ++ } ++ ++ reset_state (gwindow); ++ } ++ } ++ ++ if (prop) ++ g_free (prop); ++ } ++ } ++ ++ return GDK_FILTER_REMOVE; ++ } ++ } ++ ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++unrealize_window (GtkWidget *w) ++{ ++ all_widgets = g_slist_remove (all_widgets, w); ++} ++ ++void ++gtk_migration_mark_window (GtkWidget *w) ++{ ++ if (! gtk_migration_initialised) ++ { ++ g_warning ("gtk_migration not initialised yet"); ++ return; ++ } ++ ++ if (GTK_WIDGET_REALIZED (w)) ++ { ++ GdkWindow *window = w->window; ++ ++ gdk_window_add_filter (window, filter_func, NULL); ++ ++ reset_state (window); ++ set_challenge_on_window (window); ++ ++ all_widgets = g_slist_append (all_widgets, w); ++ ++ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); ++ } ++ else ++ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); ++} ++ ++void ++gtk_migration_init (void) ++{ ++ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) ++ no_auth = TRUE; ++ ++ string_gdkatom = gdk_atom_intern ("STRING", FALSE); ++ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); ++ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); ++ ++ gtk_migration_auth_generate_challenge (); ++ ++ gtk_migration_initialised = TRUE; ++} +--- gtk/gtkwindow.c~ 2006-07-05 13:07:08.000000000 +0200 ++++ gtk/gtkwindow.c 2006-07-05 13:07:08.000000000 +0200 +@@ -50,6 +50,9 @@ + #include "x11/gdkx.h" + #endif + ++extern void gtk_migration_mark_window (GtkWidget *w); ++ ++ + enum { + SET_FOCUS, + FRAME_EVENT, +@@ -823,6 +826,10 @@ + + g_signal_connect (window->screen, "composited_changed", + G_CALLBACK (gtk_window_on_composited_changed), window); ++ ++#ifdef ENABLE_MIGRATION ++ gtk_migration_mark_window (window); ++#endif + } + + static void diff --git a/packages/gtk+/gtk+-2.10.1/no-demos.patch b/packages/gtk+/gtk+-2.10.1/no-demos.patch new file mode 100644 index 0000000000..0fc4c48d1a --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/no-demos.patch @@ -0,0 +1,10 @@ +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.1/no-xwc.patch b/packages/gtk+/gtk+-2.10.1/no-xwc.patch new file mode 100644 index 0000000000..affb4a303e --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/no-xwc.patch @@ -0,0 +1,151 @@ +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 +@@ -576,12 +576,14 @@ + GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); + } + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); + XmbDrawString (xdisplay, impl->xid, + fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); + } ++#endif + else + g_error("undefined font type\n"); + } +@@ -613,6 +615,7 @@ + GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); + g_free (text_8bit); + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + if (sizeof(GdkWChar) == sizeof(wchar_t)) +@@ -633,6 +636,7 @@ + g_free (text_wchar); + } + } ++#endif + else + g_error("undefined font type\n"); + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 ++++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 +@@ -525,10 +525,12 @@ + width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + width = XmbTextEscapement (fontset, text, text_length); + break; ++#endif + default: + width = 0; + } +@@ -578,6 +580,7 @@ + width = 0; + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + if (sizeof(GdkWChar) == sizeof(wchar_t)) + { +@@ -595,6 +598,7 @@ + g_free (text_wchar); + } + break; ++#endif + default: + width = 0; + } +@@ -667,6 +671,7 @@ + if (descent) + *descent = overall.descent; + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + XmbTextExtents (fontset, text, text_length, &ink, &logical); +@@ -681,6 +686,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +@@ -753,6 +759,7 @@ + *descent = overall.descent; + break; + } ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + +@@ -780,6 +787,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 +@@ -48,6 +48,7 @@ + void + _gdk_x11_initialize_locale (void) + { ++#ifdef HAVE_XWC + wchar_t result; + gchar *current_locale; + static char *last_locale = NULL; +@@ -93,7 +94,8 @@ + GDK_NOTE (XIM, + g_message ("%s multi-byte string functions.", + gdk_use_mb ? "Using" : "Not using")); +- ++#endif ++ + return; + } + +@@ -136,6 +138,7 @@ + { + gchar *mbstr; + ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -178,6 +181,7 @@ + XFree (tpr.value); + } + else ++#endif + { + gint length = 0; + gint i; +@@ -210,6 +214,7 @@ + gint + gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) + { ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -242,6 +247,7 @@ + return len_cpy; + } + else ++#endif + { + gint i; + diff --git a/packages/gtk+/gtk+-2.10.1/run-iconcache.patch b/packages/gtk+/gtk+-2.10.1/run-iconcache.patch new file mode 100644 index 0000000000..f0bb6ba842 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/run-iconcache.patch @@ -0,0 +1,19 @@ +--- gtk+-2.10.0/gtk/Makefile.am~ 2006-07-05 16:49:16.000000000 +0200 ++++ gtk+-2.10.0/gtk/Makefile.am 2006-07-05 16:49:16.000000000 +0200 +@@ -1088,11 +1088,11 @@ + done \ + && touch stamp-icons + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache +- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ +- ./gtk-update-icon-cache --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache ++# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ ++# ./gtk-update-icon-cache --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.1/scroll-timings.patch b/packages/gtk+/gtk+-2.10.1/scroll-timings.patch new file mode 100644 index 0000000000..3f823a7880 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/scroll-timings.patch @@ -0,0 +1,11 @@ +--- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 +@@ -39,7 +39,7 @@ + #include "gtkalias.h" + + #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ +-#define UPDATE_DELAY 300 /* Delay for queued update */ ++#define UPDATE_DELAY 1000 /* Delay for queued update */ + + enum { + PROP_0, diff --git a/packages/gtk+/gtk+-2.10.1/single-click.patch b/packages/gtk+/gtk+-2.10.1/single-click.patch new file mode 100644 index 0000000000..3bb208d4d6 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/single-click.patch @@ -0,0 +1,54 @@ +diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c +--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 ++++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 +@@ -1023,9 +1023,11 @@ + } + + gtk_calendar_select_and_focus_day (calendar, day); +- } ++ ++ // This change causes the calendar to disappear after choosing a day ++/* } + else if (event->type == GDK_2BUTTON_PRESS) +- { ++ {*/ + private_data->in_drag = 0; + if (day_month == MONTH_CURRENT) + g_signal_emit (calendar, +diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c +--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 ++++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 +@@ -2468,6 +2468,33 @@ + if (fs->last_selected != NULL) + g_free (fs->last_selected); + ++ // Single-click directory entry ++ if (new_names->len == 1) ++ { ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ tree_view = gtk_tree_selection_get_tree_view (selection); ++ ++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) ++ { ++ path = gtk_tree_model_get_path (model, &iter); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (!is_file) ++ { ++ gtk_file_selection_dir_activate (tree_view, path, ++ gtk_tree_view_get_column (tree_view, DIR_COLUMN), ++ user_data); ++ } ++ ++ gtk_tree_path_free (path); ++ } ++ } ++ + fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); + filename = get_real_filename (fs->last_selected, FALSE); + diff --git a/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch new file mode 100644 index 0000000000..20bf4cf366 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch @@ -0,0 +1,267 @@ +diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 ++++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 +@@ -68,6 +68,7 @@ + #include "gtkprivate.h" + #include "gtkscrolledwindow.h" + #include "gtkstock.h" ++#include "gtksignal.h" + #include "gtktreeselection.h" + #include "gtktreeview.h" + #include "gtkvbox.h" +@@ -77,6 +78,7 @@ + #include "gtkmessagedialog.h" + #include "gtkdnd.h" + #include "gtkeventbox.h" ++#include "gtkimage.h" + + #undef GTK_DISABLE_DEPRECATED + #include "gtkoptionmenu.h" +@@ -245,7 +247,8 @@ + }; + + enum { +- DIR_COLUMN ++ DIR_COLUMN, ++ ISFILE_COLUMN + }; + + enum { +@@ -400,6 +403,12 @@ + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data); ++ ++static void gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data); ++ + static void gtk_file_selection_file_changed (GtkTreeSelection *selection, + gpointer user_data); + static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, +@@ -419,6 +428,7 @@ + static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); + static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); + static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); ++static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); + + static void free_selected_names (GPtrArray *names); + +@@ -578,6 +588,23 @@ + G_PARAM_WRITABLE)); + object_class->destroy = gtk_file_selection_destroy; + widget_class->map = gtk_file_selection_map; ++ widget_class->style_set = gtk_file_selection_style_set; ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_boolean ("show_fileops_default", ++ _("Show fileop buttons by default"), ++ _("Whether file operation buttons are shown by default"), ++ TRUE, ++ G_PARAM_READABLE)); ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("border_width", ++ _("Border width"), ++ _("Width of border around the main dialog area"), ++ 0, ++ G_MAXINT, ++ 10, ++ G_PARAM_READABLE)); + } + + static void gtk_file_selection_set_property (GObject *object, +@@ -649,7 +676,29 @@ + gtk_widget_grab_default (widget); + return FALSE; + } +- ++ ++static void ++gtk_file_selection_style_set (GtkWidget *filesel, ++ GtkStyle *prev_style) ++{ ++ gboolean show_fileops; ++ gint border_width; ++ ++ gtk_widget_style_get (filesel, ++ "show_fileops_default", ++ &show_fileops, ++ "border_width", ++ &border_width, ++ NULL); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); ++ ++ if (show_fileops) ++ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++ else ++ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++} ++ + static void + gtk_file_selection_init (GtkFileSelection *filesel) + { +@@ -674,17 +723,15 @@ + + /* The dialog-sized vertical box */ + filesel->main_vbox = dialog->vbox; +- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); + + /* The horizontal box containing create, rename etc. buttons */ + filesel->button_area = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); +- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, + FALSE, FALSE, 0); + gtk_widget_show (filesel->button_area); + +- gtk_file_selection_show_fileop_buttons (filesel); ++ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); + + /* hbox for pulldown menu */ + pulldown_hbox = gtk_hbox_new (TRUE, 5); +@@ -723,25 +770,32 @@ + + /* The directories list */ + +- model = gtk_list_store_new (1, G_TYPE_STRING); ++ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ + filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + g_object_unref (model); + +- column = gtk_tree_view_column_new_with_attributes (_("Folders"), ++ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, + gtk_cell_renderer_text_new (), + "text", DIR_COLUMN, + NULL); + label = gtk_label_new_with_mnemonic (_("Fol_ders")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); + gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); ++ ++ /* gtk_tree_view_column_set_widget (column, label); */ ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); ++ + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); + + gtk_widget_set_size_request (filesel->dir_list, + DIR_LIST_WIDTH, DIR_LIST_HEIGHT); + g_signal_connect (filesel->dir_list, "row_activated", +- G_CALLBACK (gtk_file_selection_dir_activate), filesel); ++ G_CALLBACK (gtk_file_selection_activate), filesel); ++ ++ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", ++ G_CALLBACK (gtk_file_selection_file_changed), filesel); ++ + + /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ + +@@ -758,41 +812,6 @@ + gtk_widget_show (filesel->dir_list); + gtk_widget_show (scrolled_win); + +- /* The files list */ +- model = gtk_list_store_new (1, G_TYPE_STRING); +- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); +- g_object_unref (model); +- +- column = gtk_tree_view_column_new_with_attributes (_("Files"), +- gtk_cell_renderer_text_new (), +- "text", FILE_COLUMN, +- NULL); +- label = gtk_label_new_with_mnemonic (_("_Files")); +- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); +- gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); +- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); +- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); +- +- gtk_widget_set_size_request (filesel->file_list, +- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); +- g_signal_connect (filesel->file_list, "row_activated", +- G_CALLBACK (gtk_file_selection_file_activate), filesel); +- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", +- G_CALLBACK (gtk_file_selection_file_changed), filesel); +- +- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ +- +- scrolled_win = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); +- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); +- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); +- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); +- gtk_widget_show (filesel->file_list); +- gtk_widget_show (scrolled_win); +- + /* action area for packing buttons into. */ + filesel->action_area = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, +@@ -2008,6 +2027,23 @@ + } + + static void ++gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data) ++{ ++ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (! is_file) ++ gtk_file_selection_dir_activate (tree_view, path, column, user_data); ++} ++ ++static void + gtk_file_selection_file_activate (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, +@@ -2103,7 +2139,6 @@ + PossibleCompletion* poss; + GtkTreeIter iter; + GtkListStore *dir_model; +- GtkListStore *file_model; + gchar* filename; + gchar* rem_path = rel_path; + gchar* sel_text; +@@ -2125,10 +2160,8 @@ + g_assert (cmpl_state->reference_dir); + + dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); +- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); + + gtk_list_store_clear (dir_model); +- gtk_list_store_clear (file_model); + + /* Set the dir list to include ./ and ../ */ + gtk_list_store_append (dir_model, &iter); +@@ -2150,13 +2183,17 @@ + strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) + { + gtk_list_store_append (dir_model, &iter); +- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, FALSE, -1); + } + } + else + { +- gtk_list_store_append (file_model, &iter); +- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_append (dir_model, &iter); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, TRUE, -1); + } + } + diff --git a/packages/gtk+/gtk+-2.10.1/spinbutton.patch b/packages/gtk+/gtk+-2.10.1/spinbutton.patch new file mode 100644 index 0000000000..8ad7507af0 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/spinbutton.patch @@ -0,0 +1,128 @@ +--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100 +@@ -733,7 +733,7 @@ + + spin = GTK_SPIN_BUTTON (widget); + arrow_size = spin_button_get_arrow_size (spin); +- panel_width = arrow_size + 2 * widget->style->xthickness; ++ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; + + widget->allocation = *allocation; + +@@ -866,19 +866,16 @@ + { + width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; + ++ y = widget->style->ythickness; ++ height = widget->requisition.height - (2 * y); ++ + if (arrow_type == GTK_ARROW_UP) + { + x = 0; +- y = 0; +- +- height = widget->requisition.height / 2; + } + else + { +- x = 0; +- y = widget->requisition.height / 2; +- +- height = (widget->requisition.height + 1) / 2; ++ x = width; + } + + if (spin_button_at_limit (spin_button, arrow_type)) +@@ -908,32 +905,17 @@ + shadow_type = GTK_SHADOW_OUT; + } + } +- ++ + gtk_paint_box (widget->style, spin_button->panel, + state_type, shadow_type, + NULL, widget, +- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", ++ NULL, + x, y, width, height); + + height = widget->requisition.height; + +- if (arrow_type == GTK_ARROW_DOWN) +- { +- y = height / 2; +- height = height - y - 2; +- } +- else +- { +- y = 2; +- height = height / 2 - 2; +- } +- + width -= 3; +- +- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) +- x = 2; +- else +- x = 1; ++ height -= 3; + + w = width / 2; + w -= w % 2 - 1; /* force odd */ +@@ -1108,7 +1090,7 @@ + if (GTK_ENTRY (widget)->editable) + gtk_spin_button_update (spin); + +- if (event->y <= widget->requisition.height / 2) ++ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) + { + if (event->button == 1) + start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); +@@ -1143,44 +1125,11 @@ + + arrow_size = spin_button_get_arrow_size (spin); + +- if (event->button == spin->button) +- { +- int click_child = spin->click_child; ++ gtk_spin_button_stop_spinning (spin); + +- gtk_spin_button_stop_spinning (spin); +- +- if (event->button == 3) +- { +- if (event->y >= 0 && event->x >= 0 && +- event->y <= widget->requisition.height && +- event->x <= arrow_size + 2 * widget->style->xthickness) +- { +- if (click_child == GTK_ARROW_UP && +- event->y <= widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->upper - spin->adjustment->value; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, diff); +- } +- else if (click_child == GTK_ARROW_DOWN && +- event->y > widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->value - spin->adjustment->lower; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, -diff); +- } +- } +- } +- spin_button_redraw (spin); ++ spin_button_redraw (spin); + +- return TRUE; +- } +- else +- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); ++ return TRUE; + } + + static gint diff --git a/packages/gtk+/gtk+-2.10.1/xsettings.patch b/packages/gtk+/gtk+-2.10.1/xsettings.patch new file mode 100644 index 0000000000..b63e262d34 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.1/xsettings.patch @@ -0,0 +1,16 @@ +--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 ++++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 +@@ -2827,10 +2827,9 @@ + { + GdkScreenX11 *screen = data; + +- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) +- return GDK_FILTER_REMOVE; +- else +- return GDK_FILTER_CONTINUE; ++ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); ++ ++ return GDK_FILTER_CONTINUE; + } + + static void diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb index 195140ea92..01110dc142 100644 --- a/packages/gtk+/gtk+_2.10.0.bb +++ b/packages/gtk+/gtk+_2.10.0.bb @@ -5,8 +5,8 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r1" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" +PR = "r3" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -35,11 +35,12 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*.so.* \ ${datadir}/themes ${sysconfdir} \ - ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \ - ${libdir}/gtk-2.0/${LIBV}/printbackends/lib*.so" + ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" @@ -70,6 +71,8 @@ fi } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + python populate_packages_prepend () { import os.path @@ -78,9 +81,11 @@ python populate_packages_prepend () { gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) loaders_root = os.path.join(gtk_libdir, 'loaders') immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (bb.data.getVar('DEBIAN_NAMES', d, 1)): bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb new file mode 100644 index 0000000000..401583987e --- /dev/null +++ b/packages/gtk+/gtk+_2.10.1.bb @@ -0,0 +1,92 @@ +LICENSE = "LGPL" +DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ +set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." +HOMEPAGE = "http://www.gtk.org" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" +PR = "r0" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://no-xwc.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://run-iconcache.patch;patch=1 \ + file://disable-print.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1" +# file://gtk+-handhelds.patch;patch=1 +# file://single-click.patch;patch=1 +# file://spinbutton.patch;patch=1 \ + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${bindir}/gtk-query-immodules-2.0 \ + ${libdir}/lib*.so.* \ + ${datadir}/themes ${sysconfdir} \ + ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" +FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" + +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" + +EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" + +LIBV = "2.10.0" + +do_stage () { + oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include + install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h + + install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/gtk-2.0 +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +} + +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + +python populate_packages_prepend () { + import os.path + + prologue = bb.data.getVar("postinst_prologue", d, 1) + + gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) + loaders_root = os.path.join(gtk_libdir, 'loaders') + immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') + do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') + + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) +} diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb index e2065b3faa..774c2eb8d4 100644 --- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" PR = "r1" diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index 817d179f9f..d2c3cd52e7 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -35,8 +35,8 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft 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/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index 5baee4ada0..59fd90d716 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "x11/libs" DESCRIPTION = "HTML rendering/editing library" DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR = "r0" inherit gnome diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb index 03defa2aba..eb36cd50d6 100644 --- a/packages/h2200-bootloader/h2200-bootloader.bb +++ b/packages/h2200-bootloader/h2200-bootloader.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ" ALLOW_EMPTY = "1" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR="r2" pkg_postinst() { diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb index c333aebb4f..3361efc6b2 100644 --- a/packages/hal/hal_0.5.7.bb +++ b/packages/hal/hal_0.5.7.bb @@ -1,6 +1,6 @@ SECTION = "unknown" DESCRIPTION = "Hardware Abstraction Layer" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" RDEPENDS_hal-device-manager = "python hal python-pygnome" diff --git a/packages/hostap/files/hostap_cs.conf b/packages/hostap/files/hostap_cs.conf index abf9c7a247..8dda82aad3 100644 --- a/packages/hostap/files/hostap_cs.conf +++ b/packages/hostap/files/hostap_cs.conf @@ -183,3 +183,11 @@ card "BENQ AWL100" version "BENQ", "AWL100 PCMCIA ADAPTER" bind "hostap_cs" +card "Pretec WLAN" + version "Pretec", "CompactWLAN Card 802.11b", "2.5" + manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "TrendNet TEW PC16" + manfid 0x0274, 0x1601 + bind "hostap_cs" diff --git a/packages/hostap/files/hostap_cs.modalias b/packages/hostap/files/hostap_cs.modalias index 9334fa88d0..cb9efab271 100644 --- a/packages/hostap/files/hostap_cs.modalias +++ b/packages/hostap/files/hostap_cs.modalias @@ -23,3 +23,6 @@ pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs # 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards. pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs + +# "BUFFALO", "WLI-CF-S11G", "", "" +pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb index e6d2e4454a..7f407e8f9a 100644 --- a/packages/hostap/hostap-conf_1.0.bb +++ b/packages/hostap/hostap-conf_1.0.bb @@ -4,7 +4,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPL" PACKAGE_ARCH = "all" -PR = "r5" +PR = "r8" SRC_URI = "file://hostap_cs.conf \ file://hostap_cs.modalias \ 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/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb index 912f7c420e..cedcf975f9 100644 --- a/packages/hping/hping2_1.9.9+2.0.0rc3.bb +++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb @@ -24,14 +24,15 @@ S="${WORKDIR}/hping2-rc3" do_configure() { # endianness fun.. inspired by openssl.inc . ${CONFIG_SITE} - BYTEORDER="UNKNOWN" - if test "x$ac_cv_c_bigendian" = "xyes"; then + BYTEORDER="UNKNOWN" + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then BYTEORDER="__BIG_ENDIAN_BITFIELD" - elif test "x$ac_cv_c_littleendian" = "xyes"; then + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then BYTEORDER="__LITTLE_ENDIAN_BITFIELD" else oefatal do_configure cannot determine endianess fi + oenote Determined byteorder as: $BYTEORDER BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure } diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb index edd0bfdd10..1cd2c39289 100644 --- a/packages/ica/ica-bin_8.0.bb +++ b/packages/ica/ica-bin_8.0.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DEPENDS = "virtual/x11 libxaw rpm2cpio-native" +DEPENDS = "virtual/libx11 libxaw rpm2cpio-native" MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>" HOMEPAGE="www.citrix.com/download/" diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb index ee444faf06..76fa2abf79 100644 --- a/packages/icewm/icewm_1.2.20.bb +++ b/packages/icewm/icewm_1.2.20.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb index 60e3a9a867..1454ae00f0 100644 --- a/packages/icewm/icewm_1.2.26.bb +++ b/packages/icewm/icewm_1.2.26.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb new file mode 100644 index 0000000000..68cfac7490 --- /dev/null +++ b/packages/images/bootstrap-image-bootchart.bb @@ -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 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/images/unslung-image.bb b/packages/images/unslung-image.bb index e57960ecdb..a704f00479 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r17" +PR = "r20" IMAGE_BASENAME = "unslung" @@ -34,10 +34,15 @@ unslung_clean_image () { # Remove the kernel image rm -rf ${IMAGE_ROOTFS}/boot + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/zImage # And remove the post and pre scripts for the kernel; saves flash space rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postinst rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postrm + # Remove all the postinst scripts; don't need them. But keep the + # postrm scripts just in case we need to remove something. + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst + # Remove info from the local feed used to build the image rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version @@ -67,19 +72,40 @@ unslung_clean_image () { ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - # We need cpio and find, but we don't need any of the other stuff in the - # packages (users can install the full package with ipkg after unsling). - # (make sure that if the package is not included (i.e. using slingbox - # instead) that the files are not deleted; they might be part of slingbox) + # We need cpio and find, but we don't need any of the other stuff in + # the packages (users can install the full package with ipkg after + # unsling). Remove the extra files and executables, and clean up + # the entries from the ipkg database manually. #-- these are for cpio: rm -f ${IMAGE_ROOTFS}/usr/bin/mt rm -rf ${IMAGE_ROOTFS}/usr/libexec + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.* + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt + sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status #-- and these for find: rm -f ${IMAGE_ROOTFS}/usr/bin/locate rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb rm -f ${IMAGE_ROOTFS}/usr/bin/xargs + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.* + sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status + + # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" + # behavior to create an extra file named .debug/<filename> containing + # the stripped symbols. These files are supposed to be packaged + # separately by the standard bb routines, but for some reason this + # does not alway occur. This extremely ugly step is to remove the + # debug cruft from the rootfs if any are left in the obvious locations. + # Once someone figures out why and what the right way is to fix this, + # this code should be removed. + + rm -rf ${IMAGE_ROOTFS}/bin/.debug + rm -rf ${IMAGE_ROOTFS}/sbin/.debug + rm -rf ${IMAGE_ROOTFS}/lib/.debug + rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug + rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug + rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug } python () { diff --git a/packages/imposter/imposter_0.3.bb b/packages/imposter/imposter_0.3.bb index 3a1f2c4e6f..27a8131d2c 100644 --- a/packages/imposter/imposter_0.3.bb +++ b/packages/imposter/imposter_0.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software." LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" DEPENDS = "gtk+" diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices index 0e59229225..422336a345 100755 --- a/packages/initscripts/initscripts-1.0/jornada7xx/devices +++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices @@ -3,35 +3,68 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +. /etc/default/rcS + # exit without doing anything if udev is active if test -e /dev/.udevdb; then - exit 0 + exit 0 fi - test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " - ( - ln -s /dev/vc/0 /dev/tty0 - ln -s /dev/vc/1 /dev/tty1 - ln -s /dev/vc/2 /dev/tty2 - ln -s /dev/vc/3 /dev/tty3 - ln -s /dev/vc/4 /dev/tty4 - ln -s /dev/vc/5 /dev/tty5 - ln -s /dev/fb/0 /dev/fb0 - # ln -s /dev/tts/0 /dev/ttySA0 - # ln -s /dev/tts/1 /dev/ttySA1 - # ln -s /dev/tts/2 /dev/ttySA2 - - ln -s /dev/sound/dsp /dev/dsp - ln -s /dev/sound/mixer /dev/mixer +if test -e /dev/.devfsd +then + if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi + ln -s /dev/touchscreen/0 /dev/ts + ln -s /dev/touchscreen/0raw /dev/tsraw + ln -s /dev/vc/0 /dev/tty0 + ln -s /dev/vc/1 /dev/tty1 + ln -s /dev/vc/2 /dev/tty2 + ln -s /dev/vc/3 /dev/tty3 + ln -s /dev/vc/4 /dev/tty4 + ln -s /dev/vc/5 /dev/tty5 + ln -s /dev/fb/0 /dev/fb0 +# ln -s /dev/tts/0 /dev/ttySA0 +# ln -s /dev/tts/1 /dev/ttySA1 +# ln -s /dev/tts/2 /dev/ttySA2 - ln -s /dev/v4l/video0 /dev/video0 - ln -s /dev/v4l/video0 /dev/video - ln -s /dev/misc/rtc /dev/rtc - ln -s /dev/misc/apm_bios /dev/apm_bios + ln -s /dev/sound/dsp /dev/dsp + ln -s /dev/sound/mixer /dev/mixer - ## need this so that ppp will autoload the ppp modules - mknod /dev/ppp c 108 0 - ) > /dev/null 2>&1 + ln -s /dev/v4l/video0 /dev/video0 + ln -s /dev/v4l/video0 /dev/video + ln -s /dev/misc/rtc /dev/rtc + ## need this so that ppp will autoload the ppp modules + mknod /dev/ppp c 108 0 + + if test "$VERBOSE" != "no"; then echo "done"; fi +else + if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi + mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev + if test $? -ne 0; then + if test "$VERBOSE" != "no"; then echo "failed"; fi + else + if test "$VERBOSE" != "no"; then echo "done"; fi + fi + if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi + cd / + mkdir -p dev/input + mknod /dev/input/ts0 c 13 65 + mknod /dev/ttySC1 c 9 204 + mknod /dev/irda0 c 10 204 + mkdir -p dev/msys + mkdir -p dev/pts + mkdir -p dev/vc + for i in 0 1 2 3 4 5 6 7 8 9; do + ln -s /dev/tty$i /dev/vc/$i + done + ln -sf /proc/self/fd /dev/fd + ln -sf /proc/kcore /dev/core + /sbin/makedevs -r / -D /etc/device_table + if test $? -ne 0; then + if test "$VERBOSE" != "no"; then echo "failed"; fi + else + if test "$VERBOSE" != "no"; then echo "done"; fi + fi +fi - test -n "$VERBOSE" && echo "done" +exit 0 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/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb index 9795e88594..64bf17e10a 100644 --- a/packages/inkscape/inkscape_0.42.bb +++ b/packages/inkscape/inkscape_0.42.bb @@ -4,7 +4,7 @@ SECTION = "x11/utils" DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ blending, node editing, SVG to PNG export, and more. Its goal is for features \ similar to Illustrator, CorelDraw, Visio, etc." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt" LICENSE = "GPL" diff --git a/packages/inkscape/inkscape_0.43.bb b/packages/inkscape/inkscape_0.43.bb index 48b4334291..f813b70afb 100644 --- a/packages/inkscape/inkscape_0.43.bb +++ b/packages/inkscape/inkscape_0.43.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ blending, node editing, SVG to PNG export, and more. Its goal is for features \ similar to Illustrator, CorelDraw, Visio, etc." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt" LICENSE = "GPL" 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/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb index 919fa64e34..432da1b629 100644 --- a/packages/ion/ion3_0.0+ds20041104.bb +++ b/packages/ion/ion3_0.0+ds20041104.bb @@ -1,7 +1,7 @@ BROKEN = "1" # is unfetchable now - upstream updated to 20050728 -DEPENDS += "lua-native lua virtual/x11 libxext" +DEPENDS += "lua-native lua virtual/libx11 libxext" DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \ users in mind." HOMEPAGE = "http://modeemi.fi/~tuomov/ion/" diff --git a/packages/ipaq-sleep/files/install-fix.patch b/packages/ipaq-sleep/files/install-fix.patch new file mode 100644 index 0000000000..59eb17b071 --- /dev/null +++ b/packages/ipaq-sleep/files/install-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2006-08-12 12:16:47.000000000 +0200 ++++ ipaq-sleep-0.9/Makefile 2006-08-12 12:22:42.188306000 +0200 +@@ -24,7 +24,7 @@ + $(CC) -o $(PACKAGE) $(PACKAGE).o $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all +- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/init.d + install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) + install $(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE).conf diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb index 5a246f4a08..7f1a54f4b1 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb @@ -4,7 +4,7 @@ PR = "r3" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb index 4d531f49ce..184a042d61 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.8.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index 3455571613..2855dcd965 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -2,11 +2,12 @@ LICENSE = "GPL" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" SRC_URI_append = " file://init-script-busybox.patch;patch=1" +SRC_URI_append = " file://install-fix.patch;patch=1" PR = "r1" 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-collateral.bb b/packages/ipkg/ipkg-collateral.bb index a4f7bb7e3a..b0e2a2ed06 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -PR = "r2" +PR = "r3" SRC_URI = " \ file://ipkg.conf.comments \ diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb index d59eab3a61..f2deb33fba 100644 --- a/packages/ipkg/ipkg-native_0.99.152.bb +++ b/packages/ipkg/ipkg-native_0.99.152.bb @@ -1,2 +1,3 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc +PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.153.bb b/packages/ipkg/ipkg-native_0.99.153.bb index d59eab3a61..f2deb33fba 100644 --- a/packages/ipkg/ipkg-native_0.99.153.bb +++ b/packages/ipkg/ipkg-native_0.99.153.bb @@ -1,2 +1,3 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc +PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb index d59eab3a61..f2deb33fba 100644 --- a/packages/ipkg/ipkg-native_0.99.154.bb +++ b/packages/ipkg/ipkg-native_0.99.154.bb @@ -1,2 +1,3 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc +PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.159.bb b/packages/ipkg/ipkg-native_0.99.159.bb index d59eab3a61..f2deb33fba 100644 --- a/packages/ipkg/ipkg-native_0.99.159.bb +++ b/packages/ipkg/ipkg-native_0.99.159.bb @@ -1,2 +1,3 @@ -include ipkg_${PV}.bb -include ipkg-native.inc +require ipkg_${PV}.bb +require ipkg-native.inc +PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index 6f6a1ea4fd..bf060f89fe 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -1,7 +1,8 @@ S = "${WORKDIR}/ipkg-${PV}" -include ipkg_${PV}.bb -include ipkg-native.inc +#require ipkg_${PV}.bb +require ipkg-native.inc +PR = "r1" inherit autotools pkgconfig native diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc index 8fc6c9efe0..adc7714bea 100644 --- a/packages/ipkg/ipkg.inc +++ b/packages/ipkg/ipkg.inc @@ -6,7 +6,7 @@ PROVIDES = "virtual/ipkg libipkg" PACKAGES =+ "libipkg-dev libipkg" FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libipkg = "${libdir}" +FILES_libipkg = "${libdir}/*.so.*" AUTO_LIBNAME_PKGS = "libipkg" SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb index 9285c61819..0d10a29c3f 100644 --- a/packages/ipkg/ipkg_0.99.152.bb +++ b/packages/ipkg/ipkg_0.99.152.bb @@ -1,2 +1,2 @@ -include ipkg.inc -PR = "r2" +require ipkg.inc +PR = "r3" diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb index 02de5e7f92..5852b6afc4 100644 --- a/packages/ipkg/ipkg_0.99.153.bb +++ b/packages/ipkg/ipkg_0.99.153.bb @@ -1,8 +1,8 @@ DEFAULT_PREFERENCE = "-1" -include ipkg.inc +require ipkg.inc -PR = "r3" +PR = "r4" SRC_URI += "file://fix-bug1393.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb index de6af147b6..20a1996658 100644 --- a/packages/ipkg/ipkg_0.99.154.bb +++ b/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ -include ipkg.inc -PR = "r3" +require ipkg.inc +PR = "r4" diff --git a/packages/ipkg/ipkg_0.99.155.bb b/packages/ipkg/ipkg_0.99.155.bb index d3ef6e22a8..e5ff6dc4c2 100644 --- a/packages/ipkg/ipkg_0.99.155.bb +++ b/packages/ipkg/ipkg_0.99.155.bb @@ -1,3 +1,3 @@ -include ipkg.inc -PR = "r1" +require ipkg.inc +PR = "r2" 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..8455050622 100644 --- a/packages/ipkg/ipkg_0.99.159.bb +++ b/packages/ipkg/ipkg_0.99.159.bb @@ -1 +1,2 @@ -include ipkg.inc +require ipkg.inc +PR = "r1" diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb new file mode 100644 index 0000000000..5d8a834b20 --- /dev/null +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -0,0 +1,18 @@ +include ipkg.inc +PR = "r1" + +S = "${WORKDIR}/ipkg-${PV}" + +SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ + file://terse.patch;patch=1" + + +do_stage() { + oe_libinstall -so libipkg ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libipkg/ + for f in *.h + do + install -m 0644 $f ${STAGING_INCDIR}/libipkg/ + done +} + 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/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb index 79a7021b5a..2cd5c92e25 100644 --- a/packages/iputils/iputils_20020927.bb +++ b/packages/iputils/iputils_20020927.bb @@ -4,7 +4,7 @@ tracepath, tracepath6, ping, ping6 and arping." SECTION = "console/network" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE ="BSD" -PR = "r3" +PR = "r4" SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \ file://debian-fixes.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss0 file://glibc-2.4-compat.patch;patch=1" S = "${WORKDIR}/iputils" -PACKAGES = "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-doc" +PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" FILES_${PN} = "" FILES_${PN}-ping = "${base_bindir}/ping.${PN}" FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}" @@ -35,9 +35,9 @@ do_compile () { do_install () { install -m 0755 -d ${D}${base_bindir} ${D}${bindir} ${D}${mandir}/man8 # SUID root programs - install -m 4755 ping ${D}${base_bindir}/ping.${PN} - install -m 4755 ping6 ${D}${base_bindir}/ping6.${PN} - install -m 4755 traceroute6 ${D}${bindir}/ + install -m 4555 ping ${D}${base_bindir}/ping.${PN} + install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN} + install -m 4555 traceroute6 ${D}${bindir}/ # Other programgs for i in arping tracepath tracepath6; do install -m 0755 $i ${D}${bindir}/ @@ -49,7 +49,9 @@ do_install () { } # Busybox also provides ping and ping6, so use update-alternatives +# Also fixup SUID bit for applications that need it pkg_postinst_${PN}-ping () { + chmod 4555 ${base_bindir}/ping.${PN} update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100 } pkg_prerm_${PN}-ping () { @@ -57,8 +59,13 @@ pkg_prerm_${PN}-ping () { } pkg_postinst_${PN}-ping6 () { + chmod 4555 ${base_bindir}/ping6.${PN} update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100 } pkg_prerm_${PN}-ping6 () { update-alternatives --remove ping6 ping6.${PN} } + +pkg_postinst_${PN}-traceroute6 () { + chmod 4555 ${bindir}/traceroute6 +} diff --git a/packages/irda-utils/files/init b/packages/irda-utils/files/init index 9becfcc0ed..2d93af34df 100755 --- a/packages/irda-utils/files/init +++ b/packages/irda-utils/files/init @@ -7,7 +7,7 @@ module_id() { if [ ! -f /etc/sysconfig/irda ]; then case `module_id` in - "HP iPAQ H2200" | "HP iPAQ HX4700") + "HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal") IRDA=yes DEVICE=/dev/ttyS2 DONGLE= diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb index db56a7044d..95a15d7d23 100644 --- a/packages/irda-utils/irda-utils_0.9.16.bb +++ b/packages/irda-utils/irda-utils_0.9.16.bb @@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \ such as phones and laptops." SECTION = "base" LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ file://configure.patch;patch=1 \ diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb index b743544903..e543ebdcc5 100644 --- a/packages/irk/irk-belkin_0.11.bb +++ b/packages/irk/irk-belkin_0.11.bb @@ -5,5 +5,5 @@ RCONFLICTS = "irk-targus" RREPLACES = "irk-targus" PR = "r3" -SRC_URI = "http://kopsisengineering.com/irk-current.tgz \ +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index 1b130776a8..87b74cb5eb 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -7,5 +7,5 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" RCONFLICTS = "irk-belkin" RREPLACES = "irk-belkin" -SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${PV}.tgz \ +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-${PV}.tgz \ file://install-default-conf.patch;patch=1" 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/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 23e3ed82be..e96f8001a4 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -1,11 +1,11 @@ -PR = "r2" +PR = "r4" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS = "libtool-cross" DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format." -PACKAGES =+ "jpeg-tools " -FILES_jpeg-tools = "${bindir}" +PACKAGES += "jpeg-tools " +FILES_jpeg-tools = "${bindir}/*" LICENSE ="jpeg" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb index 6ba72a50c3..20b59fb9c2 100644 --- a/packages/juce/juce_1.29.bb +++ b/packages/juce/juce_1.29.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.rawmaterialsoftware.com/juce" AUTHOR = "Julian Stoerer" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -DEPENDS = "alsa-lib freetype virtual/x11" +DEPENDS = "alsa-lib freetype virtual/libx11" PR = "r0" #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion 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/kaffe.inc b/packages/kaffe/kaffe.inc index ea308f1043..2d536b3dea 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.kaffe.org/" LICENSE = "GPL LGPL W3C Classpath BSD" DEPENDS = "jikes-native fastjar-native libffi zip-native" +RDEPENDS_${PN} = "${PN}-common (>= ${PV})" SRC_URI += "file://disable-automake-checks.patch;patch=1" @@ -45,7 +46,6 @@ oe_runconf () { PACKAGES =+ "${PN}-common" FILES_${PN} += "${libdir}/${PN}" -RDEPENDS_${PN} = "${PN}-common (>= ${PV})" FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar" do_install () { diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb index 569301f3f7..d4d6287592 100644 --- a/packages/kaffe/kaffeh-native_1.1.5.bb +++ b/packages/kaffe/kaffeh-native_1.1.5.bb @@ -2,7 +2,9 @@ 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 + +RDEPENDS_${PN} = "" 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/xmodmap/.mtn2git_empty b/packages/keymaps/files/h2200/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xmodmap/.mtn2git_empty +++ b/packages/keymaps/files/h2200/.mtn2git_empty diff --git a/packages/keymaps/files/h2200/keymap-2.6.map b/packages/keymaps/files/h2200/keymap-2.6.map new file mode 100644 index 0000000000..8b4c43fe0b --- /dev/null +++ b/packages/keymaps/files/h2200/keymap-2.6.map @@ -0,0 +1,17 @@ +# Kernel keymap for h2200 keys + +# Apps keys +keycode 67 = F9 +keycode 68 = F10 +keycode 87 = F11 +keycode 88 = F12 + +# Joypad +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 108 = Down +keycode 28 = Return + +# Power key +keycode 116 = F34 diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index 8fa272124e..87edceffca 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -4,7 +4,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r9" +PR = "r10" inherit update-rc.d @@ -17,7 +17,7 @@ SRC_URI_append_spitz = " file://keymap-*.map" SRC_URI_append_collie = " file://keymap-*.map" SRC_URI_append_poodle = " file://keymap-*.map" SRC_URI_append_jornada6xx = " file://keymap-*.map" - +SRC_URI_append_h2200 = " file://keymap-*.map" INITSCRIPT_NAME = "keymap" INITSCRIPT_PARAMS = "start 00 S ." @@ -27,7 +27,7 @@ do_install () { install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx) + c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200) install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} ;; *) 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/lftp/lftp-3.0.1/pty.patch b/packages/lftp/lftp-3.0.1/pty.patch deleted file mode 100644 index 166b665f3f..0000000000 --- a/packages/lftp/lftp-3.0.1/pty.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- lftp-2.6.11/m4/pty.m4~pty -+++ lftp-2.6.11/m4/pty.m4 -@@ -4,14 +4,20 @@ - *-*-sco3.2v4*) no_dev_ptmx=1;; - *-*-sco3.2v5*) no_dev_ptmx=1;; - esac -+AC_SEARCH_LIBS(openpty,util, -+ [ -+ AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function]) -+ no_dev_ptc=yes -+ no_dev_ptmx=yes -+ ]) -+AC_CHECK_FUNCS([_getpty]) - if test -z "$no_dev_ptmx" ; then - AC_CHECK_FILE("/dev/ptmx", [ - AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])]) - fi -+if test -z "$no_dev_ptc" ; then - AC_CHECK_FILE("/dev/ptc", [ - AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])]) -+fi - AC_CHECK_HEADERS([util.h sys/stropts.h pty.h]) --AC_SEARCH_LIBS(openpty,util, -- [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])]) --AC_CHECK_FUNCS([_getpty]) - ]) diff --git a/packages/lftp/lftp-3.0.1/readline.patch b/packages/lftp/lftp-3.0.1/readline.patch deleted file mode 100644 index eb90e21539..0000000000 --- a/packages/lftp/lftp-3.0.1/readline.patch +++ /dev/null @@ -1,24 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- lftp-3.0.1/configure.ac~readline.patch 2004-04-06 10:27:36.000000000 +0200 -+++ lftp-3.0.1/configure.ac 2004-04-06 23:39:01.000000000 +0200 -@@ -380,5 +378,5 @@ - sysconfdir=/etc - fi - --AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile readline-4.3/Makefile po/Makefile.in m4/Makefile contrib/Makefile]) -+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile po/Makefile.in m4/Makefile contrib/Makefile]) - AC_OUTPUT ---- lftp-3.0.1/Makefile.am~readline.patch 2003-12-19 15:16:31.000000000 +0100 -+++ lftp-3.0.1/Makefile.am 2004-04-06 23:40:17.000000000 +0200 -@@ -1,6 +1,6 @@ - EXTRA_DIST = config.rpath lftp.conf lftp.lsm FAQ acconfig.h README README.debug-levels\ - README.modules MIRRORS BUGS FEATURES --SUBDIRS = include readline-4.3 lib doc src po m4 contrib -+SUBDIRS = include lib doc src po m4 contrib - AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - diff --git a/packages/lftp/lftp-3.0.11/pty.patch b/packages/lftp/lftp-3.0.11/pty.patch deleted file mode 100644 index 166b665f3f..0000000000 --- a/packages/lftp/lftp-3.0.11/pty.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- lftp-2.6.11/m4/pty.m4~pty -+++ lftp-2.6.11/m4/pty.m4 -@@ -4,14 +4,20 @@ - *-*-sco3.2v4*) no_dev_ptmx=1;; - *-*-sco3.2v5*) no_dev_ptmx=1;; - esac -+AC_SEARCH_LIBS(openpty,util, -+ [ -+ AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function]) -+ no_dev_ptc=yes -+ no_dev_ptmx=yes -+ ]) -+AC_CHECK_FUNCS([_getpty]) - if test -z "$no_dev_ptmx" ; then - AC_CHECK_FILE("/dev/ptmx", [ - AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])]) - fi -+if test -z "$no_dev_ptc" ; then - AC_CHECK_FILE("/dev/ptc", [ - AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])]) -+fi - AC_CHECK_HEADERS([util.h sys/stropts.h pty.h]) --AC_SEARCH_LIBS(openpty,util, -- [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])]) --AC_CHECK_FUNCS([_getpty]) - ]) diff --git a/packages/lftp/lftp-3.0.11/readline.patch b/packages/lftp/lftp-3.0.11/readline.patch deleted file mode 100644 index eb90e21539..0000000000 --- a/packages/lftp/lftp-3.0.11/readline.patch +++ /dev/null @@ -1,24 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- lftp-3.0.1/configure.ac~readline.patch 2004-04-06 10:27:36.000000000 +0200 -+++ lftp-3.0.1/configure.ac 2004-04-06 23:39:01.000000000 +0200 -@@ -380,5 +378,5 @@ - sysconfdir=/etc - fi - --AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile readline-4.3/Makefile po/Makefile.in m4/Makefile contrib/Makefile]) -+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile po/Makefile.in m4/Makefile contrib/Makefile]) - AC_OUTPUT ---- lftp-3.0.1/Makefile.am~readline.patch 2003-12-19 15:16:31.000000000 +0100 -+++ lftp-3.0.1/Makefile.am 2004-04-06 23:40:17.000000000 +0200 -@@ -1,6 +1,6 @@ - EXTRA_DIST = config.rpath lftp.conf lftp.lsm FAQ acconfig.h README README.debug-levels\ - README.modules MIRRORS BUGS FEATURES --SUBDIRS = include readline-4.3 lib doc src po m4 contrib -+SUBDIRS = include lib doc src po m4 contrib - AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - diff --git a/packages/lftp/lftp_3.0.11.bb b/packages/lftp/lftp_3.0.11.bb deleted file mode 100644 index ae62962343..0000000000 --- a/packages/lftp/lftp_3.0.11.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "lftp is a sophisticated command line based file \ -transfer program. Supported protocols include FTP, HTTP, \ -and FISH." -HOMEPAGE = "http://lftp.yar.ru" -SECTION = "console/network" -DEPENDS = "readline" -PR = "r1" - -SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/lftp-${PV}.tar.bz2 \ - file://pty.patch;patch=1" - -EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no" - -inherit autotools gettext diff --git a/packages/lftp/lftp_3.0.1.bb b/packages/lftp/lftp_3.5.1.bb index ae62962343..a45b75fe35 100644 --- a/packages/lftp/lftp_3.0.1.bb +++ b/packages/lftp/lftp_3.5.1.bb @@ -4,11 +4,9 @@ transfer program. Supported protocols include FTP, HTTP, \ and FISH." HOMEPAGE = "http://lftp.yar.ru" SECTION = "console/network" -DEPENDS = "readline" -PR = "r1" +DEPENDS = "readline gnutls" -SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/lftp-${PV}.tar.bz2 \ - file://pty.patch;patch=1" +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/file-transfer/lftp-3.5.1.tar.gz" EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no" 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/xorg-fonts/.mtn2git_empty b/packages/libchm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xorg-fonts/.mtn2git_empty +++ b/packages/libchm/.mtn2git_empty diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb new file mode 100644 index 0000000000..4b44b7ce57 --- /dev/null +++ b/packages/libchm/chmlib_0.38.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +LICENSE = "GPLv2" +HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/" + +SRC_URI = "http://66.93.236.84/~jedwin/projects/chmlib/${P}.tar.bz2 \ + file://arm-guess.patch;patch=1" + +inherit autotools pkgconfig + + + diff --git a/packages/xprop/.mtn2git_empty b/packages/libchm/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xprop/.mtn2git_empty +++ b/packages/libchm/files/.mtn2git_empty diff --git a/packages/libchm/files/arm-guess.patch b/packages/libchm/files/arm-guess.patch new file mode 100644 index 0000000000..b524c81aac --- /dev/null +++ b/packages/libchm/files/arm-guess.patch @@ -0,0 +1,12 @@ +--- /tmp/chm_lib.c 2006-08-13 12:29:15.000000000 +0200 ++++ chmlib-0.38/src/chm_lib.c 2006-08-13 12:29:43.148306000 +0200 +@@ -160,7 +160,8 @@ + /* Sparc */ + /* MIPS */ + /* PPC */ +-#elif __i386__ || __sun || __sgi || __ppc__ ++/* ARM */ ++#elif __i386__ || __sun || __sgi || __ppc__ || __arm__ + typedef unsigned char UChar; + typedef short Int16; + typedef unsigned short UInt16; 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/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb index 69f15d0f8e..465346cd5d 100644 --- a/packages/libcroco/libcroco_0.6.0.bb +++ b/packages/libcroco/libcroco_0.6.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" SECTION = "x11/utils" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "glib-2.0 libxml2" LICENSE = "LGPL" PR = "r2" diff --git a/packages/libeina/libeina_0.96.5.bb b/packages/libeina/libeina_0.96.5.bb index 821cd3323a..d142c5ef67 100644 --- a/packages/libeina/libeina_0.96.5.bb +++ b/packages/libeina/libeina_0.96.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Multimedia library using gstreamer"" HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "file glib-2.0 gstreamer" diff --git a/packages/libeina/libeina_0.96.7.bb b/packages/libeina/libeina_0.96.7.bb index ac25e760dc..515654363e 100644 --- a/packages/libeina/libeina_0.96.7.bb +++ b/packages/libeina/libeina_0.96.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Multimedia library using gstreamer" HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR = "r2" DEPENDS = "glib-2.0 gstreamer" diff --git a/packages/libesmtp/libesmtp-1.0.1/configure.patch b/packages/libesmtp/libesmtp-1.0.1/configure.patch deleted file mode 100644 index 5058db4b99..0000000000 --- a/packages/libesmtp/libesmtp-1.0.1/configure.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libesmtp-1.0.1/configure.in~configure 2003-09-11 17:23:26.000000000 -0400 -+++ libesmtp-1.0.1/configure.in 2004-01-20 11:59:35.000000000 -0500 -@@ -231,7 +231,7 @@ - if test x$enable_emulate_getaddrinfo != xyes ; then - AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo]) - fi -- LIBOBJS="$LIBOBJS getaddrinfo.o" -+ AC_LIBOBJ([getaddrinfo]) - fi - - if test x"$enable_emulate_getaddrinfo" != xno ; then -@@ -259,7 +259,7 @@ - AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, , - [AC_MSG_ERROR([cannot find gethostbyname])]) - fi -- LIBOBJS="$LIBOBJS gethostbyname.o" -+ AC_LIBOBJ([gethostbyname]) - - AC_CACHE_CHECK([for IPv6 support], acx_cv_sys_use_ipv6, [ - AC_TRY_COMPILE([ -@@ -572,7 +572,7 @@ - dnl ######################################################################### - dnl Check that snprintf works correctly. - dnl ######################################################################### --ACX_SNPRINTF(,[LIBOBJS="$LIBOBJS snprintf.o"]) -+ACX_SNPRINTF(,[AC_LIBOBJ([snprintf])]) - - dnl ######################################################################### - dnl Make substitutions -@@ -588,8 +588,8 @@ - AC_SUBST(RANLIB) - AC_SUBST(subdirs) - --LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` --AC_SUBST(LTLIBOBJS) -+#LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` -+#AC_SUBST(LTLIBOBJS) - LTALLOCA=`echo "$ALLOCA" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` - AC_SUBST(LTALLOCA) - diff --git a/packages/libesmtp/libesmtp_1.0.1.bb b/packages/libesmtp/libesmtp_1.0.1.bb deleted file mode 100644 index fe6d958f1b..0000000000 --- a/packages/libesmtp/libesmtp_1.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SECTION = "libs" -DEPENDS = "openssl" -DESCRIPTION = "LibESMTP is a library to manage posting \ -(or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim." -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" - -SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2 \ - file://configure.patch;patch=1" -LICENSE = "LGPL GPL" -inherit autotools - -EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." - -do_stage () { - oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR} - install -m 644 auth-client.h ${STAGING_INCDIR} - install -m 644 auth-plugin.h ${STAGING_INCDIR} - install -m 644 libesmtp.h ${STAGING_INCDIR} -} diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.4.bb index baff0d8931..294333c579 100644 --- a/packages/libesmtp/libesmtp_1.0.3r1.bb +++ b/packages/libesmtp/libesmtp_1.0.4.bb @@ -1,22 +1,19 @@ -LICENSE = "GPL" -SECTION = "libs" -DEPENDS = "openssl" DESCRIPTION = "LibESMTP is a library to manage posting \ (or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim." -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" +preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." +LICENSE = "GPL" +SECTION = "libs/network" +DEPENDS = "openssl" +PR = "r1" SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." -do_stage () { - oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR} - install -m 644 auth-client.h ${STAGING_INCDIR} - install -m 644 auth-plugin.h ${STAGING_INCDIR} - install -m 644 libesmtp.h ${STAGING_INCDIR} +do_stage() { + autotools_stage_all } + +FILES_libesmtp_append = " ${libdir}/esmtp-plugins" diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch deleted file mode 100644 index 901615c416..0000000000 --- a/packages/libetpan/files/etpan_suffix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libetpan/configure.in~etpan_suffix -+++ libetpan/configure.in -@@ -371,7 +371,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/files/configure-pthreads.patch b/packages/libetpan/files/honor-oe-lflags.patch index c8f9566bd9..15a1535bfa 100644 --- a/packages/libetpan/files/configure-pthreads.patch +++ b/packages/libetpan/files/honor-oe-lflags.patch @@ -1,6 +1,11 @@ ---- libetpan-0.45/configure.in.orig 2006-05-09 09:48:36.000000000 +0100 -+++ libetpan-0.45/configure.in 2006-05-09 09:48:55.000000000 +0100 -@@ -350,7 +350,7 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- libetpan-0.46/configure.in~honor-oe-lflags ++++ libetpan-0.46/configure.in +@@ -361,7 +361,7 @@ LDFLAGS="-$flag $LDFLAGS" AC_TRY_LINK([], [pthread_create();], [pthflag=yes; checkpthread=no], diff --git a/packages/libetpan/files/mailstream.patch b/packages/libetpan/files/mailstream.patch deleted file mode 100644 index 2d0dad06fd..0000000000 --- a/packages/libetpan/files/mailstream.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNad libetpan-0.45~/src/data-types/mailstream_ssl.c libetpan-0.45/src/data-types/mailstream_ssl.c ---- libetpan-0.45~/src/data-types/mailstream_ssl.c 2006-02-17 23:45:14.000000000 +0300 -+++ libetpan-0.45/src/data-types/mailstream_ssl.c 2006-04-17 19:11:48.609551256 +0400 -@@ -448,7 +448,7 @@ - break; - - default: -- return r; -+ return -1; - } - } - } -@@ -486,7 +486,7 @@ - break; - - default: -- return r; -+ return -1; - } - } - } diff --git a/packages/libetpan/libetpan_0.38.bb b/packages/libetpan/libetpan_0.38.bb deleted file mode 100644 index 9dcb318b0c..0000000000 --- a/packages/libetpan/libetpan_0.38.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \ -SMTP, POP, IMAP and NNTP" -SECTION = "libs" -DEPENDS = "gnutls" -LICENSE = "BSD" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" - -do_stage () { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb deleted file mode 100644 index 51757a7265..0000000000 --- a/packages/libetpan/libetpan_0.43.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ -It supports the protocols SMTP, POP3, IMAP and NNTP." -HOMEPAGE = "http://www.etpan.org" -SECTION = "libs" -DEPENDS = "gnutls" -LICENSE = "BSD" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" - -do_stage() { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.45.bb b/packages/libetpan/libetpan_0.46.bb index 4b7abede50..dfef3b19c6 100644 --- a/packages/libetpan/libetpan_0.45.bb +++ b/packages/libetpan/libetpan_0.46.bb @@ -7,17 +7,16 @@ LICENSE = "BSD" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 \ - file://mailstream.patch;patch=1 \ - file://configure-pthreads.patch;patch=1 " + file://honor-oe-lflags.patch;patch=1" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext binconfig EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" + PARALLEL_MAKE = "" do_stage() { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} + autotools_stage_all } FILES_${PN} = "${libdir}/lib*.so.*" 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 new file mode 100644 index 0000000000..57b7b22191 --- /dev/null +++ b/packages/libgpepimc/libgpepimc_0.8.bb @@ -0,0 +1 @@ +require libgpepimc.inc diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb index 17cbd86343..ebadfb48a7 100644 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ b/packages/libgpeplugin/libgpeplugin_cvs.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Plugin system for GPE applications" AUTHOR = "Luce DeCicco <ldecicco@gmail.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "gtk+ libgpewidget" PV = "0.0+cvs${SRCDATE}" diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index 31c900dd7e..27714b8f6d 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL" DESCRIPTION = "Data interchange library for GPE" SECTION = "gpe/libs" PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb new file mode 100644 index 0000000000..21ab29bff6 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.114.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" + +PACKAGES =+ "libgpewidget-bin" +FILES_libgpewidget-bin = "${bindir}" + +EXTRA_OECONF = "--enable-cairo" + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} 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.inc b/packages/libmatchbox/libmatchbox.inc index 1a33fac5af..71682b336a 100644 --- a/packages/libmatchbox/libmatchbox.inc +++ b/packages/libmatchbox/libmatchbox.inc @@ -1,7 +1,7 @@ SECTION = "x11/libs" DESCRIPTION = "Matchbox window manager core library" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext expat libxft jpeg libpng zlib libxsettings-client" +DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client" PR = "r2" inherit autotools pkgconfig 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/gslist-fix.patch b/packages/libmimedir/files/gslist-fix.patch new file mode 100644 index 0000000000..ef28ecdc53 --- /dev/null +++ b/packages/libmimedir/files/gslist-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/mimedir-attribute.c 2006-08-12 19:55:04.000000000 +0200 ++++ libmimedir/mimedir/mimedir-attribute.c 2006-08-12 19:55:49.938306000 +0200 +@@ -1768,7 +1768,7 @@ + } + break; + case ',': +- g_slist_append (list, g_string_free (string, FALSE)); ++ list = g_slist_append (list, g_string_free (string, FALSE)); + string = g_string_new (""); + break; + case '\r': 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..f3adcc22f4 --- /dev/null +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native glib-2.0" +PR = "r2" +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 \ + file://gslist-fix.patch;patch=1" + +S = "${WORKDIR}/libmimedir" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ libmimedir-utils +PACKAGES_DYNAMIC = "libmimedir-0.4*" +FILES_libmimedir-utils = "${bindir}/" 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..6b50f5de79 --- /dev/null +++ b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch @@ -0,0 +1,13 @@ +--- libopie2/opiecore/device/odevice.h_orig 2006-08-06 14:22:16.000000000 +0000 ++++ libopie2/opiecore/device/odevice.h 2006-08-06 14:22:58.000000000 +0000 +@@ -73,7 +73,9 @@ + Model_iPAQ_HX4700 = ( Model_iPAQ | 0x000A ), + Model_Jornada = ( 6 << 16 ), + Model_Jornada_56x = ( Model_Jornada | 0x0001 ), +- Model_Jornada_720 = ( Model_Jornada | 0x0002 ), ++ Model_Jornada_6xx = ( Model_Jornada | 0x0003 ), ++ Model_Jornada_7xx = ( 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..8481f0f419 --- /dev/null +++ b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch @@ -0,0 +1,57 @@ +--- libopie2/opiecore/device/odevice_jornada.cpp_orig 2006-08-06 14:34:15.000000000 +0000 ++++ libopie2/opiecore/device/odevice_jornada.cpp 2006-08-06 14:34:53.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,10 +190,11 @@ + 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..6ae22316c5 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=1 \ + file://odevice_jornada.cpp-fixup.patch;patch=1" 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/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb index 2725031201..5f433e4619 100644 --- a/packages/libpixman/libpixman_0.1.5.bb +++ b/packages/libpixman/libpixman_0.1.5.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb index 2725031201..5f433e4619 100644 --- a/packages/libpixman/libpixman_0.1.6.bb +++ b/packages/libpixman/libpixman_0.1.6.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb index cd59c7b050..0ed6ff7dd9 100644 --- a/packages/libpixman/libpixman_cvs.bb +++ b/packages/libpixman/libpixman_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman" diff --git a/packages/libpng/libpng-native_1.2.12.bb b/packages/libpng/libpng-native_1.2.12.bb new file mode 100644 index 0000000000..231b956678 --- /dev/null +++ b/packages/libpng/libpng-native_1.2.12.bb @@ -0,0 +1,14 @@ +require libpng_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" +DEPENDS = "zlib-native" + +INHIBIT_NATIVE_STAGE_INSTALL = "1" + +do_stage_append() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} 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/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb new file mode 100644 index 0000000000..24117cb0ef --- /dev/null +++ b/packages/libpng/libpng_1.2.12.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +LICENSE = "libpng" +SECTION = "libs" +PRIORITY = "required" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +PR = "r3" + +DEPENDS = "zlib" + +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" + +FILES_${PN}12-dbg = ${libdir}/libpng12*.dbg +FILES_${PN}12 = ${libdir}/libpng12.so.* +FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" +S = "${WORKDIR}/libpng-${PV}" + +inherit pkgconfig binconfig pkgconfig + +EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}" + +do_compile() { + sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//' + unset LDFLAGS + oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ + 'ZLIBINC=${STAGING_INCDIR}' \ + 'ZLIBLIB=${STAGING_LIBDIR}' +} + +# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed +# pkgconfig.bbclass will use a similar trick to fix them + +do_stage_prepend() { + sed -i -e 's:=@libdir@:=${libdir}:;' \ + -e 's:=@includedir@:=${includedir}:;' \ + -e 's:=@prefix@:=${prefix}:' \ + -e 's:=@exec_prefix@:=${exec_prefix}:' \ + -e 's:-lpng12:-lpng12\ -lz\ -lm:' \ + libpng.pc + +} + +do_stage() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} + +do_install() { + install -d ${D}${bindir} ${D}${mandir} \ + ${D}${libdir} ${D}${includedir} + unset LDFLAGS + oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ + 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ + 'DL=${D}${libdir}' 'DM=${D}${mandir}' \ + install +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libpng12', d) + bb.build.exec_func('package_do_package', d) +} + diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb index 81274dc762..b1096779fa 100644 --- a/packages/libpng/libpng_1.2.8.bb +++ b/packages/libpng/libpng_1.2.8.bb @@ -7,8 +7,9 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS = "zlib" -PACKAGES =+ "${PN}12 ${PN}12-dev" +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" +FILES_${PN}12-dbg = ${libdir}/libpng12*.dbg FILES_${PN}12 = ${libdir}/libpng12.so.* FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc FILES_${PN} = ${libdir}/lib*.so.* 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/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb index 679b1b0558..e64e3097dc 100644 --- a/packages/librsvg/librsvg_2.11.1.bb +++ b/packages/librsvg/librsvg_2.11.1.bb @@ -5,6 +5,8 @@ DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt" LICENSE = "LGPL" PR = "r1" +EXTRA_OECONF = "--disable-mozilla-plugin" + inherit autotools pkgconfig gnome PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg" diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb index c003d76a31..b87685b913 100644 --- a/packages/libsdl/libsdl-qpe_1.2.7.bb +++ b/packages/libsdl/libsdl-qpe_1.2.7.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r8" +PR = "r9" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey.patch;patch=1 \ @@ -53,4 +53,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } 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/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb index a29a56adab..6c75068c09 100644 --- a/packages/libsdl/libsdl-x11_1.2.7.bb +++ b/packages/libsdl/libsdl-x11_1.2.7.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-qpe -PR = "r8" +PR = "r9" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ @@ -53,4 +53,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb index 986dba6da0..1fba3c4174 100644 --- a/packages/libsdl/libsdl-x11_1.2.9.bb +++ b/packages/libsdl/libsdl-x11_1.2.9.bb @@ -1,12 +1,11 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "alsa-lib virtual/x11 libxext" +DEPENDS = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -# NOTE: make sure to keep PR in sync with libsdl-qpe -PR = "r0" +PR = "r1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ @@ -52,4 +51,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb index 526e1bd6ed..f6d5cbc600 100644 --- a/packages/libsexy/libsexy_0.1.4.bb +++ b/packages/libsexy/libsexy_0.1.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" AUTHOR = "Christian Hammond <chipx86@chipx86.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>"" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"" PR = "r1" DEPENDS = "gtk+ enchant libxml2" diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb index 5ac5d296fb..e2c63a6648 100644 --- a/packages/libsexy/libsexy_0.1.5.bb +++ b/packages/libsexy/libsexy_0.1.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" AUTHOR = "Christian Hammond <chipx86@chipx86.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>"" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"" PR = "r0" DEPENDS = "gtk+ enchant libxml2" diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb index 5ac5d296fb..e2c63a6648 100644 --- a/packages/libsexy/libsexy_0.1.6.bb +++ b/packages/libsexy/libsexy_0.1.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" AUTHOR = "Christian Hammond <chipx86@chipx86.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>"" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"" PR = "r0" DEPENDS = "gtk+ enchant libxml2" diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb index 4e55160042..0c714ec633 100644 --- a/packages/libsexy/libsexy_0.1.8.bb +++ b/packages/libsexy/libsexy_0.1.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" AUTHOR = "Christian Hammond <chipx86@chipx86.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>"" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"" PR = "r0" DEPENDS = "gtk+ enchant libxml2" 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 073c977ddb..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/x11" -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/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 4f76bde334..dfce1d32ec 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 0012301a16..8f172f23a7 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxsettings-client/libxsettings-client_0.12.bb b/packages/libxsettings-client/libxsettings-client_0.12.bb index 5b707c074f..8914c3d0c4 100644 --- a/packages/libxsettings-client/libxsettings-client_0.12.bb +++ b/packages/libxsettings-client/libxsettings-client_0.12.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libgpewidget libxsettings virtual/x11" +DEPENDS = "libgpewidget libxsettings virtual/libx11" inherit pkgconfig gpe diff --git a/packages/libxsettings-client/libxsettings-client_0.13.bb b/packages/libxsettings-client/libxsettings-client_0.13.bb index 14c9e6544e..97ebe9c7ab 100644 --- a/packages/libxsettings-client/libxsettings-client_0.13.bb +++ b/packages/libxsettings-client/libxsettings-client_0.13.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libgpewidget libxsettings virtual/x11" +DEPENDS = "libgpewidget libxsettings virtual/libx11" inherit pkgconfig gpe diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb index f47b99f849..42a4a55e29 100644 --- a/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt" +DEPENDS = "libxsettings virtual/libx11 libxt" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 15786d5d87..7872a434b1 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt" +DEPENDS = "libxsettings virtual/libx11 libxt" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb index 6c60c0499e..f25ca927ad 100644 --- a/packages/libxsettings-client/libxsettings-client_0.17.bb +++ b/packages/libxsettings-client/libxsettings-client_0.17.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt gtk-doc" +DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/libxsettings/libxsettings_0.11.bb b/packages/libxsettings/libxsettings_0.11.bb index 867bcb1355..d3197a89c2 100644 --- a/packages/libxsettings/libxsettings_0.11.bb +++ b/packages/libxsettings/libxsettings_0.11.bb @@ -3,7 +3,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit gpe diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb index b2c2e6d4f0..78580d6f1a 100644 --- a/packages/lineak/lineak_0.8.3.bb +++ b/packages/lineak/lineak_0.8.3.bb @@ -3,7 +3,7 @@ SECTION = "gpe/multimedia" HOMEPAGE = "http://lineak.sourceforge.net" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \ diff --git a/packages/links/links-x11_2.1pre21.bb b/packages/links/links-x11_2.1pre21.bb index 6854248de2..4323b2e59a 100644 --- a/packages/links/links-x11_2.1pre21.bb +++ b/packages/links/links-x11_2.1pre21.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "console/network" -DEPENDS = "jpeg libpng flex openssl zlib virtual/x11" +DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." RCONFLICTS = "links" diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb index 6854248de2..4323b2e59a 100644 --- a/packages/links/links-x11_2.1pre22.bb +++ b/packages/links/links-x11_2.1pre22.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "console/network" -DEPENDS = "jpeg libpng flex openssl zlib virtual/x11" +DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." RCONFLICTS = "links" diff --git a/packages/xproto/.mtn2git_empty b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xproto/.mtn2git_empty +++ 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/LAB-kernel/greatwall_header b/packages/linux/LAB-kernel/greatwall_header Binary files differnew file mode 100644 index 0000000000..8a9589627e --- /dev/null +++ b/packages/linux/LAB-kernel/greatwall_header diff --git a/packages/linux/LAB-kernel/greatwall_trailer b/packages/linux/LAB-kernel/greatwall_trailer new file mode 100644 index 0000000000..96f565db6b --- /dev/null +++ b/packages/linux/LAB-kernel/greatwall_trailer @@ -0,0 +1 @@ +HTCE
\ No newline at end of file diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb index eb5e97cc70..3a32616d45 100644 --- a/packages/linux/LAB-kernel_2.6.13-hh2.bb +++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb @@ -1,9 +1,8 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" -KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 22128880ed..aa393af203 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" @@ -9,14 +9,15 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-1" -KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://initramfs_list \ - file://defconfig" + file://defconfig \ + file://greatwall_header \ + file://greatwall_trailer" S = "${WORKDIR}/kernel26" @@ -27,12 +28,17 @@ ALLOW_EMPTY_kernel-image_h2200 = 1 K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "15" +K_MICRO = "16" HHV = "0" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" + do_configure() { + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + # Substitute our uid/gid so the initramfs gets the right ownership. MY_UID=`id -u` MY_GID=`id -g` @@ -48,6 +54,9 @@ do_configure() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE} + + # Generate the HTC flavor, which must be a multiple of 512 bytes long. + cat ${WORKDIR}/greatwall_header arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${WORKDIR}/greatwall_trailer | dd conv=sync of=${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}.htc } do_stage() { 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/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig index 79187ffa99..eb68f48801 100644 --- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-hh0 -# Thu May 11 10:23:12 2006 +# Linux kernel version: 2.6.16-hh5 +# Thu Aug 10 15:54:59 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -129,6 +129,12 @@ CONFIG_ARCH_H2200=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_ROVERP1 is not set @@ -213,7 +219,8 @@ CONFIG_PCMCIA_H2200=y # CONFIG_PREEMPT=y CONFIG_NO_IDLE_HZ=y -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -236,9 +243,19 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mmcblk0p1" # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y CONFIG_PXA25x_ALTERNATE_FREQS=y # @@ -258,7 +275,6 @@ CONFIG_FPE_FASTFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_MISC=m -# CONFIG_ARTHUR is not set # # Power management options @@ -1094,11 +1110,13 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -1117,7 +1135,9 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_A716 is not set # CONFIG_SND_H1910 is not set CONFIG_SND_H2200=y +# CONFIG_SND_HTCMAGICIAN is not set # CONFIG_SND_HX4700 is not set +# CONFIG_SND_HTCUNIVERSAL is not set # CONFIG_SND_H5XXX_AK4535 is not set CONFIG_SND_PXA2xx_I2SOUND=y # CONFIG_SND_PXA2XX_AC97 is not set @@ -1125,7 +1145,7 @@ CONFIG_SND_PXA2xx_I2SOUND=y # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices @@ -1157,7 +1177,7 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_ISP116X_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m @@ -1181,7 +1201,11 @@ CONFIG_USB_SL811_CS=m # # USB Input Devices # -# CONFIG_USB_HID is not set +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set # # USB HID Boot Protocol drivers @@ -1220,19 +1244,31 @@ CONFIG_USB_SL811_CS=m # CONFIG_USB_KONICAWC is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set +CONFIG_USB_SN9C102=m # CONFIG_USB_STV680 is not set -# CONFIG_USB_PWC is not set +CONFIG_USB_PWC=m # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_ZD1201=m CONFIG_USB_MON=y # @@ -1305,7 +1341,8 @@ CONFIG_MMC_SAMCOP=y # # LED devices # -# CONFIG_CLASS_LEDS is not set +CONFIG_CLASS_LEDS=y +CONFIG_LEDS_H2200=y # # File systems @@ -1380,8 +1417,8 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_RELAYFS_FS=m +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems @@ -1389,7 +1426,7 @@ CONFIG_RAMFS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set +CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -1417,20 +1454,23 @@ CONFIG_CRAMFS=m # CONFIG_NFS_FS=m CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -# CONFIG_NFSD_V4 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m -# CONFIG_RPCSEC_GSS_KRB5 is not set +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set @@ -1444,7 +1484,7 @@ CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m CONFIG_RXRPC=m -# CONFIG_9P_FS is not set +CONFIG_9P_FS=m # # Partition Types diff --git a/packages/xrandr/.mtn2git_empty b/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xrandr/.mtn2git_empty +++ b/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig new file mode 100644 index 0000000000..82f309c895 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig @@ -0,0 +1,1540 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-hh5 +# Sat Aug 12 10:50:22 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +# CONFIG_MINIMAL_OOPS is not set +CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_USELIB=y +CONFIG_CORE_DUMP=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=y + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_ARCH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +CONFIG_ARCH_H5400=y +# CONFIG_IPAQ_H5400_LCD is not set +CONFIG_IPAQ_H5400_BATTERY=m +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA25x=y +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y + +# +# Compaq/iPAQ Platforms +# +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +CONFIG_IPAQ_CLOCKS=y +CONFIG_IPAQ_SLEEVE=y +CONFIG_IPAQ_SAMCOP=y +# CONFIG_IPAQ_HAMCOP is not set +CONFIG_IPAQ_SAMCOP_TOUCHSCREEN=y +# CONFIG_IPAQ_SAMCOP_FSI is not set +# CONFIG_IPAQ_SAMCOP_SLEEVE is not set +CONFIG_IPAQ_SAMCOP_DMA=y +CONFIG_DMABOUNCE=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=m +CONFIG_IPAQ_PCMCIA_SLEEVE=m + +# +# Kernel Features +# +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_QUEUE is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +CONFIG_IRPORT_SIR=m + +# +# Old Serial dongle support +# +# CONFIG_DONGLE_OLD is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +# CONFIG_PXA_FICP is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +# CONFIG_BT_HCIBLUECARD is not set +CONFIG_BT_HCIBTUART=m +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_SHARPSL is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP 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 is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +# CONFIG_ACX is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_NEWTON=m +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=m +CONFIG_SERIO_SERPORT=m +# CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELV is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# L3 serial bus support +# +CONFIG_L3=m + +# +# Mice +# +# CONFIG_BUSMOUSE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +# CONFIG_NVRAM is not set +CONFIG_SA1100_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_H5400_BUZZER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=y +# CONFIG_W1_DS9490 is not set +# CONFIG_W1_THERM is not set +# CONFIG_W1_SMEM is not set +# CONFIG_W1_DS2433 is not set +CONFIG_W1_SAMCOP=y +CONFIG_W1_DS2760=y + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# SoC drivers +# +CONFIG_SOC_MQ11XX=y +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_SOC_TSC2101 is not set + +# +# Misc devices +# +# CONFIG_BATTERY_MONITOR is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m + +# +# Video For Linux +# + +# +# Video Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_CPIA=m +# CONFIG_VIDEO_CPIA_USB is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_MAESTRO is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=m +# CONFIG_FB_PXA_PARAMETERS is not set +CONFIG_FB_MQ1100=m +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=m +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_STORAGE is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_ITMTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_PWC is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=y +CONFIG_USB_PXA2XX_SMALL=y +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_G_CHAR is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=m +# CONFIG_MMC_TMIO is not set +CONFIG_MMC_SAMCOP=y +# CONFIG_MMC_ASIC3 is not set + +# +# LED devices +# +CONFIG_CLASS_LEDS=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=m +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +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_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +# CONFIG_NFSD_TCP is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y 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/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index bcd904c6c6..da28b781af 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-hh0 -# Thu May 11 11:50:06 2006 +# Linux kernel version: 2.6.16-hh5 +# Thu Aug 10 16:39:20 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -137,6 +137,12 @@ CONFIG_HX4700_LEDS=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_MACH_X30 is not set @@ -146,6 +152,7 @@ CONFIG_HX4700_LEDS=y # CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set CONFIG_PXA27x=y +CONFIG_IWMMXT=y # CONFIG_SA1100_H3100 is not set # CONFIG_SA1100_H3600 is not set # CONFIG_SA1100_H3800 is not set @@ -217,7 +224,8 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -250,8 +258,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_PXA=y CONFIG_PXA25x_ALTERNATE_FREQS=y @@ -272,7 +280,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -291,7 +298,7 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y @@ -602,15 +609,18 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m +CONFIG_IDE=y CONFIG_BLK_DEV_IDE=m # @@ -718,6 +728,7 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # # CONFIG_NET_ETHERNET is not set +CONFIG_MII=m # # Ethernet (1000 Mbit) @@ -822,7 +833,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -1140,19 +1151,19 @@ CONFIG_LCD_DEVICE=y # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -1171,7 +1182,9 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_A716 is not set # CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set +# CONFIG_SND_HTCMAGICIAN is not set CONFIG_SND_HX4700=m +# CONFIG_SND_HTCUNIVERSAL is not set # CONFIG_SND_H5XXX_AK4535 is not set CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set @@ -1291,19 +1304,31 @@ CONFIG_USB_MOUSE=m # CONFIG_USB_KONICAWC is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set +CONFIG_USB_SN9C102=m # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_ZD1201=m CONFIG_USB_MON=y # @@ -1385,17 +1410,33 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=m -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +# CONFIG_REISERFS_FS_POSIX_ACL is not set +# CONFIG_REISERFS_FS_SECURITY is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y # CONFIG_QUOTA is not set +CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1404,7 +1445,10 @@ CONFIG_DNOTIFY=y # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_ZISOFS_FS=m CONFIG_UDF_FS=m CONFIG_UDF_NLS=y @@ -1416,7 +1460,9 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -1426,8 +1472,8 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_RELAYFS_FS=m +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems @@ -1435,14 +1481,14 @@ CONFIG_RAMFS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set +CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 -# CONFIG_JFFS2_FS_WRITEBUFFER is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y @@ -1461,14 +1507,38 @@ CONFIG_CRAMFS=m # # Network File Systems # -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp437" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set +CONFIG_9P_FS=m # # Partition Types @@ -1494,46 +1564,46 @@ CONFIG_MSDOS_PARTITION=y # # Native Language Support # -CONFIG_NLS=m +CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m CONFIG_NLS_CODEPAGE_932=m -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y # # Profiling support @@ -1580,7 +1650,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 7fcfc93943..7dfcb4d237 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 = "r3" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|ipaq-pxa270|htcuniversal)' 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;maxdate=20060807 \ + file://defconfig" S = "${WORKDIR}/kernel26" @@ -21,16 +22,23 @@ inherit kernel FILES_kernel-image_ipaq-pxa270 = "" ALLOW_EMPTY_ipaq_pxa270 = 1 +FILES_kernel-image_htcuniversal = "" +ALLOW_EMPTY_htcuniversal = 1 K_MAJOR = "2" K_MINOR = "6" K_MICRO = "16" -HHV = "4" +HHV = "5" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" do_configure() { - rm -f ${S}/.config + + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + + rm -f ${S}/.config if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." @@ -57,6 +65,7 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } + do_deploy[dirs] = "${S}" addtask deploy before do_package after do_compile diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index bdc2f86633..41cab94908 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -4,7 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3600|simpad)' +COMPATIBLE_MACHINE = '(h3600|simpad|jornada56x)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" 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-efika_2.6.16.bb b/packages/linux/linux-efika_2.6.16.bb index 93a8863aba..1e43baca56 100644 --- a/packages/linux/linux-efika_2.6.16.bb +++ b/packages/linux/linux-efika_2.6.16.bb @@ -4,6 +4,8 @@ MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" PR = "r0" +COMPATIBLE_MACHINE = "efika" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://defconfig \ " diff --git a/packages/xrdb/.mtn2git_empty b/packages/linux/linux-h1940-2.6.17-h1940/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xrdb/.mtn2git_empty +++ b/packages/linux/linux-h1940-2.6.17-h1940/.mtn2git_empty diff --git a/packages/linux/linux-h1940-2.6.17-h1940/defconfig b/packages/linux/linux-h1940-2.6.17-h1940/defconfig new file mode 100644 index 0000000000..860a338add --- /dev/null +++ b/packages/linux/linux-h1940-2.6.17-h1940/defconfig @@ -0,0 +1,1097 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-h1940 +# Thu Jul 27 09:46:13 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=y + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +CONFIG_ARCH_S3C2410=y +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# S3C24XX Implementations +# +# CONFIG_MACH_ANUBIS is not set +# CONFIG_MACH_OSIRIS is not set +# CONFIG_ARCH_BAST is not set +CONFIG_ARCH_H1940=y +# CONFIG_MACH_N30 is not set +# CONFIG_ARCH_SMDK2410 is not set +# CONFIG_ARCH_S3C2440 is not set +# CONFIG_MACH_VR1000 is not set +# CONFIG_MACH_RX3715 is not set +# CONFIG_MACH_OTOM is not set +# CONFIG_MACH_NEXCODER_2440 is not set +CONFIG_CPU_S3C2410=y + +# +# S3C2410 Boot +# +# CONFIG_S3C2410_BOOT_WATCHDOG is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set + +# +# S3C2410 Setup +# +CONFIG_S3C2410_DMA=y +# CONFIG_S3C2410_DMA_DEBUG is not set +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C2410_LOWLEVEL_UART_PORT=1 + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=200 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="rw root=/dev/ram console=tty0 console=ttySAC2,115200n8 panic=30" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_FTL=y +CONFIG_NFTL=y +CONFIG_NFTL_RW=y +CONFIG_INFTL=y +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_S3C2410=y +CONFIG_MTD_NAND_S3C2410_DEBUG=y +CONFIG_MTD_NAND_S3C2410_HWECC=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_S3C2410_BUTTONS=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_S3C2410=y +# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_S3C2410=y +CONFIG_SERIAL_S3C2410_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=128 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_S3C2410_WATCHDOG=y +# CONFIG_NVRAM is not set +CONFIG_S3C2410_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_S3C2410=y +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_S3C24XX=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_H1940=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_FIRMWARE_EDID is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_CLEAN_4x6=y +CONFIG_FONT_CLEAN_5x8=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_S3C2410=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +CONFIG_USB_GADGET_S3C2410=y +CONFIG_USB_S3C2410=y +# CONFIG_USB_S3C2410_DEBUG is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_S3C2410=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_MINIX_FS=y +CONFIG_ROMFS_FS=y +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=16 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEBUG_WAITQ=y +# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_DEBUG_S3C2410_PORT=y +CONFIG_DEBUG_S3C2410_UART=2 + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb new file mode 100644 index 0000000000..3dd1f7733d --- /dev/null +++ b/packages/linux/linux-h1940_2.6.17-h1940.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Linux kernel for h1940 devices." +MAINTAINER = "Arjan Schrijver <arjan@anymore.nl>" +SECTION = "kernel" +LICENSE = "GPL" + +PR = "r1" + +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/full.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;patch=1 \ + http://anymore.nl/ipaq/usbgadget_fixups.patch;patch=1 \ + http://anymore.nl/ipaq/udc_usb_gadget_register_driver_fix.patch;patch=1 \ + http://anymore.nl/ipaq/udc_unbind.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/linux-2.6.17" + +inherit kernel + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + yes '' | oe_runmake oldconfig +} 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 0b68fa7c64..4572f7cf9a 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 -# Thu Jul 13 16:52:12 2006 +# Sun Aug 13 16:30:04 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -36,7 +36,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=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 @@ -445,7 +446,13 @@ CONFIG_FW_LOADER=y # # Plug and Play support # -# CONFIG_PNP is not set +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_ISAPNP is not set # # Block devices @@ -482,6 +489,7 @@ CONFIG_BLK_DEV_IDECS=y # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y +# CONFIG_BLK_DEV_IDEPNP is not set CONFIG_IDE_SH=y # CONFIG_IDE_ARM is not set # CONFIG_IDE_CHIPSETS is not set @@ -522,10 +530,11 @@ 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 +# CONFIG_NET_SB1000 is not set # # ARCnet devices @@ -535,13 +544,24 @@ 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 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,13 +580,13 @@ 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_ARLAN is not set CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m @@ -613,8 +633,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 +677,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 +704,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 +1122,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 +1135,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 +1154,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/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 0bb2e3a645..bba29ac1d6 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -198,3 +198,7 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_package after do_install + +# wlan-ng stuff need compiled kernel sources +do_rm_work() { +} diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 270d6d7060..3aa85c1f98 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc -PR = "r41" +PR = "r42" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -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 \ @@ -87,7 +87,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ file://locomo-lcd-def-bightness.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 56b79952ac..f8fd9432ec 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -1,6 +1,6 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc -PR = "r7" +PR = "r8" DEFAULT_PREFERENCE = "-1" @@ -38,7 +38,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${RPSRC}/poodle_audio-r0.patch;patch=1 \ ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 88d33b352f..950f9fd787 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,8 +1,6 @@ -include linux-openzaurus.inc +require linux-openzaurus.inc -PR = "r11" - -DEFAULT_PREFERENCE = "-1" +PR = "r16" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -30,8 +28,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \ - ${RPSRC}/asoc_fixes2-r0.patch;patch=1 \ - ${RPSRC}/hx2750_base-r26.patch;patch=1 \ + ${RPSRC}/asoc_fixes2-r2.patch;patch=1 \ + ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ ${RPSRC}/pxa_keys-r5.patch;patch=1 \ @@ -50,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ ${RPSRC}/poodle_audio-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch b/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch new file mode 100644 index 0000000000..9324ba4cc2 --- /dev/null +++ b/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch @@ -0,0 +1,22 @@ +--- linux-2.6.17/include/asm-sh/pci.h.orig 2006-07-27 10:17:30.000000000 +1000 ++++ linux-2.6.17/include/asm-sh/pci.h 2006-07-27 10:21:53.000000000 +1000 +@@ -143,6 +143,19 @@ + /* generic pci stuff */ + #include <asm-generic/pci.h> + ++#ifdef CONFIG_SH_TITAN ++/* ++ * With the updated BIOS the RTL8139D is function 1 while the ++ * mini-pci card is function 0 of the RTL8139D. This is a feature ++ * which enables more pci bus-master inputs than are available by ++ * using a bus-master sharing feature of the RTL8139D. Without this ++ * patch the RTL8139D isn't detected when no mini-pci card is ++ * inserted. ++ */ ++#undef pcibios_scan_all_fns ++#define pcibios_scan_all_fns(a, b) ((b)?0:1) ++#endif ++ + /* generic DMA-mapping stuff */ + #include <asm-generic/pci-dma-compat.h> + diff --git a/packages/linux/linux-titan-sh4_2.6.17.bb b/packages/linux/linux-titan-sh4_2.6.17.bb index c3bae053cb..17ea61baa4 100644 --- a/packages/linux/linux-titan-sh4_2.6.17.bb +++ b/packages/linux/linux-titan-sh4_2.6.17.bb @@ -2,11 +2,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for SH4 based TITAN router appliance" LICENSE = "GPL" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org> -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - cvs://anonymous@linuxsh.cvs.sourceforge.net/cvsroot/linuxsh;module=linux;date=20060709 \ + cvs://anonymous@linuxsh.cvs.sourceforge.net/cvsroot/linuxsh;module=linux;date=20060726 \ file://titan-flash.patch;patch=1 \ + file://titan-pcibios-scan-update.patch;patch=1 \ file://titan-config" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/netbookpro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb index 671f0fba4f..fe0edb6c18 100644 --- a/packages/linux/netbookpro-kernel_2.6.17.bb +++ b/packages/linux/netbook-pro-kernel_2.6.17.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro compatible machines" SECTION = "kernel" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "netbook-pro" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ - http://linuxtogo.org/~koen/netbook-base-r2.patch;patch=1 \ + http://linuxtogo.org/~koen/netbook-base-r3.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-r0.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;patch=1 \ http://linuxtogo.org/~koen/defconfig \ 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 43253937b2..214ae5c60a 100644 --- a/packages/lirc/lirc_0.8.0.bb +++ b/packages/lirc/lirc_0.8.0.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.lirc.org" MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>" LICENSE = "GPL" -DEPENDS = "virtual/kernel virtual/x11 libxau libsm libice" +DEPENDS = "virtual/kernel virtual/libx11 libxau libsm libice" DEPENDS_nslu2 = "virtual/kernel lirc-modules" RDEPENDS = "lirc-modules" RDEPENDS_lirc-x = "lirc" @@ -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/loudmouth/loudmouth_1.0.1.bb b/packages/loudmouth/loudmouth_1.0.1.bb index 32cf9156fc..ab5ee81b9f 100644 --- a/packages/loudmouth/loudmouth_1.0.1.bb +++ b/packages/loudmouth/loudmouth_1.0.1.bb @@ -1,6 +1,6 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gnutls" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz" 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/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index e3158c045c..84915e03e2 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,8 +1,10 @@ --- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 +++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 -@@ -73,4 +73,4 @@ +@@ -77,5 +77,5 @@ + LDOPTS= -EB - COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC - COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ - -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 393167c165..7ab46e16b3 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,8 @@ --- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 +++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 -@@ -74,4 +74,4 @@ +@@ -79,4 +79,4 @@ LDOPTS= -EL - COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ - -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mapcs-32 -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc new file mode 100644 index 0000000000..488d9aefa4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" +LICENSE = "GPL" +RDEPENDS = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel" +PR="r0" + +SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ + file://10-xscale-be-elf-copts.patch;patch=1 \ + file://10-xscale-le-elf-copts.patch;patch=1 \ + file://10-sh4-le-elf-copts.patch;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module-base + +EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" + +EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " + +do_compile() { + oe_runmake all +} + +do_stage() { + install -d ${STAGING_INCDIR}/${PN}/include + install -d ${STAGING_INCDIR}/${PN}/net80211 + cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ + cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ +} + +do_install() { + install -d ${D}${sbindir} + oe_runmake DESTDIR=${D} BINDIR=${sbindir} install +} + +pkg_postinst() { +if test "x$D" != "x"; then + exit 1 +else + depmod -ae +fi +} + +PACKAGES = "${PN}-modules ${PN}-tools" +FILES_${PN}-modules = "/lib/modules/" +FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb index 488d9aefa4..84af37257d 100644 --- a/packages/madwifi/madwifi-ng_r1527-20060425.bb +++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb @@ -1,49 +1,2 @@ -DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" -LICENSE = "GPL" -RDEPENDS = "kernel (${KERNEL_VERSION})" -DEPENDS = "virtual/kernel" +require madwifi-ng_r.inc PR="r0" - -SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ - file://10-xscale-be-elf-copts.patch;patch=1 \ - file://10-xscale-le-elf-copts.patch;patch=1 \ - file://10-sh4-le-elf-copts.patch;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module-base - -EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" - -EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " - -do_compile() { - oe_runmake all -} - -do_stage() { - install -d ${STAGING_INCDIR}/${PN}/include - install -d ${STAGING_INCDIR}/${PN}/net80211 - cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ - cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ -} - -do_install() { - install -d ${D}${sbindir} - oe_runmake DESTDIR=${D} BINDIR=${sbindir} install -} - -pkg_postinst() { -if test "x$D" != "x"; then - exit 1 -else - depmod -ae -fi -} - -PACKAGES = "${PN}-modules ${PN}-tools" -FILES_${PN}-modules = "/lib/modules/" -FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb new file mode 100644 index 0000000000..6268f2b78f --- /dev/null +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -0,0 +1,2 @@ +require madwifi-ng_r.inc +PR="r1" diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb index 93bf0cbfa2..5be7259d98 100644 --- a/packages/maemo/hildon-fm_0.9.1-2.bb +++ b/packages/maemo/hildon-fm_0.9.1-2.bb @@ -1,6 +1,6 @@ PR = "r1" LICENSE = "GPL/LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz" diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb index 9656fd85b6..7d09b02127 100644 --- a/packages/maemo/hildon-lgpl_0.9.14-2.bb +++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf" diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb index 05403155b5..bcbdccb8e4 100644 --- a/packages/maemo/hildon-libs_0.9.6-2.bb +++ b/packages/maemo/hildon-libs_0.9.6-2.bb @@ -1,6 +1,6 @@ PR = "r1" LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ diff --git a/packages/maemo/lessertunjo_0.0.10.bb b/packages/maemo/lessertunjo_0.0.10.bb index bc76d6c295..a0c81af27b 100644 --- a/packages/maemo/lessertunjo_0.0.10.bb +++ b/packages/maemo/lessertunjo_0.0.10.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "gconf-osso hildon-libs dbus libosso" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/l/lessertunjo/lessertunjo_${PV}-3.tar.gz" diff --git a/packages/maemo/libosso_0.8.9.bb b/packages/maemo/libosso_0.8.9.bb index 288881ebd3..ead1b7ce37 100644 --- a/packages/maemo/libosso_0.8.9.bb +++ b/packages/maemo/libosso_0.8.9.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR = "r2" DEPENDS = "glib-2.0 dbus outo" diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb index 2ffa19b6bc..7ca7378c9c 100644 --- a/packages/maemo/osso-af-utils_0.4.bb +++ b/packages/maemo/osso-af-utils_0.4.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" -DEPENDS = "virtual/x11 dbus libosso" +DEPENDS = "virtual/libx11 dbus libosso" SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz" inherit autotools pkgconfig diff --git a/packages/maemo/osso-bttools_0.25.1.bb b/packages/maemo/osso-bttools_0.25.1.bb index f95b82aecd..9e602af548 100644 --- a/packages/maemo/osso-bttools_0.25.1.bb +++ b/packages/maemo/osso-bttools_0.25.1.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "dbus glib-2.0 libosso bluez-libs" diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb index 47f5097301..bcf5caff7a 100644 --- a/packages/maemo/osso-gwconnect_0.70.1.bb +++ b/packages/maemo/osso-gwconnect_0.70.1.bb @@ -1,5 +1,5 @@ LICENSE = "" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "dbus gconf glib-2.0 libosso bluez-libs" diff --git a/packages/maemo/osso-gwobex_0.26.1.bb b/packages/maemo/osso-gwobex_0.26.1.bb index 3a7c1d8743..e6204cd212 100644 --- a/packages/maemo/osso-gwobex_0.26.1.bb +++ b/packages/maemo/osso-gwobex_0.26.1.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "glib-2.0 openobex dbus libxml2 osso-gwconnect" diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb index 03659654f3..551d4d4128 100644 --- a/packages/maemo/osso-thumbnail_0.3.1-1.bb +++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb @@ -1,6 +1,6 @@ PR = "r2" LICENSE = "" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_${PV}.tar.gz" diff --git a/packages/maemo/outo_0.1.1.bb b/packages/maemo/outo_0.1.1.bb index 63f1ef4f9f..368b0bb243 100644 --- a/packages/maemo/outo_0.1.1.bb +++ b/packages/maemo/outo_0.1.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Outo Unit Tester by Otso" LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_${PV}.orig.tar.gz \ http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1-2.diff.gz;patch=1;pnum=1" diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index b8ee5d9b98..d56581dcde 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/packages/maemo/xpext_1.0-5.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xextensions libxext" +DEPENDS = "virtual/libx11 xextensions libxext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \ file://auxdir.patch;patch=1;pnum=0" diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index d797724f4c..7c54931b03 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/packages/maemo/xsp_1.0.0-8.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xextensions libxext xpext" +DEPENDS = "virtual/libx11 xextensions libxext xpext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz" S = "${WORKDIR}/Xsp" 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/man/man_1.5p.bb b/packages/man/man_1.5p.bb index fa4b318956..c2e0e829ce 100644 --- a/packages/man/man_1.5p.bb +++ b/packages/man/man_1.5p.bb @@ -4,7 +4,7 @@ MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DESCRIPTION = "The man page suite, including man, apropos, \ and whatis consists of programs that are used to read most \ of the documentation available on a Linux system." -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "less groff" # Note: The default man.conf uses wrong names for GNU eqn and troff, @@ -37,6 +37,6 @@ do_install() { install -m 644 ${FILESDIR}/man.conf ${D}/etc } -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin /sbin /lib/*/ /lib/*.so*" diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index d2514d95c3..7042bf22d5 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "x11" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PV = "0.0+svn${SRCDATE}" PR="r2" diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc index f82b66a0e9..16f471356a 100644 --- a/packages/matchbox-panel/matchbox-panel.inc +++ b/packages/matchbox-panel/matchbox-panel.inc @@ -11,6 +11,7 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify " EXTRA_OECONF_append_h3600 = " --enable-small-icons " EXTRA_OECONF_append_h3900 = " --enable-small-icons " EXTRA_OECONF_append_h2200 = " --enable-small-icons " +EXTRA_OECONF_append_h4000 = " --enable-small-icons " EXTRA_OECONF_append_collie = " --enable-small-icons " EXTRA_OECONF_append_poodle = " --enable-small-icons " EXTRA_OECONF_append_mnci = " --enable-small-icons " diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb index 3f836a32bb..9475edd55e 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" PR = "r4" DESCRIPTION = "Matchbox panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ file://automake-lossage.patch;patch=1 \ diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb index dd991ddbaa..f6bc0166fc 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" PR = "r1" diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb index 361a901597..a65c017f9e 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.bb @@ -1,7 +1,7 @@ SECTION = "x11/utils" DESCRIPTION = "Matchbox panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm" RDEPENDS = "libmatchbox matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2" diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb index fa68298a37..3a10e1938d 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" PR = "r2" 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_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb index 9b36f17692..4f0a8a6b00 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${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_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index af791cbe23..947f14e867 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index af791cbe23..947f14e867 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index 7f8b768106..304efc3c44 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r1" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index b858153b8f..3a46009a4c 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r2" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 05f006c195..4fa9a6bd74 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index 06cd29eb6b..aad37abc3f 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r0" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index ddc3dccd62..4a9fa639f2 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index 88c04d9473..00bea89603 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" 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/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 5720c23392..95d24b5b95 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "0.9.5+svn${SRCDATE}" PR = "r2" 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 b3fccad992..aca9331e00 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/Mesa" LICENSE = "LGPL" RDEPENDS = "expat" -DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/x11 libxext libxxf86vm libxi libxmu libice" +DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}" @@ -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/meta-sdk.bb b/packages/meta/meta-sdk.bb index 286abb4d79..0714e506b7 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for SDK including GPE and Opie" LICENSE = MIT DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r10" +PR = "r11" PACKAGES = "" diff --git a/packages/meta/package-index.bb b/packages/meta/package-index.bb index 0f8c450e37..0afb36a6ba 100644 --- a/packages/meta/package-index.bb +++ b/packages/meta/package-index.bb @@ -27,6 +27,7 @@ do_build[nostamp] = 1 do_build[dirs] = "${DEPLOY_DIR_IPK}" do_build() { set -ex + touch Packages ipkg-make-index -r Packages -p Packages -l Packages.filelist -m . set +ex } diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index e40116d292..e3988aa8a2 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,14 +5,13 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r3" +PR = "r5" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" PROVIDES += "${SLUGOS_IMAGENAME}-native" -DEPENDS = "libc6-dev" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. @@ -37,6 +36,7 @@ SLUGOS_NATIVE_RT = "\ # Run-time and DEPENDS SLUGOS_NATIVE_prepend_linux = "\ + libc6-dev \ " SLUGOS_NATIVE_prepend_linux-uclibc = "\ libiconv \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f729c7f22b..241f999999 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,20 +6,21 @@ 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 = "r12" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" EXCLUDE_FROM_WORLD = "1" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 -PACKAGES = "${PN}" -# The list of packages to build for the ucslugc DISTRO. +# The list of packages to build for the slugos DISTRO. # KEEP IN ALPHABETICAL ORDER SLUGOS_PACKAGES = "\ alsa-lib \ - apr \ + alsa-utils \ + asterisk \ + asterisk-sounds \ atftp \ audiofile \ aumix \ @@ -32,7 +33,6 @@ SLUGOS_PACKAGES = "\ bison \ bluez-libs \ bluez-utils-nodbus \ - boost \ bridge-utils \ bwmon \ bzip2 \ @@ -61,6 +61,7 @@ SLUGOS_PACKAGES = "\ findutils \ flac \ flex \ + flite \ ftpd-topfield \ gawk \ gcc \ @@ -77,6 +78,7 @@ SLUGOS_PACKAGES = "\ ifupdown \ ipkg-utils \ iptables \ + ircp \ joe \ jpeg \ lcdproc \ @@ -92,6 +94,7 @@ SLUGOS_PACKAGES = "\ libol \ libpng \ libtool \ + libupnp \ libusb \ libvorbis \ libxml2 \ @@ -100,11 +103,13 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madplay \ madwifi-ng \ mailx \ make \ masqmail \ mdadm \ + memtester \ mgetty \ miau \ microcom \ @@ -151,7 +156,6 @@ SLUGOS_PACKAGES = "\ ssmtp \ strace \ streamripper \ - sudo \ sysfsutils \ syslog-ng \ tar \ @@ -159,6 +163,7 @@ SLUGOS_PACKAGES = "\ tiff \ unzip \ usbutils \ + ushare \ util-linux \ vim \ vlan \ @@ -176,7 +181,6 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ irssi \ - memtester \ obexftp \ qc-usb-messenger \ unionfs-modules \ @@ -197,11 +201,11 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\ # These packages work with glibc, but break on uclibc. UCLIBC_BROKEN_PACKAGES = "\ - alsa-utils \ - asterisk \ - asterisk-sounds \ + apr \ bogofilter \ - ircp \ + boost \ + linphone \ + sudo \ " # Packages which build only with glibc (some of these use internal diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb index 79146fb580..76acab9f64 100644 --- a/packages/mikmod/mikmod_3.2.2-beta1.bb +++ b/packages/mikmod/mikmod_3.2.2-beta1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod." SECTION = "console/multimedia" HOMEPAGE = "http://mikmod.raphnet.net" MAINTAINER = "Michael 'Mickey' Lauer" -DEPENDS = "libmikmod" +DEPENDS = "ncurses libmikmod" PR = "r1" LICENSE = "GPL" SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \ diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb index f0e5e46d6e..980f928ccd 100644 --- a/packages/miniclipboard/miniclipboard_0.3.bb +++ b/packages/miniclipboard/miniclipboard_0.3.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" inherit gpe LICENSE = "LGPL" DESCRIPTION = "Clipboard management application" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" RDEPENDS = "gdk-pixbuf-loader-xpm" MAINTAINER = "Phil Blundell <pb@handhelds.org>" PR = "r1" diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb index df8cfe7781..e67bf0daff 100644 --- a/packages/minipredict/minipredict.bb +++ b/packages/minipredict/minipredict.bb @@ -1,7 +1,7 @@ inherit gpe pkgconfig DESCRIPTION = "Minipredict is a app that sits above the dock, e.g. mbdock, and suggests words for completion." -DEPENDS = "virtual/x11 libxext gtk+ libdictionary zlib" +DEPENDS = "virtual/libx11 libxext gtk+ libdictionary zlib" SECTION = "gpe" PRIORITY = "optional" 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/xserver-common/.mtn2git_empty b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xserver-common/.mtn2git_empty +++ b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty diff --git a/packages/mozilla/firefox-1.5.0.1/jsautocfg.h b/packages/mozilla/firefox-1.5.0.6/jsautocfg.h index 05f3dad50a..05f3dad50a 100644 --- a/packages/mozilla/firefox-1.5.0.1/jsautocfg.h +++ b/packages/mozilla/firefox-1.5.0.6/jsautocfg.h diff --git a/packages/mozilla/firefox-1.5.0.1/mozconfig b/packages/mozilla/firefox-1.5.0.6/mozconfig index 025b396ac7..025b396ac7 100644 --- a/packages/mozilla/firefox-1.5.0.1/mozconfig +++ b/packages/mozilla/firefox-1.5.0.6/mozconfig 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.6.bb index 95c9509b69..8f888db5ca 100644 --- a/packages/mozilla/firefox_1.5.0.1.bb +++ b/packages/mozilla/firefox_1.5.0.6.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/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb index f4f34a672c..153d226f97 100644 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ b/packages/mrxvt/mrxvt_0.4.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/apps" -DEPENDS = "virtual/x11 libxext libxpm jpeg libpng" +DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ 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/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb index 53165ac8d4..79f22e8562 100644 --- a/packages/mysql/mysql_4.1.18.bb +++ b/packages/mysql/mysql_4.1.18.bb @@ -5,7 +5,7 @@ DEPENDS += "ncurses mysql-native" LICENSE = "GPL" PR="r2" -SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ +SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ file://gen_lex_hash.patch;patch=1 \ file://my.cnf \ 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/nautilus/nautilus_2.12.2.bb b/packages/nautilus/nautilus_2.12.2.bb index 6828c78c79..2f5628073e 100644 --- a/packages/nautilus/nautilus_2.12.2.bb +++ b/packages/nautilus/nautilus_2.12.2.bb @@ -5,7 +5,7 @@ inherit gnome LICENSE="GPL" -DEPENDS="librsvg eel esound gnome-desktop" +DEPENDS="librsvg libexif eel esound gnome-desktop" EXTRA_OECONF = "--disable-gtk-doc" 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/xset/.mtn2git_empty b/packages/ndisc6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xset/.mtn2git_empty +++ b/packages/ndisc6/.mtn2git_empty diff --git a/packages/ndisc6/files/.mtn2git_empty b/packages/ndisc6/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ndisc6/files/.mtn2git_empty diff --git a/packages/ndisc6/files/acinclude.m4 b/packages/ndisc6/files/acinclude.m4 new file mode 100644 index 0000000000..5360fff5d2 --- /dev/null +++ b/packages/ndisc6/files/acinclude.m4 @@ -0,0 +1,197 @@ +# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# -------------------------------------------------------------- +# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99') +# by trying to compile a program of TEST-PROLOGUE and TEST-BODY. If this fails, +# try again with each compiler option in the space-separated OPTION-LIST; if one +# helps, append it to CC. If eventually successful, run ACTION-IF-AVAILABLE, +# else ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_C_STD_TRY], +[AC_MSG_CHECKING([for $CC option to accept ISO ]m4_translit($1, [c], [C])) +AC_CACHE_VAL(ac_cv_prog_cc_$1, +[ac_cv_prog_cc_$1=no +ac_save_CC=$CC +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CC="$ac_save_CC $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg]) + test "x$ac_cv_prog_cc_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +])# AC_CACHE_VAL +case "x$ac_cv_prog_cc_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + CC="$CC $ac_cv_prog_cc_$1" + AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;; +esac +AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6]) +])# _AC_C_STD_TRY + +# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C99 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C99 on some system or another. It +# considers the compiler to be in ISO C99 mode if it handles mixed +# code and declarations, _Bool, inline and restrict. +AC_DEFUN([_AC_PROG_CC_C99], +[_AC_C_STD_TRY([c99], +[[#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} +]], +[[ + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; +]], +dnl Try +dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) +dnl AIX -qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99) +dnl Intel ICC -c99 +dnl IRIX -c99 +dnl Solaris (unused because it causes the compiler to assume C99 semantics for +dnl library functions, and this is invalid before Solaris 10: -xc99) +dnl Tru64 -c99 +dnl with extended modes being tried first. +[[-std=gnu99 -c99 -qlanglvl=extc99]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C99 + +# AC_PROG_CC_C99 +# -------------- +AC_DEFUN([AC_PROG_CC_C99], +[ AC_REQUIRE([AC_PROG_CC])dnl + _AC_PROG_CC_C99 +]) + +# AC_USE_SYSTEM_EXTENSIONS +# ------------------------ +# Enable extensions on systems that normally disable them, +# typically due to standards-conformance issues. +AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], +[ + AC_BEFORE([$0], [AC_COMPILE_IFELSE]) + AC_BEFORE([$0], [AC_RUN_IFELSE]) + + AC_REQUIRE([AC_GNU_SOURCE]) + AC_REQUIRE([AC_AIX]) + AC_REQUIRE([AC_MINIX]) + + AH_VERBATIM([__EXTENSIONS__], +[/* Enable extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif]) + AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], + [ac_cv_safe_to_define___extensions__], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ +# define __EXTENSIONS__ 1 + AC_INCLUDES_DEFAULT])], + [ac_cv_safe_to_define___extensions__=yes], + [ac_cv_safe_to_define___extensions__=no])]) + test $ac_cv_safe_to_define___extensions__ = yes && + AC_DEFINE([__EXTENSIONS__]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) +]) diff --git a/packages/ndisc6/files/autoconf-older-version.patch b/packages/ndisc6/files/autoconf-older-version.patch new file mode 100644 index 0000000000..0ab0fd13bb --- /dev/null +++ b/packages/ndisc6/files/autoconf-older-version.patch @@ -0,0 +1,14 @@ +Patch the required version back to 2.59 +We'll include the missing macros via acinclude.m4 + +--- ndisc6-0.6.7/configure.ac~ 2006-08-14 16:46:06.000000000 +1000 ++++ ndisc6-0.6.7/configure.ac 2006-08-14 16:46:06.000000000 +1000 +@@ -21,7 +21,7 @@ + + AC_COPYRIGHT([Copyright (C) 2005-2006 Remi Denis-Courmont]) + AC_INIT(ndisc6, 0.6.7, rdenis@simphalempin.com) +-AC_PREREQ(2.59c) ++AC_PREREQ(2.59) + INVOCATION="$0 $*" + + AS_MESSAGE(checking system...) diff --git a/packages/ndisc6/ndisc6_0.6.7.bb b/packages/ndisc6/ndisc6_0.6.7.bb new file mode 100644 index 0000000000..a9e2118b39 --- /dev/null +++ b/packages/ndisc6/ndisc6_0.6.7.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +DESCRIPTION = "This package includes some useful diagnostics tools for \ +IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" +HOMEPAGE = "http://www.simphalempin.com/dev/ndisc6/" +LICENSE = "GPL" +PR = "r0" + +# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to +# perform the actual trace operation. +RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" + +SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ + file://autoconf-older-version.patch;patch=1 \ + file://acinclude.m4" + +inherit autotools + +# Split into seperate packages since we normal don't want them all +# The main package is left empty and therefore not created. +PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ + ${PN}-tcptraceroute6 ${PN}-rltraceroute6 ${PN}-tracert6" +FILES_${PN} = "" +FILES_${PN}-ndisc6 = "${bindir}/ndisc6" +FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES_${PN}-rdisc6 = "${bindir}/rdisc6" +FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES_${PN}-tracert6 = "${bindir}/tracert6" + +DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +Performs IPv6 neighbor discovery in userland. Replaces arping from the \ +IPv4 world." +DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +Queries IPv6 routers on the network for advertised prefixes. Can be used \ +to detect rogue IPv6 routers, monitor legitimate IPv6 routers." +DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ +sessions between the local system and a remote echo server in either IPv6 \ +or IPv4." + + + +# Add some macros from the autoconf 2.60 which to let us build with +# autoconf 2.59. This can be removed when/if we update to autoconf +# 2.60 +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S} +} + + +# Enable SUID bit for applications that need it +pkg_postinst_${PN}-rltraceroute6 () { + chmod 4555 ${bindir}/rltraceroute6 +} +pkg_postinst_${PN}-ndisc6 () { + chmod 4555 ${bindir}/ndisc6 +} +pkg_postinst_${PN}-rdisc6 () { + chmod 4555 ${bindir}/rdisc6 +} diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb index 2fec075716..25c9e62f7c 100644 --- a/packages/net-snmp/net-snmp_5.1.2.bb +++ b/packages/net-snmp/net-snmp_5.1.2.bb @@ -3,6 +3,8 @@ HOMEPAGE = "http://www.net-snmp.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" DEPENDS = "openssl" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://uclibc-fix.patch;patch=1 \ file://init \ @@ -16,15 +18,16 @@ EXTRA_OECONF = "--enable-shared --disable-manuals" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" do_configure() { - # endianness fun.. inspired by openssl.inc + # endianness fun... inspired by openssl.inc . ${CONFIG_SITE} - if test "x$ac_cv_c_bigendian" = "xyes"; then + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then ENDIANESS=" --with-endianness=big" - elif test "x$ac_cv_c_littleendian" = "xyes"; then + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then ENDIANESS=" --with-endianness=little" else oefatal do_configure cannot determine endianess fi + oenote Determined endianess as: $ENDIANESS oe_runconf $ENDIANESS } @@ -36,11 +39,12 @@ do_install_append() { install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ } -PACKAGES = "net-snmp-doc net-snmp-dev net-snmp-libs net-snmp-mibs net-snmp-server net-snmp-client" -FILES_net-snmp-libs = "${libdir}" +PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs net-snmp-mibs net-snmp-server net-snmp-client" +FILES_net-snmp-libs = "${libdir}/*" FILES_net-snmp-mibs = "${datadir}/snmp/mibs" -FILES_net-snmp-server = "${sbindir} ${sysconfdir}" -FILES_net-snmp-client = "${bindir} ${datadir}/snmp/" +FILES_net-snmp-server = "${sbindir}/* ${sysconfdir}" +FILES_net-snmp-client = "${bindir}/* ${datadir}/snmp/" +FILES_net-snmp-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" RDEPENDS_net-snmp-server += "net-snmp-mibs" RDEPENDS_net-snmp-client += "net-snmp-mibs" diff --git a/packages/netbase/netbase/tosa/interfaces b/packages/netbase/netbase/tosa/interfaces index 92b022475c..0da7168535 100644 --- a/packages/netbase/netbase/tosa/interfaces +++ b/packages/netbase/netbase/tosa/interfaces @@ -9,8 +9,8 @@ iface wlan0 inet dhcp wireless_type wlan-ng wireless_mode Managed pre-up modprobe prism2_usb - pre-up /sbin/usbctl on 1 - post-down /sbin/usbctl off 1 +# pre-up /sbin/usbctl on 1 +# post-down /sbin/usbctl off 1 post-down rmmod prism2_usb # Wired or wireless interfaces diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index d79dbc2a26..8c0652daec 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r11" +PR = "r12" inherit update-rc.d 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/nonworking/monotone-viz/monotone-viz_0.11.bb b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb index a0df63f445..6470fe7bb7 100644 --- a/packages/nonworking/monotone-viz/monotone-viz_0.11.bb +++ b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs." DEPENDS = "gtk+ libgnomecanvas lablgtk sqlite3 ocaml-cross" RDEPENDS = "graphviz" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "http://oandrieu.nerim.net/monotone-viz/monotone-viz-0.11.tar.gz" diff --git a/packages/nonworking/xlibs/xext_6.4.3.bb b/packages/nonworking/xlibs/xext_6.4.3.bb deleted file mode 100644 index f8a17fe2db..0000000000 --- a/packages/nonworking/xlibs/xext_6.4.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "X Server Extension library" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "xproto x11 xextensions" - -SRC_URI = "${XLIBS_MIRROR}/libXext-${PV}.tar.bz2" -S = "${WORKDIR}/libXext-${PV}" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/nonworking/xlibs/xmu_6.2.3.bb b/packages/nonworking/xlibs/xmu_6.2.3.bb deleted file mode 100644 index cad9bdc5d5..0000000000 --- a/packages/nonworking/xlibs/xmu_6.2.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "xt xext xaw" - -SRC_URI = "${XLIBS_MIRROR}/libXmu-${PV}.tar.bz2" -S = "${WORKDIR}/libXmu-${PV}" - -inherit autotools pkgconfig - -do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} -} 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/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index d6d103f542..cc3ecb89dc 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -PR = "r7" +PR = "r8" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ @@ -28,7 +28,7 @@ inherit autotools update-rc.d EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no" CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -PACKAGES = "ntpdate ntp-bin ntp ntp-tickadj" +PACKAGES += "ntpdate ntp-bin ntp ntp-tickadj" # NOTE: you don't need ntpdate, use "ntpdc -q -g -x" PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate" 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.inc b/packages/openssl/openssl.inc index 027351e31a..ab99495c54 100644 --- a/packages/openssl/openssl.inc +++ b/packages/openssl/openssl.inc @@ -28,15 +28,12 @@ do_compile () { # endianness fun.. whee . ${CONFIG_SITE} - if test "x$ac_cv_c_bigendian" = "xyes"; then + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then CFLAG="${CFLAG} -DB_ENDIAN" - elif test "x$ac_cv_c_littleendian" = "xyes"; then + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then CFLAG="${CFLAG} -DL_ENDIAN" - elif test "x$ac_cv_c_bigendian" = "xno" && test "x$ac_cv_c_littleendian" = "xno"; then - # no idea what to do with this... - : else - CFLAG="${CFLAG} -DL_ENDIAN" + oefatal do_configure cannot determine endianess fi os=${HOST_OS} 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/opensync/libopensync-plugin-file_0.18.bb b/packages/opensync/libopensync-plugin-file_0.18.bb index 332777e949..234413f114 100644 --- a/packages/opensync/libopensync-plugin-file_0.18.bb +++ b/packages/opensync/libopensync-plugin-file_0.18.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL" DEPENDS = "libopensync" RRECOMMENDS = "multisync" HOMEPAGE = "http://www.opensync.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit autotools pkgconfig diff --git a/packages/opensync/libopensync-plugin-gpe_0.18.bb b/packages/opensync/libopensync-plugin-gpe_0.18.bb index b8b27d3689..e1c59d328f 100644 --- a/packages/opensync/libopensync-plugin-gpe_0.18.bb +++ b/packages/opensync/libopensync-plugin-gpe_0.18.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL" DEPENDS = "libopensync" RRECOMMENDS = "multisync" HOMEPAGE = "http://www.opensync.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit autotools pkgconfig diff --git a/packages/opensync/libopensync-plugin-irmc_0.18.bb b/packages/opensync/libopensync-plugin-irmc_0.18.bb index 49cff5c25d..1e3b246a95 100644 --- a/packages/opensync/libopensync-plugin-irmc_0.18.bb +++ b/packages/opensync/libopensync-plugin-irmc_0.18.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL" DEPENDS = "libopensync openobex bluez-libs" RRECOMMENDS = "multisync" HOMEPAGE = "http://www.opensync.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit autotools pkgconfig diff --git a/packages/opensync/libopensync_0.18.bb b/packages/opensync/libopensync_0.18.bb index 1b3f338e51..eef443fc98 100644 --- a/packages/opensync/libopensync_0.18.bb +++ b/packages/opensync/libopensync_0.18.bb @@ -4,7 +4,7 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/libopensync-${PV}.tar.gz" LICENSE = "LGPL" DEPENDS = "sqlite3 libxml2 zlib glib-2.0" HOMEPAGE = "http://www.opensync.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit autotools pkgconfig diff --git a/packages/opensync/multisync_0.90.18.bb b/packages/opensync/multisync_0.90.18.bb index 0d80412a58..d10c816c41 100644 --- a/packages/opensync/multisync_0.90.18.bb +++ b/packages/opensync/multisync_0.90.18.bb @@ -4,7 +4,7 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${P}.tar.gz" LICENSE = "GPL" DEPENDS = "libopensync" HOMEPAGE = "http://www.opensync.org/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit autotools pkgconfig 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..ca0beacb47 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,7 +1,6 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp" 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.inc b/packages/opie-networksettings/opie-networksettings.inc index 9a9a88417d..c2f59fd04d 100644 --- a/packages/opie-networksettings/opie-networksettings.inc +++ b/packages/opie-networksettings/opie-networksettings.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Opie Network Settings" SECTION = "opie/settings" PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" APPNAME = "networksettings" 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/.mtn2git_empty b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty diff --git a/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch new file mode 100644 index 0000000000..f214057e0c --- /dev/null +++ b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch @@ -0,0 +1,13 @@ +--- sysinfo/versioninfo.cpp_orig 2006-08-06 15:16:55.000000000 +0000 ++++ sysinfo/versioninfo.cpp 2006-08-06 15:17:31.000000000 +0000 +@@ -136,8 +136,8 @@ + modelPixmap += "simpad"; + else if ( model == Model_Jornada_56x ) + modelPixmap += "jornada56x"; +- else if ( model == Model_Jornada_720 ) +- modelPixmap += "jornada720"; ++ else if ( model == Model_Jornada_7xx ) ++ modelPixmap += "jornada7xx"; + else + modelPixmap += "pda"; + diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 6aa27a6242..6517203c8e 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -1,8 +1,9 @@ -include ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + file://jornada-6xx-7xx.patch;patch=1" 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.inc b/packages/opie-taskbar/opie-taskbar.inc index 3f6c8bca2e..fd218d2a02 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -15,6 +15,7 @@ EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_spitz = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_akita = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" # Wallpaper and welcome splash PIXMAP_SIZE = "" @@ -23,6 +24,7 @@ PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" PIXMAP_SIZE_tosa = "-480x640" PIXMAP_SIZE_simpad = "-800x600" +PIXMAP_SIZE_htcuniversal= "-480x640" inherit opie update-rc.d 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/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb index 4be6047ffa..27d57052f7 100644 --- a/packages/pango/pango_1.10.0.bb +++ b/packages/pango/pango_1.10.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb index 3006b41970..74730e18db 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index 8859f6b873..907d813d00 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.2.bb index dda2cf7d1c..fb2a6a7394 100644 --- a/packages/pango/pango_1.13.2.bb +++ b/packages/pango/pango_1.13.2.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb new file mode 100644 index 0000000000..77eee85214 --- /dev/null +++ b/packages/pango/pango_1.14.0.bb @@ -0,0 +1,49 @@ +LICENSE = "LGPL" +SECTION = "x11/libs" +# Xt needed to keep autoconf's check for X11 happy +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt gtk-doc cairo" +DESCRIPTION = "The goal of the Pango project is to provide an \ +Open Source framework for the layout and rendering of \ +internationalized text." +PR = "r0" + +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-${PV}.tar.bz2 \ + file://no-tests.patch;patch=1 \ + " +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glibtest \ + --enable-explicit-deps=no \ + --disable-debug" + +FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" + +LIBV = "1.5.0" + +do_stage () { + for lib in pango pangox pangoft2 pangoxft pangocairo; do + oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ + done + install -d ${STAGING_INCDIR}/pango + install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +} + +python populate_packages_prepend () { + prologue = bb.data.getVar("postinst_prologue", d, 1) + + modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) + + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') +} diff --git a/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb index bf66887e9f..5a8e3da345 100644 --- a/packages/pango/pango_1.2.5.bb +++ b/packages/pango/pango_1.2.5.bb @@ -1,6 +1,6 @@ LICENSE = "LGPL" SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb index 1e53f049d4..3f2f664d21 100644 --- a/packages/pango/pango_1.4.0.bb +++ b/packages/pango/pango_1.4.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb index 52007acf78..32edd7965c 100644 --- a/packages/pango/pango_1.4.1.bb +++ b/packages/pango/pango_1.4.1.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb index 55dac29f25..fe9752c8bd 100644 --- a/packages/pango/pango_1.8.0.bb +++ b/packages/pango/pango_1.8.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb index 55dac29f25..fe9752c8bd 100644 --- a/packages/pango/pango_1.8.1.bb +++ b/packages/pango/pango_1.8.1.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb index 7dad993d9c..923e17a029 100644 --- a/packages/pango/pango_1.8.2.bb +++ b/packages/pango/pango_1.8.2.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb index d110d0a76d..dad91c7101 100644 --- a/packages/pango/pango_1.9.1.bb +++ b/packages/pango/pango_1.9.1.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ 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/pax-utils/pax-utils-native_0.1.9.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb index d586dcb29e..d586dcb29e 100644 --- a/packages/pax-utils/pax-utils-native_0.1.9.bb +++ b/packages/pax-utils/pax-utils-native_0.1.13.bb diff --git a/packages/pax-utils/pax-utils_0.1.9.bb b/packages/pax-utils/pax-utils_0.1.13.bb index 3aa6b22ee8..0e514673b0 100644 --- a/packages/pax-utils/pax-utils_0.1.9.bb +++ b/packages/pax-utils/pax-utils_0.1.13.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" LICENSE = "GPLv2" MAINTAINER = "freyther@handhelds.org" -SRC_URI = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=71e8d13d072efcbc4123960211a34d4f" +SRC_URI = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=5f09df47a16e83462384b44b75310539" S = "${WORKDIR}/pax-utils-${PV}" +CPPFLAGS += "-D_GNU_SOURCE " + do_compile() { oe_runmake } 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/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index 451d44b17c..7603e11537 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r5" +PR = "r6" LICENSE = "BSD" SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" @@ -38,4 +38,4 @@ do_stage () { } FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" 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..f3486307b5 100644 --- a/packages/perl/perl-native_5.8.4.bb +++ b/packages/perl/perl-native_5.8.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r3" SECTION = "libs" inherit native @@ -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..af7680f013 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Perl is a popular scripting language." MAINTAINER="David Karlstrom <daka@thg.se>" HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r3" SECTION = "libs" inherit native @@ -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.inc b/packages/perl/perl.inc index ac4bfefd32..a9a3d6b655 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -67,9 +67,9 @@ python populate_packages_prepend () { do_split_packages(d, libdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) } -PACKAGES = "perl perl-misc perl-lib perl-dev perl-pod" +PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod" FILES_${PN} = "/usr/bin/perl /usr/bin/perl${PV}" FILES_${PN}-lib = "/usr/lib/libperl.so*" FILES_${PN}-dev = "/usr/lib/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/" FILES_${PN}-pod = "/usr/lib/perl5/${PV}/pod" -FILES_perl-misc = "/usr/bin/" +FILES_perl-misc = "/usr/bin/*" diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 70ac74a3f6..35ff774b52 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" +PR = "r4" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 510505abb5..b3cfd1a3bb 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 \ @@ -12,7 +12,7 @@ SRC_URI += "file://config.sh-armeb-linux \ PARALLEL_MAKE = "" -PR = "r15" +PR = "r17" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl @@ -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-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch deleted file mode 100644 index 7e466a425e..0000000000 --- a/packages/php/php-5.0.5/autotools.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4 ---- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -781,10 +781,10 @@ - OVERALL_TARGET=[]ifelse($1,,php,$1) - php_c_pre='$(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_cxx_pre='$(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_lo=o - - case $with_pic in -@@ -1531,6 +1531,7 @@ - - dnl even newer glibcs have a different seeker definition... - -+ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, - AC_TRY_RUN([ - #define _GNU_SOURCE - #include <stdio.h> -@@ -1560,8 +1561,8 @@ - } - - ], -- [ cookie_io_functions_use_off64_t=yes ], -- [ ] ) -+ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ], -+ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) - - else - dnl older glibc versions (up to 2.1.2 ?) -diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in ---- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700 -@@ -247,7 +247,7 @@ - sinclude(Zend/acinclude.m4) - sinclude(Zend/Zend.m4) - sinclude(TSRM/tsrm.m4) -- -+sinclude(TSRM/threads.m4) - - - divert(2) -diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4 ---- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -1,7 +1,5 @@ - dnl This file becomes configure.in for self-contained extensions. - --AC_INIT(config.m4) -- - PHP_INIT_BUILD_SYSTEM - - AC_DEFUN([PHP_WITH_PHP_CONFIG],[ -@@ -55,8 +53,6 @@ - PHP_PROG_RE2C - AC_PROG_AWK - --sinclude(config.m4) -- - enable_static=no - enable_shared=yes - -diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4 ---- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700 -@@ -86,7 +86,7 @@ - pthreads_working=no - ], [ - dnl For cross compiling running this test is of no use. NetWare supports pthreads -- pthreads_working=no -+ pthreads_working=yes - case $host_alias in - *netware*) - pthreads_working=yes -diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4 ---- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -68,7 +68,6 @@ - ]) - - sinclude(threads.m4) --sinclude(TSRM/threads.m4) - - AC_DEFUN([TSRM_CHECK_PTHREADS],[ - diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch deleted file mode 100644 index 0231727c33..0000000000 --- a/packages/php/php-5.0.5/endianness.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-5.0.5/Zend/zend_strtod.c~ 2005-10-10 19:58:06.000000000 -0700 -+++ php-5.0.5/Zend/zend_strtod.c 2005-10-10 20:21:35.000000000 -0700 -@@ -130,6 +130,7 @@ - * but the word order is big endian. - */ - #define IEEE_BIG_ENDIAN -+#undef IEEE_LITTLE_ENDIAN - #endif - - #ifdef __vax__ diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/php/php-5.1.4/.mtn2git_empty diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch new file mode 100644 index 0000000000..d198c8e36d --- /dev/null +++ b/packages/php/php-5.1.4/autotools.patch @@ -0,0 +1,94 @@ +diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 +--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 ++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 +@@ -818,10 +818,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post= ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post= ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=lo + + case $with_pic in +@@ -1670,6 +1670,7 @@ + have_fopen_cookie=yes + + dnl even newer glibcs have a different seeker definition... ++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include <stdio.h> +@@ -1702,10 +1703,11 @@ + cookie_io_functions_use_off64_t=yes + ], [ + cookie_io_functions_use_off64_t=no +-], [ +- cookie_io_functions_use_off64_t=no +-]) +- ++], ++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) ++ ++ + else + + dnl older glibc versions (up to 2.1.2 ?) +diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in +--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 ++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 +@@ -209,6 +209,7 @@ + + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) ++sinclude(TSRM/threads.m4) + + + divert(2) +diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 +--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 ++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -3,7 +3,6 @@ + divert(1) + + AC_PREREQ(2.13) +-AC_INIT(config.m4) + + PHP_CONFIG_NICE(config.nice) + +@@ -69,8 +68,6 @@ + PHP_PROG_RE2C + PHP_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 +--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 ++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4 +--- php-5.1.4~/TSRM/tsrm.m4 2005-05-29 19:16:40.000000000 -0400 ++++ php-5.1.4/TSRM/tsrm.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -68,7 +68,6 @@ + ]) + + sinclude(threads.m4) +-sinclude(TSRM/threads.m4) + + AC_DEFUN([TSRM_CHECK_PTHREADS],[ + 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/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb deleted file mode 100644 index b4b721f85e..0000000000 --- a/packages/php/php_5.0.5.bb +++ /dev/null @@ -1,60 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql" -SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \ - file://autotools.patch;patch=1 \ - file://endianness.patch;patch=1" -S = "${WORKDIR}/php-${PV}" - -inherit autotools - -CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ - --with-mysql=${STAGING_LIBDIR}/.. \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ - --without-libpng --without-libjpeg \ - --with-config-file-path=${sysconfdir}/php5 \ - --cache-file=config.cache \ - --disable-debug \ - --disable-rpath \ - --enable-bcmath \ - --enable-calendar \ - --enable-maintainer-zts \ - --enable-embed=shared \ - --enable-force-cgi-redirect \ - --enable-ftp \ - --enable-inline-optimization \ - --enable-magic-quotes \ - --enable-memory-limit \ - --enable-pic \ - --enable-safe-mode \ - --enable-sockets \ - --enable-track-vars \ - --enable-trans-sid \ - --enable-wddx \ - --sysconfdir=/etc/appWeb \ - --with-exec-dir=/etc/appWeb/exec \ - --with-db \ - --with-regex=system \ - --with-pear \ - --with-xml \ - --with-xmlrpc \ - --with-zlib \ - --without-iconv" - -EXTRA_OECONF += " --without-pear" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" -#DEPENDS += " php-native" - -acpaths = "" - -do_configure_prepend() { - find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' -} - -do_install () { - oe_runmake 'INSTALL_ROOT=${D}' install -} diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb new file mode 100644 index 0000000000..fc982a678c --- /dev/null +++ b/packages/php/php_5.1.4.bb @@ -0,0 +1,38 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>" +LICENSE = "PHP" +DEPENDS = "zlib libxml2 mysql libiconv" +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1" +S = "${WORKDIR}/php-${PV}" +PR = "r1" + +inherit autotools + +export THREADS="pthread" +export LIBS=" -lpthread " + +CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +EXTRA_OECONF = "--without-iconv \ + --enable-discard-path \ + --enable-sockets \ + --enable-memory-limit \ + --enable-wddx \ + --with-zlib" + +EXTRA_OECONF += " --without-pear" +# Uncomment the following two lines, and comment the above to enable PEAR +#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" +#DEPENDS += " php-native" + +acpaths = "" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + +do_install () { + oe_runmake 'INSTALL_ROOT=${D}' install +} 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/poppler/poppler_0.5.3.bb b/packages/poppler/poppler_0.5.3.bb new file mode 100644 index 0000000000..a974c66243 --- /dev/null +++ b/packages/poppler/poppler_0.5.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +DEPENDS = "fontconfig jpeg gtk+ cairo" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt" + +do_stage() { + autotools_stage_all +} diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb index b6daea0cd0..16ec699657 100644 --- a/packages/poppler/poppler_20060418.bb +++ b/packages/poppler/poppler_20060418.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" DEPENDS = "fontconfig jpeg gtk+ cairo" LICENSE = "GPL" +PV = "0.5.1+cvs20060418" PR = "r0" SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler;date=${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/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index 5c0197d2d6..c1ead5c0be 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -12,7 +12,7 @@ PR = "r1" do_configure_prepend() { - cp ${STAGING_DATADIR}/libtool/* ${S}/unix/scripts/ + cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/ } do_configure () { 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/powernowd/powernowd_0.96.bb b/packages/powernowd/powernowd_0.96.bb index f5a98aa4d2..0d953fe0b8 100644 --- a/packages/powernowd/powernowd_0.96.bb +++ b/packages/powernowd/powernowd_0.96.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A daemon to manage CPUfreq states" HOMEPAGE = "http://www.deater.net/john/powernowd.html" LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SRC_URI = "http://www.deater.net/john/${P}.tar.gz \ 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/proj4/.mtn2git_empty b/packages/proj4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/proj4/.mtn2git_empty diff --git a/packages/proj4/proj-4_4.9.bb b/packages/proj4/proj-4_4.9.bb new file mode 100644 index 0000000000..cb8dcc5eea --- /dev/null +++ b/packages/proj4/proj-4_4.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "PROJ.4 - Cartographic Projections Library" +HOMEPAGE = "http://www.remotesensing.org/proj/" +LICENSE = "MIT" + +inherit autotools pkgconfig + +SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz" + +S = "${WORKDIR}/proj-4.${PV}" + +do_stage() { + autotools_stage_all +} + 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/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb index fe641570e2..41a6e808ab 100644 --- a/packages/puzzles/puzzles_r6712.bb +++ b/packages/puzzles/puzzles_r6712.bb @@ -7,7 +7,7 @@ SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \ S = "${WORKDIR}/puzzles/" do_configure() { - cd ${S} && ${STAGING_BINDIR}/perl mkfiles.pl + cd ${S} && perl mkfiles.pl } do_compile_prepend = " \ 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-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 92db34115b..82c886658c 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 8 12:48:43 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed Aug 2 23:25:58 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,9 +8,14 @@ ######################################################################################################################## -PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " + +DESCRIPTION_python-profile="Python Basic Profiling Support" +PR_python-profile="ml0" +RDEPENDS_python-profile="python-core" +FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" PR_python-threading="ml0" @@ -130,7 +135,7 @@ FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" PR_python-netclient="ml1" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* ${libdir}/python2.4/Cookie.*" +FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" PR_python-pprint="ml0" @@ -162,6 +167,11 @@ PR_python-readline="ml0" RDEPENDS_python-readline="python-core libreadline4" FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " +DESCRIPTION_python-subprocess="Python Subprocess Support" +PR_python-subprocess="ml0" +RDEPENDS_python-subprocess="python-core python-io python-re" +FILES_python-subprocess="${libdir}/python2.4/subprocess.* " + DESCRIPTION_python-pydoc="Python Interactive Help Support" PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" @@ -228,8 +238,8 @@ RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml0" -RDEPENDS_python-zlib="python-core libz1" +PR_python-zlib="ml1" +RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" @@ -258,9 +268,4 @@ RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " -DESCRIPTION_python-profile="Python Profiler Support" -PR_python-profile="ml0" -RDEPENDS_python-profile="python-core" -FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " - 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-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb index b9529b28b4..a6d205dd5d 100644 --- a/packages/python/python-pymp3_0.3.4.bb +++ b/packages/python/python-pymp3_0.3.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/" SECTION = "console/multimedia" PRIORITY = "optional" -RDEPENDS = "python-core python-ncurses python-pyid3lib python-mad python-ao" +RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao" LICENSE = "GPL" PR = "r2" 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 3a0d977dbb..d7ec81fd8e 100644 --- a/packages/python/python-pyrex-native_0.9.3.bb +++ b/packages/python/python-pyrex-native_0.9.3.bb @@ -1,6 +1,7 @@ -include python-pyrex_${PV}.bb +require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" +RDEPENDS = "" do_stage() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb index 72ffc39104..1f10a64226 100644 --- a/packages/python/python-pysqlite2_2.2.2.bb +++ b/packages/python/python-pysqlite2_2.2.2.bb @@ -3,10 +3,10 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "PSF" -RDEPENDS = "python-core python-re python-lang" +RDEPENDS = "python-core python-re python-lang python-datetime" DEPENDS = "sqlite3" SRCNAME = "pysqlite" -PR = "ml0" +PR = "ml1" SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index b5d277916d..edf1d21542 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "PSF" RDEPENDS = "python-core python-xml python-netclient" SRCNAME = "pyxml" -PV = "0.8.3" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.96.90.bb index bc6fc7992d..31bce5583d 100644 --- a/packages/python/python-scons-native_0.96.90.bb +++ b/packages/python/python-scons-native_0.96.90.bb @@ -1,5 +1,7 @@ -include python-scons_${PV}.bb +require python-scons_${PV}.bb inherit native +DEPENDS = "python-native" +RDEPENDS = "" do_stage() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 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.9.bb index 3428d98a89..7673efe936 100644 --- a/packages/qpf-fonts/qpf-dejavusans_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusans_2.9.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.9.bb index 7494374023..0a753d90a8 100644 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.9.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.9.bb index 51c9e1b925..e2b07e4015 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.9.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.9.bb index 81009e8a8c..863d6a3e45 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_2.9.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.9.bb index db31216907..d84cdff195 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.9.bb @@ -1,3 +1,3 @@ DESCRIPTION = "DejaVu Serif Condensed font - QPF Edition" -include qpf-dejavu.inc +require qpf-dejavu.inc diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb index 6509bac524..b246e9ebcf 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL QPL" HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc3-native freetype virtual/x11 xft libxext libxrender libxrandr libxcursor mysql" +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql" PROVIDES = "qt3x11" PR = "r0" diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb index 128413d166..cd0f90becd 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/x11 xft libxext libxrender libxrandr libxcursor" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" PR = "r1" 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/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index 7695b336d3..ed19483d6b 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "RDesktop is a X11 based RDP client" HOMEPAGE = "http://www.rdesktop.org/" LICENSE = "GPL" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" RDEPENDS= "openssl" SECTION = "x11/network" diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb index 5d0dff6627..315dd87ebe 100644 --- a/packages/rdesktop/rdesktop_1.4.1.bb +++ b/packages/rdesktop/rdesktop_1.4.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb index 0568789afa..e111189e6f 100644 --- a/packages/rdesktop/rdesktop_cvs.bb +++ b/packages/rdesktop/rdesktop_cvs.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" 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/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb index 8f2a2b71a4..0b7b845380 100644 --- a/packages/roadster/roadster_cvs.bb +++ b/packages/roadster/roadster_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software." LICENSE = "GPL" HOMEPAGE = "http://linuxadvocate.org/projects/roadster/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PV = "0.0+cvs${SRCDATE}" DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade" diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb index 06f8d8c73c..726b68aa81 100644 --- a/packages/rosetta/rosetta_cvs.bb +++ b/packages/rosetta/rosetta_cvs.bb @@ -1,6 +1,6 @@ SECTION = "x11/utils" PV = "0.0+cvs${SRCDATE}" -DEPENDS = "gtk+ libgpewidget virtual/x11 libxrandr libxft libxtst libxext libxau \ +DEPENDS = "gtk+ libgpewidget virtual/libx11 libxrandr libxft libxtst libxext libxau \ virtual/libintl" DESCRIPTION = "Multistroke / full word handwriting recognition for X" LICENSE = "GPL" diff --git a/packages/rt2x00/.mtn2git_empty b/packages/rt2x00/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rt2x00/.mtn2git_empty diff --git a/packages/rt2x00/rt2570_1.1.0-b2.bb b/packages/rt2x00/rt2570_1.1.0-b2.bb new file mode 100644 index 0000000000..a3cc233351 --- /dev/null +++ b/packages/rt2x00/rt2570_1.1.0-b2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Driver for Ralink rt2570 USB 802.11g WiFi sticks" +HOMEPAGE = "http://rt2x00.serialmonkey.com/" +SECTION = "kernel/modules" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rt2400/rt2570-${PV}.tar.gz" + +inherit module + +S = "${WORKDIR}/${PN}-${PV}/Module/" + +EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ +} 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/rxvt-unicode/rxvt-unicode_4.8.bb b/packages/rxvt-unicode/rxvt-unicode_4.8.bb index 5ba2b23616..3b96243b77 100644 --- a/packages/rxvt-unicode/rxvt-unicode_4.8.bb +++ b/packages/rxvt-unicode/rxvt-unicode_4.8.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_4.9.bb b/packages/rxvt-unicode/rxvt-unicode_4.9.bb index dd3cf46c2c..d7c5b4c705 100644 --- a/packages/rxvt-unicode/rxvt-unicode_4.9.bb +++ b/packages/rxvt-unicode/rxvt-unicode_4.9.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb index 001da697ad..966f006178 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.2.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.2.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb index 2825fb015f..b3f261818c 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.3.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb index 2825fb015f..b3f261818c 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.4.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.4.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 296582ef73..f9ba2bedde 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb index e6c3c165a3..532fe2da63 100644 --- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb +++ b/packages/rxvt-unicode/rxvt-unicode_7.7.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft libxpm" +DEPENDS = "virtual/libx11 libxt libxft libxpm" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb index 73674bac92..fca5be9370 100644 --- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb +++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb index 0093a218fd..5a66d04f9d 100644 --- a/packages/rxvt/rxvt_2.7.9.bb +++ b/packages/rxvt/rxvt_2.7.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Well known terminal emulator" SECTION = "x11/utils" PR = "r1" -DEPENDS = "virtual/x11 libxft" +DEPENDS = "virtual/libx11 libxft" LICENSE = "GPL" SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \ file://include.patch;patch=1" 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/scratchbox/.mtn2git_empty b/packages/scratchbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/scratchbox/.mtn2git_empty diff --git a/packages/scratchbox/sbrsh_7.1.bb b/packages/scratchbox/sbrsh_7.1.bb new file mode 100644 index 0000000000..e692d2f242 --- /dev/null +++ b/packages/scratchbox/sbrsh_7.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Daemon to allow scratchbox to use your device as a CPU tranparency target" +HOMEPAGE = "http://scratchbox.org" +LICENSE = "GPLv2" +DEPENDS = "fakeroot" +PR = "r1" +RRECOMMENDS = "kernel-module-nfs" + + +SRC_URI = "http://scratchbox.org/download/files/sbox-releases/apophis/src/${P}.tar.gz" + +do_install() { + install -d ${D}${sbindir} + install -m 755 sbrsh sbrshd sb-exportfs ${D}${sbindir} + install -d ${D}/${sysconfdir} + touch ${D}/${sysconfdir}/sbrshd.conf +} + +CONFFILES_${PN} = "${sysconfdir}/sbrshd.conf" 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/slcalc/.mtn2git_empty b/packages/slcalc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/slcalc/.mtn2git_empty diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb new file mode 100644 index 0000000000..a399defb76 --- /dev/null +++ b/packages/slcalc/slcalc_1.2.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Scientific calculator with user definable constants and functions." +HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm" +SECTION = "opie/applications" +LICENSE = "GPL" +PR = "r1" + +APPTYPE = "binary" +APPDESKTOP = "${S}" + +SRC_URI = "http://homepage3.nifty.com/cam/slcalc_1.2.1_arm.tar.gz" + +inherit opie + +S = "${WORKDIR}/slcalc_source" + +do_install() { + install -d ${D}${palmtopdir}/pics + install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/slcalc.png +} 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/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb index bd19dcf717..c34d459a26 100644 --- a/packages/speex/speex_1.1.12.bb +++ b/packages/speex/speex_1.1.12.bb @@ -7,6 +7,8 @@ PR = "r1" SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz" +PARALLEL_MAKE = "" + inherit autotools pkgconfig # Some interesting options are: diff --git a/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.3.7/cross-compile.patch b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch new file mode 100644 index 0000000000..31d4f0d162 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch @@ -0,0 +1,92 @@ +--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 ++++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 +@@ -187,10 +187,11 @@ + default_build_cflags="-g" + if test "$config_BUILD_CC" = ""; then + AC_PROG_CC +- if test "$cross_compiling" = "yes"; then +- AC_MSG_ERROR([unable to find a compiler for building build tools]) +- fi +- BUILD_CC=$CC ++# if test "$cross_compiling" = "yes"; then ++# AC_MSG_ERROR([unable to find a compiler for building build tools]) ++# fi ++# BUILD_CC=$CC ++BUILD_CC=gcc + default_build_cflags=$CFLAGS + else + BUILD_CC=$config_BUILD_CC +@@ -238,6 +239,12 @@ + TARGET_LINK=$config_TARGET_LINK + fi + AC_MSG_RESULT($TARGET_LINK) ++if test "$config_TARGET_LFLAGS" != ""; then ++ TARGET_LFLAGS=$config_TARGET_LFLAGS ++ else ++ TARGET_LFLAGS=$BUILD_LFLAGS ++ fi ++AC_MSG_RESULT($TARGET_LFLAGS) + AC_MSG_CHECKING([switches on the target compiler]) + if test "$config_TARGET_TFLAGS" != ""; then + TARGET_TFLAGS=$config_TARGET_TFLAGS +@@ -592,15 +599,7 @@ + # Figure out what C libraries are required to compile programs + # that use "readline()" library. + # +-if test "$config_TARGET_READLINE_LIBS" != ""; then +- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" +-else +- CC=$TARGET_CC +- LIBS="" +- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) +- AC_CHECK_LIB([readline], [readline]) +- TARGET_READLINE_LIBS="$LIBS" +-fi ++TARGET_READLINE_LIBS="-lreadline" + AC_SUBST(TARGET_READLINE_LIBS) + + ########## +@@ -615,41 +614,8 @@ + ########## + # Figure out where to get the READLINE header files. + # +-AC_MSG_CHECKING([readline header files]) +-found=no +-if test "$config_TARGET_READLINE_INC" != ""; then +- TARGET_READLINE_INC=$config_TARGET_READLINE_INC +- found=yes +-fi +-if test "$found" = "yes"; then +- AC_MSG_RESULT($TARGET_READLINE_INC) +-else +- AC_MSG_RESULT(not specified: still searching...) +- AC_CHECK_HEADER(readline.h, [found=yes]) +-fi +-if test "$found" = "no"; then +- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do +- AC_CHECK_FILE($dir/include/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include" +- break +- fi +- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include/readline" +- break +- fi +- done +-fi +-if test "$found" = "yes"; then +- if test "$TARGET_READLINE_LIBS" = ""; then +- TARGET_HAVE_READLINE=0 +- else +- TARGET_HAVE_READLINE=1 +- fi +-else +- TARGET_HAVE_READLINE=0 +-fi ++TARGET_READLINE_INC="" ++TARGET_HAVE_READLINE=1 + AC_SUBST(TARGET_READLINE_INC) + AC_SUBST(TARGET_HAVE_READLINE) + diff --git a/packages/sqlite/sqlite3-3.3.7/ldflags.patch b/packages/sqlite/sqlite3-3.3.7/ldflags.patch new file mode 100644 index 0000000000..ee5105ffff --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/ldflags.patch @@ -0,0 +1,67 @@ +--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200 ++++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200 +@@ -31,6 +31,10 @@ + # + TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src + ++# OE overrides ++# ++TARGET_LFLAGS = @TARGET_LFLAGS@ ++ + # Define -DNDEBUG to compile without debugging (i.e., for production usage) + # Omitting the define will cause extra debugging code to be inserted and + # includes extra comments when "EXPLAIN stmt" is used. +@@ -257,17 +261,17 @@ + | $(NAWK) '{print $$5,$$6}' >last_change + + libsqlite3.la: $(LIBOBJ) +- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ + ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ ++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ + -rpath $(libdir)/sqlite \ + -version-info "8:6:8" + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ ++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o $@ $(TOP)/src/shell.c libsqlite3.la \ + $(LIBREADLINE) $(TLIBS) + +@@ -456,12 +460,12 @@ + + tclsqlite3: tclsqlite-shell.lo libsqlite3.la + $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) +@@ -471,7 +475,7 @@ + ./testfixture $(TOP)/test/quick.test + + sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ +- $(TESTSRC) $(TOP)/tool/spaceanal.tcl ++ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl + sed \ + -e '/^#/d' \ + -e 's,\\,\\\\,g' \ +@@ -481,7 +485,7 @@ + $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h + $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ + -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libtclsqlite3.la $(LIBTCL) ++ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + # Rules used to build documentation + # diff --git a/packages/sqlite/sqlite3-3.3.7/libtool.patch b/packages/sqlite/sqlite3-3.3.7/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3.inc b/packages/sqlite/sqlite3.inc new file mode 100644 index 0000000000..01290c2e41 --- /dev/null +++ b/packages/sqlite/sqlite3.inc @@ -0,0 +1,44 @@ +DESCRIPTION = "An Embeddable SQL Database Engine" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "readline ncurses" +LICENSE = "PD" + +SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://libtool.patch;patch=1 \ + file://ldflags.patch;patch=1" +S = "${WORKDIR}/sqlite-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-tcl --enable-shared \ + --enable-threadsafe" +export config_BUILD_CC = "${BUILD_CC}" +export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" +export config_BUILD_LIBS = "${BUILD_LDFLAGS}" +export config_TARGET_CC = "${CC}" +export config_TARGET_LINK = "${CCLD}" +export config_TARGET_CFLAGS = "${CFLAGS}" +export config_TARGET_LFLAGS = "${LDFLAGS}" + +do_compile_prepend() { + oe_runmake sqlite3.h + install -m 0644 sqlite3.h ${STAGING_INCDIR} +} + +do_stage() { + oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} +} + +#do_install() { +# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} +#} + +PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3 sqlite3-dbg" +FILES_sqlite3 = "${bindir}/*" +FILES_libsqlite = "${libdir}/*.so.*" +FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ + ${libdir}/pkgconfig ${includedir}" +FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}" +AUTO_LIBNAME_PKGS = "libsqlite" diff --git a/packages/sqlite/sqlite3_3.2.2.bb b/packages/sqlite/sqlite3_3.2.2.bb index a133f832a9..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.2.bb +++ b/packages/sqlite/sqlite3_3.2.2.bb @@ -1,44 +1,2 @@ -DESCRIPTION = "An Embeddable SQL Database Engine" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "readline ncurses" -LICENSE = "PD" - -SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libtool.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/sqlite-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-tcl --enable-shared \ - --enable-threadsafe" -export config_BUILD_CC = "${BUILD_CC}" -export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" -export config_BUILD_LIBS = "${BUILD_LDFLAGS}" -export config_TARGET_CC = "${CC}" -export config_TARGET_LINK = "${CCLD}" -export config_TARGET_CFLAGS = "${CFLAGS}" -export config_TARGET_LFLAGS = "${LDFLAGS}" - -do_compile_prepend() { - oe_runmake sqlite3.h - install -m 0644 sqlite3.h ${STAGING_INCDIR} -} - -do_stage() { - oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} -} - -#do_install() { -# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} -#} - -PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3" -FILES_sqlite3 = "${bindir}/*" -FILES_libsqlite = "${libdir}/*.so.*" -FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ - ${libdir}/pkgconfig ${includedir}" -FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}" -AUTO_LIBNAME_PKGS = "libsqlite" +require sqlite3.inc +PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.5.bb b/packages/sqlite/sqlite3_3.2.5.bb index a133f832a9..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.5.bb +++ b/packages/sqlite/sqlite3_3.2.5.bb @@ -1,44 +1,2 @@ -DESCRIPTION = "An Embeddable SQL Database Engine" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "readline ncurses" -LICENSE = "PD" - -SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libtool.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/sqlite-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-tcl --enable-shared \ - --enable-threadsafe" -export config_BUILD_CC = "${BUILD_CC}" -export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" -export config_BUILD_LIBS = "${BUILD_LDFLAGS}" -export config_TARGET_CC = "${CC}" -export config_TARGET_LINK = "${CCLD}" -export config_TARGET_CFLAGS = "${CFLAGS}" -export config_TARGET_LFLAGS = "${LDFLAGS}" - -do_compile_prepend() { - oe_runmake sqlite3.h - install -m 0644 sqlite3.h ${STAGING_INCDIR} -} - -do_stage() { - oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} -} - -#do_install() { -# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} -#} - -PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3" -FILES_sqlite3 = "${bindir}/*" -FILES_libsqlite = "${libdir}/*.so.*" -FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ - ${libdir}/pkgconfig ${includedir}" -FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}" -AUTO_LIBNAME_PKGS = "libsqlite" +require sqlite3.inc +PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.7.bb b/packages/sqlite/sqlite3_3.2.7.bb index a133f832a9..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.7.bb +++ b/packages/sqlite/sqlite3_3.2.7.bb @@ -1,44 +1,2 @@ -DESCRIPTION = "An Embeddable SQL Database Engine" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "readline ncurses" -LICENSE = "PD" - -SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libtool.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/sqlite-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-tcl --enable-shared \ - --enable-threadsafe" -export config_BUILD_CC = "${BUILD_CC}" -export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" -export config_BUILD_LIBS = "${BUILD_LDFLAGS}" -export config_TARGET_CC = "${CC}" -export config_TARGET_LINK = "${CCLD}" -export config_TARGET_CFLAGS = "${CFLAGS}" -export config_TARGET_LFLAGS = "${LDFLAGS}" - -do_compile_prepend() { - oe_runmake sqlite3.h - install -m 0644 sqlite3.h ${STAGING_INCDIR} -} - -do_stage() { - oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} -} - -#do_install() { -# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} -#} - -PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3" -FILES_sqlite3 = "${bindir}/*" -FILES_libsqlite = "${libdir}/*.so.*" -FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ - ${libdir}/pkgconfig ${includedir}" -FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}" -AUTO_LIBNAME_PKGS = "libsqlite" +require sqlite3.inc +PR = "r2" diff --git a/packages/sqlite/sqlite3_3.3.7.bb b/packages/sqlite/sqlite3_3.3.7.bb new file mode 100644 index 0000000000..d21fb6ad3e --- /dev/null +++ b/packages/sqlite/sqlite3_3.3.7.bb @@ -0,0 +1,2 @@ +require sqlite3.inc +PR = "r2" diff --git a/packages/sqlite/sqlite_2.8.15.bb b/packages/sqlite/sqlite_2.8.15.bb index 17b3605f12..2c1d9ecb08 100644 --- a/packages/sqlite/sqlite_2.8.15.bb +++ b/packages/sqlite/sqlite_2.8.15.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "readline ncurses" LICENSE = "PD" -PR = "r3" +PR = "r5" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ file://main.mk" @@ -51,6 +51,6 @@ do_install() { } PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/sqlite/sqlite_2.8.16.bb b/packages/sqlite/sqlite_2.8.16.bb index fcbca7153f..f0d62bac75 100644 --- a/packages/sqlite/sqlite_2.8.16.bb +++ b/packages/sqlite/sqlite_2.8.16.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "readline ncurses" LICENSE = "PD" -PR = "r1" +PR = "r3" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ file://sqlite.pc \ @@ -54,6 +54,6 @@ do_install() { } PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/sqlite/sqlite_2.8.17.bb b/packages/sqlite/sqlite_2.8.17.bb index 7e44ac87ae..b5939d9848 100644 --- a/packages/sqlite/sqlite_2.8.17.bb +++ b/packages/sqlite/sqlite_2.8.17.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "readline ncurses" LICENSE = "PD" -PR = "r0" +PR = "r2" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ file://mainmk_build_dynamic.patch;patch=1 \ @@ -56,6 +56,6 @@ do_install() { } PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/sqlite/sqlite_2.8.9.bb b/packages/sqlite/sqlite_2.8.9.bb index 5063711928..120e721c24 100644 --- a/packages/sqlite/sqlite_2.8.9.bb +++ b/packages/sqlite/sqlite_2.8.9.bb @@ -1,13 +1,13 @@ -PR = "r1" +PR = "r3" DESCRIPTION = "An Embeddable SQL Database Engine" SECTION = "libs" PRIORITY = "optional" DEPENDS = "readline ncurses" LICENSE = "PD" -PACKAGES =+ "sqlite-bin" +PACKAGES += "sqlite-bin" -FILES_sqlite-bin = "${bindir}" +FILES_sqlite-bin = "${bindir}/*" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ file://crosscompile.patch;patch=1" 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/starling/.mtn2git_empty b/packages/starling/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/starling/.mtn2git_empty diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb new file mode 100644 index 0000000000..5f4311dfe5 --- /dev/null +++ b/packages/starling/starling_0.1.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" +MAINTAINER = "Florian Boor <fb@kernelconcepts.de> + +inherit gpe autotools + +DESCRIPTION = "Starling audio player for GPE" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound-gpe" +RDEPENDS = "esd \ + gst-plugins \ + gst-plugin-audio \ + gst-plugin-audioconvert \ + gst-plugin-audiofile \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" + +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-tagedit \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +SRC_URI = "http://handhelds.org/~skyhusker/${P}.tar.bz2" diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb index b056ea9441..efb2b69ad7 100644 --- a/packages/startup-monitor/startup-monitor_0.18-2.bb +++ b/packages/startup-monitor/startup-monitor_0.18-2.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -DEPENDS = "virtual/x11 startup-notification glib-2.0 libmatchbox" +DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox" inherit gpe pkgconfig diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb index d04c6da160..e53ac16fa2 100644 --- a/packages/startup-notification/startup-notification_0.5.bb +++ b/packages/startup-notification/startup-notification_0.5.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit autotools pkgconfig diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb index d847de20d0..0cf4f089cc 100644 --- a/packages/startup-notification/startup-notification_0.8.bb +++ b/packages/startup-notification/startup-notification_0.8.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit autotools pkgconfig 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.inc b/packages/sudo/sudo.inc index 92d3c47266..0dfb22ba8a 100644 --- a/packages/sudo/sudo.inc +++ b/packages/sudo/sudo.inc @@ -1,4 +1,3 @@ -SECTION = "base" DESCRIPTION = "Sudo (superuser do) allows a system \ administrator to give certain users (or groups of \ users) the ability to run some (or all) commands \ 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/swig/swig-native_1.3.29.bb b/packages/swig/swig-native_1.3.29.bb new file mode 100644 index 0000000000..8210bb9cfb --- /dev/null +++ b/packages/swig/swig-native_1.3.29.bb @@ -0,0 +1,7 @@ +require swig_${PV}.bb +inherit native + +do_stage() { + oe_runmake install PREFIX=${STAGING_BINDIR}/.. +} + 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.0.bb b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb index bc21b36a01..47d15645e6 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10_2.2.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10.2_2.4.0.bb @@ -1,6 +1,6 @@ -include sylpheed-claws-extra-plugins.inc +require sylpheed-claws-extra-plugins.inc DEPENDS_append = " gtkhtml2" -S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/gtkhtml2_viewer-0.10 +S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/gtkhtml2_viewer-0.10.2 diff --git a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb deleted file mode 100644 index 56f86e6923..0000000000 --- a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -include sylpheed-claws-extra-plugins.inc - -DEPENDS_append = " db" - -S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/maildir-0.22 - 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 new file mode 100644 index 0000000000..2fb1c5f1dc --- /dev/null +++ b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.24.1_2.4.0.bb @@ -0,0 +1,6 @@ +require sylpheed-claws-extra-plugins.inc + +DEPENDS_append = " db" + +S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/maildir-0.24.1 + diff --git a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb new file mode 100644 index 0000000000..39ed9152aa --- /dev/null +++ b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb @@ -0,0 +1,5 @@ +require sylpheed-claws-extra-plugins.inc + +SRC_URI = "http://www.sylpheed-claws.net/downloads/plugins/mailmbox-1.12.1.tar.gz" +S = "${WORKDIR}/mailmbox-1.12.1" + diff --git a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.4cvs8_2.2.0.bb b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.4cvs8_2.2.0.bb deleted file mode 100644 index 3c95ee1b17..0000000000 --- a/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.4cvs8_2.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -include sylpheed-claws-extra-plugins.inc - -DEPENDS_append = " libxml2 curl glib-2.0 gtk+" - -S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/rssyl-0.4cvs8 - 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 new file mode 100644 index 0000000000..7c68da1ea8 --- /dev/null +++ b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.6_2.4.0.bb @@ -0,0 +1,6 @@ +require sylpheed-claws-extra-plugins.inc + +DEPENDS_append = " libxml2 curl glib-2.0 gtk+" + +S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/rssyl-0.6 + diff --git a/packages/sylpheed/sylpheed-claws_2.2.0.bb b/packages/sylpheed/sylpheed-claws_2.4.0.bb index 0308e60964..0308e60964 100644 --- a/packages/sylpheed/sylpheed-claws_2.2.0.bb +++ b/packages/sylpheed/sylpheed-claws_2.4.0.bb diff --git a/packages/sylpheed/sylpheed_2.2.4.bb b/packages/sylpheed/sylpheed_2.2.4.bb deleted file mode 100644 index e1ede2b302..0000000000 --- a/packages/sylpheed/sylpheed_2.2.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -LICENSE = "GPL" -PR = "r5" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ - file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ - file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \ - file://sylpheed-gnutls_2.2.4.patch;patch=1" - - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--disable-ssl --enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.2.5.bb b/packages/sylpheed/sylpheed_2.2.5.bb deleted file mode 100644 index e1ede2b302..0000000000 --- a/packages/sylpheed/sylpheed_2.2.5.bb +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -LICENSE = "GPL" -PR = "r5" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ - file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ - file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \ - file://sylpheed-gnutls_2.2.4.patch;patch=1" - - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--disable-ssl --enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.2.6.bb b/packages/sylpheed/sylpheed_2.2.7.bb index 3ea47c44dd..3ea47c44dd 100644 --- a/packages/sylpheed/sylpheed_2.2.6.bb +++ b/packages/sylpheed/sylpheed_2.2.7.bb diff --git a/packages/sysvinit/sysvinit/htcuniversal/inittab b/packages/sysvinit/sysvinit/htcuniversal/inittab index 8714c7ee93..6abbdf4558 100644 --- a/packages/sysvinit/sysvinit/htcuniversal/inittab +++ b/packages/sysvinit/sysvinit/htcuniversal/inittab @@ -28,7 +28,3 @@ l5:5:wait:/etc/init.d/rc 5 l6:6:wait:/etc/init.d/rc 6 # Normally not reached, but fallthrough in case of emergency. z6:6:respawn:/sbin/sulogin -1:2345:respawn:/sbin/getty 115200 tty1 -2:2345:respawn:/sbin/getty 115200 tty2 -3:2345:respawn:/sbin/getty 115200 tty3 -4:2345:respawn:/sbin/getty 115200 tty4 diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index a9644e45a4..d2b538b1f9 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r25" +PR = "r28" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. @@ -40,7 +40,7 @@ ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit" ALTERNATIVE_PRIORITY = "50" PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" -FILES_${PN} += "${base_sbindir} ${base_bindir}" +FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin" 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-dvb.bb b/packages/tasks/task-dvb.bb index 5a5c37a565..335ab27e8d 100644 --- a/packages/tasks/task-dvb.bb +++ b/packages/tasks/task-dvb.bb @@ -7,3 +7,6 @@ PR = "r5" RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via" LICENSE = MIT + +# there is a -march=586 somewhere in the source tree of mythtv +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb index a1532c1739..a938a12e57 100644 --- a/packages/tasks/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb @@ -7,3 +7,6 @@ PR = "r6" RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm" LICENSE = MIT + +# there is a -march=586 somewhere in the source tree of mythtv +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb index 50f42d84fa..d6a73739f5 100644 --- a/packages/tasks/task-qpe.bb +++ b/packages/tasks/task-qpe.bb @@ -3,7 +3,7 @@ SECTION = "opie/base" ALLOW_EMPTY = 1 PACKAGE_ARCH = "all" LICENSE = "MIT" -PR = "r6" +PR = "r7" PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \ task-qpe-multimedia task-qpe-emulators task-qpe-applications \ @@ -106,7 +106,8 @@ RDEPENDS_task-qpe-games = "\ zrally \ zrev7 \ zsubhunt \ - ztappy" + ztappy \ + zudoku" RDEPENDS_task-qpe-inputmethods = "\ custominput \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index c39ffd59f8..8514ceb717 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 = "r2" +PR = "r5" LICENSE = MIT ALLOW_EMPTY = "1" @@ -14,11 +14,14 @@ PACKAGES = "\ RDEPENDS_task-sdk-bare := "\ glibc \ glibc-dev \ + libgcc1 \ " RDEPENDS_task-sdk-base := "\ glibc \ glibc-dev \ + libgcc1 \ + alsa-dev \ audiofile-dev \ bluez-libs-dev \ dbus-dev \ @@ -27,24 +30,27 @@ RDEPENDS_task-sdk-base := "\ freetype-dev \ glib-2.0-dev \ gstreamer-dev \ - ice-dev \ + libice-dev \ ipkg-dev \ jpeg-dev \ libapm-dev \ + libasound2 \ libdisplaymigration-dev \ libetpan-dev \ libgcrypt-dev \ libglade-dev \ + libgnutls-dev \ libgpg-error-dev \ libidl-dev \ libiw-dev \ - libmimedir-dev \ + libmimedir-0.4-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ + libsoup-2.2-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ @@ -55,7 +61,7 @@ RDEPENDS_task-sdk-base := "\ readline-dev \ sqlite-dev \ zlib-dev \ - xmu-dev" + libxmu-dev" RDEPENDS_task-sdk-x11 := "\ atk-dev \ @@ -101,12 +107,14 @@ RDEPENDS_task-sdk-x11-ext := "\ # libxss-dev \ RDEPENDS_task-sdk-gpe := "\ + libcontactsdb-dev \ esound-gpe-dev \ libeventdb-dev \ libgpepimc-dev \ libgpevtype-dev \ libgpelaunch-dev \ - libgpewidget-dev" + libgpewidget-dev \ + libhandoff-dev" RDEPENDS_task-sdk-opie := "\ libopiebluez2 \ diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb index c8b3ac0d3a..69a3227437 100644 --- a/packages/tcltk/tk_8.4.11.bb +++ b/packages/tcltk/tk_8.4.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language ToolKit Extension" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -DEPENDS = "tcl virtual/x11 libxt" +DEPENDS = "tcl virtual/libx11 libxt" RDEPENDS = "tcl" PR = "r4" diff --git a/packages/telepathy/telepathy-gabble_20060503.bb b/packages/telepathy/telepathy-gabble_0.3.0.bb index c873894f1c..78440a7148 100644 --- a/packages/telepathy/telepathy-gabble_20060503.bb +++ b/packages/telepathy/telepathy-gabble_0.3.0.bb @@ -4,11 +4,10 @@ DEPENDS = "glib-2.0 dbus loudmouth" LICENSE = "lgpl" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/telepathy-gabble-${PV}.tar.bz2" +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz" inherit autotools pkgconfig -S = "${WORKDIR}/${PN}/" FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" diff --git a/packages/teleport/teleport_0.33.bb b/packages/teleport/teleport_0.33.bb index a8730433f0..d25398220b 100644 --- a/packages/teleport/teleport_0.33.bb +++ b/packages/teleport/teleport_0.33.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DESCRIPTION = "Teleport app" DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" SECTION = "gpe" PRIORITY = "optional" PR = "r2" diff --git a/packages/teleport/teleport_0.34.bb b/packages/teleport/teleport_0.34.bb index 3b89a5be51..f97432d8a5 100644 --- a/packages/teleport/teleport_0.34.bb +++ b/packages/teleport/teleport_0.34.bb @@ -2,5 +2,5 @@ inherit gpe LICENSE = "GPL" DESCRIPTION = "Teleport app" DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite" -MAINTAINER = "Koen Kooi <koen@handhelds.org>"SECTION = "gpe" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"SECTION = "gpe" PRIORITY = "optional" 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/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb index ad0e0f23f2..838447fa57 100644 --- a/packages/tetex/tetex_3.0.bb +++ b/packages/tetex/tetex_3.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible HOMEPAGE = "http://www.tug.org/tetex" LICENSE = "GPL" SECTION = "console/utils" -DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/x11 libxau libxext libxt zlib" +DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "r5" diff --git a/packages/tilibs/libticables_3.9.2.bb b/packages/tilibs/libticables_3.9.2.bb index ba8497ec60..4f59a7fa7d 100644 --- a/packages/tilibs/libticables_3.9.2.bb +++ b/packages/tilibs/libticables_3.9.2.bb @@ -1,5 +1,5 @@ LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz" diff --git a/packages/tilibs/libticalcs_4.5.9.bb b/packages/tilibs/libticalcs_4.5.9.bb index f106d0f364..efe83ba746 100644 --- a/packages/tilibs/libticalcs_4.5.9.bb +++ b/packages/tilibs/libticalcs_4.5.9.bb @@ -1,5 +1,5 @@ LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html" DPENDS = "libticables libtifiles" diff --git a/packages/tilibs/libtifiles_0.6.5.bb b/packages/tilibs/libtifiles_0.6.5.bb index aa44094a61..62277d9656 100644 --- a/packages/tilibs/libtifiles_0.6.5.bb +++ b/packages/tilibs/libtifiles_0.6.5.bb @@ -1,5 +1,5 @@ LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz" 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/tsclient/tsclient_0.140.bb b/packages/tsclient/tsclient_0.140.bb index 368c66a230..2d744687ac 100644 --- a/packages/tsclient/tsclient_0.140.bb +++ b/packages/tsclient/tsclient_0.140.bb @@ -1,6 +1,6 @@ DESCRIPTION = "tsclient == a frontend for rdesktop and other remote desktop tool" HOMEPAGE = "http://www.gnomepro.com/tsclient/" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libpanelapplet rdesktop" RDEPENDS = "rdesktop" diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/tslib/tslib/h4000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h4000/.mtn2git_empty diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh new file mode 100644 index 0000000000..0de3534a51 --- /dev/null +++ b/packages/tslib/tslib/h4000/tslib.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +case `uname -r` in +2.4*) + TSLIB_TSDEVICE=/dev/touchscreen/0raw + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 + ;; +*) + TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac + +export TSLIB_TSDEVICE TSLIB_CONFFILE + diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb new file mode 100644 index 0000000000..6a4bc321c9 --- /dev/null +++ b/packages/tslib/tslib_1.0.bb @@ -0,0 +1,98 @@ +DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." +HOMEPAGE = "http://cvs.arm.linux.org.uk/" +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +SECTION = "base" +LICENSE = "LGPL" + +PR = "r0" +SRCDATE_tslib = "now" + +SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \ + file://ts.conf \ + file://ts-2.6.conf \ + file://ts.conf-h3600-2.4 \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-corgi-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh" +SRC_URI_append_mnci += " file://devfs.patch;patch=1" +SRC_URI_append_mnci += " file://event1.patch;patch=1" +S = "${WORKDIR}/${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " + +do_stage() { + autotools_stage_all +} + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + case ${MACHINE} in + a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-h3600-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + c7x0 | spitz | akita | tosa ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-corgi-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + + simpad ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-simpad-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + *) + ;; + esac +} + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" + +RDEPENDS_tslib-conf_h1940 = "detect-stylus" +RDEPENDS_tslib-conf_h2200 = "detect-stylus" +RDEPENDS_tslib-conf_h3600 = "detect-stylus" +RDEPENDS_tslib-conf_h3900 = "detect-stylus" +RDEPENDS_tslib-conf_h5xxx = "detect-stylus" +RDEPENDS_tslib-conf_h6300 = "detect-stylus" +RDEPENDS_tslib-conf_blueangel = "detect-stylus" +RDEPENDS_tslib-conf_htcuniversal = "detect-stylus" +RDEPENDS_tslib-conf_h4000 = "detect-stylus" +RDEPENDS_tslib-conf_ipaq-pxa270 = "detect-stylus" + +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" + +PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" + +RDEPENDS_libts = "tslib-conf" + +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_libts-dev = "${FILES_tslib-dev}" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/packages/ttf-fonts/ttf-dejavu_2.7.bb b/packages/ttf-fonts/ttf-dejavu_2.9.bb index ca84ccbe8e..4599e6e016 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.7.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.9.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/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.28.bb index 454136cc05..cb59f88957 100644 --- a/packages/uae/e-uae_0.8.27.bb +++ b/packages/uae/e-uae_0.8.28.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Amiga Emulator based on SDL" SECTION = "base" PRIORITY = "optional" -DEPENDS = "libsdl-qpe" +DEPENDS = "virtual/libsdl zlib" LICENSE = "GPL" -PR = "r1" +PR = "r0" -SRC_URI = "http://rcdrummond.net/uae/old/e-uae-${PV}/e-uae-${PV}.tar.bz2 \ +SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \ file://configure.patch;patch=1" -# file://m4.patch;patch=1" inherit autotools @@ -24,13 +23,3 @@ PARALLEL_MAKE = "" do_configure_prepend () { touch NEWS AUTHORS ChangeLog } - -do_install_append() { -# Packages NEVER, ever, ever, ever touch home directories directly. -# ever. -# Either update a global config in /etc, install it into /etc/skel/ for -# new users homedirs, rely on the user installing it to put it in place, -# or dont install it at all. --CL -# install -d ${D}/home/root -# install ${FILESDIR}/uaerc ${D}/home/root/.uaerc -} diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb new file mode 100644 index 0000000000..efe4addbb0 --- /dev/null +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "U-boot bootloader" +PROVIDES = "virtual/bootloader" +SECTION = "bootloader" +MAINTAINER = "philip@balister.org" +PRIORITY = "optional" +LICENSE = "GPL" + +PR = "r0" + +TAG = "${@bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git;tag=${TAG}" +# file://config.patch;patch=1" + +S = "${WORKDIR}/git" + +#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" +EXTRA_OEMAKE = "" + +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + + +#inherit base + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_stage() { + install -m755 tools/mkimage ${STAGING_BINDIR} +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile 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-0.9.28/dl-startup.h.patch b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch new file mode 100644 index 0000000000..c4b699f263 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch @@ -0,0 +1,22 @@ +--- uClibc-0.9.28/ldso/ldso/arm/dl-startup.h- 2006-08-13 18:56:40.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/arm/dl-startup.h 2006-08-13 18:56:58.000000000 +0200 +@@ -4,8 +4,8 @@ + * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org> + */ + +-#if defined(__arm__) +-asm( ++#if !defined(__thumb__) ++__asm__( + " .text\n" + " .globl _start\n" + " .type _start,%function\n" +@@ -57,7 +57,7 @@ + ".previous\n" + ); + #else +-asm( ++__asm__( + " .text\n" + " .arm\n" + " .globl _start\n" diff --git a/packages/uclibc/uclibc-0.9.28/dl-string.h.patch b/packages/uclibc/uclibc-0.9.28/dl-string.h.patch new file mode 100644 index 0000000000..a2bdb81907 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/dl-string.h.patch @@ -0,0 +1,225 @@ +--- uClibc-0.9.28/ldso/include/dl-string.h.orig 2006-08-14 17:20:02.000000000 +0200 ++++ uClibc-0.9.28/ldso/include/dl-string.h 2006-08-14 17:19:38.000000000 +0200 +@@ -1,9 +1,24 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * Copyright (C) 2000-2005 by Erik Andersen <andersen@codepoet.org> ++ * ++ * GNU Lesser General Public License version 2.1 or later. ++ */ ++ + #ifndef _LINUX_STRING_H_ + #define _LINUX_STRING_H_ + +-#include <dl-sysdep.h> // for do_rem ++#include <dl-sysdep.h> /* for do_rem */ + #include <features.h> + ++/* provide some sane defaults */ ++#ifndef do_rem ++# define do_rem(result, n, base) ((result) = (n) % (base)) ++#endif ++#ifndef do_div_10 ++# define do_div_10(result, remain) ((result) /= 10) ++#endif ++ + static size_t _dl_strlen(const char * str); + static char *_dl_strcat(char *dst, const char *src); + static char * _dl_strcpy(char * dst,const char *src); +@@ -26,8 +41,8 @@ + static __always_inline size_t _dl_strlen(const char * str) + { + register const char *ptr = (char *) str-1; +- +- while (*++ptr); ++ while (*++ptr) ++ ;/* empty */ + return (ptr - str); + } + +@@ -49,7 +64,8 @@ + register char *ptr = dst; + + dst--;src--; +- while ((*++dst = *++src) != 0); ++ while ((*++dst = *++src) != 0) ++ ;/* empty */ + + return ptr; + } +@@ -63,8 +79,7 @@ + c2 = (unsigned char) *++s2; + if (c1 == '\0') + return c1 - c2; +- } +- while (c1 == c2); ++ } while (c1 == c2); + + return c1 - c2; + } +@@ -98,43 +113,41 @@ + return 0; + } + +-static inline char * _dl_strrchr(const char *str, int c) ++static __always_inline char * _dl_strrchr(const char *str, int c) + { +- register char *prev = 0; +- register char *ptr = (char *) str-1; ++ register char *prev = 0; ++ register char *ptr = (char *) str-1; + +- while (*++ptr != '\0') { +- if (*ptr == c) +- prev = ptr; +- } +- if (c == '\0') +- return(ptr); +- return(prev); ++ while (*++ptr != '\0') { ++ if (*ptr == c) ++ prev = ptr; ++ } ++ if (c == '\0') ++ return(ptr); ++ return(prev); + } + +-static inline char * _dl_strstr(const char *s1, const char *s2) ++static __always_inline char * _dl_strstr(const char *s1, const char *s2) + { +- register const char *s = s1; +- register const char *p = s2; ++ register const char *s = s1; ++ register const char *p = s2; + +- do { +- if (!*p) { +- return (char *) s1;; +- } +- if (*p == *s) { +- ++p; +- ++s; +- } else { +- p = s2; +- if (!*s) { +- return NULL; +- } +- s = ++s1; +- } +- } while (1); ++ do { ++ if (!*p) ++ return (char *) s1;; ++ if (*p == *s) { ++ ++p; ++ ++s; ++ } else { ++ p = s2; ++ if (!*s) ++ return NULL; ++ s = ++s1; ++ } ++ } while (1); + } + +-static inline void * _dl_memcpy(void * dst, const void * src, size_t len) ++static __always_inline void * _dl_memcpy(void * dst, const void * src, size_t len) + { + register char *a = dst-1; + register const char *b = src-1; +@@ -163,27 +176,28 @@ + /* Will generate smaller and faster code due to loop unrolling.*/ + static __always_inline void * _dl_memset(void *to, int c, size_t n) + { +- unsigned long chunks; +- unsigned long *tmp_to; ++ unsigned long chunks; ++ unsigned long *tmp_to; + unsigned char *tmp_char; + +- chunks = n / 4; +- tmp_to = to + n; +- c = c << 8 | c; +- c = c << 16 | c; +- if (!chunks) +- goto lessthan4; +- do { +- *--tmp_to = c; +- } while (--chunks); +- lessthan4: +- n = n % 4; +- if (!n ) return to; +- tmp_char = (unsigned char *)tmp_to; +- do { +- *--tmp_char = c; +- } while (--n); +- return to; ++ chunks = n / 4; ++ tmp_to = to + n; ++ c = c << 8 | c; ++ c = c << 16 | c; ++ if (!chunks) ++ goto lessthan4; ++ do { ++ *--tmp_to = c; ++ } while (--chunks); ++lessthan4: ++ n = n % 4; ++ if (!n) ++ return to; ++ tmp_char = (unsigned char *)tmp_to; ++ do { ++ *--tmp_char = c; ++ } while (--n); ++ return to; + } + #else + static __always_inline void * _dl_memset(void * str,int c,size_t len) +@@ -225,10 +239,10 @@ + char *p = &local[22]; + *--p = '\0'; + do { +- char temp; +- do_rem(temp, i, 10); +- *--p = '0' + temp; +- i /= 10; ++ char temp; ++ do_rem(temp, i, 10); ++ *--p = '0' + temp; ++ do_div_10(i, temp); + } while (i > 0); + return p; + } +@@ -242,9 +256,9 @@ + do { + char temp = i & 0xf; + if (temp <= 0x09) +- *--p = '0' + temp; ++ *--p = '0' + temp; + else +- *--p = 'a' - 0x0a + temp; ++ *--p = 'a' - 0x0a + temp; + i >>= 4; + } while (i > 0); + *--p = 'x'; +@@ -270,8 +284,8 @@ + + /* On some arches constant strings are referenced through the GOT. + * This requires that load_addr must already be defined... */ +-#if defined(mc68000) || defined(__arm__) || defined(__thumb__) || defined(__mips__) \ +- || defined(__sh__) || defined(__powerpc__) ++#if defined(mc68000) || defined(__arm__) || defined(__thumb__) || \ ++ defined(__mips__) || defined(__sh__) || defined(__powerpc__) + # define CONSTANT_STRING_GOT_FIXUP(X) \ + if ((X) < (const char *) load_addr) (X) += load_addr + # define NO_EARLY_SEND_STDERR +@@ -318,7 +332,7 @@ + do { \ + do_rem(v, (X), 10); \ + *--tmp2 = '0' + v; \ +- (X) /= 10; \ ++ do_div_10((X), v); \ + } while ((X) > 0); \ + _dl_write(2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1); \ + } diff --git a/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch b/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch new file mode 100644 index 0000000000..0d271a9ca0 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch @@ -0,0 +1,10 @@ +--- uClibc-0.9.28/ldso/ldso/arm/dl-sysdep.h.orig 2006-08-14 17:22:50.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/arm/dl-sysdep.h 2006-08-14 17:23:45.000000000 +0200 +@@ -43,6 +43,7 @@ + return m; + } + #define do_rem(result, n, base) ((result) = arm_modulus(n, base)) ++#define do_div_10(result, remain) ((result) = (((result) - (remain)) / 2) * -(-1ul / 5ul)) + + /* Here we define the magic numbers that this dynamic loader should accept */ + #define MAGIC1 EM_ARM diff --git a/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro b/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro index 7019e97369..fd922e1d76 100644 --- a/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro @@ -82,7 +82,7 @@ UCLIBC_HAS_PRINTF_M_SPEC=y UCLIBC_HAS_ERRNO_MESSAGES=y # UCLIBC_HAS_SYS_ERRLIST is not set UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_SYS_SIGLIST=y UCLIBC_HAS_GNU_GETOPT=y # 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..0a0fe100cd 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" +PR = "r6" -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) @@ -30,6 +30,9 @@ SRC_URI += " file://thumb-swi-r7.patch;patch=1" SRC_URI += " file://thumb-sysnum-h.patch;patch=1" SRC_URI += " file://thumb-asm-swi.patch;patch=1" SRC_URI += " file://thumb-call-via-rx.patch;patch=1" +SRC_URI += " file://dl-startup.h.patch;patch=1" +SRC_URI += " file://dl-string.h.patch;patch=1" +SRC_URI += " file://dl-sysdep.h.patch;patch=1" # # This is a core change and is controversial, maybe even wrong # on some architectures 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/files/50-hostap_cs.rules b/packages/udev/files/50-hostap_cs.rules new file mode 100644 index 0000000000..efefdc58fc --- /dev/null +++ b/packages/udev/files/50-hostap_cs.rules @@ -0,0 +1,4 @@ +# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards +# +ACTION=="add", DEVICE=="hostap_cs", \ + SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/packages/udev/files/h2200/.mtn2git_empty b/packages/udev/files/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/files/h2200/.mtn2git_empty diff --git a/packages/udev/files/h2200/mount.blacklist b/packages/udev/files/h2200/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/h2200/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram
\ No newline at end of file diff --git a/packages/udev/files/ipaq-pxa270/.mtn2git_empty b/packages/udev/files/ipaq-pxa270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/files/ipaq-pxa270/.mtn2git_empty diff --git a/packages/udev/files/ipaq-pxa270/mount.blacklist b/packages/udev/files/ipaq-pxa270/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/ipaq-pxa270/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram
\ No newline at end of file diff --git a/packages/udev/udev-058/flags.patch b/packages/udev/udev-058/flags.patch deleted file mode 100644 index f67024dbb8..0000000000 --- a/packages/udev/udev-058/flags.patch +++ /dev/null @@ -1,40 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-058/Makefile~flags.patch -+++ udev-058/Makefile -@@ -153,16 +153,17 @@ - - SYSFS = $(PWD)/libsysfs/sysfs.a - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -@@ -178,9 +179,9 @@ - KLCC = $(KLIBC_INSTALL)/bin/klcc - CC = $(KLCC) - LD = $(KLCC) -- LDFLAGS += -static -+ override LDFLAGS += -static - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - endif - - ifeq ($(strip $(USE_SELINUX)),true) diff --git a/packages/udev/udev-058/init b/packages/udev/udev-058/init deleted file mode 100644 index a213463ad2..0000000000 --- a/packages/udev/udev-058/init +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -e - -PATH="/usr/sbin:/usr/bin:/sbin:/bin" - -UDEVSTART=/sbin/udevstart - -# default maximum size of the /dev ramfs -ramfs_size="1M" - -[ -x $UDEVSTART ] || exit 0 - -. /etc/udev/udev.conf - -case "$(uname -r)" in - 2.[012345].*) - echo "udev requires a kernel >= 2.6, not started." - exit 0 - ;; -esac - -if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then - echo "udev requires ramfs support, not started." - exit 0 -fi - -if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ] ; then - echo "udev requires hotplug support, not started." - exit 0 -fi - -############################################################################## - -# we need to unmount /dev/pts/ and remount it later over the ramfs -unmount_devpts() { - if mountpoint -q /dev/pts/; then - umount -l /dev/pts/ - fi - - if mountpoint -q /dev/shm/; then - umount -l /dev/shm/ - fi -} - -# mount a ramfs over /dev, if somebody did not already do it -mount_ramfs() { - if grep -E -q "^[^[:space:]]+ /dev ramfs" /proc/mounts; then - return 0 - fi - - # /.dev is used by /sbin/MAKEDEV to access the real /dev directory. - # if you don't like this, remove /.dev/. - [ -d /.dev ] && mount --bind /dev /.dev - - echo -n "Mounting a ramfs over /dev..." - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none /dev - echo "done." -} - -# I hate this hack. -- Md -make_extra_nodes() { - if [ -f /etc/udev/links.conf ]; then - grep '^[^#]' /etc/udev/links.conf | \ - while read type name arg1; do - [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue - case "$type" in - L) - ln -s $arg1 /dev/$name - ;; - D) - mkdir -p /dev/$name - ;; - M) - mknod -m 600 /dev/$name $arg1 - ;; - *) - echo "unparseable line ($type $name $arg1)" - ;; - esac - done - fi -} - -############################################################################## - -if [ "$udev_root" != "/dev" ]; then - echo "WARNING: udev_root != /dev" - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none $udev_root - echo -n "Creating initial device nodes..." - $UDEVSTART - echo "done." - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - echo -n "Unmounting $udev_root..." - # unmounting with -l should never fail - if umount -l $udev_root; then - echo "done." - else - echo "failed." - fi - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - - exit 0 -fi # udev_root != /dev/ - -############################################################################## -# When modifying this script, do not forget that between the time that -# the new /dev has been mounted and udevstart has been run there will be -# no /dev/null. This also means that you cannot use the "&" shell command. - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - unmount_devpts - mount_ramfs - ACTION=add - echo -n "Creating initial device nodes..." - $UDEVSTART - make_extra_nodes - echo "done." -# /etc/init.d/mountvirtfs start - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - unmount_devpts - echo -n "Unmounting /dev..." - # unmounting with -l should never fail - if umount -l /dev; then - echo "done." - umount -l /.dev || true -# /etc/init.d/mountvirtfs start - else - echo "failed." - fi - ;; - restart|force-reload) - start-stop-daemon -K -x /sbin/udevd - echo -n "Recreating device nodes..." - ACTION=add - $UDEVSTART - make_extra_nodes - echo "done." - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 - diff --git a/packages/udev/udev-058/noasmlinkage.patch b/packages/udev/udev-058/noasmlinkage.patch deleted file mode 100644 index 1694d4d661..0000000000 --- a/packages/udev/udev-058/noasmlinkage.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-042/udev.c~noasmlinkage -+++ udev-042/udev.c -@@ -60,7 +60,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-042/udevd.c~noasmlinkage -+++ udev-042/udevd.c -@@ -308,7 +308,7 @@ - return; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - diff --git a/packages/udev/udev-063/flags.patch b/packages/udev/udev-063/flags.patch deleted file mode 100644 index e6969f2f63..0000000000 --- a/packages/udev/udev-063/flags.patch +++ /dev/null @@ -1,53 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/Makefile~flags.patch -+++ udev-062/Makefile -@@ -151,16 +151,17 @@ - - SYSFS = $(PWD)/libsysfs/sysfs.a - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -@@ -176,19 +177,20 @@ - KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc - CC = $(KLCC) - LD = $(KLCC) -+ override LDFLAGS += -static - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -- LDFLAGS += -static -+ override CFLAGS += -DUSE_STATIC -+ override LDFLAGS += -static - endif - - ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-063/init b/packages/udev/udev-063/init deleted file mode 100644 index 67886c9e54..0000000000 --- a/packages/udev/udev-063/init +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -e - -PATH="/usr/sbin:/usr/bin:/sbin:/bin" - -UDEVSTART=/sbin/udevstart - -# default maximum size of the /dev ramfs -ramfs_size="1M" - -[ -x $UDEVSTART ] || exit 0 - -. /etc/udev/udev.conf - -case "$(uname -r)" in - 2.[012345].*) - echo "udev requires a kernel >= 2.6, not started." - exit 0 - ;; -esac - -if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then - echo "udev requires ramfs support, not started." - exit 0 -fi - -if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then - echo "udev requires hotplug support, not started." - exit 0 -fi - -############################################################################## - -# we need to unmount /dev/pts/ and remount it later over the ramfs -unmount_devpts() { - if mountpoint -q /dev/pts/; then - umount -l /dev/pts/ - fi - - if mountpoint -q /dev/shm/; then - umount -l /dev/shm/ - fi -} - -# mount a ramfs over /dev, if somebody did not already do it -mount_ramfs() { - if grep -E -q "^[^[:space:]]+ /dev ramfs" /proc/mounts; then - return 0 - fi - - # /.dev is used by /sbin/MAKEDEV to access the real /dev directory. - # if you don't like this, remove /.dev/. - [ -d /.dev ] && mount --bind /dev /.dev - - echo -n "Mounting a ramfs over /dev..." - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none /dev - echo "done." -} - -# I hate this hack. -- Md -make_extra_nodes() { - if [ -f /etc/udev/links.conf ]; then - grep '^[^#]' /etc/udev/links.conf | \ - while read type name arg1; do - [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue - case "$type" in - L) - ln -s $arg1 /dev/$name - ;; - D) - mkdir -p /dev/$name - ;; - M) - mknod -m 600 /dev/$name $arg1 - ;; - *) - echo "unparseable line ($type $name $arg1)" - ;; - esac - done - fi -} - -############################################################################## - -if [ "$udev_root" != "/dev" ]; then - echo "WARNING: udev_root != /dev" - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none $udev_root - echo -n "Creating initial device nodes..." - $UDEVSTART - echo "done." - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - echo -n "Unmounting $udev_root..." - # unmounting with -l should never fail - if umount -l $udev_root; then - echo "done." - else - echo "failed." - fi - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - - exit 0 -fi # udev_root != /dev/ - -############################################################################## -# When modifying this script, do not forget that between the time that -# the new /dev has been mounted and udevstart has been run there will be -# no /dev/null. This also means that you cannot use the "&" shell command. - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - unmount_devpts - mount_ramfs - ACTION=add - echo -n "Creating initial device nodes..." - $UDEVSTART - make_extra_nodes - echo "done." -# /etc/init.d/mountvirtfs start - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - unmount_devpts - echo -n "Unmounting /dev..." - # unmounting with -l should never fail - if umount -l /dev; then - echo "done." - umount -l /.dev || true -# /etc/init.d/mountvirtfs start - else - echo "failed." - fi - ;; - restart|force-reload) - start-stop-daemon -K -x /sbin/udevd - echo -n "Recreating device nodes..." - ACTION=add - $UDEVSTART - make_extra_nodes - echo "done." - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 - diff --git a/packages/udev/udev-063/tty-symlinks.patch b/packages/udev/udev-063/tty-symlinks.patch deleted file mode 100644 index 6a458de64c..0000000000 --- a/packages/udev/udev-063/tty-symlinks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- udev-063/etc/udev/udev.rules.devfs.orig 2005-07-27 19:55:51 +0200 -+++ udev-063/etc/udev/udev.rules.devfs 2005-07-27 19:56:49 +0200 -@@ -103,3 +103,8 @@ - - # raw devices - KERNEL="raw[0-9]*", NAME="raw/%k" -+ -+# tty devices -+KERNEL=="tty[0-9]*", SYMLINK="%k" -+KERNEL=="ttyS[0-9]*", SYMLINK="%k" -+ diff --git a/packages/udev/udev-065/flags.patch b/packages/udev/udev-065/flags.patch deleted file mode 100644 index d95daa51e2..0000000000 --- a/packages/udev/udev-065/flags.patch +++ /dev/null @@ -1,66 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-065/Makefile~flags -+++ udev-065/Makefile -@@ -106,11 +106,11 @@ - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} - --CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ -+override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ - -Wstrict-prototypes -Wsign-compare --CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) --CFLAGS += -pipe --CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) -+override CFLAGS += -pipe -+override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - - # use '-Os' optimization if available, else use -O2 - OPTFLAGS := $(call cc-supports, -Os, -O2) -@@ -154,16 +154,16 @@ - - SYSFS = $(PWD)/libsysfs/sysfs.a - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -@@ -180,18 +180,18 @@ - CC = $(KLCC) - LD = $(KLCC) - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -- LDFLAGS += -static -+ override CFLAGS += -DUSE_STATIC -+ override LDFLAGS += -static - endif - - ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-065/init b/packages/udev/udev-065/init deleted file mode 100644 index 67886c9e54..0000000000 --- a/packages/udev/udev-065/init +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -e - -PATH="/usr/sbin:/usr/bin:/sbin:/bin" - -UDEVSTART=/sbin/udevstart - -# default maximum size of the /dev ramfs -ramfs_size="1M" - -[ -x $UDEVSTART ] || exit 0 - -. /etc/udev/udev.conf - -case "$(uname -r)" in - 2.[012345].*) - echo "udev requires a kernel >= 2.6, not started." - exit 0 - ;; -esac - -if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then - echo "udev requires ramfs support, not started." - exit 0 -fi - -if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then - echo "udev requires hotplug support, not started." - exit 0 -fi - -############################################################################## - -# we need to unmount /dev/pts/ and remount it later over the ramfs -unmount_devpts() { - if mountpoint -q /dev/pts/; then - umount -l /dev/pts/ - fi - - if mountpoint -q /dev/shm/; then - umount -l /dev/shm/ - fi -} - -# mount a ramfs over /dev, if somebody did not already do it -mount_ramfs() { - if grep -E -q "^[^[:space:]]+ /dev ramfs" /proc/mounts; then - return 0 - fi - - # /.dev is used by /sbin/MAKEDEV to access the real /dev directory. - # if you don't like this, remove /.dev/. - [ -d /.dev ] && mount --bind /dev /.dev - - echo -n "Mounting a ramfs over /dev..." - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none /dev - echo "done." -} - -# I hate this hack. -- Md -make_extra_nodes() { - if [ -f /etc/udev/links.conf ]; then - grep '^[^#]' /etc/udev/links.conf | \ - while read type name arg1; do - [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue - case "$type" in - L) - ln -s $arg1 /dev/$name - ;; - D) - mkdir -p /dev/$name - ;; - M) - mknod -m 600 /dev/$name $arg1 - ;; - *) - echo "unparseable line ($type $name $arg1)" - ;; - esac - done - fi -} - -############################################################################## - -if [ "$udev_root" != "/dev" ]; then - echo "WARNING: udev_root != /dev" - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - mount -n -o size=$ramfs_size,mode=0755 -t ramfs none $udev_root - echo -n "Creating initial device nodes..." - $UDEVSTART - echo "done." - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - echo -n "Unmounting $udev_root..." - # unmounting with -l should never fail - if umount -l $udev_root; then - echo "done." - else - echo "failed." - fi - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - - exit 0 -fi # udev_root != /dev/ - -############################################################################## -# When modifying this script, do not forget that between the time that -# the new /dev has been mounted and udevstart has been run there will be -# no /dev/null. This also means that you cannot use the "&" shell command. - -case "$1" in - start) - if [ -e "$udev_root/.udev.tdb" ]; then - if mountpoint -q /dev/; then - echo "FATAL: udev is already active on $udev_root." - exit 1 - else - echo "WARNING: .udev.tdb already exists on the old $udev_root!" - fi - fi - unmount_devpts - mount_ramfs - ACTION=add - echo -n "Creating initial device nodes..." - $UDEVSTART - make_extra_nodes - echo "done." -# /etc/init.d/mountvirtfs start - ;; - stop) - start-stop-daemon -K -x /sbin/udevd - unmount_devpts - echo -n "Unmounting /dev..." - # unmounting with -l should never fail - if umount -l /dev; then - echo "done." - umount -l /.dev || true -# /etc/init.d/mountvirtfs start - else - echo "failed." - fi - ;; - restart|force-reload) - start-stop-daemon -K -x /sbin/udevd - echo -n "Recreating device nodes..." - ACTION=add - $UDEVSTART - make_extra_nodes - echo "done." - ;; - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 - diff --git a/packages/udev/udev-065/tty-symlinks.patch b/packages/udev/udev-065/tty-symlinks.patch deleted file mode 100644 index 6a458de64c..0000000000 --- a/packages/udev/udev-065/tty-symlinks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- udev-063/etc/udev/udev.rules.devfs.orig 2005-07-27 19:55:51 +0200 -+++ udev-063/etc/udev/udev.rules.devfs 2005-07-27 19:56:49 +0200 -@@ -103,3 +103,8 @@ - - # raw devices - KERNEL="raw[0-9]*", NAME="raw/%k" -+ -+# tty devices -+KERNEL=="tty[0-9]*", SYMLINK="%k" -+KERNEL=="ttyS[0-9]*", SYMLINK="%k" -+ diff --git a/packages/udev/udev-070/flags.patch b/packages/udev/udev-070/flags.patch deleted file mode 100644 index bd04041f78..0000000000 --- a/packages/udev/udev-070/flags.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- udev-070/Makefile~flags 2005-09-15 01:19:07 +0200 -+++ udev-070/Makefile 2005-09-16 11:44:37 +0200 -@@ -160,36 +160,36 @@ - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} - --CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ -+override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ - -Wstrict-prototypes -Wsign-compare --CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) --CFLAGS += -pipe --CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) -+override CFLAGS += -pipe -+override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - - # use '-Os' optimization if available, else use -O2 - OPTFLAGS := $(call cc-supports, -Os, -O2) - - # include our local copy of libsysfs --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ override CFLAGS += -O1 -g -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer -+ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer - LDFLAGS += -s -Wl - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif - - ifeq ($(strip $(USE_GCOV)),true) -- CFLAGS += -fprofile-arcs -ftest-coverage -+ override CFLAGS += -fprofile-arcs -ftest-coverage - LDFLAGS = -fprofile-arcs - endif - -@@ -200,18 +200,18 @@ - CC = $(KLCC) - LD = $(KLCC) - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - LDFLAGS += -Wl,-warn-common - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -+ override CFLAGS += -DUSE_STATIC - LDFLAGS += -static - endif - diff --git a/packages/udev/udev-070/tty-symlinks.patch b/packages/udev/udev-070/tty-symlinks.patch deleted file mode 100644 index 28bdf92af8..0000000000 --- a/packages/udev/udev-070/tty-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 -+++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 -@@ -14,8 +14,8 @@ - KERNEL="fd[0-9]*", NAME="floppy/%n" - - # tty devices --KERNEL="tty[0-9]*", NAME="vc/%n" --KERNEL="ttyS[0-9]*", NAME="tts/%n" -+KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" -+KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" - KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" - - # vc devices diff --git a/packages/udev/udev-071/flags.patch b/packages/udev/udev-071/flags.patch deleted file mode 100644 index cb17336212..0000000000 --- a/packages/udev/udev-071/flags.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: udev-071/Makefile -=================================================================== ---- udev-071.orig/Makefile 2005-10-19 23:28:34.000000000 +0100 -+++ udev-071/Makefile 2005-11-01 22:04:31.000000000 +0000 -@@ -160,36 +160,36 @@ - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} - --CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ -+override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ - -Wstrict-prototypes -Wsign-compare --CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) --CFLAGS += -pipe --CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) -+override CFLAGS += -pipe -+override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - - # use '-Os' optimization if available, else use -O2 - OPTFLAGS := $(call cc-supports, -Os, -O2) - - # include our local copy of libsysfs --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ override CFLAGS += -O1 -g -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer -+ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer - LDFLAGS += -s -Wl - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif - - ifeq ($(strip $(USE_GCOV)),true) -- CFLAGS += -fprofile-arcs -ftest-coverage -+ override CFLAGS += -fprofile-arcs -ftest-coverage - LDFLAGS = -fprofile-arcs - endif - -@@ -200,18 +200,18 @@ - CC = $(KLCC) - LD = $(KLCC) - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - LDFLAGS += -Wl,-warn-common - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -lsepol -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -+ override CFLAGS += -DUSE_STATIC - LDFLAGS += -static - endif - diff --git a/packages/udev/udev-071/tty-symlinks.patch b/packages/udev/udev-071/tty-symlinks.patch deleted file mode 100644 index 28bdf92af8..0000000000 --- a/packages/udev/udev-071/tty-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 -+++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 -@@ -14,8 +14,8 @@ - KERNEL="fd[0-9]*", NAME="floppy/%n" - - # tty devices --KERNEL="tty[0-9]*", NAME="vc/%n" --KERNEL="ttyS[0-9]*", NAME="tts/%n" -+KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" -+KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" - KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" - - # vc devices diff --git a/packages/udev/udev-092/arm_inotify_fix.patch b/packages/udev/udev-092/arm_inotify_fix.patch new file mode 100644 index 0000000000..4bd0d4d9b9 --- /dev/null +++ b/packages/udev/udev-092/arm_inotify_fix.patch @@ -0,0 +1,17 @@ +Index: udev-092/udev_libc_wrapper.h +=================================================================== +--- udev-092.orig/udev_libc_wrapper.h 2006-07-26 21:55:06.000000000 +0100 ++++ udev-092/udev_libc_wrapper.h 2006-07-26 21:55:37.000000000 +0100 +@@ -58,9 +58,9 @@ + # define __NR_inotify_add_watch 152 + # define __NR_inotify_rm_watch 156 + #elif defined (__arm__) +-# define __NR_inotify_init 316 +-# define __NR_inotify_add_watch 317 +-# define __NR_inotify_rm_watch 318 ++# define __NR_inotify_init __NR_SYSCALL_BASE+316 ++# define __NR_inotify_add_watch __NR_SYSCALL_BASE+317 ++# define __NR_inotify_rm_watch __NR_SYSCALL_BASE+318 + #elif defined (__sh__) + # define __NR_inotify_init 290 + # define __NR_inotify_add_watch 291 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-097/.mtn2git_empty b/packages/udev/udev-097/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-097/.mtn2git_empty diff --git a/packages/udev/udev-097/flags.patch b/packages/udev/udev-097/flags.patch new file mode 100644 index 0000000000..492a39881c --- /dev/null +++ b/packages/udev/udev-097/flags.patch @@ -0,0 +1,51 @@ +--- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 ++++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 +@@ -117,28 +117,28 @@ + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes +-CFLAGS += $(WARNINGS) ++override CFLAGS += $(WARNINGS) + + LDFLAGS = -Wl,-warn-common + + OPTFLAGS = -Os +-CFLAGS += $(OPTFLAGS) ++override CFLAGS += $(OPTFLAGS) + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -DDEBUG ++ override CFLAGS += -DDEBUG + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS += -fprofile-arcs + endif + +@@ -151,11 +151,11 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init new file mode 100644 index 0000000000..cc25c026a3 --- /dev/null +++ b/packages/udev/udev-097/init @@ -0,0 +1,242 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + # The mount options in busybox are non-standard... + if test -x /bin/mount.util-linux + then + /bin/mount.util-linux --move /etc/udev /dev/.static/dev + elif test -x /bin/busybox + then + busybox mount -n -o move /etc/udev /dev/.static/dev + else + echo "udev requires an identifiable mount command, not started." + umount /etc/udev + umount /dev + exit 1 + fi +} + +create_dev_makedev() { + if [ -e /sbin/MAKEDEV ]; then + [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV + else + ln -s /bin/true /dev/MAKEDEV + fi +} + +# I hate this hack. -- Md +make_extra_nodes() { + if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then + cp -a /lib/udev/devices/* /dev/ + fi + + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod -m 600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;; + esac + return 0 +} + +load_input_modules() { + case "$(uname -r)" in + 2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15 + *) return 0 + esac + + for module in mousedev evdev joydev; do + modprobe -q $module || true + done +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +[ -x /sbin/udevd ] || exit 0 + +PATH="/sbin:/bin:/usr/bin" + +# defaults +tmpfs_size="10M" +udev_root="/dev" + +if [ -e /etc/udev/udev.conf ]; then + . /etc/udev/udev.conf +fi + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.15, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevsynthesize has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +udev_root=${udev_root%/} + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q $udev_root/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo > /proc/sys/kernel/hotplug + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/db/ /dev/.udev/queue/ + + echo "Synthesizing the initial hotplug events" + udevtrigger + + load_input_modules + create_dev_makedev + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + if ! udevsettle; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart) + echo "Stopping the hotplug events dispatcher" "udevd" + if start-stop-daemon --stop --name udevd --quiet ; then + exit 1 + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + ;; + + reload) + udevcontrol reload_rules + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules new file mode 100644 index 0000000000..2308b52c4a --- /dev/null +++ b/packages/udev/udev-097/local.rules @@ -0,0 +1,31 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +# Try and modprobe for drivers for new hardware +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,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-097/permissions.rules b/packages/udev/udev-097/permissions.rules new file mode 100644 index 0000000000..8da35c3090 --- /dev/null +++ b/packages/udev/udev-097/permissions.rules @@ -0,0 +1,109 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" + +# IDE devices +BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" +BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +BUS=="scsi", SYSFS{type}=="1", GROUP="tape" +BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" +BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" +BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" + +# USB devices +BUS=="usb", KERNEL=="legousbtower*", MODE="0666" +BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb_device", MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb_device", GROUP="plugdev", \ + SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="nvram", GROUP="nvram" +KERNEL=="rtc", GROUP="audio" +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" +KERNEL=="fuse", GROUP="fuse" + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +KERNEL=="uverbs*", GROUP="rdma" +KERNEL=="ucm*", GROUP="rdma" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/packages/udev/udev-097/udev.rules b/packages/udev/udev-097/udev.rules new file mode 100644 index 0000000000..9c4ea4214d --- /dev/null +++ b/packages/udev/udev-097/udev.rules @@ -0,0 +1,98 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +KERNEL=="buzzer", NAME="misc/buzzer" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index a3896a6978..5245d6e2b3 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ +DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" @@ -33,7 +33,8 @@ bindir = "/bin" sbindir = "/sbin" UDEV_EXTRAS = "<override me>" -FILES_${PN} += "${usrbindir} ${usrsbindir}" +FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*" +FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" EXTRA_OEMAKE = "-e \ 'EXTRAS=${UDEV_EXTRAS}' \ 'STRIP=echo'" diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb deleted file mode 100644 index 0c24e363ed..0000000000 --- a/packages/udev/udev_058.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://permissions.rules \ - file://init" - -include 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 deleted file mode 100644 index 912d3725ba..0000000000 --- a/packages/udev/udev_063.bb +++ /dev/null @@ -1,22 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://fix-alignment.patch;patch=1 \ - file://tty-symlinks.patch;patch=1" - -include udev.inc - -PR = "r7" -UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" - -#FIXME UDEV MIGRATION PLAN: -#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) -#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug -#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() -#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules - -do_install_append() { - install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/ - echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules -} diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb deleted file mode 100644 index 8d186023c8..0000000000 --- a/packages/udev/udev_065.bb +++ /dev/null @@ -1,21 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://tty-symlinks.patch;patch=1" - -include udev.inc - -PR = "r5" -UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" - -#FIXME UDEV MIGRATION PLAN: -#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) -#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug -#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() -#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules - -do_install_append() { - install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/ - echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules -} diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb deleted file mode 100644 index 937462de85..0000000000 --- a/packages/udev/udev_070.bb +++ /dev/null @@ -1,17 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://tty-symlinks.patch;patch=1" - -include udev.inc - -PR = "r8" - -UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" - -#FIXME UDEV MIGRATION PLAN: -#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) -#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug -#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() -#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules diff --git a/packages/udev/udev_071.bb b/packages/udev/udev_071.bb deleted file mode 100644 index c1db91d692..0000000000 --- a/packages/udev/udev_071.bb +++ /dev/null @@ -1,17 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://tty-symlinks.patch;patch=1" - -include udev.inc - -PR = "r10" - -UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" - -#FIXME UDEV MIGRATION PLAN: -#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) -#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug -#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() -#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 71c8e048ff..b08f6b0635 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -11,13 +11,13 @@ 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 ." -PR = "r13" +PR = "r14" -FILES_${PN} += "${base_libdir}" +FILES_${PN} += "${base_libdir}/udev/*" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" EXTRA_OEMAKE += "libudevdir=/lib/udev" diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb index 62bc43d48f..a91a0eee5d 100644 --- a/packages/udev/udev_089.bb +++ b/packages/udev/udev_089.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 = "r3" +PR = "r4" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -12,11 +12,11 @@ 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 ." -FILES_${PN} += "${base_libdir}" +FILES_${PN} += "${base_libdir}/udev/*" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" EXTRA_OEMAKE += "libudevdir=/lib/udev" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index f25eeb0946..87febedf05 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,20 +3,26 @@ 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 = "r5" +PR = "r11" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ - file://mount.blacklist" + file://arm_inotify_fix.patch;patch=1 \ + file://mount.blacklist \ + " -include udev.inc +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +require udev.inc INITSCRIPT_PARAMS = "start 03 S ." -FILES_${PN} += "${base_libdir}" +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" EXTRA_OEMAKE += "libudevdir=/lib/udev" @@ -47,3 +53,7 @@ do_install () { install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb new file mode 100644 index 0000000000..2e9e8d500f --- /dev/null +++ b/packages/udev/udev_097.bb @@ -0,0 +1,63 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.15." +DESCRIPTION_libvolume-id = "libvolume_id shared library, \ +used to detect the type of a file system and read its metadata." +DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ +needed to link programs with libvolume_id." + +PR = "r0" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://mount.blacklist \ + " + +require udev.inc + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +INITSCRIPT_PARAMS = "start 03 S ." + +PACKAGES =+ "libvolume-id-dev libvolume-id" +PKG_libvolume-id-dev = "libvolume-id-dev" +FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" +FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" +EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb index 59cba88047..2b6fb5c089 100644 --- a/packages/uim/uim_1.1.0.bb +++ b/packages/uim/uim_1.1.0.bb @@ -1,5 +1,5 @@ require uim.inc -DEPENDS = "gtk+ uim-native anthy fontconfig virtual/x11 libxft xt glib-2.0 ncurses" +DEPENDS = "gtk+ uim-native anthy fontconfig virtual/libx11 libxft xt glib-2.0 ncurses" SRC_URI += "file://uim-module-manager.patch;patch=1" 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/ushare/.mtn2git_empty b/packages/ushare/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ushare/.mtn2git_empty diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb new file mode 100644 index 0000000000..a922fed2d0 --- /dev/null +++ b/packages/ushare/ushare_0.9.7.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ushare is a UPnP media server" +LICENSE = "GPL" +HOMEPAGE = "http://ushare.geexbox.org/" +MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>" +DEPENDS = "libupnp" +SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2" +S = "${WORKDIR}/ushare-${PV}" +PR = "r0" + +inherit autotools 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/v4l2apps/v4l2apps_20020317.bb b/packages/v4l2apps/v4l2apps_20020317.bb index 0206863f93..9915cd63a0 100644 --- a/packages/v4l2apps/v4l2apps_20020317.bb +++ b/packages/v4l2apps/v4l2apps_20020317.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" DESCRIPTION = "Video4linux Two sample applications" LICENSE = "PD" -DEPENDS = "libxaw virtual/x11 libxt" +DEPENDS = "libxaw virtual/libx11 libxt" SRC_URI = "http://www.thedirks.org/pub/v4l2/apps/apps${PV}.tgz" S = "${WORKDIR}" 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/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb index a79f100230..c5fe202c64 100644 --- a/packages/vnc/tightvnc_1.3dev7.bb +++ b/packages/vnc/tightvnc_1.3dev7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A Unix VNC client" HOMEPAGE = "http://www.tightvnc.com/" -DEPENDS = "virtual/x11 zlib libxmu libxaw" +DEPENDS = "virtual/libx11 zlib libxmu libxaw" LICENSE = "GPL" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb index 5565f8c9c0..d195c094eb 100644 --- a/packages/vte/vte_0.11.15.bb +++ b/packages/vte/vte_0.11.15.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" inherit gnome 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/wireless-tools/wireless-tools_29-pre10.bb b/packages/wireless-tools/wireless-tools_29-pre10.bb index 6b5abbcd00..f42ef62f09 100644 --- a/packages/wireless-tools/wireless-tools_29-pre10.bb +++ b/packages/wireless-tools/wireless-tools_29-pre10.bb @@ -4,6 +4,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>, Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz \ file://man.patch;patch=1 \ @@ -34,7 +35,7 @@ do_install() { install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools } -PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" +PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc ${PN}-dbg" FILES_libiw = "${libdir}/*.so.*" FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" FILES_libiw-doc = "${mandir}/man7" 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/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb index 236992f8f0..7af73f085c 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb @@ -6,7 +6,7 @@ MAINTAINER = "Eric Shattow <lucent@gmail.com>" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "gnutls madwifi-ng" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ @@ -40,19 +40,19 @@ do_compile () { do_install () { install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} + install -m 755 wpa_supplicant ${D}${sbindir} + install -m 755 wpa_passphrase ${D}${sbindir} + install -m 755 wpa_cli ${D}${sbindir} install -d ${D}${localstatedir}/run/wpa_supplicant install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant + install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant install -d ${D}${sysconfdir}/init.d - install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa + install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa install -d ${D}${sysconfdir}/default - install -m600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa - install -m600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf + install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa + install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf } 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/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb index 18ff27b428..068fc094b1 100644 --- a/packages/xawtv/xawtv_3.93.bb +++ b/packages/xawtv/xawtv_3.93.bb @@ -4,7 +4,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \ driver or video4linux. It also contains various command-line utilities for \ grabbing images and AVI movies, tuning in TV stations, etc." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/x11 ncurses libxft fs jpeg" +DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg" SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \ file://make.patch;patch=1" diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb index 7239275f21..1de87c04eb 100644 --- a/packages/xcalibrate/xcalibrate_20060312.bb +++ b/packages/xcalibrate/xcalibrate_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xcalibrateext libxext" +DEPENDS = "virtual/libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index 98c493f3ca..a5b435795a 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xcalibrateext libxext" +DEPENDS = "virtual/libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.0.bb index 462ed4d6e9..4f8d990a87 100644 --- a/packages/xchat/xchat_2.6.0.bb +++ b/packages/xchat/xchat_2.6.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" HOMEPAGE = "http://www.xchat.org" -MAINTAINER = "Koen Kooi <koen@handhelds.org" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org" DEPENDS = "libgcrypt zlib gtk+" SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2" diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb index 462ed4d6e9..4f8d990a87 100644 --- a/packages/xchat/xchat_2.6.1.bb +++ b/packages/xchat/xchat_2.6.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" HOMEPAGE = "http://www.xchat.org" -MAINTAINER = "Koen Kooi <koen@handhelds.org" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org" DEPENDS = "libgcrypt zlib gtk+" SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2" diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb index ba2550261d..3979e430c0 100644 --- a/packages/xcompmgr/xcompmgr_cvs.bb +++ b/packages/xcompmgr/xcompmgr_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "BSD-X" SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libxdamage libxcomposite libxrender" +DEPENDS = "virtual/libx11 libxdamage libxcomposite libxrender" DESCRIPTION = "X Compositing Manager" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr" diff --git a/packages/xdemineur/xdemineur_2.1.1.bb b/packages/xdemineur/xdemineur_2.1.1.bb index ffd6b3a918..8c1e8ae206 100644 --- a/packages/xdemineur/xdemineur_2.1.1.bb +++ b/packages/xdemineur/xdemineur_2.1.1.bb @@ -1,7 +1,7 @@ inherit gpe LICENSE = "BSD-X" -DEPENDS = "virtual/x11 libxpm" +DEPENDS = "virtual/libx11 libxpm" SECTION = "gpe" DESCRIPTION = "Mine-sweeper game for GPE." PRIORITY = "optional" 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.inc b/packages/xfcalendar/xfcalendar.inc index 8a1a5b7e20..987d8b4d67 100644 --- a/packages/xfcalendar/xfcalendar.inc +++ b/packages/xfcalendar/xfcalendar.inc @@ -4,5 +4,5 @@ DESCRIPTION="XFCE Calendar" SECTION = "x11" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs" inherit xfce diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb index 8a1a5b7e20..987d8b4d67 100644 --- a/packages/xfcalendar/xfcalendar_4.2.0.bb +++ b/packages/xfcalendar/xfcalendar_4.2.0.bb @@ -4,5 +4,5 @@ DESCRIPTION="XFCE Calendar" SECTION = "x11" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs" inherit xfce 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.inc b/packages/xfce-utils/xfce-utils.inc index a4b3958493..3de7625940 100644 --- a/packages/xfce-utils/xfce-utils.inc +++ b/packages/xfce-utils/xfce-utils.inc @@ -3,7 +3,7 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION="XFCE4 Utilities" -DEPENDS = "virtual/x11 libxfcegui4 xfce-mcs-manager" +DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" inherit xfce FILES_${PN} += " /usr/share/xfce4/AUTHORS \ 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.inc b/packages/xfce4-panel/xfce4-panel.inc index 573e2bdaa3..e43807540e 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -4,7 +4,7 @@ DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS = "startup-notification virtual/x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" inherit pkgconfig xfce 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.inc b/packages/xfdesktop/xfdesktop.inc index 1b22894fed..380832d7c3 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb index 4c56b459a3..7a90487cc8 100644 --- a/packages/xfdesktop/xfdesktop_4.2.0.bb +++ b/packages/xfdesktop/xfdesktop_4.2.0.bb @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" inherit xfce PACKAGES += "xfdesktop-backdrops" 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.inc b/packages/xfwm4/xfwm4.inc index 5af8a5f18b..fb85b4d9eb 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -8,11 +8,16 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" -DEPENDS = "startup-notification virtual/x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +DEPENDS = "startup-notification virtual/libx11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" +do_configure_append() { + sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile +} + PACKAGES_DYNAMIC = "xfwm4-theme-*" python populate_packages_prepend () { diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb index f23227ae60..e6fbd22b59 100644 --- a/packages/xfwm4/xfwm4_4.2.0.bb +++ b/packages/xfwm4/xfwm4_4.2.0.bb @@ -9,7 +9,7 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" -DEPENDS = "startup-notification virtual/x11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" EXTRA_OECONF += " --enable-startup-notification" 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/xmms/files/acinclude.m4 b/packages/xmms/files/acinclude.m4 new file mode 100644 index 0000000000..099d55b0b2 --- /dev/null +++ b/packages/xmms/files/acinclude.m4 @@ -0,0 +1,36 @@ +dnl XMMS_FUNC_POSIX(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for functions in posix libraries, and define POSIX_LIBS +AC_DEFUN(XMMS_FUNC_POSIX, +[dnl + xmms_posix4=no + xmms_rt=no + for xmms_func in $1 + do + xmms_have_func=no + AC_CHECK_FUNC($xmms_func,xmms_have_func=yes,[ + dnl try in libposix4 if not found in current LIBS + AC_CHECK_LIB(posix4,$xmms_func,[xmms_have_func=yes xmms_posix4=yes],[ + dnl try in librt, if not found so far + AC_CHECK_LIB(rt,$xmms_func,[xmms_have_func=yes xmms_rt=yes]) + ]) + ]) + if test $xmms_have_func = yes; then + changequote(, )dnl + xmms_tr_func=HAVE_`echo $xmms_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + changequote([, ])dnl + AC_DEFINE_UNQUOTED($xmms_tr_func) + ifelse([$2], , :, [$2]) + else + ifelse([$3], , :, [$3]) + fi + done + POSIX_LIBS= + if test $xmms_posix4 = yes; then + POSIX_LIBS=-lposix4 + fi + if test $xmms_rt = yes; then + POSIX_LIBS="$POSIX_LIBS -lrt" + fi + AC_SUBST(POSIX_LIBS) +]) + diff --git a/packages/xmms/files/xmms-config-dequote.patch b/packages/xmms/files/xmms-config-dequote.patch new file mode 100644 index 0000000000..8fdd7f0cf7 --- /dev/null +++ b/packages/xmms/files/xmms-config-dequote.patch @@ -0,0 +1,25 @@ +--- xmms-1.2.10/xmms-config.in.orig 2006-08-13 06:55:56.000000000 +0100 ++++ xmms-1.2.10/xmms-config.in 2006-08-13 06:56:52.000000000 +0100 +@@ -12,15 +12,15 @@ + # + # This work is released under the GNU GPL, version 2 or later. + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ + exec_prefix_set=no +-data_dir="@datadir@/@PACKAGE@" ++data_dir=@datadir@/@PACKAGE@ + +-version="@VERSION@" +-include_dir="@includedir@" +-xmms_include_dir="@includedir@/@PACKAGE@" +-lib_dir="@libdir@" ++version=@VERSION@ ++include_dir=@includedir@ ++xmms_include_dir=@includedir@/@PACKAGE@ ++lib_dir=@libdir@ + + if ( (gtk-config --version) > /dev/null 2>&1) then + gtk_libs=`gtk-config --libs` diff --git a/packages/xmms/files/xmms.sh b/packages/xmms/files/xmms.sh new file mode 100644 index 0000000000..7d1a96e129 --- /dev/null +++ b/packages/xmms/files/xmms.sh @@ -0,0 +1,4 @@ +#! /bin/sh + +XLIB_SKIP_ARGB_VISUALS=1 xmms + diff --git a/packages/xmms/xmms-mad_0.10.bb b/packages/xmms/xmms-mad_0.10.bb new file mode 100644 index 0000000000..6c43d7878f --- /dev/null +++ b/packages/xmms/xmms-mad_0.10.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "xmms plugin for the mad integer mp3 decoder" +SECTION = "x11/multimedia" +HOMEPAGE = "http://xmms-mad.sourceforge.net +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms libmad libid3tag" +SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2" + +inherit autotools + +export XMMS_CONFIG = "${STAGING_BINDIR}/xmms-config" + +FILES_${PN} = "${libdir}/xmms/Input/libxmmsmad.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmsmad.so" + diff --git a/packages/xmms/xmms-tremor_1.0.bb b/packages/xmms/xmms-tremor_1.0.bb new file mode 100644 index 0000000000..d6619d4d97 --- /dev/null +++ b/packages/xmms/xmms-tremor_1.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "xmms plugin for the tremos integer vorbis decoder" +SECTION = "x11/multimedia" +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms tremor" +SRC_URI = "http://mirror1.pdaxrom.org/source/src/xmms-tremor-1.0.tar.bz2" + +inherit autotools + +FILES_${PN} = "${libdir}/xmms/Input/libxmmstremor.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmstremor.so" + diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 05bfb1dc3e..9ee59cef29 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -2,22 +2,39 @@ DESCRIPTION = "The X MultiMedia System" HOMEPAGE = "http://www.xmms.org/" LICENSE = "GPL" SECTION = "x11/multimedia" -# TODO add esd mikmod vorbis -DEPENDS = "gtk+-1.2" +# TODO add esd +DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib" SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \ - file://gcc4.patch;patch=1" + file://gcc4.patch;patch=1 \ + file://xmms-config-dequote.patch;patch=1 \ + file://acinclude.m4 \ + file://xmms.sh" +PR = "r2" -inherit autotools +inherit autotools binconfig -# TODO enable esd mikmod vorbis -EXTRA_OECONF = "--disable-opengl --disable-esd --disable-mikmod --disable-vorbis" +# TODO enable esd +EXTRA_OECONF = "--disable-opengl --disable-esd \ + --with-vorbis-includes=${STAGING_INCDIR} \ + --with-ogg-includes=${STAGING_INCDIR} \ + --with-vorbis-libraries=${STAGING_LIBDIR} \ + --with-ogg-libraries=${STAGING_LIBDIR}" -do_configure() { - oe_runconf +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S} + rm ${S}/libxmms/acinclude.m4 || true } -do_compile() { - oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool +do_install_append() { + install -m 0755 ${WORKDIR}/xmms.sh ${D}${bindir} + install -d ${D}${datadir}/applications + install xmms/xmms.desktop ${D}${datadir}/applications + sed -i "s/Exec=xmms/Exec=xmms.sh/" ${D}${datadir}/applications/xmms.desktop + install -d ${D}${datadir}/pixmaps + install xmms/xmms_mini.xpm ${D}${datadir}/pixmaps } +do_stage() { + autotools_stage_all +} diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb index 6f3bf8888a..813a390c7c 100644 --- a/packages/xmonobut/xmonobut_0.4.1.bb +++ b/packages/xmonobut/xmonobut_0.4.1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxext libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxext libxpm libmatchbox" SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb index fb377cb179..97ebcbd84c 100644 --- a/packages/xmonobut/xmonobut_0.4.bb +++ b/packages/xmonobut/xmonobut_0.4.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxext libxpm" +DEPENDS = "virtual/libx11 libxext libxpm" SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools 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 cb0d42a2a6..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The appres program prints the resources seen by an application." -DEPENDS += " virtual/x11 libxt" +DEPENDS += " virtual/libx11 libxt" 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 e25b3ba16a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxscrnsaver libxt libxaw libxt" +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" 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 3d953e8a19..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,5 +1,5 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu xbitmaps libxt" +DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" 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 3e5736e063..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu xbitmaps libxt" +DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" 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 908dc878cb..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt libxmu libxaw" +DEPENDS += " virtual/libx11 libxt libxmu libxaw" 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 b274cd549f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" 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 b274cd549f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" 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 b274cd549f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 f18de41289..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,6 +1,6 @@ -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." -DEPENDS += " xtrans libxext liblbxutil virtual/x11 libice xproxymngproto bigreqsproto zlib" +DEPENDS += " xtrans libxext liblbxutil virtual/libx11 libice xproxymngproto bigreqsproto zlib" 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 aff984e46b..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw virtual/x11 libxt libxmu" +DEPENDS += " libxaw virtual/libx11 libxt libxmu" 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 c83cd38c5d..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " zlib zlib virtual/x11 libfontenc" +DEPENDS += " zlib zlib virtual/libx11 libfontenc" 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 144e600beb..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxfont libfs libfontenc" +DEPENDS += " virtual/libx11 libxfont libfs libfontenc" 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-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb index 29e304922d..98b49f99ac 100644 --- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/apps" LICENSE = "MIT-X" S="${WORKDIR}/mkfontscale-${PV}" -DEPENDS = "virtual/x11-native libfontenc-native" +DEPENDS = "libx11-native libfontenc-native" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2" 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 dc2b681490..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " zlib libfontenc freetype virtual/x11" +DEPENDS += " zlib libfontenc freetype virtual/libx11" 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 4c564a3643..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu libxext libxt" +DEPENDS += " virtual/libx11 libxmu libxext libxt" 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 7272764f52..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libice libxt virtual/x11 xproxymngproto" +DEPENDS += " libice libxt virtual/libx11 xproxymngproto" 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 0895ec79c8..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt" +DEPENDS += " virtual/libx11 libxt" 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 4077c44cfb..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,7 +1,10 @@ -include xorg-app-common.inc +require xorg-app-common.inc +PR = "r1" #DESCRIPTION = "" DEPENDS += " xproto util-macros" +FILES_${PN} += "${datadir}/X11" + 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 e1f332e8c1..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 29ed7358d5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" 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 29ed7358d5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" 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 c975c2c42d..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "tiny window manager" -DEPENDS += " virtual/x11 libxext libxt libxmu" +DEPENDS += " virtual/libx11 libxext libxt libxmu" ALTERNATIVE_PATH = "${bindir}/twm" ALTERNATIVE_NAME = "x-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 8e07c499b9..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" 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 4b4f4fe068..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,5 +1,5 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu libxrender libxft libxext" +DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext" 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 d9e62caa1f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxau libxext libxmu" +DEPENDS += " virtual/libx11 libxau libxext libxmu" diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb index c1489e10a9..a944d1d51d 100644 --- a/packages/xorg-app/xauth_cvs.bb +++ b/packages/xorg-app/xauth_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxau libxmu libxext" +DEPENDS = "virtual/libx11 libxau libxmu libxext" DESCRIPTION = "X authority file utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" 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 e8ee6e20a4..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt" +DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" 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 e8ee6e20a4..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt" +DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 f75a98b9d3..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxcursor libpng" +DEPENDS += " virtual/libx11 libxcursor libpng" 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 f75a98b9d3..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxcursor libpng" +DEPENDS += " virtual/libx11 libxcursor libpng" 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 e99c1aa768..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display manager" -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt" +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" EXTRA_OECONF += " --with-random-device=/dev/urandom" 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 438af7fbf6..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display manager" -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt" +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" EXTRA_OECONF += " --with-random-device=/dev/urandom" 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 c577aeb38a..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,9 +1,9 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X display information utility" LICENSE = "MIT" -DEPENDS += " libxtst libxext virtual/x11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" SRC_URI += "file://disable-xkb.patch;patch=1" diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb index 06d548c9ba..df31ba68d5 100644 --- a/packages/xorg-app/xdpyinfo_cvs.bb +++ b/packages/xorg-app/xdpyinfo_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxext libxtst" +DEPENDS = "virtual/libx11 libxext libxtst" DESCRIPTION = "X display information utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" 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 9ab9e1a0e7..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 glproto mesa" +DEPENDS += " virtual/libx11 glproto mesa" 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 9ab9e1a0e7..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 glproto mesa" +DEPENDS += " virtual/libx11 glproto mesa" 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 61b8ca4284..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Event Viewer" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb index e1f9a33a67..8acf2261cb 100644 --- a/packages/xorg-app/xev_cvs.bb +++ b/packages/xorg-app/xev_cvs.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" LICENSE = "MIT" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxau" +DEPENDS = "virtual/libx11 libxau" PR = "r1" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \ 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 6d2c81ffd6..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,5 +1,5 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxau libxt libxext libxmu" +DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" 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 4dfb42d0b3..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxxf86dga libxt libxaw libxmu" +DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" 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 41fe411756..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libice libxt xproxymngproto" +DEPENDS += " virtual/libx11 libice libxt xproxymngproto" 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 b274cd549f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" 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 258c980548..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libice xproxymngproto" +DEPENDS += " virtual/libx11 libice xproxymngproto" 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 8f3678475a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxxf86vm" +DEPENDS += " virtual/libx11 libxxf86vm" 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_20040413.bb b/packages/xorg-app/xhost_20040413.bb index 1bc64ecf77..ed240dbba1 100644 --- a/packages/xorg-app/xhost_20040413.bb +++ b/packages/xorg-app/xhost_20040413.bb @@ -1,7 +1,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" PV = "0.0+cvs${FIXEDSRCDATE}" -DEPENDS = "virtual/x11 libxext libxmu" +DEPENDS = "virtual/libx11 libxext libxmu" DESCRIPTION = "server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" 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 ff7cacd178..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11 libxmu libxau" +DEPENDS += " virtual/libx11 libxmu libxau" 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 ff7cacd178..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11 libxmu libxau" +DEPENDS += " virtual/libx11 libxmu libxau" 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 e1f332e8c1..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 59f7755640..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" FILES_${PN} += " /usr/lib/X11/xinit" 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 aa6b46e13c..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." -DEPENDS += " virtual/x11 libxkbfile" +DEPENDS += " virtual/libx11 libxkbfile" 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 aa6b46e13c..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." -DEPENDS += " virtual/x11 libxkbfile" +DEPENDS += " virtual/libx11 libxkbfile" 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 29ed7358d5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" 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 29ed7358d5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" 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 29ed7358d5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" 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 512ff6c6de..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw libxkbfile virtual/x11" +DEPENDS += " libxaw libxkbfile virtual/libx11" 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 8e07c499b9..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" 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 8e07c499b9..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" 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 8e07c499b9..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 e0149a478f..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,8 +1,8 @@ -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>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 40e27576a6..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,8 +1,8 @@ -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>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb index c1fb2425d1..7f45b28a89 100644 --- a/packages/xorg-app/xmodmap_cvs.bb +++ b/packages/xorg-app/xmodmap_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" PR = "r1" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ file://autofoo.patch;patch=1" 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/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 78146b1e78..53aa991b9f 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " /usr/lib/X11/${XORG_PN}" 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 609c5643bf..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxprintapputil libxaw libxprintutil libxt libxp" +DEPENDS += " virtual/libx11 libxprintapputil libxaw libxprintutil libxt libxp" 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 f1c547af4e..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxp libxprintutil virtual/x11" +DEPENDS += " libxp libxprintutil virtual/libx11" 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 7bba2c74df..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" 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 cccb035df6..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxp virtual/x11" +DEPENDS += " libxp virtual/libx11" 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 7bba2c74df..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb index 93ddb2dbf6..1079d6a591 100644 --- a/packages/xorg-app/xprop_cvs.bb +++ b/packages/xorg-app/xprop_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxmu libxext" +DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "property displayer for X" MAINTER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" 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 b03804bcb6..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" -DEPENDS += " libxrandr libxrender virtual/x11" +DEPENDS += " libxrandr libxrender virtual/libx11" 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 b03804bcb6..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" -DEPENDS += " libxrandr libxrender virtual/x11" +DEPENDS += " libxrandr libxrender virtual/libx11" diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb index f45e04115b..30a31e1569 100644 --- a/packages/xorg-app/xrandr_cvs.bb +++ b/packages/xorg-app/xrandr_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" -DEPENDS = "libxrandr virtual/x11 libxext" +DEPENDS = "libxrandr virtual/libx11 libxext" DESCRIPTION = "X Resize and Rotate extension command." SECTION = "x11/base" 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 7d8538be29..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,8 +1,8 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "xrdb" -DEPENDS += " libxmu virtual/x11 libxext" +DEPENDS += " libxmu virtual/libx11 libxext" 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 9533003b8f..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,7 +1,7 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "xrdb" -DEPENDS += " libxmu virtual/x11 libxext" +DEPENDS += " libxmu virtual/libx11 libxext" diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb index 191eb9897f..51a3fcd08a 100644 --- a/packages/xorg-app/xrdb_cvs.bb +++ b/packages/xorg-app/xrdb_cvs.bb @@ -1,5 +1,5 @@ PV = "0.0+cvs${SRCDATE}" -DEPENDS = "virtual/x11 libxmu libxext" +DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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 831e7de68f..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw virtual/x11 libxt libxext xtrans xproxymngproto libxau" +DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau" diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb index ca41d2373d..90247fdb26 100644 --- a/packages/xorg-app/xset_20040817.bb +++ b/packages/xorg-app/xset_20040817.bb @@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.0+cvs${FIXEDSRCDATE}" PR = "r1" -DEPENDS = "virtual/x11 libxext xextensions libxmu" +DEPENDS = "virtual/libx11 libxext xextensions libxmu" CFLAGS += "-D_GNU_SOURCE" 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 ca689e55f7..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,10 +1,10 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" LICENSE = "MIT" -DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp" +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" SRC_URI += "file://disable-xkb.patch;patch=1" 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 ca689e55f7..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,10 +1,10 @@ -include xorg-app-common.inc +require xorg-app-common.inc DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" LICENSE = "MIT" -DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp" +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" SRC_URI += "file://disable-xkb.patch;patch=1" 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 6bd79a0eb8..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxi virtual/x11" +DEPENDS += " libxi virtual/libx11" 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 6bd79a0eb8..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxi virtual/x11" +DEPENDS += " libxi virtual/libx11" 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 99061f45c4..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11 xbitmaps" +DEPENDS += " libxmu virtual/libx11 xbitmaps" 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 7bba2c74df..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index aa34d9b106..03b9b3873c 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -3,9 +3,9 @@ SECTION = "x11/apps" #MAINTAINER = "" LICENSE = "MIT-X" -DEPENDS = "xproto virtual/x11 xextproto xext xau xpm ncurses" +DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau xpm ncurses" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz" inherit autotools pkgconfig 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 fb3dca78a1..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxtrap" +DEPENDS += " virtual/libx11 libxtrap" 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 fb3dca78a1..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxtrap" +DEPENDS += " virtual/libx11 libxtrap" 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 4fdaf2427e..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxv virtual/x11" +DEPENDS += " libxv virtual/libx11" 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 7bba2c74df..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" 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 a871a5c6e5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu libxext virtual/x11" +DEPENDS += " libxmu libxext virtual/libx11" 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 a871a5c6e5..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu libxext virtual/x11" +DEPENDS += " libxmu libxext virtual/libx11" 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 827257910a..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,6 +1,6 @@ -include xorg-app-common.inc +require xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" 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-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc index ade9fdec58..095bc095fc 100644 --- a/packages/xorg-data/xorg-data-common.inc +++ b/packages/xorg-data/xorg-data-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index 91a297265b..3be252d076 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig 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 6ec014854c..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,6 +1,6 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I810 for X11" -DEPENDS += " virtual/x11 libxvmc drm xf86driproto" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" 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 6ec014854c..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,6 +1,6 @@ -include xorg-driver-video.inc +require xorg-driver-video.inc DESCRIPTION = "I810 for X11" -DEPENDS += " virtual/x11 libxvmc drm xf86driproto" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" 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-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index 361914db24..6d8204b9b1 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -7,7 +7,7 @@ LICENSE = "MIT-X" DEPENDS = "randrproto xorg-server xproto" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" 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 02db64181a..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,7 +1,7 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "X font aliases." -DEPENDS = "xserver-xorg font-util" +DEPENDS = "virtual/xserver font-util" RDEPENDS = "encodings font-util" 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 17986ecffe..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,7 +1,9 @@ -include xorg-font-common.inc +require xorg-font-common.inc DESCRIPTION = "X font utils." DEPENDS = "encodings" -RDEPENDS = "encodings" +RDEPENDS = "mkfontdir mkfontscale encodings" + +PR="r1" 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-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 38fd1af5a5..8a6bd0b475 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -7,7 +7,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS = "encodings font-util font-alias" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-lib/diet-x11/autofoo.patch b/packages/xorg-lib/diet-x11/autofoo.patch new file mode 100644 index 0000000000..8bdba09768 --- /dev/null +++ b/packages/xorg-lib/diet-x11/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/configure.ac~autofoo ++++ libX11-6.2.1/configure.ac +@@ -7,12 +7,12 @@ + [jg@freedesktop.org], + libX11) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_AUX_DIR(.) + ++AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([src/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libx11/xim.patch b/packages/xorg-lib/diet-x11/xim.patch index 0eab197a80..0eab197a80 100644 --- a/packages/xorg-lib/libx11/xim.patch +++ b/packages/xorg-lib/diet-x11/xim.patch 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..688d59eef6 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,9 +1,12 @@ 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" +PR = "r1" + SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" + file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" 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 4ae26c4a14..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto applewmproto" +DEPENDS += " virtual/libx11 libxext xextproto applewmproto" XORG_PN = "libAppleWM" 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 8e14c07680..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,5 +1,5 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto dmxproto" +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" 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 8e14c07680..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,5 +1,5 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto dmxproto" +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" 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_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb index c5403f625f..e771161e59 100644 --- a/packages/xorg-lib/libice_6.3.3.bb +++ b/packages/xorg-lib/libice_6.3.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE= "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" 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/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb index 598791cc40..1756a235d7 100644 --- a/packages/xorg-lib/libice_cvs.bb +++ b/packages/xorg-lib/libice_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch new file mode 100644 index 0000000000..afa34712e2 --- /dev/null +++ b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch @@ -0,0 +1,54 @@ +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac +--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000 +@@ -60,4 +60,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) 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..57b2987968 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,6 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc + +SRC_URI += "file://mkg3states-1.0.0.patch;patch=0" 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 3d17aa561b..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" XORG_PN = "liboldX" diff --git a/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb index 51dbe93251..cd374649bb 100644 --- a/packages/xorg-lib/libsm_6.0.3.bb +++ b/packages/xorg-lib/libsm_6.0.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "MIT-X" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libice" +DEPENDS = "virtual/libx11 libice" DESCRIPTION = "Session management library" PR = "r1" 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/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb index ce43901aad..45d6bfa236 100644 --- a/packages/xorg-lib/libsm_cvs.bb +++ b/packages/xorg-lib/libsm_cvs.bb @@ -2,7 +2,7 @@ PV = "6.0.3+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libice" +DEPENDS = "virtual/libx11 libice" DESCRIPTION = "Session management library" PR = "r1" 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 27cf01a31c..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto windowswmproto" +DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" XORG_PN = "libWindowsWM" 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_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb index 54e79bf727..ce57c42f7f 100644 --- a/packages/xorg-lib/libx11_6.2.1.bb +++ b/packages/xorg-lib/libx11_6.2.1.bb @@ -3,7 +3,8 @@ LICENSE = "XFree86" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" 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 e738d48e73..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,10 +1,11 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" XORG_PN = "libX11" 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 e738d48e73..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,10 +1,11 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb index b37d0e13e7..aaa052eba3 100644 --- a/packages/xorg-lib/libx11_cvs.bb +++ b/packages/xorg-lib/libx11_cvs.bb @@ -5,7 +5,8 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 347d4c1386..3f7fd5853e 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -6,7 +6,8 @@ PRIORITY = "optional" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" 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_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb index 883886efb2..04f2855101 100644 --- a/packages/xorg-lib/libxaw_7.0.2.bb +++ b/packages/xorg-lib/libxaw_7.0.2.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "xproto virtual/x11 libxt libxmu libxpm" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" 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 a558b889ae..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" XORG_PN = "libXaw" 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 a558b889ae..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" XORG_PN = "libXaw" diff --git a/packages/xorg-lib/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb index da21df75c3..2c696ceba2 100644 --- a/packages/xorg-lib/libxaw_cvs.bb +++ b/packages/xorg-lib/libxaw_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto virtual/x11 libxt libxmu libxpm" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" diff --git a/packages/xorg-lib/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb index 987a7043b5..a60f8d5179 100644 --- a/packages/xorg-lib/libxcomposite_1.0.1.bb +++ b/packages/xorg-lib/libxcomposite_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." PR = "r1" 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 ee5b2f7358..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/x11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index ee5b2f7358..4cab60a531 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -1,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/x11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" diff --git a/packages/xorg-lib/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb index 922488593a..fd31b5dbff 100644 --- a/packages/xorg-lib/libxcomposite_cvs.bb +++ b/packages/xorg-lib/libxcomposite_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." 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 25f1c15d78..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" -DEPENDS += " libxrender libxfixes virtual/x11 fixesproto" +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" XORG_PN = "libXcursor" 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 25f1c15d78..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" -DEPENDS += " libxrender libxfixes virtual/x11 fixesproto" +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" XORG_PN = "libXcursor" diff --git a/packages/xorg-lib/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb index c2e9ab0ae0..a132b751c0 100644 --- a/packages/xorg-lib/libxdamage_1.0.1.bb +++ b/packages/xorg-lib/libxdamage_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." PR = "r1" 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 258ec25203..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto" +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" XORG_PN = "libXdamage" 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 258ec25203..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto" +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" XORG_PN = "libXdamage" diff --git a/packages/xorg-lib/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb index 41f7846888..a613d0e673 100644 --- a/packages/xorg-lib/libxdamage_cvs.bb +++ b/packages/xorg-lib/libxdamage_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." 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 1697278938..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext evieext" +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" XORG_PN = "libXevie" 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 1697278938..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext evieext" +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" XORG_PN = "libXevie" diff --git a/packages/xorg-lib/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb index 27f7c1c96e..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/x11-native xextensions-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 d16fc00f5b..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" -DEPENDS += " xproto virtual/x11 xextproto libxau" +DEPENDS += " xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" XORG_PN = "libXext" 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 d16fc00f5b..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" -DEPENDS += " xproto virtual/x11 xextproto libxau" +DEPENDS += " xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb index 3193857eb8..101c240c5e 100644 --- a/packages/xorg-lib/libxext_cvs.bb +++ b/packages/xorg-lib/libxext_cvs.bb @@ -4,7 +4,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Extension library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PROVIDES = "xext" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" diff --git a/packages/xorg-lib/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb index 2c86445d74..ceebdfaa11 100644 --- a/packages/xorg-lib/libxfixes_2.0.1.bb +++ b/packages/xorg-lib/libxfixes_2.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." PR = "r1" 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 f39b08b3ae..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 xproto fixesproto xextproto" +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" XORG_PN = "libXfixes" 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 f39b08b3ae..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 xproto fixesproto xextproto" +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" XORG_PN = "libXfixes" diff --git a/packages/xorg-lib/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb index 50d01a1f21..92bad48eeb 100644 --- a/packages/xorg-lib/libxfixes_cvs.bb +++ b/packages/xorg-lib/libxfixes_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" diff --git a/packages/xorg-lib/libxfont/no-scalable-crash.patch b/packages/xorg-lib/libxfont/no-scalable-crash.patch new file mode 100644 index 0000000000..90bded6fba --- /dev/null +++ b/packages/xorg-lib/libxfont/no-scalable-crash.patch @@ -0,0 +1,22 @@ +--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 ++++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 +@@ -695,6 +695,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -794,6 +799,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } 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 07fbf5f9a6..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,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc + +PR = "r1" +SRC_URI += "file://no-scalable-crash.patch;patch=1" + DESCRIPTION = "X font library (used by the X server)." LICENSE= "BSD-X" 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 c0fb08edea..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,10 +1,13 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc + +PR = "r1" DESCRIPTION = "X font library (used by the X server)." LICENSE= "BSD-X" PRIORITY = "optional" SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" +SRC_URI += "file://no-scalable-crash.patch;patch=1" DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" PROVIDES = "xfont" 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 b4cf34f438..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto fontcacheproto" +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" XORG_PN = "libXfontcache" 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 b4cf34f438..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto fontcacheproto" +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" XORG_PN = "libXfontcache" diff --git a/packages/xorg-lib/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb index 03abf5a6ab..a793925596 100644 --- a/packages/xorg-lib/libxft_2.1.6.bb +++ b/packages/xorg-lib/libxft_2.1.6.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" PR = "r1" 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/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb index e1cc3ceb7b..38ba5a6d5c 100644 --- a/packages/xorg-lib/libxft_cvs.bb +++ b/packages/xorg-lib/libxft_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" diff --git a/packages/xorg-lib/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb index 8900afdc6f..b9958ea6ac 100644 --- a/packages/xorg-lib/libxi_6.0.1.bb +++ b/packages/xorg-lib/libxi_6.0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X Input Extension library" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ 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 8ba01c923b..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Input extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext inputproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" XORG_PN = "libXi" 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 8ba01c923b..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Input extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext inputproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb index 191e90a2ec..f37c78e819 100644 --- a/packages/xorg-lib/libxi_cvs.bb +++ b/packages/xorg-lib/libxi_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" DESCRIPTION = "X Input extension library." PR = "r1" diff --git a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb index d2d4e31027..eb4a6d54cf 100644 --- a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb +++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb index 4036f17fd8..429c2fc4d0 100644 --- a/packages/xorg-lib/libxinerama_1.0.2.bb +++ b/packages/xorg-lib/libxinerama_1.0.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Xinerama library" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" PR = "r1" 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 4904bfd840..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xinerama library" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxext xextproto xineramaproto" +DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" PROVIDES = "xinerama" XORG_PN = "libXinerama" diff --git a/packages/xorg-lib/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb index 10604909f6..5138367bbf 100644 --- a/packages/xorg-lib/libxinerama_cvs.bb +++ b/packages/xorg-lib/libxinerama_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Xinerama library" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" PV = "0.0+cvs${SRCDATE}" 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 eb73c0f4c4..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 kbproto" +DEPENDS += " virtual/libx11 kbproto" 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 eb73c0f4c4..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 kbproto" +DEPENDS += " virtual/libx11 kbproto" diff --git a/packages/xorg-lib/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb index de63e64057..336caf139a 100644 --- a/packages/xorg-lib/libxkbfile_cvs.bb +++ b/packages/xorg-lib/libxkbfile_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "X11 keyboard library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" 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 af76b740a3..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxt libxkbfile" +DEPENDS += " virtual/libx11 libxt libxkbfile" PROVIDES = "xkbui" 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 af76b740a3..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxt libxkbfile" +DEPENDS += " virtual/libx11 libxt libxkbfile" PROVIDES = "xkbui" 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 7f3d946dff..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/x11" +DEPENDS += " libxt libxext xextproto virtual/libx11" PROVIDES = "xmu" XORG_PN = "libXmu" 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 7f3d946dff..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/x11" +DEPENDS += " libxt libxext xextproto virtual/libx11" PROVIDES = "xmu" XORG_PN = "libXmu" 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 5565f35010..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X print extension library." -DEPENDS += " virtual/x11 libxext xextproto libxau printproto" +DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" XORG_PN = "libXp" diff --git a/packages/xorg-lib/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb index 0d31fd6bca..e434e089cf 100644 --- a/packages/xorg-lib/libxp_cvs.bb +++ b/packages/xorg-lib/libxp_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X print extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" diff --git a/packages/xorg-lib/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb index 69a2d5953a..8447cd3630 100644 --- a/packages/xorg-lib/libxpm_3.5.1.bb +++ b/packages/xorg-lib/libxpm_3.5.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "X-BSD" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto virtual/x11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" 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 b99596f5f1..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,10 +1,10 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Pixmap library." PRIORITY = "optional" LICENSE = "X-BSD" -DEPENDS += " xproto virtual/x11 libxt libxext xextproto" +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" XORG_PN = "libXpm" 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 b99596f5f1..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,10 +1,10 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Pixmap library." PRIORITY = "optional" LICENSE = "X-BSD" -DEPENDS += " xproto virtual/x11 libxt libxext xextproto" +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb index 3e625a1dd4..4d4d534e9a 100644 --- a/packages/xorg-lib/libxpm_cvs.bb +++ b/packages/xorg-lib/libxpm_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "X-BSD" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto virtual/x11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" 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 a8fcd93f69..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxp libxprintutil printproto libxau" +DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" XORG_PN = "libXprintAppUtil" 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 c0d1244a26..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxp libxt printproto libxau" +DEPENDS += " virtual/libx11 libxp libxt printproto libxau" XORG_PN = "libXprintUtil" diff --git a/packages/xorg-lib/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb index ddb1f61556..d87471af05 100644 --- a/packages/xorg-lib/libxrandr_1.0.2.bb +++ b/packages/xorg-lib/libxrandr_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "BSD-X" -DEPENDS = "randrext virtual/x11 libxrender libxext" +DEPENDS = "randrext virtual/libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" 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 42062b5902..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" XORG_PN = "libXrandr" 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 42062b5902..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb index 44b34f07d3..12f3b4ef38 100644 --- a/packages/xorg-lib/libxrandr_cvs.bb +++ b/packages/xorg-lib/libxrandr_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" -DEPENDS = "randrext virtual/x11 libxrender libxext" +DEPENDS = "randrext virtual/libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/packages/xorg-lib/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb index 129cc58bbb..32e1962f26 100644 --- a/packages/xorg-lib/libxrender_0.8.4.bb +++ b/packages/xorg-lib/libxrender_0.8.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -DEPENDS = "renderext virtual/x11" +DEPENDS = "renderext virtual/libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" PR = "r1" 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 6f6fe2a7f9..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 renderproto" +DEPENDS += " virtual/libx11 renderproto" XORG_PN = "libXrender" 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 6f6fe2a7f9..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 renderproto" +DEPENDS += " virtual/libx11 renderproto" XORG_PN = "libXrender" diff --git a/packages/xorg-lib/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb index 49a3f4204a..31a710643c 100644 --- a/packages/xorg-lib/libxrender_cvs.bb +++ b/packages/xorg-lib/libxrender_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" -DEPENDS = "renderext virtual/x11" +DEPENDS = "renderext virtual/libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" diff --git a/packages/xorg-lib/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb index 752ef865fd..3f0d32bfe4 100644 --- a/packages/xorg-lib/libxres_1.0.1.bb +++ b/packages/xorg-lib/libxres_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "virtual/x11 xextensions libxext resourceext" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" 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 ed49e72be6..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/x11 libxext xextproto resourceproto" +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" XORG_PN = "libXres" 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 ed49e72be6..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/x11 libxext xextproto resourceproto" +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" XORG_PN = "libXres" diff --git a/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb index 0c19870e16..a457d6c14f 100644 --- a/packages/xorg-lib/libxres_cvs.bb +++ b/packages/xorg-lib/libxres_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "virtual/x11 xextensions libxext resourceext" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" 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 c41dbe5a12..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto" +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" XORG_PN = "libXScrnSaver" 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 c41dbe5a12..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto" +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" XORG_PN = "libXScrnSaver" diff --git a/packages/xorg-lib/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb index 36d3d5956b..614133fce7 100644 --- a/packages/xorg-lib/libxss_cvs.bb +++ b/packages/xorg-lib/libxss_cvs.bb @@ -4,7 +4,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r2" SECTION = "libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X screen saver extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" diff --git a/packages/xorg-lib/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb index 4d8139b850..9c31075285 100644 --- a/packages/xorg-lib/libxt_0.1.5.bb +++ b/packages/xorg-lib/libxt_0.1.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libsm" +DEPENDS = "virtual/libx11 libsm" PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" 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 7c7054270a..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" -DEPENDS += " libsm virtual/x11 xproto kbproto" +DEPENDS += " libsm virtual/libx11 xproto kbproto" PROVIDES = "xt" XORG_PN = "libXt" 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 7c7054270a..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" -DEPENDS += " libsm virtual/x11 xproto kbproto" +DEPENDS += " libsm virtual/libx11 xproto kbproto" PROVIDES = "xt" XORG_PN = "libXt" diff --git a/packages/xorg-lib/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb index 6f8a66d0bd..3fd2eabe67 100644 --- a/packages/xorg-lib/libxt_cvs.bb +++ b/packages/xorg-lib/libxt_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libsm" +DEPENDS = "virtual/libx11 libsm" PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" 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 7f59ec2621..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt trapproto libxext xextproto" +DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" XORG_PN = "libXTrap" 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 01bcada964..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxext recordproto xextproto inputproto" +DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" PROVIDES = "xtst" XORG_PN = "libXtst" diff --git a/packages/xorg-lib/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb index 875cd0914b..dc3e358d64 100644 --- a/packages/xorg-lib/libxtst_cvs.bb +++ b/packages/xorg-lib/libxtst_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 recordext libxext" +DEPENDS = "virtual/libx11 recordext libxext" PROVIDES = "xtst" DESCRIPTION = "X Test Extension: client side library" PR = "r3" diff --git a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb index e8f01379fd..93c41ce126 100644 --- a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb +++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" diff --git a/packages/xorg-lib/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb index e88a35f1cd..d42302979e 100644 --- a/packages/xorg-lib/libxv_2.2.2.bb +++ b/packages/xorg-lib/libxv_2.2.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" 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 be3cacf4df..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,9 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto videoproto" +DEPENDS += " virtual/libx11 libxext xextproto videoproto" XORG_PN = "libXv" diff --git a/packages/xorg-lib/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb index 6fa8c8a272..f256211962 100644 --- a/packages/xorg-lib/libxvmc_20040919.bb +++ b/packages/xorg-lib/libxvmc_20040919.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/xorg-lib/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb index 55cbc58265..ff8dda58a6 100644 --- a/packages/xorg-lib/libxvmc_20041025.bb +++ b/packages/xorg-lib/libxvmc_20041025.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/xorg-lib/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb index d322ecfb33..d9be65baa0 100644 --- a/packages/xorg-lib/libxvmc_20050612.bb +++ b/packages/xorg-lib/libxvmc_20050612.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r0" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ 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 aef95aaf60..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/x11 libxext libxv xextproto videoproto" +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" XORG_PN = "libXvMC" 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 aef95aaf60..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/x11 libxext libxv xextproto videoproto" +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" XORG_PN = "libXvMC" 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 30e979cf7d..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" XORG_PN = "libXxf86dga" 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 30e979cf7d..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb index cb91e2eb2d..d110e7e4c0 100644 --- a/packages/xorg-lib/libxxf86dga_cvs.bb +++ b/packages/xorg-lib/libxxf86dga_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "XFree86" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext xxf86dgaext" +DEPENDS = "virtual/libx11 libxext xxf86dgaext" DESCRIPTION = "Xxf86dga extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" 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 c6a95ddfd0..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" PROVIDES = "xxf86misc" XORG_PN = "libXxf86misc" 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 c6a95ddfd0..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" PROVIDES = "xxf86misc" XORG_PN = "libXxf86misc" 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 c6b0ed5bfb..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" XORG_PN = "libXxf86vm" 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 c6b0ed5bfb..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,8 +1,8 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" XORG_PN = "libXxf86vm" diff --git a/packages/xorg-lib/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb index a045adf458..5464c4330c 100644 --- a/packages/xorg-lib/libxxf86vm_cvs.bb +++ b/packages/xorg-lib/libxxf86vm_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext xxf86vmext" +DEPENDS = "virtual/libx11 libxext xxf86vmext" DESCRIPTION = "Xxf86vm extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 7a3e0425c7..8e5ba5874f 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -5,7 +5,7 @@ LICENSE = "MIT-X" DEPENDS = "util-macros" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig 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-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb index ff63987713..7d24f07432 100644 --- a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb @@ -1,6 +1,5 @@ SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "BSD-X" DEPENDS = "util-macros-native" diff --git a/packages/xorg-lib/xtrans/.mtn2git_empty b/packages/xorg-lib/xtrans/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/xtrans/.mtn2git_empty diff --git a/packages/xorg-lib/xtrans/fix-missing-includepath.patch b/packages/xorg-lib/xtrans/fix-missing-includepath.patch new file mode 100644 index 0000000000..043d14f7bf --- /dev/null +++ b/packages/xorg-lib/xtrans/fix-missing-includepath.patch @@ -0,0 +1,13 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200 ++++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200 +@@ -6,4 +6,4 @@ + Name: XTrans + Description: Abstract network code for X + Version: @PACKAGE_VERSION@ +-Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@ ++Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@ 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..2c38782a57 100644 --- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -1,8 +1,9 @@ -include xorg-lib-common.inc +require xorg-lib-common.inc +PR = "r1" + +SRC_URI += "file://fix-missing-includepath.patch;patch=1" DESCRIPTION = "network API translation layer to \ insulate X applications and libraries from OS \ network vageries." -#DEPENDS += " " - 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 new file mode 100644 index 0000000000..813143995d --- /dev/null +++ b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +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" + +#DESCRIPTION = "" + +#DEPENDS += " " 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/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 74e7312a50..4d189235f4 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig 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/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 6c1bbd34a9..5f5f5c0dea 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -18,7 +18,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" REPENDS="rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \ +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ file://xorg.conf" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb index 3683562543..b7e192dc76 100644 --- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" diff --git a/packages/xorg-xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb index 8cbde48ebd..c198a94de2 100644 --- a/packages/xorg-xserver/xserver-kdrive_20050207.bb +++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb @@ -3,11 +3,11 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" # Uncomment the following DEPENDS line and the commented line in SRC_URI # to make this snapshot build against X11R7.0 xlibs. -#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" +#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" diff --git a/packages/xorg-xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb index fb6229e51f..f9ba323529 100644 --- a/packages/xorg-xserver/xserver-kdrive_20050624.bb +++ b/packages/xorg-xserver/xserver-kdrive_20050624.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb index 44a91ae1e9..594b6d74ec 100644 --- a/packages/xorg-xserver/xserver-kdrive_20060312.bb +++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 2a572bea53..cfb1294c09 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -39,6 +39,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ + --disable-dmx \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb index c6d4a17e20..c2b25973fb 100644 --- a/packages/xorg-xserver/xserver-kdrive_cvs.bb +++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 71522c2909..90fa12aebb 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,8 +1,8 @@ -PV = "0.0+git" +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -26,7 +26,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://enable-tslib.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -43,5 +43,6 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ --with-default-font-path=built-ins \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" 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 674f1e5e64..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,7 +1,9 @@ -include xorg-xserver-common.inc +require xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + #DESCRIPTION = "" #DEPENDS += " " diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index d5a8e70332..0c7a77e7f9 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -2,15 +2,13 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" SECTION = "x11" - SRCDATE = "20041111" -DEPENDS = "freetype libxi libxmu flex-2.5.4-native virtual/libqte2 libqpe-opie" +DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie" SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \ file://imake-staging.patch;patch=1 \ file://moc_call.patch;patch=1 " - S = "${WORKDIR}/xc" do_configure() { 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/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb index c26836893d..e007029b9b 100644 --- a/packages/xscreensaver/xscreensaver_4.16.bb +++ b/packages/xscreensaver/xscreensaver_4.16.bb @@ -16,7 +16,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/" PR = "r1" SECTION="x11-misc" -DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index a7e457935c..d3b8e20022 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -13,7 +13,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/" PR = "r0" SECTION="x11-misc" -DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb index e33a4c8223..ca4afd2e6b 100644 --- a/packages/xstroke/xstroke_0.6.bb +++ b/packages/xstroke/xstroke_0.6.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 xft libxtst libxpm" +DEPENDS = "virtual/libx11 xft libxtst libxpm" PR = "r2" SRC_URI = "http://www.oesources.org/source/xstroke-0.6.tar.gz \ diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb index d53aabe4bf..f2008506b5 100644 --- a/packages/xtscal/xtscal_0.4.bb +++ b/packages/xtscal/xtscal_0.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr" +DEPENDS = "virtual/libx11 libxft libxrandr" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb index 9642be132a..ff0346f9d9 100644 --- a/packages/xtscal/xtscal_0.5.1.bb +++ b/packages/xtscal/xtscal_0.5.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" PR = "r1" diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb index cec5782236..8f5a62c980 100644 --- a/packages/xtscal/xtscal_0.5.bb +++ b/packages/xtscal/xtscal_0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb index c8e7657ffb..682ed2258a 100644 --- a/packages/xtscal/xtscal_0.6.3.bb +++ b/packages/xtscal/xtscal_0.6.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" PR = "r1" 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/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 26cf1e5453..3a45a2bf74 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -28,4 +28,4 @@ do_deploy() { esac } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_compile 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} } diff --git a/packages/zudoku/.mtn2git_empty b/packages/zudoku/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zudoku/.mtn2git_empty diff --git a/packages/zudoku/files/.mtn2git_empty b/packages/zudoku/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zudoku/files/.mtn2git_empty diff --git a/packages/zudoku/files/zudoku.desktop b/packages/zudoku/files/zudoku.desktop new file mode 100644 index 0000000000..5b5f9f29f6 --- /dev/null +++ b/packages/zudoku/files/zudoku.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Exec=zudoku +Icon=zudoku +Comment= +Name=Zudoku diff --git a/packages/zudoku/files/zudoku.html b/packages/zudoku/files/zudoku.html new file mode 100644 index 0000000000..b5ceaac4ee --- /dev/null +++ b/packages/zudoku/files/zudoku.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> + <head> + <title>Fig Labs presents 'Zudoku'!</title> + </head> + <p> + <h1>Fig Labs presents 'Zudoku'!</h1> + <h2>About Zudoku</h2> + <p>Sudoku, sometimes written Su Doku, is a logic-based placement puzzle, also known as Number Place in the United States. The aim of the puzzle is to enter a numerical digit from 1 to 9 in each cell of a 9x9 grid, starting with various digits given in some cells (the "givens"). The grid is made up of 3x3 subgrids (called "regions"). Each row, column, and region must contain only one instance of each numeral. Completing the puzzle requires patience and logical ability. Although first published in 1979, Sudoku initially caught on in Japan in 1986 and attained international popularity in 2005. Fig Labs Zudoku is a free version of this popular puzzle for your computer.</p> + <h2>About Fig Labs</h2> + <p>The Fig Labs management team has over 35 years of portable computing experience; between us we've 'done time' at Psion, Symbian, Motorola, Gemplus and Intuwave, building systems software, applications and middleware. So we now feel that we are uniquely placed to tackle the big issue in constrained appliances - complexity - and subsequently make portable technology usable.</p> + <h2>Help</h2> + <p>You can use Fig Labs Zudoku to: + <ul> + <li>Generate an unlimited number of puzzles for you to play.</li> + <LI>Enter puzzles from newspapers or magazines so that you can play them on your computer.</LI> + <li>Create your own puzzles.</li> + <li>Help you with solving puzzles, or even solve an entire puzzle for you.</li> + <li>Print puzzles out to solve on paper.</li> + </ul> + </p> + <h3><b>Playing a puzzle</b></h3> + <p>When you first start Zudoku, it will generate a new 'medium' level puzzle for you. Thereafter, it will always start up from wherever you left it last time.</p> + <p>The bold digits are part of the puzzle, the "givens" - you can't change those unless you are designing the puzzle yourself. Digits you enter yourself are italic.</p> + <p>You can fill in the blank squares in two ways: + <ol><LI>Either: use the cursor keys to move round the grid and press 1-9 to fill in the current square.</LI> + <li>Or: click on a square and choose a digit from the pop-up list to fill it in.</li></ol></p> + <p>If you fill a square with a digit which breaks the rules of Sudoku, then that digit and those that it clashes with will be highlighted in red.</p> + <p>To delete a digit, just use the cursor keys to move to the square and press Spacebar, or click on it and select the blank entry from the pop-up list.</p> + <p>To help you solve more difficult puzzles, you can make 'pencil' marks on the board. Choose 'Make pencil marks' from the Game menu. After that, any moves you make will appear as small numbers in a gold colour. You can pencil in several numbers in as many squares as you like. To erase a pencil mark, enter the same number again. To erase all marks in a square, press Spacebar or choose the blank entry from the pop up menu.</p> + <p>If you want to start the current puzzle afresh, go to the Game menu and choose Start again.</p> + <p>If you want to print the puzzle out, choose Print from the File menu.</p> + <h3><b>Creating a new puzzle</b></h3> + <p>To start a new puzzle from scratch, go to the Game menu and choose New puzzle. While Zudoku is working, the grid will fill with question marks. When it is ready you will be presented with a brand new puzzle - probably one that has never been seen before!</p> + <p>When you start Zudoku, it is set to generate 'medium' level puzzles. To change the level of puzzle generated, go to the Game menu, choose New puzzle level, then pick a new level. If you set the level to Fiendish, sometimes Zudoku can only make a Difficult puzzle. If that happens, just generate again. If you choose 'Unlimited' Zudoku will try and make the hardest puzzle it can.</p> + <h3><b>Entering a printed puzzle</b></h3> + <p>If you have a printed puzzle, for example in a newspaper, magazine or book, you can enter that into Zudoku. You can then play it or solve it on your computer. To do this, just follow these steps:</p> + <p> + <ol><LI>Choose Design mode from the Game menu.</LI> + <li>Blank out the puzzle by choosing New blank puzzle from the Game menu.</li> + <li>Use the cursor keys or the pop-up list to enter digits into the puzzle to match the printed copy.</li> + <li>Choose Design mode again from the Game menu to leave Design mode. Zudoku now gives it a difficulty rating and you can start playing.</li></ol></p> + <h3><b>Creating your own puzzles</b></h3> + <p>Have a go at making your own puzzles - it's harder than it looks! Just go to Design mode as above, and place some digits.</p> + <p>If you try and put a digit in an invalid position while in Design mode, Zudoku won't let you do it. Try putting it somewhere else, or changing one of the other digits in the puzzle first.</p> + <p>Leave Design mode and see what Zudoku makes of your puzzle. It may tell you that there are Many solutions to the puzzle. In this case, you need to enter some more digits to make sure there is only a single solution. Sometimes Zudoku will think for a while and tell you there is no solution - you probably need to remove some digits to make your puzzle solvable.</p> + <h3><b>Helping you solve and design</b></h3> + <p>You can ask Zudoku to show you what numbers can possibly go in the empty squares. From the Game menu, choose Show possible moves. Zudoku will fill in small green digits to show the possibilities for each space. If there are 7 or more possible digits, Zudoku just puts an asterisk. If there are no possible digits, Zudoku puts a red exclamation mark.</p> + <p>If it all gets too much, or you are just interested to watch, you can ask Zudoku to solve the puzzle for you. Just choose Solve from the Game menu. You will see Zudoku rapidly filling in squares until the grid is full. Where a puzzle has more than one solution, it will simply display the first solution it comes across. If the puzzle is not solvable, Zudoku will try for a while before giving up and telling you.</p> + </body> +</html>
\ No newline at end of file diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb new file mode 100644 index 0000000000..46c64ebb6e --- /dev/null +++ b/packages/zudoku/zudoku_1.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A Sudoku Game for Opie" +HOMEPAGE = "http://figlabs.com" +AUTHOR = "FigLabs" +LICENSE = "GPL" +SECTION = "opie/games" +APPTYPE = "binary" +APPDESKTOP = "${WORKDIR}" + +SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \ + file://zudoku.html \ + file://zudoku.desktop" + +inherit opie + +EXTRA_QMAKEVARS_POST += "TARGET=zudoku" + +do_install() { + install -d ${D}${palmtopdir}/help/en/html + install -m 0644 ${WORKDIR}/zudoku.html ${D}${palmtopdir}/help/en/html/ + install -d ${D}${palmtopdir}/pics/ + install -m 0644 zudoku64x64.png ${D}${palmtopdir}/pics/zudoku.png +} diff --git a/site/i386-linux b/site/i386-linux index 422c825bef..7640a45d88 100644 --- a/site/i386-linux +++ b/site/i386-linux @@ -104,3 +104,13 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i486-linux b/site/i486-linux index 1791e58ea7..1d4115be90 100644 --- a/site/i486-linux +++ b/site/i486-linux @@ -140,3 +140,13 @@ ac_cv_file_lib_src_libmad_frame_h=${ac_cv_file_lib_src_libmad_frame_h=no} # xorg X11R7 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i586-linux b/site/i586-linux index 65b7c0dd8a..f78dbbfe04 100644 --- a/site/i586-linux +++ b/site/i586-linux @@ -123,3 +123,13 @@ php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_ # xffm jm_cv_func_working_readdir=yes + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i686-linux b/site/i686-linux index 113929adbb..ce5580f973 100644 --- a/site/i686-linux +++ b/site/i686-linux @@ -202,3 +202,8 @@ jm_cv_func_working_readdir=yes #xserver-xorg ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/sh4-linux b/site/sh4-linux index 7189cd1615..8e25cad4a5 100644 --- a/site/sh4-linux +++ b/site/sh4-linux @@ -196,10 +196,6 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=no} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} -ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} -ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} -ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} -ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # startup-notification lf_cv_sane_realloc=yes diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc index 734e0924f7..30054561f2 100644 --- a/site/sh4-linux-uclibc +++ b/site/sh4-linux-uclibc @@ -35,3 +35,8 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int=4} ac_cv_va_copy=${ac_cv_va_copy=no} ac_cv___va_copy=${ac_cv___va_copy=yes} racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} |