diff options
1590 files changed, 34260 insertions, 11604 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dc53a1d054..de503c5ad7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25,6 +25,12 @@ Machines: storcenter Recipes: apache2, apc, gallery, initscripts-openprotium, linux-storcenter*, Recipes: modphp, sccd, uboot-utils, xfsprogs +Person: Cliff Brake +Mail: cbrake@bec-systems.com +Website: http://bec-systems.com +Interests: Support in OE for single board computers, web application support +Machines: compulab-pxa270, logicpd-pxa270 + Person: Erik Hovland Mail: erik@hovland.org Distros: familiar @@ -151,6 +157,11 @@ Machines: collie Recipes: anthy, nunome, uim*, granule, qpobox*, qte-font-unifont* Recipes: qpf-unismall, poboxserver, imkit* +Person: Shane Volpe +Mail: shanevolpe@gmail.com +Machines: logicpd-pxa270 +Recipes: directfb + Person: Øyvind Repvik Mail: nail@nslu2-linux.org Machines: nslu2, fsg3, ixp4xx, n2100 diff --git a/classes/base.bbclass b/classes/base.bbclass index 249a25a218..504707e37b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -41,12 +41,17 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d): else: return falsevalue -def base_contains(variable, checkvalue, truevalue, falsevalue, d): - import bb - if bb.data.getVar(variable,d,1).find(checkvalue) != -1: - return truevalue - else: - return falsevalue +def base_contains(variable, checkvalues, truevalue, falsevalue, d): + import bb + matches = 0 + if type(checkvalues).__name__ == "str": + checkvalues = [checkvalues] + for value in checkvalues: + if bb.data.getVar(variable,d,1).find(value) != -1: + matches = matches + 1 + if matches == len(checkvalues): + return truevalue + return falsevalue def base_both_contain(variable1, variable2, checkvalue, d): import bb diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 317e080fc5..dadf2dddfc 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,11 +20,6 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s -# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages -def is_native(d): - import bb.data - return ["","-native"][bb.data.inherits_class('native', d)] - BINCONFIG_GLOB ?= "*-config" do_install_append() { @@ -52,9 +47,9 @@ do_install_append() { do_stage_append() { for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do - configname=`basename $config`${@is_native(d)} - install -d ${STAGING_BINDIR} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname - chmod u+x ${STAGING_BINDIR}/$configname + configname=`basename $config` + install -d ${STAGING_BINDIR_CROSS} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname + chmod u+x ${STAGING_BINDIR_CROSS}/$configname done } diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 3992a76084..a0c78a25f4 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -1,6 +1,6 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" -# Debain package renaming only occurs when a package is built +# Debian package renaming only occurs when a package is built # We therefore have to make sure we build all runtime packages # before building the current package to make the packages runtime # depends are correct diff --git a/classes/e.bbclass b/classes/e.bbclass index ae8fea0d5d..f20c1f8b60 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -8,23 +8,19 @@ do_prepsources () { } addtask prepsources after do_fetch before do_unpack -def binconfig_suffix(d): - import bb - return ["","-native"][bb.data.inherits_class('native', d)] - -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" -export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" -export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" -export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" -export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" -export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" -export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" +export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" +export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config" +export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config" +export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config" +export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config" +export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config" +export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config" +export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" +export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' diff --git a/classes/efl.bbclass b/classes/efl.bbclass index be5ef9dcb0..9b0345a5b8 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -13,6 +13,10 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" +def efl_is_native(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + do_stage_append () { for i in ${libraries} do @@ -24,7 +28,7 @@ do_stage_append () { done # Install binaries automatically for native builds - if [ "${@binconfig_suffix(d)}" = "-native" ] + if [ "${@efl_is_native(d)}" = "-native" ] then # Most EFL binaries start with the package name diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index fbd2814d35..5fadee4ab6 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -5,14 +5,26 @@ # the directories are added at the head of the PATH list and ICECC_CXX # and ICEC_CC are set. # -# For the cross compiler, creates a tar.bz2 of our toolchain and sets +# For the cross compiler, creates a tar.gz of our toolchain and sets # ICECC_VERSION accordingly. # -# This class needs ICECC_PATH to be set already. It must have -# been exported from the shell running bitbake. Setting it in -# local.conf is not adequate. +#The class now handles all 3 different compile 'stages' (i.e native ,cross-kernel and target) creating the +#necessary enviroment tar.gz file to be used by the remote machines # -# This class objdump, ldconfig, grep, sed installed on the build host. +#If ICECC_PATH is not set in local.conf then the class will try to locate it using 'which' +#but nothing is sure ;) +# +#If ICECC_ENV_EXEC is set in local.conf should point to the icecc-create-env script provided by the user +#or the default one provided by icecc-create-env.bb will be used +#(NOTE that this is a modified version of the script need it and *not the one that comes with icecc* +# +#User can specify if specific packages or packages belonging to class should not use icecc to distribute +#compile jobs to remote machines, but handled localy, by defining ICECC_USER_CLASS_BL and ICECC_PACKAGE_BL +#with the appropriate values in local.conf +######################################################################################### +#Error checking is kept to minimum so double check any parameters you pass to the class +########################################################################################### + def icc_determine_gcc_version(gcc): """ @@ -23,7 +35,7 @@ def icc_determine_gcc_version(gcc): import os return os.popen("%s --version" % gcc ).readline().split()[2] -def create_env(bb,d): +def create_cross_env(bb,d): """ Create a tar.bz2 of the current toolchain """ @@ -40,20 +52,21 @@ def create_env(bb,d): distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) target_prefix = bb.data.expand('${TARGET_PREFIX}', d) - float = bb.data.getVar('${TARGET_FPU}', d) or "hard" + 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(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libc.so')) os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: # no cross compiler built yet return "" 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 = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2') + cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz') try: os.stat(tar_file) @@ -66,74 +79,123 @@ def create_env(bb,d): # directory already exists, continue 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') - - # 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") ) - - cc = bb.data.getVar('CC', d, True) - - # use bitbake's PATH so that the cross-compiler is actually found on the PATH - oldpath = os.environ['PATH'] - os.environ['PATH'] = bb.data.getVar('PATH', d, True) - - # FIXME falsely assuming there is only a single NEEDED per file - # FIXME falsely assuming the lib path is /lib - - # which libc does the compiler need? (for example: libc.so.6) - libc = os.popen("objdump -x `which %s` | sed -n 's/.*NEEDED *//p'" % cc).read()[:-1] - # what is the absolute path of libc? (for example: /lib/libc.so.6) - # FIXME assuming only one entry is returned, which easily breaks - libc = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % libc).read()[:-1] - - # which loader does the compiler need? - ldlinux = os.popen("objdump -x %s | sed -n 's/.*NEEDED *//p'" % libc).read()[:-1] - ldlinux = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % ldlinux).read()[:-1] - - tar.add(libc) - tar.add(ldlinux) + + #check if user has specified a specific icecc-create-env script + #if not use the OE provided one + cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" + #call the modified create-env script + result=os.popen("%s %s %s %s %s %s" %(cr_env_script, + "--silent", + os.path.join(ice_dir,target_sys,'bin','gcc'), + os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join(ice_dir,"ice",cross_name) ) ) + return tar_file + + +def create_native_env(bb,d): + + import tarfile, socket, time, os + ice_dir = bb.data.expand('${CROSS_DIR}', d) + prefix = bb.data.expand('${HOST_PREFIX}' , d) + distro = bb.data.expand('${DISTRO}', d) + target_sys = bb.data.expand('${TARGET_SYS}', d) + target_prefix = bb.data.expand('${TARGET_PREFIX}', d) + float = bb.data.getVar('TARGET_FPU', d) or "hard" + name = socket.gethostname() - # Now let us find cc1 and cc1plus - cc1 = os.popen("%s -print-prog-name=cc1" % cc).read()[:-1] - cc1plus = os.popen("%s -print-prog-name=cc1plus" % cc).read()[:-1] - spec = os.popen("%s -print-file-name=specs" % cc).read()[:-1] + + archive_name = "local-host-env" + "-" + name + tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz') - os.environ['PATH'] = oldpath + try: + os.stat(tar_file) + # tar file already exists + return tar_file + except: + try: + #os.makedirs(os.path.join(ice_dir)) + os.makedirs(os.path.join(ice_dir,'ice')) + except: + # directory already exists, continue + pass + + + #check if user has specified a specific icecc-create-env script + #if not use the OE provided one + cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" + result=os.popen("%s %s %s %s %s %s" %(cr_env_script, + "--silent", + os.popen("%s gcc" % "which").read()[:-1], + os.popen("%s g++" % "which").read()[:-1], + os.popen("%s as" % "which").read()[:-1], + os.path.join(ice_dir,"ice",archive_name) ) ) + return tar_file + + + +def create_cross_kernel_env(bb,d): + + import tarfile, socket, time, os + ice_dir = bb.data.expand('${CROSS_DIR}', d) + prefix = bb.data.expand('${HOST_PREFIX}' , d) + distro = bb.data.expand('${DISTRO}', d) + target_sys = bb.data.expand('${TARGET_SYS}', d) + target_prefix = bb.data.expand('${TARGET_PREFIX}', d) + float = bb.data.getVar('TARGET_FPU', d) or "hard" + name = socket.gethostname() + kernel_cc = bb.data.expand('${KERNEL_CC}', d) + kernel_cc = kernel_cc[:-1] + + + # Stupid check to determine if we have built a libc and a cross + # compiler. + try: + os.stat(os.path.join(ice_dir, 'bin', kernel_cc)) + except: # no cross compiler built yet + return "" - # CC1 and CC1PLUS should be there... - #tar.add(cc1, os.path.join('usr', 'bin', 'cc1')) - #tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus')) + VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) ) + cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz') - # I think they should remain absolute paths (as gcc expects them there) - tar.add(cc1) - tar.add(cc1plus) + try: + os.stat(tar_file) + # tar file already exists + return tar_file + except: + try: + os.makedirs(os.path.join(ice_dir,'ice')) + except: + # directory already exists, continue + pass - # spec - if it exists - if os.path.exists(spec): - tar.add(spec) - tar.close() + #check if user has specified a specific icecc-create-env script + #if not use the OE provided one + cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" + result=os.popen("%s %s %s %s %s %s" %(cr_env_script, + "--silent", + os.path.join(ice_dir,'bin',kernel_cc), + os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join(ice_dir,"ice",cross_name) ) ) return tar_file +def create_env(bb,d): + + #return create_cross_kernel_env(bb,d) + if bb.data.inherits_class("native", d): + return create_native_env(bb,d) + elif bb.data.inherits_class("kernel", d): + return create_cross_kernel_env(bb,d) + elif bb.data.inherits_class("cross", d): + return create_native_env(bb,d) + else: + return create_cross_env(bb,d) + + def create_path(compilers, type, bb, d): """ Create Symlinks for the icecc in the staging directory @@ -141,8 +203,11 @@ def create_path(compilers, type, bb, d): import os staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) - icecc = bb.data.getVar('ICECC_PATH', d) + #check if the icecc path is set by the user + icecc = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1] + + # Create the dir if necessary try: os.stat(staging) @@ -158,42 +223,87 @@ def create_path(compilers, type, bb, d): return staging + ":" + + + + def use_icc_version(bb,d): - # Constin native native - prefix = bb.data.expand('${HOST_PREFIX}', d) - if len(prefix) == 0: - return "no" - blacklist = [ "cross", "native" ] + icecc_ver = "yes" + system_class_blacklist = [ "none" ] + + for black in system_class_blacklist: + if bb.data.inherits_class(black, d): + icecc_ver = "no" + + + user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none" + user_class_blacklist = user_class_blacklist.split() + + for black in user_class_blacklist: + if bb.data.inherits_class(black, d): + icecc_ver = "no" + + return icecc_ver - for black in blacklist: - if bb.data.inherits_class(black, d): - return "no" - return "yes" 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 "" + package_tmp = bb.data.expand('${PN}', d) + + #"system" package blacklist contains a list of packages that can not distribute compile tasks + #for one reason or the other + system_package_blacklist = [ "uclibc", "glibc", "qemu" ] + + for black in system_package_blacklist: + if black in package_tmp: + return "" + + #user defined exclusion list + user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none" + user_package_blacklist = user_package_blacklist.split() + + for black in user_package_blacklist: + if black in package_tmp: + return "" - 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: - return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d) + + + if compile and bb.data.inherits_class("cross", d): + return create_path( ["gcc", "g++"], "native", bb, d) + + elif compile and bb.data.inherits_class("native", d): + return create_path( ["gcc", "g++"], "native", bb, d) + + elif compile and bb.data.inherits_class("kernel", d): + #kernel_cc = bb.data.expand('${KERNEL_CC}', d) + return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d) + elif not compile or len(prefix) == 0: - return create_path( ["gcc", "g++"], "native", bb, d) + return create_path( ["gcc", "g++"], "native", bb, d) + + else: + return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d) + + + def icc_version(bb,d): return create_env(bb,d) -# +def check_for_kernel(bb,d): + if bb.data.inherits_class("kernel", d): + return "yes" + + return "no" + + +def get_cross_kernel_ver(bb,d): + + return bb.data.expand('${KERNEL_CC}', d).strip() or "gcc" + # set the icecream environment variables do_configure_prepend() { export PATH=${@icc_path(bb,d,False)}$PATH @@ -202,12 +312,22 @@ do_configure_prepend() { } do_compile_prepend() { + export PATH=${@icc_path(bb,d,True)}$PATH + + #check if we are building a kernel and select gcc-cross-kernel + if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then + export ICECC_CC="${@get_cross_kernel_ver(bb,d)}" + export ICECC_CXX="${HOST_PREFIX}g++" + else export ICECC_CC="${HOST_PREFIX}gcc" export ICECC_CXX="${HOST_PREFIX}g++" + fi if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - print ICECC_VERSION="${@icc_version(bb,d)}" export ICECC_VERSION="${@icc_version(bb,d)}" + else + export ICECC_VERSION="NONE" fi } + diff --git a/classes/image_ipk.bbclass b/classes/image.bbclass index 2beb137aef..bcf9bef13c 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image.bbclass @@ -1,4 +1,6 @@ -inherit rootfs_ipk +inherit rootfs_${IMAGE_PKGTYPE} + +PACKAGES = "" # We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" @@ -9,6 +11,8 @@ EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" +PID = "${@os.getpid()}" + DEPENDS += "makedevs-native" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -46,6 +50,17 @@ def get_devtable_list(d): IMAGE_POSTPROCESS_COMMAND ?= "" +# some default locales +IMAGE_LINGUAS ?= "de-de fr-fr en-gb" + +LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" + +ROOTFS_POSTPROCESS_COMMAND ?= "" + +do_rootfs[nostamp] = "1" +do_rootfs[dirs] = "${TOPDIR}" +do_build[nostamp] = "1" + # Must call real_do_rootfs() from inside here, rather than as a separate # task, so that we have a single fakeroot context for the whole process. fakeroot do_rootfs () { @@ -59,7 +74,7 @@ fakeroot do_rootfs () { done fi - real_do_rootfs + rootfs_${IMAGE_PKGTYPE}_do_rootfs insert_feed_uris @@ -68,6 +83,7 @@ fakeroot do_rootfs () { ${IMAGE_PREPROCESS_COMMAND} export TOPDIR=${TOPDIR} + export MACHINE=${MACHINE} for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then @@ -97,3 +113,55 @@ insert_feed_uris () { echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done } + +log_check() { + set +x + for target in $* + do + lf_path="${WORKDIR}/temp/log.do_$target.${PID}" + + echo "log_check: Using $lf_path as logfile" + + if test -e "$lf_path" + then + rootfs_${IMAGE_PKGTYPE}_log_check $target $lf_path + else + echo "Cannot find logfile [$lf_path]" + fi + echo "Logfile is clean" + done + + set -x +} + +# set '*' as the rootpassword so the images +# can decide if they want it or not + +zap_root_password () { + sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new + mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd +} + +create_etc_timestamp() { + date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp +} + +# Turn any symbolic /sbin/init link into a file +remove_init_link () { + if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then + LINKFILE=${IMAGE_ROOTFS}`readlink ${IMAGE_ROOTFS}/sbin/init` + rm ${IMAGE_ROOTFS}/sbin/init + cp $LINKFILE ${IMAGE_ROOTFS}/sbin/init + fi +} + +make_zimage_symlink_relative () { + if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then + (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done) + fi +} + +# export the zap_root_password, create_etc_timestamp and remote_init_link +EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative + +addtask rootfs before do_build after do_install diff --git a/classes/package.bbclass b/classes/package.bbclass index 132fdcb37a..a327aa46bd 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -116,7 +116,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst bb.data.setVar('PACKAGES', ' '.join(packages), d) -PACKAGE_DEPENDS ?= "file-native" +PACKAGE_DEPENDS ?= "file-native fakeroot-native" DEPENDS_prepend =+ "${PACKAGE_DEPENDS} " # file(1) output to match to consider a file an unstripped executable FILE_UNSTRIPPED_MATCH ?= "not stripped" diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass new file mode 100644 index 0000000000..9697426d5d --- /dev/null +++ b/classes/package_deb.bbclass @@ -0,0 +1,238 @@ +inherit package +DEPENDS_prepend="${@["dpkg-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" +BOOTSTRAP_EXTRA_RDEPENDS += "dpkg" +DISTRO_EXTRA_RDEPENDS += "dpkg" +PACKAGE_WRITE_FUNCS += "do_package_deb" +IMAGE_PKGTYPE ?= "deb" + +python package_deb_fn () { + from bb import data + bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) +} + +addtask package_deb_install +python do_package_deb_install () { + import os, sys + pkg = bb.data.getVar('PKG', d, 1) + pkgfn = bb.data.getVar('PKGFN', d, 1) + rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) + debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) + stagingdir = bb.data.getVar('STAGING_DIR', d, 1) + stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) + tmpdir = bb.data.getVar('TMPDIR', d, 1) + + if None in (pkg,pkgfn,rootfs): + raise bb.build.FuncFailed("missing variables (one or more of PKG, PKGFN, IMAGE_ROOTFS)") + try: + if not os.exists(rootfs): + os.makedirs(rootfs) + os.chdir(rootfs) + except OSError: + raise bb.build.FuncFailed(str(sys.exc_value)) + + # update packages file + (exitstatus, output) = commands.getstatusoutput('dpkg-scanpackages %s > %s/Packages' % (debdir, debdir)) + if (exitstatus != 0 ): + raise bb.build.FuncFailed(output) + + f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w") + f.close() + + # NOTE: this env stuff is racy at best, we need something more capable + # than 'commands' for command execution, which includes manipulating the + # env of the fork+execve'd processs + + # Set up environment + apt_config = os.getenv('APT_CONFIG') + os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) + path = os.getenv('PATH') + os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH'))) + + # install package + commands.getstatusoutput('apt-get update') + commands.getstatusoutput('apt-get install -y %s' % pkgfn) + + # revert environment + os.putenv('APT_CONFIG', apt_config) + os.putenv('PATH', path) +} + +python do_package_deb () { + import copy # to back up env data + import sys + import re + + workdir = bb.data.getVar('WORKDIR', d, 1) + if not workdir: + bb.error("WORKDIR not defined, unable to package") + return + + import os # path manipulations + outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) + if not outdir: + bb.error("DEPLOY_DIR_DEB not defined, unable to package") + return + + dvar = bb.data.getVar('D', d, 1) + if not dvar: + bb.error("D not defined, unable to package") + return + bb.mkdirhier(dvar) + + packages = bb.data.getVar('PACKAGES', d, 1) + if not packages: + bb.debug(1, "PACKAGES not defined, nothing to package") + return + + tmpdir = bb.data.getVar('TMPDIR', d, 1) + # Invalidate the packages file + if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): + os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) + + if packages == []: + bb.debug(1, "No packages; nothing to do") + return + + for pkg in packages.split(): + localdata = bb.data.createCopy(d) + root = "%s/install/%s" % (workdir, pkg) + + bb.data.setVar('ROOT', '', localdata) + bb.data.setVar('ROOT_%s' % pkg, root, localdata) + pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1) + if not pkgname: + pkgname = pkg + bb.data.setVar('PKG', pkgname, localdata) + + overrides = bb.data.getVar('OVERRIDES', localdata) + if not overrides: + raise bb.build.FuncFailed('OVERRIDES not defined') + overrides = bb.data.expand(overrides, localdata) + bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) + + bb.data.update_data(localdata) + basedir = os.path.join(os.path.dirname(root)) + + pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1)) + bb.mkdirhier(pkgoutdir) + + os.chdir(root) + from glob import glob + g = glob('*') + try: + del g[g.index('DEBIAN')] + del g[g.index('./DEBIAN')] + except ValueError: + pass + if not g and not bb.data.getVar('ALLOW_EMPTY', localdata): + from bb import note + note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) + continue + controldir = os.path.join(root, 'DEBIAN') + bb.mkdirhier(controldir) + try: + ctrlfile = file(os.path.join(controldir, 'control'), 'wb') + # import codecs + # ctrlfile = codecs.open("someFile", "w", "utf-8") + except OSError: + raise bb.build.FuncFailed("unable to open control file for writing.") + + fields = [] + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + fields.append(["Description: %s\n", ['DESCRIPTION']]) + fields.append(["Section: %s\n", ['SECTION']]) + fields.append(["Priority: %s\n", ['PRIORITY']]) + fields.append(["Maintainer: %s\n", ['MAINTAINER']]) + fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) + fields.append(["OE: %s\n", ['P']]) + fields.append(["Homepage: %s\n", ['HOMEPAGE']]) + +# Package, Version, Maintainer, Description - mandatory +# Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional + + + def pullData(l, d): + l2 = [] + for i in l: + data = bb.data.getVar(i, d, 1) + if data is None: + raise KeyError(f) + if i == 'TARGET_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all': + data = 'all' + l2.append(data) + return l2 + + ctrlfile.write("Package: %s\n" % pkgname) + # check for required fields + try: + for (c, fs) in fields: + ctrlfile.write(unicode(c % tuple(pullData(fs, localdata)))) + except KeyError: + (type, value, traceback) = sys.exc_info() + ctrlfile.close() + raise bb.build.FuncFailed("Missing field for deb generation: %s" % value) + # more fields + + bb.build.exec_func("mapping_rename_hook", localdata) + + rdepends = explode_deps(unicode(bb.data.getVar("RDEPENDS", localdata, 1) or "")) + rdepends = [dep for dep in rdepends if not '*' in dep] + rrecommends = explode_deps(unicode(bb.data.getVar("RRECOMMENDS", localdata, 1) or "")) + rrecommends = [rec for rec in rrecommends if not '*' in rec] + rsuggests = (unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or "")).split() + rprovides = (unicode(bb.data.getVar("RPROVIDES", localdata, 1) or "")).split() + rreplaces = (unicode(bb.data.getVar("RREPLACES", localdata, 1) or "")).split() + rconflicts = (unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or "")).split() + if rdepends: + ctrlfile.write(u"Depends: %s\n" % ", ".join(rdepends)) + if rsuggests: + ctrlfile.write(u"Suggests: %s\n" % ", ".join(rsuggests)) + if rrecommends: + ctrlfile.write(u"Recommends: %s\n" % ", ".join(rrecommends)) + if rprovides: + ctrlfile.write(u"Provides: %s\n" % ", ".join(rprovides)) + if rreplaces: + ctrlfile.write(u"Replaces: %s\n" % ", ".join(rreplaces)) + if rconflicts: + ctrlfile.write(u"Conflicts: %s\n" % ", ".join(rconflicts)) + ctrlfile.close() + + for script in ["preinst", "postinst", "prerm", "postrm"]: + scriptvar = bb.data.getVar('pkg_%s' % script, localdata, 1) + if not scriptvar: + continue + try: + scriptfile = file(os.path.join(controldir, script), 'w') + except OSError: + raise bb.build.FuncFailed("unable to open %s script file for writing." % script) + scriptfile.write(scriptvar) + scriptfile.close() + os.chmod(os.path.join(controldir, script), 0755) + + conffiles_str = bb.data.getVar("CONFFILES", localdata, 1) + if conffiles_str: + try: + conffiles = file(os.path.join(controldir, 'conffiles'), 'w') + except OSError: + raise bb.build.FuncFailed("unable to open conffiles for writing.") + for f in conffiles_str.split(): + conffiles.write('%s\n' % f) + conffiles.close() + + os.chdir(basedir) + ret = os.system("PATH=\"%s\" fakeroot dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, 1), root, pkgoutdir)) + if ret != 0: + raise bb.build.FuncFailed("dpkg-deb execution failed") + + for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: + scriptfile = os.path.join(controldir, script) + try: + os.remove(scriptfile) + except OSError: + pass + try: + os.rmdir(controldir) + except OSError: + pass + del localdata +} diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass new file mode 100644 index 0000000000..59909d6852 --- /dev/null +++ b/classes/rootfs_deb.bbclass @@ -0,0 +1,136 @@ +DEPENDS_prepend = "dpkg-native apt-native fakeroot-native " +DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}" + +fakeroot rootfs_deb_do_rootfs () { + set +e + mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates} + + rm -f ${STAGING_DIR}/etc/apt/sources.list.rev + rm -f ${STAGING_DIR}/etc/apt/preferences + > ${IMAGE_ROOTFS}/var/dpkg/status + > ${IMAGE_ROOTFS}/var/dpkg/available + # > ${STAGING_DIR}/var/dpkg/status + + priority=1 + for arch in ${PACKAGE_ARCHS}; do + if [ ! -d ${DEPLOY_DIR_DEB}/$arch ]; then + continue; + fi + cd ${DEPLOY_DIR_DEB}/$arch + # if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + rm -f Packages.gz Packages Packages.bz2 + # fi + apt-ftparchive packages . | bzip2 > Packages.bz2 + echo "Label: $arch" > Release + + echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}/etc/apt/sources.list.rev + (echo "Package: *" + echo "Pin: release l=$arch" + echo "Pin-Priority: $((800 + $priority))" + echo) >> ${STAGING_DIR}/etc/apt/preferences + priority=$(expr $priority + 5) + done + + tac ${STAGING_DIR}/etc/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list + + cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ + | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ + > "${STAGING_DIR}/etc/apt/apt-rootfs.conf" + + export APT_CONFIG="${STAGING_DIR}/etc/apt/apt-rootfs.conf" + export D=${IMAGE_ROOTFS} + export OFFLINE_ROOT=${IMAGE_ROOTFS} + export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + + apt-get update + + _flag () { + sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/dpkg/status + } + _getflag () { + cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}" + } + + if [ ! -z "${LINGUAS_INSTALL}" ]; then + apt-get install glibc-localedata-i18n + if [ $? -eq 1 ]; then + exit 1 + fi + for i in ${LINGUAS_INSTALL}; do + apt-get install $i + if [ $? -eq 1 ]; then + exit 1 + fi + done + fi + + if [ ! -z "${PACKAGE_INSTALL}" ]; then + for i in ${PACKAGE_INSTALL}; do + apt-get install $i + if [ $? -eq 1 ]; then + exit 1 + fi + find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do + mv $i `echo $i | sed -e's,\.dpkg-new$,,'` + done + done + fi + + install -d ${IMAGE_ROOTFS}/${sysconfdir} + echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version + + # Mark all packages installed + sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${IMAGE_ROOTFS}/var/dpkg/status + + # Attempt to run preinsts + # Mark packages with preinst failures as unpacked + for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.preinst; do + if [ -f $i ] && ! sh $i; then + _flag unpacked `basename $i .preinst` + fi + done + + # Attempt to run postinsts + # Mark packages with postinst failures as unpacked + for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.postinst; do + if [ -f $i ] && ! sh $i configure; then + _flag unpacked `basename $i .postinst` + fi + done + + set -e + + # Hacks to make dpkg/ipkg coexist for now + mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/ + if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then + rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives + fi + ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives + ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info + ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status + + ${ROOTFS_POSTPROCESS_COMMAND} + + log_check rootfs +} + +rootfs_deb_log_check() { + target="$1" + lf_path="$2" + + lf_txt="`cat $lf_path`" + for keyword_die in "E:" + do + if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 + then + echo "log_check: There were error messages in the logfile" + echo -e "log_check: Matched keyword: [$keyword_die]\n" + echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" + echo "" + do_exit=1 + fi + done + test "$do_exit" = 1 && exit 1 + true +} + diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8020fd0ca3..03ba5f86b7 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -2,40 +2,22 @@ # Creates a root filesystem out of IPKs # # This rootfs can be mounted via root-nfs or it can be put into an cramfs/jffs etc. -# See image_ipk.oeclass for a usage of this. +# See image.bbclass for a usage of this. # DEPENDS_prepend="ipkg-native ipkg-utils-native fakeroot-native " DEPENDS_append=" ${EXTRA_IMAGEDEPENDS}" RDEPENDS += "ipkg ipkg-collateral" -PACKAGES = "" - -do_rootfs[nostamp] = "1" -do_rootfs[dirs] = "${TOPDIR}" -do_build[nostamp] = "1" - IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" -IPKG_INSTALL += "ipkg ipkg-collateral" - -ROOTFS_POSTPROCESS_COMMAND ?= "" - -PID = "${@os.getpid()}" +PACKAGE_INSTALL += "ipkg ipkg-collateral" -# some default locales -IMAGE_LINGUAS ?= "de-de fr-fr en-gb" - -LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" - -real_do_rootfs () { +fakeroot rootfs_ipk_do_rootfs () { set -x mkdir -p ${IMAGE_ROOTFS}/dev - #work around a build in ipkg-make-index - touch ${DEPLOY_DIR_IPK}/Packages - 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} @@ -55,11 +37,12 @@ real_do_rootfs () { ipkg-cl ${IPKG_ARGS} install $i done fi - if [ ! -z "${IPKG_INSTALL}" ]; then - ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL} + if [ ! -z "${PACKAGE_INSTALL}" ]; then + ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL} fi export D=${IMAGE_ROOTFS} + export OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/ grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf @@ -83,75 +66,22 @@ real_do_rootfs () { log_check rootfs } -log_check() { - set +x - for target in $* - do - lf_path="${WORKDIR}/temp/log.do_$target.${PID}" - - echo "log_check: Using $lf_path as logfile" - - if test -e "$lf_path" +rootfs_ipk_log_check() { + target="$1" + lf_path="$2" + + lf_txt="`cat $lf_path`" + for keyword_die in "Cannot find package" "exit 1" ERR Fail + do + if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then - lf_txt="`cat $lf_path`" - - for keyword_die in "Cannot find package" "exit 1" ERR Fail - do - - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 - then - echo "log_check: There were error messages in the logfile" - echo -e "log_check: Matched keyword: [$keyword_die]\n" - echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die" -C1 - echo "" - do_exit=1 - fi - done - test "$do_exit" = 1 && exit 1 - else - echo "Cannot find logfile [$lf_path]" + echo "log_check: There were error messages in the logfile" + echo -e "log_check: Matched keyword: [$keyword_die]\n" + echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die" -C1 + echo "" + do_exit=1 fi - echo "Logfile is clean" done - - set -x - + test "$do_exit" = 1 && exit 1 + true } - -fakeroot do_rootfs () { - rm -rf ${IMAGE_ROOTFS} - real_do_rootfs -} - -# set '*' as the rootpassword so the images -# can decide if they want it or not - -zap_root_password () { - sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new - mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd -} - -create_etc_timestamp() { - date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp -} - -# Turn any symbolic /sbin/init link into a file -remove_init_link () { - if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then - LINKFILE=${IMAGE_ROOTFS}`readlink ${IMAGE_ROOTFS}/sbin/init` - rm ${IMAGE_ROOTFS}/sbin/init - cp $LINKFILE ${IMAGE_ROOTFS}/sbin/init - fi -} - -make_zimage_symlink_relative () { - if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then - (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done) - fi -} - -# export the zap_root_password, create_etc_timestamp and remote_init_link -EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link make_zimage_symlink_relative - - -addtask rootfs before do_build after do_install diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5a37768b52..94d25bf56f 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -49,6 +49,7 @@ def get_siteinfo_list(d): if target in targetinfo: info = targetinfo[target].split() info.append(target) + info.append("common") return info else: bb.error("Information not available for target '%s'" % target) @@ -90,7 +91,7 @@ def siteinfo_get_files(d): if os.path.exists(fname): sitefiles += fname + " " - bb.note("SITE files " + sitefiles); + bb.debug(1, "SITE files " + sitefiles); return sitefiles # diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass index ba1163a719..45d9ac923f 100644 --- a/classes/wrt-image.bbclass +++ b/classes/wrt-image.bbclass @@ -3,7 +3,7 @@ ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*" def wrt_get_kernel_version(d): import bb - if bb.data.inherits_class('image_ipk', d): + if bb.data.inherits_class('image', d): skd = bb.data.getVar('STAGING_KERNEL_DIR', d, 1) return base_read_file(skd+'/kernel-abiversion') return "-no kernel version for available-" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index dcdc18c322..77eaabb4a6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -153,10 +153,9 @@ S = "${WORKDIR}/${P}" B = "${S}" STAGING_DIR = "${TMPDIR}/staging" -STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin" -# Set these to the same a STAGING_BINDIR for now +STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin" +STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" -STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" @@ -191,12 +190,14 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${EXTRA_IMAGECMD}" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" +IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." +IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" +IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz)" EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" @@ -217,7 +218,7 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross" CROSS_DATADIR = "${CROSS_DIR}/share" -export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:" +export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" ################################################################## # Build utility info. @@ -422,7 +423,7 @@ require conf/sanity.conf IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" -MACHINE_TASK_PROVIDER ?= "task-bootstrap" +MACHINE_TASK_PROVIDER ?= "task-base" IMAGE_ROOTFS_SIZE_ext2 ?= "65536" IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf new file mode 100644 index 0000000000..d1541509c5 --- /dev/null +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -0,0 +1,17 @@ +require conf/distro/angstrom-2007.1.conf + +#this is a special version of angstrom for armv4 based machines that can't do EABI +#see http://wiki.debian.org/ArmEabiPort for details on that + +#only glibc based builds are supported ATM +TARGET_OS = "linux" + +FEED_ARCH_collie = "arm" +FEED_ARCH_h3600 = "arm" +FEED_ARCH_h3800 = "arm" +FEED_ARCH_simpad = "arm" + + + + + diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 52e89c7637..b95fdb7223 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "23" +DISTRO_REVISION = "28" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -32,6 +32,7 @@ FEED_ARCH_a780 = "armv5te" FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" +FEED_ARCH_h3900 = "armv5te" FEED_ARCH_h4000 = "armv5te" FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" @@ -67,9 +68,10 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode -#SRCDATE = "20061029" +#SRCDATE = "20070303" -PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" @@ -92,7 +94,11 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.6" +PREFERRED_VERSION_cairo = "1.3.10" + +#work around a segfault in gcc for armv4t +PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" +PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -141,6 +147,7 @@ PREFERRED_PROVIDER_libxss = "libxss" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" #shouldn't that be uclibc-initial???? PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" @@ -180,7 +187,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.71" -PREFERRED_VERSION_gstreamer ?= "0.10.6" +PREFERRED_VERSION_gstreamer ?= "0.10.11" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 0bcdac1db5..d33ae96c68 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug" SLUGOS_IMAGESEX = "little-endian" # debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "nslu2" +SLUGOS_FLASH_IMAGE = "1" # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see debianslug-packages.conf in this @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 8041ca8fb6..2b0c745bde 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,88 +1 @@ -DISTRO = "familiar" -DISTRO_NAME = "Familiar Linux" -DISTRO_VERSION = "unstable-${DATE}" - -require conf/distro/include/familiar.inc - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" -#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - -FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ - locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ - locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ - locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" - -#SRCDATE = 20050331 -#SRCDATE = "now" - -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_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -PREFERRED_VERSION_hostap-modules ?= "0.3.9" - -#2.4 machines prefer 0.13e ones -PREFERRED_VERSION_orinoco-modules ?= "0.13e" - -#but 0.13e doesn't build against 2.6 -PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15" -PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" - -# The CSL compiler is unusable because -# 1) certain programs stop to compile -# 2) more programs segfault -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" - -# -# PIN the familiar build to a version -# -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" - - -# -# Base -# -PREFERRED_PROVIDER_hostap-conf = "hostap-conf" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc -PREFERRED_VERSION_busybox ?= "1.00" - -# -# GlibC -# -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" - -# -# Opie -# - -OPIE_VERSION = "1.2.2" -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QT = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# E -# -require conf/distro/include/preferred-e-versions.inc - +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf new file mode 100644 index 0000000000..2b0c745bde --- /dev/null +++ b/conf/distro/familiar.conf @@ -0,0 +1 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc deleted file mode 100644 index ea360f5dc5..0000000000 --- a/conf/distro/include/familiar.inc +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Distribution -#@NAME: Familiar Linux -#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) - -MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>" - -INHERIT += "package_ipk debian multimachine" -TARGET_OS = "linux" - -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" - -ENABLE_BINARY_LOCALE_GENERATION ?= "1" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "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')}" - -# We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index c75241f8a0..f73fa22e34 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" SRCDATE_fstests ?= "20061122" -SRCDATE_eds-dbus ?= "20060707" +SRCDATE_eds-dbus ?= "20061215" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index f73a980c52..5819b5ad59 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -23,8 +23,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" # use latest booting kernel but allow to override it in local.conf -PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" #use EABI toolchain diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dec16d8cd7..1091aa2e98 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug" SLUGOS_IMAGESEX = "big-endian" # openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "nslu2" +SLUGOS_FLASH_IMAGE = "1" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 892c589389..25ac84d270 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -75,3 +75,10 @@ INHERIT += "nslu2-mirrors" PREFERRED_VERSION_ipkg ?= "0.99.154" PREFERRED_VERSION_ipkg-native ?= "0.99.154" +#------------------------------------------------------------------- +# FIXME! +# This is clearly wrong, the headers should match the 2.4.22 kernel, +# but locking this to 2.6.11.1 at least gets Unslung building again. +# - mwester 16 Dec 2006 +# +PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" diff --git a/conf/documentation.conf b/conf/documentation.conf index 392d1718b6..f5be55eb82 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -105,3 +105,6 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking." + +BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure." +BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 52bd88a4e9..df00fbae37 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -55,8 +55,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TMPDIR = /usr/local/projects/oetmp # Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -# MACHINE = "collie" +# for machines currently known to OpenEmbedded. This will automatically take care +# of TARGET_ARCH +# MACHINE = "c7x0" # Use this to specify the target architecture. Note that this is only # needed when building for a machine not known to OpenEmbedded. Better use @@ -66,25 +67,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Use this to specify the target operating system. The default is "linux", # for a normal linux system with glibc. Set this to "linux-uclibc" if you want # to build a uclibc based system. +# Normally the DISTRO of your choosing will take care of this # TARGET_OS = "linux" # TARGET_OS = "linux-uclibc" # Uncomment this to select a distribution policy. See the conf directory # for distributions currently known to OpenEmbedded. -# Although they no longer contain version number in the (file-)name -# familiar-unstable and openzaurus-unstable are so called "versioned" -# distros, i.e. they explicitely select specific versions of various -# packages. +# Although it no longer contain version number in the (file-)name +# openzaurus-unstable is a so called "versioned" distro, i.e. they +# explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "generic" -# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and # thereby guarantee i18n support on all devices. If your build breaks on # qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that # this breaks i18n on devices with less than 128MB RAM) or installing # a working third-party qemu (e.g. provided by your distribution) and -# adding qemu-native to ASSUME_PROVIDED +# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party +# qemus lack patches needed to work with various OE targets. # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" @@ -108,7 +110,8 @@ IMAGE_FSTYPES = "jffs2 tar" # BBDEBUG = "yes" # Uncomment these two if you want BitBake to build images useful for debugging. -# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined +# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined. +# Also note that OE now produces -dbg packages which contain debugging symbols. # DEBUG_BUILD = "1" # INHIBIT_PACKAGE_STRIP = "1" diff --git a/conf/machine/a1200.conf b/conf/machine/a1200.conf new file mode 100644 index 0000000000..684238b695 --- /dev/null +++ b/conf/machine/a1200.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: Motorola EZX A1200 +#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200 + + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" + +EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" + +#cat /proc/mtd +#dev: size erasesize name +#mtd0: 00020000 00008000 "Bootloader" +#mtd1: 000e0000 00020000 "Kernel" +#mtd2: 00580000 00020000 "VFM_Filesystem" +#mtd3: 00020000 00020000 "Logo" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" + +#the a780 needs a userspace daemon to stop the BP from shutting down the phone +MACHINE_EXTRA_RDEPENDS += "opentapi" + +ROOT_FLASH_SIZE = "24" + +EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index a369eab0a3..85beb45325 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -2,12 +2,12 @@ #@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i #@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i -require conf/machine/include/motorola-ezx.conf TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" @@ -20,11 +20,14 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" +#the a780 needs a userspace daemon to stop the BP from shutting down the phone +MACHINE_EXTRA_RDEPENDS += "opentapi" + ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 2682fb300f..fad73c53bf 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 85afdc85f4..d4877a1724 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -21,7 +21,7 @@ GUI_MACHINE_CLASS="smallscreen" PREFERRED_VERSION_u-boot = "1.1.4" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +require conf/machine/include/tune-arm920t.conf IMAGE_ROOTFS_SIZE_ext2 = "8192" IMAGE_ROOTFS_SIZE_ext2.gz = "8192" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index d1afb882e3..098d0526f0 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index deefa1b698..bfa8ace376 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,19 +3,11 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -# -# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash -# no usbgadget feature because 2.4 kernel handle it in own way on each machine -# -MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" +MACHINE_KERNEL_VERSION ?= "2.4" +require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support" - -# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied +PREFERRED_PROVIDER_xserver = "xserver-kdrive" # This is needed for the ramdisk script to work MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" @@ -24,14 +16,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/tune-strongarm.conf +IMAGE_FSTYPES ?= "jffs2 tar.gz" -SERIAL_CONSOLE = "115200 ttyS0" +require conf/machine/include/tune-strongarm.conf ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - MACHINE_TASK_PROVIDER = "task-base" +GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 12f82773d4..3968bcb6f2 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -1,15 +1,15 @@ #@TYPE: Machine #@Name: Compulab PXA270 system -#@DESCRIPTION: Machine configuration for LogicPD PXA270 system -#OLDEST_KERNEL = "2.6.17" +#@DESCRIPTION: Machine configuration for Compulab PXA270 system +#OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" -PREFERRED_VERSION_logicpd-pxa270 = "2.6.17" +PREFERRED_VERSION_compulab-pxa270 = "2.6.16" GUI_MACHINE_CLASS = "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 7d19d02439..029246a8c2 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index ffd114ace4..244a89a6b3 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -11,5 +11,5 @@ TARGET_CPU = "405" OLDEST_KERNEL = "2.6.9" #tune for the 405 cpu -include conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.conf diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 5b2c87b55c..7c277d3d73 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -14,4 +14,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" USE_VT = "0" #tune for the MPC5200B cpu -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 5e9917ffaf..0951056710 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus #can be used for crunch support later on -#include conf/machine/include/tune-ep9312.conf +#require conf/machine/include/tune-ep9312.conf -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 08f12a0ac6..189021747a 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -9,5 +9,5 @@ GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" PACKAGE_EXTRA_ARCHS = "i386" -include conf/machine/include/tune-c3.conf +require conf/machine/include/tune-c3.conf diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 0fccf05b3b..36ed04e67b 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" OLDEST_KERNEL = "2.6.15" MODUTILS = "26" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale" PACKAGE_ARCH = "arm" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 08104624ca..1a63643868 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -4,17 +4,22 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" -HANDHELD_MODULES = "" +# Set preferred providers +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +# Set features for task-base +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" -INHERIT += "linux-kernel-base" +# Some extra configuration +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" +SERIAL_CONSOLE = "115200 ttySAC2 vt100" +USE_VT = "0" + +# tune for armv4t +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f00dc9eb96..323aa8f061 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,37 +1,34 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx - -KERNEL ?= "kernel24" -#KERNEL ?= "kernel26" - -INHERIT += "linux-kernel-base" - -OVERRIDES =. "${KERNEL}:" +#@NAME: HP iPAQ h39xx +#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6" -EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" -ROOT_FLASH_SIZE = "32" +require conf/machine/include/tune-xscale.conf -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" -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 +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" -SERIAL_CONSOLE = "115200 tts/0 vt100" +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_g_ether = "g_ether" -USE_DEVFS_kernel24 = "1" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" - -GUI_MACHINE_CLASS = "smallscreen" - -# not using tune-xscale so as to retain backwards compatibility -require conf/machine/include/tune-xscale.conf +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/blueangel.conf b/conf/machine/htcblueangel.conf index dd079c244b..a61656ab5c 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -2,23 +2,39 @@ #@NAME: HTC Blueangel #@DESCRIPTION: Machine configuration for the HTC Blueangel device -KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" - +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6" -PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +require conf/machine/include/tune-xscale.conf + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "128" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" -BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_core g_ether blueangel_battery \ - pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp" -# pxa2xx_udc is built in to the kernel +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "acx-firmware" +MACHINE_EXTRA_RRECOMMENDS = "blueangel_pcmcia \ + blueangel_audio \ + blueangel_rom \ + blueangel_kp + blueangel_battery \ + blueangel_leds \ + " +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_g_ether = "g_ether" module_autoload_evdev = "evdev" module_autoload_himalaya_tsc2200 = "himalaya_tsc2200" module_autoload_himalaya_ts3 = "himalaya_ts3" @@ -30,14 +46,9 @@ module_autoload_blueangel_audio = "blueangel_audio" module_autoload_bluenagel_leds = "bleangel_leds" module_autoload_hci_uart = "hci_uart" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -SERIAL_CONSOLE = "115200 tts/2 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" -ROOT_FLASH_SIZE = "32" - -# optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility -include conf/machine/include/tune-xscale.conf +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 0eb733bfb5..0f8ed6ed82 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ require conf/machine/include/tune-xscale.conf #require conf/machine/include/tune-iwmmxt.conf GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth" # # Software/packages selection diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 48a4bbf3e5..900da400b0 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -22,11 +22,6 @@ MODUTILS = "26" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" PCMCIA_MANAGER = "pcmciautils" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware" - -PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf new file mode 100644 index 0000000000..0412ea359a --- /dev/null +++ b/conf/machine/include/collie-2.4.conf @@ -0,0 +1,17 @@ +PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" + +SERIAL_CONSOLE = "115200 ttyS0" +# +# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash +# no usbgadget feature because 2.4 kernel handle it in own way on each machine +# +MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ + kernel-module-usbdcore kernel-module-usbdmonitor \ + sharp-sdmmc-support" + +# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf new file mode 100644 index 0000000000..eab879368c --- /dev/null +++ b/conf/machine/include/collie-2.6.conf @@ -0,0 +1,4 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +SERIAL_CONSOLE = "115200 ttySA0" +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf index b314fa9bea..26b78a6a9d 100644 --- a/conf/machine/include/qemu.conf +++ b/conf/machine/include/qemu.conf @@ -7,4 +7,5 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" IMAGE_FSTYPES ?= "tar.bz2 ext2" -ROOT_FLASH_SIZE = "100" +ROOT_FLASH_SIZE = "200" +IMAGE_ROOTFS_SIZE_ext2 = "200000" diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf deleted file mode 100644 index f3591b4b75..0000000000 --- a/conf/machine/include/tosa-2.6.conf +++ /dev/null @@ -1,6 +0,0 @@ -include conf/machine/include/zaurus-2.6.conf -# wlan-ng Modules -MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" - -# WM97xx Modules -#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf new file mode 100644 index 0000000000..48003571f1 --- /dev/null +++ b/conf/machine/include/tune-thumb.conf @@ -0,0 +1,32 @@ +#tune file for thumb instructions + +ARM_INSTRUCTION_SET ?= "arm" +# "arm" "thumb" +# The instruction set the compiler should use when generating application +# code. The kernel is always compiled with arm code at present. arm code +# is the original 32 bit ARM instruction set, thumb code is the 16 bit +# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) +# but requires more instructions (140% for 70% smaller code) so may be +# slower. + +THUMB_INTERWORK ?= "no" +# "yes" "no" +# Whether to compile with code to allow interworking between the two +# instruction sets. This allows thumb code to be executed on a primarily +# arm system and vice versa. It is strongly recommended that DISTROs not +# turn this off - the actual cost is very small. + +OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" + +# Compiler and linker options for application code and kernel code. These +# options ensure that the compiler has the correct settings for the selected +# instruction set and interworking. +ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" + +# +TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" +TARGET_CC_KERNEL_ARCH += "-mno-thumb" + diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index 6d7fd11a05..f955215f31 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -4,7 +4,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index 5108623750..f303454cbb 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -5,9 +5,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "be" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" +PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 --faketime -n" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index ac62d669e5..d3fcd2b017 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -5,9 +5,11 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "le" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf +require conf/machine/include/tune-xscale.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" + +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index d6b3c70454..385af0864a 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index aa6631a524..a12328b993 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "sh3" -include conf/machine/include/tune-sh3.conf +require conf/machine/include/tune-sh3.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 811ea6a3e8..74a94bdfcf 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 3cbc44485d..f47e773717 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -8,4 +8,4 @@ TARGET_PREFIX = "powerpc-603e-linux-gnu-" IMAGE_FSTYPES = "jffs2 tar.bz2" -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 8fd58bb5ed..dacee830b7 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 914022c7bc..6303a8e96a 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index 77961714eb..160b9fd207 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index 33456a4b03..07976f7dbd 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-arm1136jf-s.conf +require conf/machine/include/tune-arm1136jf-s.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index f83de23786..3baf1c2878 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -31,4 +31,4 @@ 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 +require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index de53f3c3bc..f7e05e768b 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -14,7 +14,7 @@ XSERVER = "xserver-kdrive-omap" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) ROOT_FLASH_SIZE = "123" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index b00f8a520c..304018baea 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,4 +2,4 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 70a3082956..a9e1a00cc5 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index f8a3472f78..8369789f1b 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" +# PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" @@ -28,7 +28,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ kernel-module-nls-base \ kernel-module-vfat" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf # old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index ec7336fe06..ba67f473b2 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" -PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk" +PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" @@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +require conf/machine/include/tune-xscale.conf module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf new file mode 100644 index 0000000000..0a58defa69 --- /dev/null +++ b/conf/machine/palmtx.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Palm TX +#@DESCRIPTION: Machine configuration for the Palm TX + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen" + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf + +module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 371ba927bb..2de34e42c9 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttyAMA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf new file mode 100644 index 0000000000..dfbd345ae8 --- /dev/null +++ b/conf/machine/qemux86.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: qemu x86 Emulator setup +#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation + +TARGET_ARCH = "i586" +PACKAGE_EXTRA_ARCHS = "x86" + +require conf/machine/include/qemu.conf + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf new file mode 100644 index 0000000000..53be3506af --- /dev/null +++ b/conf/machine/rokr-e2.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: Motorola EZX rokr e2 +#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2 + + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" + +EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" + +#cat /proc/mtd +#dev: size erasesize name +#mtd0: 00020000 00008000 "Bootloader" +#mtd1: 000e0000 00020000 "Kernel" +#mtd2: 00580000 00020000 "VFM_Filesystem" +#mtd3: 00020000 00020000 "Logo" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" + +#the a780 needs a userspace daemon to stop the BP from shutting down the phone +MACHINE_EXTRA_RDEPENDS += "opentapi" + +ROOT_FLASH_SIZE = "24" + +EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index c0324c887d..40b13667b6 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index 6a8deb9176..f2064175fd 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -16,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz" MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 apm screen" -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 455ae56677..84c340f66e 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index a36684b758..511d200deb 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -14,4 +14,4 @@ MACHINE_FEATURES= "kernel26 usbhost" BOOTSTRAP_EXTRA_RDEPENDS = "mdadm" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index e893cf8ed0..e9ab7dd34a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -include conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.conf # wlan-ng Modules MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 685dcd91fb..d79c23e4ac 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0" KERNEL_CONSOLE = "ttys0,38400" USE_VT = "0" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/x86-uml.conf b/conf/machine/x86-uml.conf index 34a6b89ab5..e90333836e 100644 --- a/conf/machine/x86-uml.conf +++ b/conf/machine/x86-uml.conf @@ -2,7 +2,7 @@ #@NAME: X86 User Mode Linux #@DESCRIPTION: Machine configuration for a User Mode Linux running on an x86 compatible PC -include conf/machine/x86.conf +require conf/machine/x86.conf PREFERRED_PROVIDER_virtual/kernel = "linux-uml" diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 7170af08bb..a92b58dc73 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -136,7 +136,7 @@ OE_vars = [ 'INITSCRIPT_PACKAGES', 'INITSCRIPT_NAME', 'INITSCRIPT_PARAMS', - 'IPKG_INSTALL', + 'PACKAGE_INSTALL', 'KERNEL_IMAGETYPE', 'KERNEL_IMAGEDEST', 'KERNEL_OUTPUT', diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 9810c7b1ae..ec65d221c3 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -8,12 +8,12 @@ import os import sys import time -VERSION = "2.4.3" +VERSION = "2.4.4" # increase when touching python-core BASEREV = 0 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -__version__ = "$Revision: 1.20 $" +__version__ = "$Revision: 1.21 $" class MakefileMaker: @@ -24,7 +24,7 @@ class MakefileMaker: self.targetPrefix = "${libdir}/python%s" % VERSION[:3] self.output = outfile self.out( "#" * 120 ) - self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) ) self.out( "###" ) self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) self.out( "###" ) @@ -158,7 +158,7 @@ if __name__ == "__main__": m.setPrefix( "/", "/usr/" ) - m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "", + m.addPackage( 0, "python-core", "Python Interpreter and core modules (needed!)", "", "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " + "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " + "lib/python2.4/os.* lib/python2.4/posixpath.* " + @@ -202,7 +202,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold", "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) - m.addPackage( 1, "python-curses", "Python Curses Support", "python-core", + m.addPackage( 0, "python-curses", "Python Curses Support", "python-core", "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs", @@ -236,7 +236,7 @@ if __name__ == "__main__": "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " "pipes.* socket.* tempfile.* StringIO.* " ) - m.addPackage( 1, "python-lang", "Python Low-Level Language Support", "python-core", + m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core", "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* " + @@ -263,14 +263,14 @@ if __name__ == "__main__": m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core", "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) - m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime", + m.addPackage( 0, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" ) m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient", "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) - m.addPackage( 1, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re", + m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re", "pickle.* shelve.* lib-dynload/cPickle.so" ) m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core", @@ -306,7 +306,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-tests", "Python Tests", "python-core", "test" ) # package - m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", + m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", @@ -318,7 +318,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang", "xmlrpclib.* SimpleXMLRPCServer.*" ) - m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core", + m.addPackage( 0, "python-zlib", "Python zlib Support.", "python-core", "lib-dynload/zlib.so" ) m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime", diff --git a/contrib/site-conf/aclocal.m4 b/contrib/site-conf/aclocal.m4 index f415403d6d..65b9fa316a 100644 --- a/contrib/site-conf/aclocal.m4 +++ b/contrib/site-conf/aclocal.m4 @@ -11,5 +11,45 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_include([m4/apache.m4]) +m4_include([m4/bash.m4]) m4_include([m4/builtin.m4]) +m4_include([m4/clamav.m4]) +m4_include([m4/coreutils.m4]) +m4_include([m4/cvs.m4]) +m4_include([m4/dbus.m4]) +m4_include([m4/dpkg.m4]) +m4_include([m4/edb.m4]) +m4_include([m4/enca.m4]) +m4_include([m4/ettercap.m4]) +m4_include([m4/fget.m4]) +m4_include([m4/fnmatch.m4]) +m4_include([m4/gettext.m4]) +m4_include([m4/glib.m4]) +m4_include([m4/glib2.m4]) m4_include([m4/gnu.m4]) +m4_include([m4/httppc.m4]) +m4_include([m4/ipsectools.m4]) +m4_include([m4/jikes.m4]) +m4_include([m4/lftp.m4]) +m4_include([m4/libesmtp.m4]) +m4_include([m4/libidl.m4]) +m4_include([m4/libnet.m4]) +m4_include([m4/libxfce4util.m4]) +m4_include([m4/links.m4]) +m4_include([m4/mono.m4]) +m4_include([m4/mysql.m4]) +m4_include([m4/nano.m4]) +m4_include([m4/orbit2.m4]) +m4_include([m4/pcap.m4]) +m4_include([m4/php.m4]) +m4_include([m4/rsync.m4]) +m4_include([m4/samba.m4]) +m4_include([m4/screen.m4]) +m4_include([m4/sleepycat.m4]) +m4_include([m4/slrn.m4]) +m4_include([m4/socat.m4]) +m4_include([m4/ssh.m4]) +m4_include([m4/startupnotification.m4]) +m4_include([m4/sudo.m4]) +m4_include([m4/xffm.m4]) diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb index 1bea8a864d..c2afe0856c 100644 --- a/packages/aalib/aalib_1.4rc5.bb +++ b/packages/aalib/aalib_1.4rc5.bb @@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \ file://configure.patch;patch=1" S = "${WORKDIR}/aalib-1.4.0" -inherit autotools +inherit autotools EXTRA_OECONF = '--without-x11-driver --without-slang-driver \ --with-curses-driver --without-gpm \ diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc new file mode 100644 index 0000000000..c96f431224 --- /dev/null +++ b/packages/acpid/acpid.inc @@ -0,0 +1,32 @@ +SECTION = "base" +DESCRIPTION = "A daemon for delivering ACPI events." +LICENSE="GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ + file://init" + +EXTRA_OEMAKE = "" +do_compile () { + oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' +} + +do_install () { + oe_runmake 'INSTPREFIX=${D}' install + install -d ${D}${sysconfdir}/init.d + cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid + chmod 755 ${D}${sysconfdir}/init.d/acpid +} + +pkg_postinst () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D acpid defaults +} + +pkg_prerm () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D acpid remove +} diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb index c96f431224..af1d3b2853 100644 --- a/packages/acpid/acpid_1.0.2.bb +++ b/packages/acpid/acpid_1.0.2.bb @@ -1,32 +1 @@ -SECTION = "base" -DESCRIPTION = "A daemon for delivering ACPI events." -LICENSE="GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ - file://init" - -EXTRA_OEMAKE = "" -do_compile () { - oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' -} - -do_install () { - oe_runmake 'INSTPREFIX=${D}' install - install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid - chmod 755 ${D}${sysconfdir}/init.d/acpid -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} +require acpid.inc diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb index 4ce3878785..596ef49452 100644 --- a/packages/acpid/acpid_1.0.3.bb +++ b/packages/acpid/acpid_1.0.3.bb @@ -1,33 +1,2 @@ -SECTION = "base" -DESCRIPTION = "A daemon for delivering ACPI events." -LICENSE="GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ - file://gcc40.patch;patch=1 \ - file://init" - -EXTRA_OEMAKE = "" -do_compile () { - oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' -} - -do_install () { - oe_runmake 'INSTPREFIX=${D}' install - install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid - chmod 755 ${D}${sysconfdir}/init.d/acpid -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} +require acpid.inc +SRC_URI += "file://gcc40.patch;patch=1" diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb index 4ce3878785..596ef49452 100644 --- a/packages/acpid/acpid_1.0.4.bb +++ b/packages/acpid/acpid_1.0.4.bb @@ -1,33 +1,2 @@ -SECTION = "base" -DESCRIPTION = "A daemon for delivering ACPI events." -LICENSE="GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ - file://gcc40.patch;patch=1 \ - file://init" - -EXTRA_OEMAKE = "" -do_compile () { - oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' -} - -do_install () { - oe_runmake 'INSTPREFIX=${D}' install - install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid - chmod 755 ${D}${sysconfdir}/init.d/acpid -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} +require acpid.inc +SRC_URI += "file://gcc40.patch;patch=1" diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb index cf10afeefe..9ac6821e0e 100644 --- a/packages/addons/devshell.bb +++ b/packages/addons/devshell.bb @@ -38,7 +38,7 @@ python do_compile() { workdir = bb.data.getVar('WORKDIR', d, 1) shellfile = os.path.join(workdir, bb.data.expand("${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell", d)) - + f = open(shellfile, "w") # emit variables and shell functions @@ -63,7 +63,7 @@ do_deploy() { cp $shellfile tmpfile echo "#!/bin/bash --rcfile" > $shellfile sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile - + echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile echo "alias ./configure=oe_runconf" >> $shellfile echo "alias make=oe_runmake" >> $shellfile diff --git a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty b/packages/alp/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty +++ b/packages/alp/.mtn2git_empty diff --git a/packages/alp/hiker_0.9.bb b/packages/alp/hiker_0.9.bb new file mode 100644 index 0000000000..ce5994ebcc --- /dev/null +++ b/packages/alp/hiker_0.9.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Hiker Application Framework™" +LICENSE = "MPL" + +DEPENDS = "gtk+ sqlite3 gnet dbus-glib" + +SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz" + +inherit autotools pkgconfig lib_package + +export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" +export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" + +do_configure_prepend() { + sed -i s:unittest::g utils/Makefile.am +} + +PACKAGES =+ "libhiker libsqlfs" +FILES_libhiker += "${libdir}/libhiker*.so.*" +FILES_libsqlfs += "${libdir}/libsql*.so.*" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index f8b3f6fab7..53d898d030 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -31,7 +31,7 @@ midi_modules = "snd-seq-midi-emul.o \ snd-seq-midi-event.o \ snd-seq-midi.o \ snd-seq-virmidi.o \ - snd-seq-oss.o" + snd-seq-oss.o" FILES_${PN}-midi = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('midi_modules', d).split()))}" misc_modules = "snd-gus-synth.o \ snd-emu8000-synth.o \ @@ -72,9 +72,9 @@ if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then familiar_arch=ipaqpxa fi - fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; + fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; - if [ -d ${D}${sysconfdir}/modutils/ ] ; then + if [ -d ${D}${sysconfdir}/modutils/ ] ; then rm -r ${D}${sysconfdir}/modutils/ ; fi mkdir -p ${D}${sysconfdir}/modutils/ diff --git a/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb index 89cd378c38..9a7751ee6b 100644 --- a/packages/alsa/alsa-oss_1.0.11.bb +++ b/packages/alsa/alsa-oss_1.0.11.bb @@ -7,7 +7,7 @@ PR = "r0" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" -inherit autotools +inherit autotools do_configure_prepend () { touch NEWS README AUTHORS ChangeLog diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index be73b0caed..0df86ad794 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -53,7 +53,7 @@ do_install() { install -d ${D}/etc/altboot-menu/Advanced install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds + install -d ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc @@ -61,14 +61,14 @@ do_install() { install -m 0644 ${WORKDIR}/altbootctl.conf ${D}/etc install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin install -m 0755 ${WORKDIR}/altbootctl ${D}/sbin - + install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - + install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc -} + install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc +} ###################################################################################### diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 8c9b21e232..2762001dbd 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -32,18 +32,18 @@ do_install() { install -d ${D}/etc/altboot-menu/Advanced install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot - + if test -d ${WORKDIR}/altboot/${MACHINE} then install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc else install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc fi - + install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin - - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ then install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu else @@ -56,10 +56,10 @@ do_install() { else install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced fi - + install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc -} + install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc +} ###################################################################################### diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index 4c214796d7..c52c0972a3 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -51,7 +51,7 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - + if test -d ${WORKDIR}/altboot/${MACHINE} then install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc @@ -62,14 +62,14 @@ do_install() { install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin - + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - + install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc -} + install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc +} ###################################################################################### diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index 7e6d06e943..714a3d1d2b 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -56,7 +56,7 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds install -d ${D}/etc/skel/altboot - + if test -d ${WORKDIR}/altboot/${MACHINE} then install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/ @@ -66,17 +66,17 @@ do_install() { install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc + install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin - + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - + install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc -} + install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc +} ###################################################################################### diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 9a0bf12a08..43c25eb1ba 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -7,9 +7,9 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 838ad249c0..3977e223af 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,13 +1,18 @@ #Angstrom bootstrap image LICENSE = "MIT" -PR = "r2" +PR = "r3" + +ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default task-base" +RDEPENDS = "task-base-core-default \ + task-base \ + ${ANGSTROM_EXTRA_INSTALL} \ + " export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index c0678431b2..d366a62bf7 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -25,9 +25,9 @@ RDEPENDS = "\ ${ANGSTROM_EXTRA_INSTALL}" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" #zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index e6545117b8..2488255b53 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,6 +1,7 @@ PV = "${DISTRO_VERSION}" PACKAGES = "${PN}" +PACKAGE_ARCH = "${MACHINE_ARCH}" do_compile() { mkdir -p ${D}${sysconfdir} diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 817ac81f19..c7ac97d2e5 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -42,7 +42,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-autostarter \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \ - ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ suspend-desktop \ teleport \ xauth \ diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index e988a97a24..2522658d32 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -75,9 +75,9 @@ do_install_append () { -e 's,/etc/,${sysconfdir}/,g' \ -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache chmod 755 ${D}/${sysconfdir}/init.d/apache - + install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf - + rm ${D}/${libdir}/libexpat.* } diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index 9c6c862ad7..b58aa41756 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -29,9 +29,9 @@ do_populate_staging () { cp build/instdso.sh ${STAGING_DIR}/build cp .libs/httpd ${STAGING_BINDIR} - (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | + (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | (cd ${STAGING_LIBDIR}; tar -xf - ) - (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | + (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | (cd ${STAGING_LIBDIR}; tar -xf - ) mkdir -p ${STAGING_INCDIR}/apache2 diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb index 4c95a25477..aaf5ab4298 100644 --- a/packages/apache2/apache2_2.2.3.bb +++ b/packages/apache2/apache2_2.2.3.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/httpd-${PV}" # # implications - autotools defines suitable do_configure, do_install, etc. # update-rc.d adds hooks for rc-update. -# +# # inherit autotools update-rc.d @@ -60,7 +60,7 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconf ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \ ${libdir}/${PN}" -# we want htdocs and cgi-bin to go with the binary +# we want htdocs and cgi-bin to go with the binary FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin" #make sure the lone .so links also get wrapped in the base package diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index 94541581d3..4313115c91 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "libtool-cross" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ file://debian.patch;patch=1 \ @@ -44,6 +44,7 @@ do_install() { install -d ${D}${bindir} install -d ${D}${libdir} install -d ${D}${datadir}/apmd + install -d ${D}${includedir} install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd diff --git a/packages/application-registry/application-registry_0.1.bb b/packages/application-registry/application-registry_0.1.bb index 9fe339d566..1ebfbdd907 100644 --- a/packages/application-registry/application-registry_0.1.bb +++ b/packages/application-registry/application-registry_0.1.bb @@ -11,7 +11,7 @@ SRC_URI = "file://abiword.applications \ file://gnumeric.applications \ file://gpe-calendar.applications \ file://gpe-contacts.applications \ - file://ipkg.applications" + file://ipkg.applications" do_install_append () { diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb index 8bd6d778f0..9c1b9d94f0 100644 --- a/packages/appweb/appweb_1.2.0.bb +++ b/packages/appweb/appweb_1.2.0.bb @@ -55,10 +55,10 @@ require appweb.inc # --with-esp Include the ESP handler. # --with-ssl Build support for the SSL protocol. # --with-upload Build with the file upload handler -# --with-xdb Build with XDB +# --with-xdb Build with XDB # Supported PACKAGE names: openssl, php4, php5 -# --with-PACKAGE=[builtin|, module] -# Include support for the PACKAGE. Link into appWeb +# --with-PACKAGE=[builtin|, module] +# Include support for the PACKAGE. Link into appWeb # statically and/or build as a module # --with-PACKAGE-dir=DIR Set the source directory of the package # --with-PACKAGE-libs=libs Set a list of libraries to use when linking with diff --git a/packages/appweb/appweb_2.0.4.bb b/packages/appweb/appweb_2.0.4.bb index 7f7941012a..59682840a3 100644 --- a/packages/appweb/appweb_2.0.4.bb +++ b/packages/appweb/appweb_2.0.4.bb @@ -56,10 +56,10 @@ require appweb.inc # --with-esp Include the ESP handler. # --with-ssl Build support for the SSL protocol. # --with-upload Build with the file upload handler -# --with-xdb Build with XDB +# --with-xdb Build with XDB # Supported PACKAGE names: openssl, php4, php5 -# --with-PACKAGE=[builtin|, module] -# Include support for the PACKAGE. Link into appWeb +# --with-PACKAGE=[builtin|, module] +# Include support for the PACKAGE. Link into appWeb # statically and/or build as a module # --with-PACKAGE-dir=DIR Set the source directory of the package # --with-PACKAGE-libs=libs Set a list of libraries to use when linking with diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb index 776fd03bfe..b726f2adf1 100644 --- a/packages/apr/apr-util_0.9.12.bb +++ b/packages/apr/apr-util_0.9.12.bb @@ -14,7 +14,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=$ inherit autotools lib_package binconfig do_configure() { - cp ${S}/../uri_delims.h ${S}/uri/. + cp ${S}/../uri_delims.h ${S}/uri/. oe_runconf } diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index ec1998d64b..c73eb8023c 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -3,12 +3,16 @@ SECTION = "libs" DEPENDS = "apr expat gdbm" LICENSE = "Apache License, Version 2.0" -PR = "r0" +PR = "r2" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz" -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \ + --with-gdbm=${STAGING_DIR}/${HOST_SYS} \ + --without-sqlite2 \ + --without-sqlite3 \ + --with-expat=${STAGING_DIR}/${HOST_SYS}" inherit autotools lib_package binconfig @@ -17,5 +21,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index 6374949f91..2016ca0126 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library" SECTION = "libs" LICENSE = "Apache License, Version 2.0" -PR = "r0" +PR = "r1" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" @@ -14,5 +14,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb index efcadfaf94..89bcfa85d9 100644 --- a/packages/ark3116/ark3116_0.4.1.bb +++ b/packages/ark3116/ark3116_0.4.1.bb @@ -5,10 +5,10 @@ SECTION = "kernel/modules" LICENSE = "GPL" PR = "r2" RRECOMMENDS = "kernel-module-usbserial" - + SRC_URI = "http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz \ file://ark3116.c.patch;patch=1 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/ark3116" @@ -23,12 +23,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial } diff --git a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch deleted file mode 100644 index 208c65108b..0000000000 --- a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch +++ /dev/null @@ -1,103 +0,0 @@ -Index: arpwatch/Makefile.in -diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1 ---- arpwatch/Makefile.in:1.1.1.1 Tue Apr 17 13:31:36 2001 -+++ arpwatch/Makefile.in Tue Apr 17 13:53:29 2001 -@@ -31,7 +31,8 @@ - # Pathname of directory to install the man page - MANDEST = @mandir@ - # Pathname of directory to install database file --ARPDIR = $(prefix)/arpwatch -+ARPDIR = /var/lib/arpwatch -+ETHERCODES = /usr/share/arpwatch/ethercodes.dat - - # VPATH - srcdir = @srcdir@ -@@ -45,7 +46,8 @@ - PROG = arpwatch - CCOPT = @V_CCOPT@ - INCLS = -I. @V_INCLS@ --DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" -+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \ -+ -DETHERCODES=\"$(ETHERCODES)\" - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) -Index: arpwatch/arpsnmp.8 -diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1 ---- arpwatch/arpsnmp.8:1.1.1.1 Tue Apr 17 13:31:36 2001 -+++ arpwatch/arpsnmp.8 Tue Apr 17 13:53:29 2001 -@@ -1,4 +1,4 @@ --.\" @(#) $Id: arpsnmp.8,v 1.5 2000/09/17 20:34:41 leres Exp $ (LBL) -+.\" @(#) $Id: arpsnmp.8,v 1.5 2001/04/17 20:34:41 leres Exp $ (LBL) - .\" - .\" Copyright (c) 1996, 1997, 1999, 2000 - .\" The Regents of the University of California. All rights reserved. -@@ -69,9 +69,9 @@ - .na - .nh - .nf --/usr/operator/arpwatch - default directory -+/var/lib/arpwatch - default directory - arp.dat - ethernet/ip address database --ethercodes.dat - vendor ethernet block list -+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list - .ad - .hy - .fi -Index: arpwatch/arpwatch.8 -diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1 ---- arpwatch/arpwatch.8:1.1.1.1 Tue Apr 17 13:31:36 2001 -+++ arpwatch/arpwatch.8 Tue Apr 17 13:53:29 2001 -@@ -1,4 +1,4 @@ --.\" @(#) $Id: arpwatch.8,v 1.13 2000/10/08 20:31:25 leres Exp $ (LBL) -+.\" @(#) $Id: arpwatch.8,v 1.13 2001/04/17 20:31:25 leres Exp $ (LBL) - .\" - .\" Copyright (c) 1992, 1994, 1996, 1997, 2000 - .\" The Regents of the University of California. All rights reserved. -@@ -152,9 +152,9 @@ - .na - .nh - .nf --/usr/operator/arpwatch - default directory -+/var/lib/arpwatch - default directory - arp.dat - ethernet/ip address database --ethercodes.dat - vendor ethernet block list -+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list - .ad - .hy - .fi -Index: arpwatch/arpwatch.h -diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1 ---- arpwatch/arpwatch.h:1.1.1.1 Tue Apr 17 13:31:36 2001 -+++ arpwatch/arpwatch.h Tue Apr 17 13:53:29 2001 -@@ -1,7 +1,7 @@ - /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */ - - #define ARPFILE "arp.dat" --#define ETHERCODES "ethercodes.dat" -+/* #define ETHERCODES "ethercodes.dat" */ - #define CHECKPOINT (15*60) /* Checkpoint time in seconds */ - - #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n) -Index: arpwatch/bihourly -diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1 ---- arpwatch/bihourly:1.1.1.1 Tue Apr 17 13:31:36 2001 -+++ arpwatch/bihourly Tue Apr 17 13:53:29 2001 -@@ -6,7 +6,7 @@ - PATH=$PATH:/usr/local/sbin - export PATH - # --cd /usr/operator/arpwatch -+cd /var/lib/arpwatch - # - list=`cat list` - cname=`cat cname` -@@ -14,7 +14,7 @@ - # - alist="" - for r in $list; do \ -- ./arpfetch $r $cname > $r 2> $errs -+ arpfetch $r $cname > $r 2> $errs - if test -s $errs; then - echo "arpfetch $r failed:" - sed -e 's/^/ /' $errs diff --git a/packages/arpwatch/arpwatch_2.1a13.bb b/packages/arpwatch/arpwatch_2.1a13.bb deleted file mode 100644 index 6605b2482d..0000000000 --- a/packages/arpwatch/arpwatch_2.1a13.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Ethernet/FDDI station activity monitor" -LICENSE = "BSD" -SECTION = "network" -HOMEPAGE = "http://www-nrg.ee.lbl.gov/" -DEPENDS = "fakeroot-native" -RRECOMMENDS = "arpwatch-data" - -SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \ - file://05debian_fhs.patch;patch=1 \ - file://06debian_manpages.patch;patch=1 \ - file://init.d \ - file://arpwatch.default \ - file://arpwatch.conf \ - file://ethercodes.dat \ - file://make.patch;patch=1" - -inherit autotools - -EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}" - -fakeroot do_install() { - install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/init.d \ - ${D}${datadir}/arpwatch - - oe_runmake install DESTDIR=${D} - oe_runmake install-man DESTDIR=${D} - - install -m 0755 ${S}/arp2ethers ${D}${sbindir} - install -m 0755 ${S}/arpfetch ${D}${sbindir} - install -m 0755 ${S}/bihourly ${D}${sbindir} - install -m 0755 ${S}/massagevendor ${D}${sbindir} - - install -m 0644 ${S}/arp2ethers.8 ${D}${mandir}/man8 - install -m 0644 ${S}/arpfetch.8 ${D}${mandir}/man8 - install -m 0644 ${S}/bihourly.8 ${D}${mandir}/man8 - install -m 0644 ${S}/massagevendor.8 ${D}${mandir}/man8 - - install -m 0755 ${WORKDIR}/init.d ${D}${sysconfdir}/init.d/arpwatch - install -m 0644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default/arpwatch - install -m 0644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir} - - install -m 0644 ${WORKDIR}/ethercodes.dat ${D}${datadir}/arpwatch -} - -PACKAGES =+ "arpwatch-data" -FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat" diff --git a/packages/aspell/aspell_0.50.5.bb b/packages/aspell/aspell_0.50.5.bb index 8b8c5e779b..f685133121 100644 --- a/packages/aspell/aspell_0.50.5.bb +++ b/packages/aspell/aspell_0.50.5.bb @@ -15,6 +15,8 @@ FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir inherit autotools +export CXXFLAGS += "-lstdc++" + do_compile_prepend() { install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h } diff --git a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb index 3a07f2cb0d..2a0dbbc82f 100644 --- a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb +++ b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb @@ -4,7 +4,7 @@ LICENSE="GPL" DEPENDS="asterisk" PR = "r1" -SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz" +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz" do_install() { oe_runmake DESTDIR=${D} install diff --git a/packages/atk/atk.inc b/packages/atk/atk.inc new file mode 100644 index 0000000000..c4878d87ce --- /dev/null +++ b/packages/atk/atk.inc @@ -0,0 +1,13 @@ +DEPENDS = "glib-2.0 gtk-doc" +DESCRIPTION = "An accessibility toolkit for GNOME." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "LGPL" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glibtest" + +CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ + -I${STAGING_INCDIR}/glib-2.0/glib \ + -I${STAGING_INCDIR}/glib-2.0/gobject" diff --git a/packages/atk/atk_1.10.3.bb b/packages/atk/atk_1.10.3.bb index d04b943557..ab359172a1 100644 --- a/packages/atk/atk_1.10.3.bb +++ b/packages/atk/atk_1.10.3.bb @@ -1,20 +1,8 @@ -DEPENDS = "glib-2.0 gtk-doc" -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPL" +require atk.inc SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - -CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ - -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - do_stage () { - oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} - autotools_stage_includes + oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} + autotools_stage_includes } diff --git a/packages/atk/atk_1.2.0.bb b/packages/atk/atk_1.2.0.bb index 37e9fd1a2e..767c13fb4d 100644 --- a/packages/atk/atk_1.2.0.bb +++ b/packages/atk/atk_1.2.0.bb @@ -1,19 +1,8 @@ -DEPENDS = "glib-2.0" -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -LICENSE = "LGPL" +require atk.inc -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \ +SRC_URI = "${GNOME_MIRROR}/atk/1.2/atk-${PV}.tar.bz2 \ file://m4.patch;patch=1" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - -CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ - -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - do_stage () { oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/atk diff --git a/packages/atk/atk_1.6.0.bb b/packages/atk/atk_1.6.0.bb index 1511da84d0..320a205d9f 100644 --- a/packages/atk/atk_1.6.0.bb +++ b/packages/atk/atk_1.6.0.bb @@ -1,20 +1,8 @@ -DEPENDS = "glib-2.0" -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPL" +require atk.inc SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \ file://gtk-doc.patch;patch=1" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - -CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ - -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - do_stage () { oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/atk diff --git a/packages/atk/atk_1.6.1.bb b/packages/atk/atk_1.6.1.bb index 9344d747b2..afc21753d5 100644 --- a/packages/atk/atk_1.6.1.bb +++ b/packages/atk/atk_1.6.1.bb @@ -1,19 +1,7 @@ -DEPENDS = "glib-2.0 gtk-doc" -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPL" +require atk.inc SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - -CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ - -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - do_stage () { oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} autotools_stage_includes diff --git a/packages/atk/atk_1.9.0.bb b/packages/atk/atk_1.9.0.bb index 2dd743e146..557858318d 100644 --- a/packages/atk/atk_1.9.0.bb +++ b/packages/atk/atk_1.9.0.bb @@ -1,20 +1,8 @@ -DEPENDS = "glib-2.0 gtk-doc" -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPL" +require atk.inc SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/atk-${PV}.tar.bz2" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - -CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ - -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - do_stage () { - oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} - autotools_stage_includes + oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} + autotools_stage_includes } diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb index ad07c26b53..18df2e860b 100644 --- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb +++ b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb @@ -19,7 +19,7 @@ do_compile() { export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/" export KERNEL_PATH="${STAGING_KERNEL_DIR}" export KERNEL_SRC="${STAGING_KERNEL_DIR}" - export CC="${KERNEL_CC}" + export CC="${KERNEL_CC}" export LD="${KERNEL_LD}" export KERNEL_VERSION="${KERNEL_VERSION}" export TOPDIR="${S}" diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb index 333d8f12ec..705ab532fc 100644 --- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb +++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb @@ -29,8 +29,8 @@ do_compile() { export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/" export KERNEL_PATH="${STAGING_KERNEL_DIR}" export KERNEL_SRC="${STAGING_KERNEL_DIR}" - export CC="${KERNEL_CC}" - export CCC="${KERNEL_CC}" + export CC="${KERNEL_CC}" + export CCC="${KERNEL_CC}" export LD="${KERNEL_LD}" export KERNEL_VERSION="${KERNEL_VERSION}" export TOPDIR="${S}" diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb index d87e62cbec..bfa113dc2d 100644 --- a/packages/audiofile/audiofile_0.2.6.bb +++ b/packages/audiofile/audiofile_0.2.6.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL GPL" DESCRIPTION = "The Audio File Library provides a uniform and elegant \ API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ -Research, Amiga IFF/8SVX, and NIST SPHERE." +Research, Amiga IFF/8SVX, and NIST SPHERE." PACKAGES += "${PN}-bin" FILES_${PN} = "${libdir}/libaudiofile*.so.*" diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb index 92a9257797..aa4871e194 100644 --- a/packages/autoconf/autoconf-native_2.59.bb +++ b/packages/autoconf/autoconf-native_2.59.bb @@ -1,5 +1,5 @@ -SECTION = "devel" require autoconf_${PV}.bb + DEPENDS = "m4-native gnu-config-native" RDEPENDS_${PN} = "m4-native gnu-config-native" diff --git a/packages/autoconf/autoconf.inc b/packages/autoconf/autoconf.inc new file mode 100644 index 0000000000..7761af06d7 --- /dev/null +++ b/packages/autoconf/autoconf.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "A package of M4 macros to produce scripts to \ +automatically configure sourcecode." +LICENSE = "GPL" +HOMEPAGE = "http://www.gnu.org/software/autoconf/" +SECTION = "devel" +DEPENDS += "m4-native" +RDEPENDS_${PN} = "m4 gnu-config" + +SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ + file://program_prefix.patch;patch=1" + +inherit autotools diff --git a/packages/autoconf/autoconf_2.57.bb b/packages/autoconf/autoconf_2.57.bb index 48726b1605..6c2906a362 100644 --- a/packages/autoconf/autoconf_2.57.bb +++ b/packages/autoconf/autoconf_2.57.bb @@ -1,9 +1,2 @@ -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://program_prefix.patch;patch=1" -LICENSE = "GPL" -DESCRIPTION = "A package of M4 macros to produce scripts to \ -automatically configure sourcecode." - +require autoconf.inc PR = "r1" -SECTION = "devel" -inherit autotools diff --git a/packages/autoconf/autoconf_2.59.bb b/packages/autoconf/autoconf_2.59.bb index 3a5c220a48..5891d1ec59 100644 --- a/packages/autoconf/autoconf_2.59.bb +++ b/packages/autoconf/autoconf_2.59.bb @@ -1,15 +1,10 @@ -DESCRIPTION = "A package of M4 macros to produce scripts to \ -automatically configure sourcecode." -LICENSE = "GPL" -HOMEPAGE = "http://www.gnu.org/software/autoconf/" -SECTION = "devel" +require autoconf.inc + DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 gnu-config" PR = "r5" -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://program_prefix.patch;patch=1 \ - file://autoreconf-include.patch;patch=1 \ +SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://autoreconf-exclude.patch;patch=1 \ file://autoreconf-foreign.patch;patch=1 \ file://autoreconf-gnuconfigize.patch;patch=1 \ @@ -18,4 +13,3 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ file://sizeof_types.patch;patch=1 \ file://autoconf-x.patch;patch=1 \ ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" -inherit autotools diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb index adac2a6e1b..370315f041 100644 --- a/packages/autoconf/autoconf_2.61.bb +++ b/packages/autoconf/autoconf_2.61.bb @@ -1,20 +1,13 @@ -DESCRIPTION = "A package of M4 macros to produce scripts to \ -automatically configure sourcecode." -LICENSE = "GPL" -HOMEPAGE = "http://www.gnu.org/software/autoconf/" -SECTION = "devel" +require autoconf.inc + DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 gnu-config" -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://program_prefix.patch;patch=1 \ - file://autoreconf-include.patch;patch=1 \ +SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://autoreconf-exclude.patch;patch=1 \ file://autoreconf-foreign.patch;patch=1 \ file://autoreconf-gnuconfigize.patch;patch=1 \ file://autoheader-nonfatal-warnings.patch;patch=1 \ ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" -inherit autotools - DEFAULT_PREFERENCE = "-1" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc new file mode 100644 index 0000000000..19ef64f0e1 --- /dev/null +++ b/packages/avahi/avahi.inc @@ -0,0 +1,66 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" +HOMEPAGE = "http://avahi.org" +SECTION = "network" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "expat libdaemon dbus" +RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_avahi-daemon = "libnss-mdns" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" + +inherit autotools pkgconfig update-rc.d + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" + +PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +# At the time the postinst runs, dbus might not be setup so only restart if running + +pkg_postinst_avahi-daemon () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep avahi /etc/group || addgroup avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + + DBUSPID=`pidof dbus-daemon` + + if [ "x$DBUSPID" != "x" ]; then + /etc/init.d/dbus-1 force-reload + fi +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb index 39ef299351..27dcdcffcb 100644 --- a/packages/avahi/avahi_0.6.10.bb +++ b/packages/avahi/avahi_0.6.10.bb @@ -1,65 +1,3 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" -PR = "r1" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d +require avahi.inc -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} +PR = "r1" diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb index 6132fda504..27dcdcffcb 100644 --- a/packages/avahi/avahi_0.6.11.bb +++ b/packages/avahi/avahi_0.6.11.bb @@ -1,65 +1,3 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" -PR="r1" +require avahi.inc -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} +PR = "r1" diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb index 97fe491577..aad7d2661c 100644 --- a/packages/avahi/avahi_0.6.12.bb +++ b/packages/avahi/avahi_0.6.12.bb @@ -1,66 +1,7 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" -PR = "r2" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d +require avahi.inc +PR = "r2" do_stage() { autotools_stage_all } - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb index a758997b4c..076dc0d148 100644 --- a/packages/avahi/avahi_0.6.13.bb +++ b/packages/avahi/avahi_0.6.13.bb @@ -1,70 +1,7 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" -PR = "r1" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d +require avahi.inc +PR = "r1" do_stage() { autotools_stage_all } - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} diff --git a/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.14.bb index 2b5d56fffd..e42f4bbc13 100644 --- a/packages/avahi/avahi_0.6.14.bb +++ b/packages/avahi/avahi_0.6.14.bb @@ -1,71 +1,8 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -SECTION = "network" -PRIORITY = "optional" -LICENSE = "GPL" +require avahi.inc -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS_avahi-daemon = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -inherit autotools pkgconfig update-rc.d - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" - -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core = "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" do_stage() { autotools_stage_all } - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} diff --git a/packages/avahi/avahi_0.6.15.bb b/packages/avahi/avahi_0.6.15.bb index 331018d23a..07a429e133 100644 --- a/packages/avahi/avahi_0.6.15.bb +++ b/packages/avahi/avahi_0.6.15.bb @@ -1,72 +1,10 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -SECTION = "network" -PRIORITY = "optional" -LICENSE = "GPL" +require avahi.inc -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS_avahi-daemon = "libnss-mdns" +SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0" -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ - file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0" - -inherit autotools pkgconfig update-rc.d - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" - -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core = "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" do_stage() { autotools_stage_all } - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb index 4e27d655b0..9189734dfa 100644 --- a/packages/avahi/avahi_0.6.5.bb +++ b/packages/avahi/avahi_0.6.5.bb @@ -1,49 +1 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -pkg_postinst_avahi-daemon () { - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - /etc/init.d/dbus-1 force-reload -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} +require avahi.inc diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb index 828ea4a39a..9189734dfa 100644 --- a/packages/avahi/avahi_0.6.8.bb +++ b/packages/avahi/avahi_0.6.8.bb @@ -1,53 +1 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -pkg_postinst_avahi-daemon () { - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - /etc/init.d/dbus-1 force-reload -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} +require avahi.inc diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb index 5140b07874..be88139319 100644 --- a/packages/avetanabt/avetanabt_20060413.bb +++ b/packages/avetanabt/avetanabt_20060413.bb @@ -34,7 +34,7 @@ do_compile() { # move classes into jar archive # jar -> fastjar ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml - + # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h # javah -> kaffeh ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ @@ -58,5 +58,5 @@ do_install() { install -d ${D}${datadir}/avetanabt install avetanaBT.jar ${D}${datadir}/avetanabt/ - + } diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb index 66ee81d99a..a5c9ce0ac7 100644 --- a/packages/avetanabt/avetanabt_cvs.bb +++ b/packages/avetanabt/avetanabt_cvs.bb @@ -37,7 +37,7 @@ do_compile() { # move classes into jar archive # jar -> fastjar ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml - + # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h # javah -> kaffeh ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ @@ -61,5 +61,5 @@ do_install() { install -d ${D}${datadir}/avetanabt install avetanaBT.jar ${D}${datadir}/avetanabt/ - + } diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index 754f140b34..0b64a3bc80 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -13,4 +13,6 @@ tmpfs /media/ram tmpfs defaults 0 0 # USB Storage /dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 +usbfs /proc/bus/usb usbf defaults 0 0 + diff --git a/packages/findutils/findutils-4.1.20/.mtn2git_empty b/packages/base-files/base-files/angstrom/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/findutils/findutils-4.1.20/.mtn2git_empty +++ b/packages/base-files/base-files/angstrom/.mtn2git_empty diff --git a/packages/base-files/base-files/angstrom/issue b/packages/base-files/base-files/angstrom/issue new file mode 100644 index 0000000000..c322134459 --- /dev/null +++ b/packages/base-files/base-files/angstrom/issue @@ -0,0 +1,2 @@ +The Angstrom Distribution \n \l + diff --git a/packages/base-files/base-files/angstrom/issue.net b/packages/base-files/base-files/angstrom/issue.net new file mode 100644 index 0000000000..554e604a6f --- /dev/null +++ b/packages/base-files/base-files/angstrom/issue.net @@ -0,0 +1,3 @@ +The Angstrom Distribution %h + + diff --git a/packages/gbluezconf/.mtn2git_empty b/packages/base-files/base-files/efika/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gbluezconf/.mtn2git_empty +++ b/packages/base-files/base-files/efika/.mtn2git_empty diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab new file mode 100644 index 0000000000..ac92724dbc --- /dev/null +++ b/packages/base-files/base-files/efika/fstab @@ -0,0 +1,5 @@ +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbfs /proc/bus/usb usbfs auto 0 0 +tmpfs /var tmpfs defaults 0 0 diff --git a/packages/gcc/gcc-4.1-20060217/.mtn2git_empty b/packages/base-files/base-files/ep93xx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gcc/gcc-4.1-20060217/.mtn2git_empty +++ b/packages/base-files/base-files/ep93xx/.mtn2git_empty diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab new file mode 100644 index 0000000000..ac92724dbc --- /dev/null +++ b/packages/base-files/base-files/ep93xx/fstab @@ -0,0 +1,5 @@ +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbfs /proc/bus/usb usbfs auto 0 0 +tmpfs /var tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 8bfb08720f..00d0072a41 100644 --- a/packages/base-files/base-files/fstab +++ b/packages/base-files/base-files/fstab @@ -3,7 +3,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 tmpfs /var tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab index b776dc0641..21b2bb1360 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -1,12 +1,10 @@ -# stock fstab - you probably want to override this with a machine specific one - rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -#usbfs /proc/bus/usb usbfs noauto 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 tmpfs /var tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab index d10c78bd66..ac92724dbc 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -1,5 +1,5 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +usbfs /proc/bus/usb usbfs auto 0 0 tmpfs /var tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index 68b56b63e3..40823df5fa 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -3,4 +3,4 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 tmpfs /var tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 proc /proc proc defaults 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index 3d0e508dfd..a1fb3d4da1 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -19,7 +19,7 @@ tmpfs /media/ram tmpfs defaults 0 0 # /dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs noauto 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 # # Harddisk diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index fb37e07aec..4a784180ca 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -6,6 +6,8 @@ proc /proc proc defaults 0 0 tmpfs /var tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 +usbfs /proc/bus/usb usbfs auto 0 0 + # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index c5cc234f7d..63e041bf62 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 = "r55" +PR = "r57" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb index 6fcb211bda..051b8d6a3f 100644 --- a/packages/base-passwd/base-passwd_3.5.9.bb +++ b/packages/base-passwd/base-passwd_3.5.9.bb @@ -51,7 +51,7 @@ pkg_postinst () { if [ ! -e $D${sysconfdir}/passwd ] ; then cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd fi - + if [ ! -e $D${sysconfdir}/group ] ; then cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group fi diff --git a/packages/beepmp/beepmp_0.9.7.bb b/packages/beepmp/beepmp_0.9.7.bb index c02c2f8675..e83237a18b 100644 --- a/packages/beepmp/beepmp_0.9.7.bb +++ b/packages/beepmp/beepmp_0.9.7.bb @@ -17,10 +17,10 @@ S = "${WORKDIR}/bmp-0.9.7" FILES_${PN} += " ${libdir}/bmp/Output/*.so ${libdir}/bmp/Input/*.so \ ${libdir}/bmp/Visualization/*.so ${datadir}/bmp" - + EXTRA_OECONF = "--disable-esd --disable-alsa --enable-simd" do_configure() { rm -rf m4/libtool.m4 - autotools_do_configure + autotools_do_configure } diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb index 34b79ec1e9..3e7502fa67 100644 --- a/packages/billiardz/billiardz_0.1.4.bb +++ b/packages/billiardz/billiardz_0.1.4.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \ inherit palmtop QMAKE_PROFILES = "billiardz.arm.pro" -EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL" +EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL" do_install() { install -d ${D}${palmtopdir}/bin \ diff --git a/packages/gnome/gnome-vfs-dbus/.mtn2git_empty b/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnome/gnome-vfs-dbus/.mtn2git_empty +++ b/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty diff --git a/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch new file mode 100644 index 0000000000..be85ceb109 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch @@ -0,0 +1,24 @@ +diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure +--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300 +@@ -1299,7 +1299,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; +diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in +--- binutils-2.16.91.0.7.orig/configure.in 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure.in 2006-05-31 14:55:53.000000000 +0300 +@@ -497,7 +497,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch new file mode 100644 index 0000000000..4461bedd4e --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch @@ -0,0 +1,31 @@ +# strip (and objcopy) fail to set the error code if there is no +# output file name and the rename of the stripped (or copied) file +# fails, yet the command fails to do anything. This fixes both +# objcopy and strip. +# +# modification by bero: Ported to 2.16.91.0.6 +# +#Signed-off-by: John Bowler <jbowler@acm.org> +#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> +--- binutils-2.16.91.0.6/binutils/objcopy.c.ark 2006-03-11 15:59:07.000000000 +0100 ++++ binutils-2.16.91.0.6/binutils/objcopy.c 2006-03-11 15:59:45.000000000 +0100 +@@ -2593,7 +2593,8 @@ + if (preserve_dates) + set_times (tmpname, &statbuf); + if (output_file == NULL) +- smart_rename (tmpname, argv[i], preserve_dates); ++ if(smart_rename (tmpname, argv[i], preserve_dates)) ++ hold_status = 1; + status = hold_status; + } + else +@@ -3184,7 +3185,8 @@ + { + if (preserve_dates) + set_times (tmpname, &statbuf); +- smart_rename (tmpname, input_filename, preserve_dates); ++ if (smart_rename (tmpname, input_filename, preserve_dates)) ++ status = 1; + } + else + unlink (tmpname); diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch new file mode 100644 index 0000000000..25222e5df2 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch @@ -0,0 +1,139 @@ +--- binutils-2.16.91.0.7/bfd/configure ++++ binutils-2.16.91.0.7/bfd/configure +@@ -3576,7 +3576,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/binutils/configure ++++ binutils-2.16.91.0.7/binutils/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/configure ++++ binutils-2.16.91.0.7/configure +@@ -1270,7 +1270,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -1578,7 +1578,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[3456789]86-*-vsta) ;; # don't add gprof back in + i[3456789]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/configure.in ++++ binutils-2.16.91.0.7/configure.in +@@ -468,7 +468,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -776,7 +776,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[[3456789]]86-*-vsta) ;; # don't add gprof back in + i[[3456789]]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/gas/configure ++++ binutils-2.16.91.0.7/gas/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/gprof/configure ++++ binutils-2.16.91.0.7/gprof/configure +@@ -3419,6 +3419,11 @@ + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++ + netbsd* | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' +--- binutils-2.16.91.0.7/ld/configure ++++ binutils-2.16.91.0.7/ld/configure +@@ -3413,7 +3413,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/libtool.m4 ++++ binutils-2.16.91.0.7/libtool.m4 +@@ -739,7 +739,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/ltconfig ++++ binutils-2.16.91.0.7/ltconfig +@@ -602,6 +602,7 @@ + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in ++linux-uclibc*) ;; + linux-gnu*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac +@@ -1247,7 +1248,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + version_type=linux + need_lib_prefix=no + need_version=no +--- binutils-2.16.91.0.7/opcodes/configure ++++ binutils-2.16.91.0.7/opcodes/configure +@@ -3579,7 +3579,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..04a7e61e25 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch @@ -0,0 +1,50 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis <chris@debian.org> +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- binutils-2.16.91.0.1/ld/Makefile.am ++++ binutils-2.16.91.0.1/ld/Makefile.am +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- binutils-2.16.91.0.1/ld/Makefile.in ++++ binutils-2.16.91.0.1/ld/Makefile.in +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch new file mode 100644 index 0000000000..f337611edf --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Specify which filename is causing an error if the filename is a +## DP: directory. (#45832) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 ++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 +@@ -150,6 +150,13 @@ + { + bfd *nbfd; + const bfd_target *target_vec; ++ struct stat s; ++ ++ if (stat (filename, &s) == 0) ++ if (S_ISDIR(s.st_mode)) { ++ bfd_set_error (bfd_error_file_not_recognized); ++ return NULL; ++ } + + nbfd = _bfd_new_bfd (); + if (nbfd == NULL) diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..498651a90c --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch @@ -0,0 +1,47 @@ +#!/bin/sh -e +## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for +## DP: cases where -rpath isn't specified. (#151024) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em +--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 ++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 +@@ -692,6 +692,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -871,6 +873,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, 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 9161a520ff..7d3bb6c09c 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 @@ -12,7 +12,7 @@ do_stage() { do_install () { autotools_do_install - + # Install the libiberty header install -d ${D}${includedir} install -m 644 ${S}/include/ansidecl.h ${D}${includedir} 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 9161a520ff..7d3bb6c09c 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 @@ -12,7 +12,7 @@ do_stage() { do_install () { autotools_do_install - + # Install the libiberty header install -d ${D}${includedir} install -m 644 ${S}/include/ansidecl.h ${D}${includedir} diff --git a/packages/binutils/binutils-cross_2.17.50.0.8.bb b/packages/binutils/binutils-cross_2.17.50.0.8.bb new file mode 100644 index 0000000000..1f2f43ecf8 --- /dev/null +++ b/packages/binutils/binutils-cross_2.17.50.0.8.bb @@ -0,0 +1,32 @@ +SECTION = "devel" +require binutils_${PV}.bb +inherit cross +DEPENDS += "flex-native bison-native" +PROVIDES = "virtual/${TARGET_PREFIX}binutils" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" +PACKAGES = "" +EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ + --program-prefix=${TARGET_PREFIX}" + +do_stage () { + oe_runmake install + + # We don't really need these, so we'll remove them... + rm -rf ${CROSS_DIR}/lib/ldscripts + rm -rf ${CROSS_DIR}/share/info + rm -rf ${CROSS_DIR}/share/locale + rm -rf ${CROSS_DIR}/share/man + rmdir ${CROSS_DIR}/share || : + rmdir ${CROSS_DIR}/${libdir}/gcc-lib || : + rmdir ${CROSS_DIR}/${libdir} || : + rmdir ${CROSS_DIR}/${prefix} || : + + # We want to move this into the target specific location + mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib + mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib + rmdir ${CROSS_DIR}/lib || : +} + +do_install () { + : +} diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 02ad406170..007089761d 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -1,6 +1,11 @@ +DESCRIPTION = "A GNU collection of binary utilities" +HOMEPAGE = "http://www.gnu.org/software/binutils/" +SECTION = "devel" +LICENSE = "GPL" + inherit autotools gettext -PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" +PACKAGES += "${PN}-symlinks" FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ @@ -28,6 +33,9 @@ FILES_${PN}-symlinks = " \ ${bindir}/size \ ${bindir}/strip" +S = "${WORKDIR}/binutils-${PV}" +B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" + EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index c56f227d58..a03f355379 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -1,7 +1,3 @@ -DESCRIPTION = "A GNU collection of binary utilities" -HOMEPAGE = "http://www.gnu.org/software/binutils/" -SECTION = "devel" -LICENSE = "GPL" PR = "r7" SRC_URI = \ @@ -19,7 +15,4 @@ SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1" -S = "${WORKDIR}/binutils-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - require binutils.inc diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb index 87a333b035..dc73dc6909 100644 --- a/packages/binutils/binutils_2.17.50.0.5.bb +++ b/packages/binutils/binutils_2.17.50.0.5.bb @@ -1,39 +1,6 @@ -DESCRIPTION = "A GNU collection of binary utilities" -HOMEPAGE = "http://www.gnu.org/software/binutils/" -SECTION = "devel" -LICENSE = "GPL" +require binutils.inc -inherit autotools gettext - -PACKAGES += "${PN}-symlinks" - -FILES_${PN} = " \ - ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ - ${prefix}/${TARGET_SYS}/bin/*" - -FILES_${PN}-dev = " \ - ${includedir} \ - ${libdir}/*.a \ - ${libdir}/*.la \ - ${libdir}/libbfd.so \ - ${libdir}/libopcodes.so" - -FILES_${PN}-symlinks = " \ - ${bindir}/addr2line \ - ${bindir}/ar \ - ${bindir}/as \ - ${bindir}/c++filt \ - ${bindir}/gprof \ - ${bindir}/ld \ - ${bindir}/nm \ - ${bindir}/objcopy \ - ${bindir}/objdump \ - ${bindir}/ranlib \ - ${bindir}/readelf \ - ${bindir}/size \ - ${bindir}/strings \ - ${bindir}/strip" +PR = "r1" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ @@ -43,88 +10,4 @@ SRC_URI = \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ - " - -S = "${WORKDIR}/binutils-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - -EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ - --enable-shared" - -# This is necessary due to a bug in the binutils Makefiles -EXTRA_OEMAKE = "configure-build-libiberty all" - -export AR = "${HOST_PREFIX}ar" -export AS = "${HOST_PREFIX}as" -export LD = "${HOST_PREFIX}ld" -export NM = "${HOST_PREFIX}nm" -export RANLIB = "${HOST_PREFIX}ranlib" -export OBJCOPY = "${HOST_PREFIX}objcopy" -export OBJDUMP = "${HOST_PREFIX}objdump" - -export AR_FOR_TARGET = "${TARGET_PREFIX}ar" -export AS_FOR_TARGET = "${TARGET_PREFIX}as" -export LD_FOR_TARGET = "${TARGET_PREFIX}ld" -export NM_FOR_TARGET = "${TARGET_PREFIX}nm" -export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" - -export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" - -export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" - -do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" - oe_runconf -# -# must prime config.cache to ensure the build of libiberty -# - mkdir -p ${B}/build-${BUILD_SYS} - for i in ${CONFIG_SITE}; do - cat $i >> ${B}/build-${BUILD_SYS}/config.cache - done - -} - -do_stage () { - oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/ - oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/ - oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/ - install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/ - install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/ -} - -do_install () { - autotools_do_install - - # We don't really need these, so we'll remove them... - rm -rf ${D}${libdir}/ldscripts - - # Fix the /usr/${TARGET_SYS}/bin/* links - for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do - rm -f $l - ln -sf `echo ${prefix}/${TARGET_SYS}/bin \ - | tr -s / \ - | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l - done - - # Install the libiberty header - install -d ${D}${includedir} - install -m 644 ${S}/include/ansidecl.h ${D}${includedir} - install -m 644 ${S}/include/libiberty.h ${D}${includedir} - - cd ${D}${bindir} - - # Symlinks for ease of running these on the native target - for p in ${TARGET_SYS}-* ; do - ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` - done -} + " diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb new file mode 100644 index 0000000000..f832d97cd1 --- /dev/null +++ b/packages/binutils/binutils_2.17.50.0.8.bb @@ -0,0 +1,12 @@ +require binutils.inc + + +SRC_URI = \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ + file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ + file://110-arm-eabi-conf.patch;patch=1 \ + file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ + file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ + file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ + " diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb index d9e167f051..9610634959 100644 --- a/packages/binutils/binutils_2.17.bb +++ b/packages/binutils/binutils_2.17.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "A GNU collection of binary utilities" -HOMEPAGE = "http://www.gnu.org/software/binutils/" -SECTION = "devel" -LICENSE = "GPL" +require binutils.inc + PR = "r0" SRC_URI = \ @@ -24,9 +22,3 @@ SRC_URI += "\ # Zecke's OSX fixes SRC_URI += " file://warning-free.patch;patch=1 " - - -S = "${WORKDIR}/binutils-${PV}" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - -require binutils.inc diff --git a/packages/bitbake/bitbake-package.inc b/packages/bitbake/bitbake-package.inc deleted file mode 100644 index fa1e76b392..0000000000 --- a/packages/bitbake/bitbake-package.inc +++ /dev/null @@ -1 +0,0 @@ -FILES_${PN} += "${datadir}/bitbake" diff --git a/packages/bitbake/bitbake.inc b/packages/bitbake/bitbake.inc index 1c5c7ad2a6..2c5f523d4f 100644 --- a/packages/bitbake/bitbake.inc +++ b/packages/bitbake/bitbake.inc @@ -9,3 +9,14 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/" LICENSE = "GPL MIT" SECTION = "devel" SUMMARY = "BitBake build tool" +RDEPENDS += "python-shell python-lang python-textutils python-pickle python-crypt python-netclient" + +# crypt for md5 +# netclient for tinderclient.bbclass + +# We don't need a toolchain... +INHIBIT_DEFAULT_DEPS = "1" + +inherit distutils + +FILES_${PN} += "${datadir}/bitbake" diff --git a/packages/bitbake/bitbake_1.6.2.bb b/packages/bitbake/bitbake_1.6.2.bb index f0fdfb9e76..6a6fffcfef 100644 --- a/packages/bitbake/bitbake_1.6.2.bb +++ b/packages/bitbake/bitbake_1.6.2.bb @@ -1,16 +1,7 @@ require bitbake.inc -PR = "r0" - -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" +PR = "r1" SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz" S = "${WORKDIR}/bitbake-${PV}" - -inherit distutils - -require bitbake-package.inc - -RDEPENDS += "python-shell python-lang python-textutils python-pickle" diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb index d43d03b0f3..d16471d405 100644 --- a/packages/bitbake/bitbake_svn.bb +++ b/packages/bitbake/bitbake_svn.bb @@ -1,16 +1,11 @@ require bitbake.inc +PV = "1.7.2+svn${SRCDATE}" +PR = "r1" + # Don't use the tip of svn by default DEFAULT_PREFERENCE = "-1" -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" - -PV = "1.7.0+svn${SRCDATE}" SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake" -# SRC_URI = "svn+ssh://svn.berlios.de/bitbake/trunk;module=bitbake" -S = "${WORKDIR}/bitbake" -inherit distutils - -require bitbake-package.inc +S = "${WORKDIR}/bitbake" diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb index 11d338bb6e..2072ea10e5 100644 --- a/packages/bl/bl_cvs.bb +++ b/packages/bl/bl_cvs.bb @@ -7,7 +7,7 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \ file://nokernelheader.patch;patch=1;pnum=0 \ file://zaurus-hinge.bl-on \ file://zaurus-hinge.bl-off" - + S = "${WORKDIR}/h3600_test" PR = "r1" @@ -24,17 +24,17 @@ do_compile (){ } do_install () { - install -d ${D}${bindir} + install -d ${D}${bindir} install -d ${D}/etc/apm/resume.d install -d ${D}/etc/zaurusd/hinge-close.d - install -d ${D}/etc/zaurusd/hinge-portrait.d - install -d ${D}/etc/zaurusd/hinge-landscape.d + install -d ${D}/etc/zaurusd/hinge-portrait.d + install -d ${D}/etc/zaurusd/hinge-landscape.d install -m 4755 ${S}/bl ${D}${bindir}/bl - - install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/apm/resume.d/00-backlight-on" - install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-landscape.d/00-backlight-on" - install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on" - install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off" - -} + + install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/apm/resume.d/00-backlight-on" + install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-landscape.d/00-backlight-on" + install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on" + install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off" + +} diff --git a/packages/blueprobe/blueprobe.inc b/packages/blueprobe/blueprobe.inc new file mode 100644 index 0000000000..f619f7336c --- /dev/null +++ b/packages/blueprobe/blueprobe.inc @@ -0,0 +1,3 @@ +SECTION = "base" +LICENSE = "GPL" +inherit gpe diff --git a/packages/blueprobe/blueprobe_0.13.bb b/packages/blueprobe/blueprobe_0.13.bb index e54d2ed066..50ea03e854 100644 --- a/packages/blueprobe/blueprobe_0.13.bb +++ b/packages/blueprobe/blueprobe_0.13.bb @@ -1,4 +1 @@ -SECTION = "base" -LICENSE = "GPL" -inherit gpe - +require blueprobe.inc diff --git a/packages/blueprobe/blueprobe_0.14.bb b/packages/blueprobe/blueprobe_0.14.bb index e54d2ed066..50ea03e854 100644 --- a/packages/blueprobe/blueprobe_0.14.bb +++ b/packages/blueprobe/blueprobe_0.14.bb @@ -1,4 +1 @@ -SECTION = "base" -LICENSE = "GPL" -inherit gpe - +require blueprobe.inc diff --git a/packages/blueprobe/blueprobe_0.15.bb b/packages/blueprobe/blueprobe_0.15.bb index 282387707a..e39407cc16 100644 --- a/packages/blueprobe/blueprobe_0.15.bb +++ b/packages/blueprobe/blueprobe_0.15.bb @@ -1,6 +1,4 @@ -SECTION = "base" -LICENSE = "GPL" -inherit gpe +require blueprobe.inc PR = "r2" diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb index 7ec102d0eb..db190332e7 100644 --- a/packages/blueprobe/blueprobe_0.16.bb +++ b/packages/blueprobe/blueprobe_0.16.bb @@ -1,6 +1,4 @@ -SECTION = "base" -LICENSE = "GPL" -inherit gpe +require blueprobe.inc PR = "r1" diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb index f367e43698..ffd83b66ae 100644 --- a/packages/blueprobe/blueprobe_0.17.bb +++ b/packages/blueprobe/blueprobe_0.17.bb @@ -1,6 +1,4 @@ -SECTION = "base" -LICENSE = "GPL" -inherit gpe +require blueprobe.inc PR = "r2" diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index 4c709e6842..0a72d360d6 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -93,7 +93,7 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" # it. The problem is that the user.hpp configuration file must receive a # pre-processor macro defined as the appropriate string - complete with "'s # around it. (<> is a possibility here but the danger to that is that the -# failure case interprets the < and > as shell redirections, creating +# failure case interprets the < and > as shell redirections, creating # random files in the source tree.) # #bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb new file mode 100644 index 0000000000..4de97661d3 --- /dev/null +++ b/packages/boost/boost_1.33.1.bb @@ -0,0 +1,153 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +DEPENDS = "boost-jam-native zlib" +PRIORITY = "optional" +LICENSE = "Boost Software License" +PR = "r0" + +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" +SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" +#SRC_URI += "file://unit_test_log10f.patch;patch=1" +SRC_URI += "file://linux-uclibc.patch;patch=1" + +S = "${WORKDIR}/${BOOST_P}" + +# Make a package for each library, plus -dev and -python +PACKAGES = + +PACKAGES += "boost-date-time" +FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" + +PACKAGES += "boost-filesystem" +FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" + +PACKAGES += "boost-prg-exec-monitor" +FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" + +PACKAGES += "boost-program-options" +FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" + +PACKAGES += "boost-regex" +FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" + +PACKAGES += "boost-signals" +FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" + +PACKAGES += "boost-test-exec-monitor" +FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" + +PACKAGES += "boost-thread-mt" +FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" + +PACKAGES += "boost-unit-test-framework" +FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" + +PACKAGES += "boost-iostreams" +FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" + +PACKAGES += "boost-serialization" +FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" + +PACKAGES += "boost-wserialization" +FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" + +# Python - remove this and set: +#PYTHON_ROOT = "/dev/null" +# to remove the python build +DEPENDS += "python" +PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}" +PYTHON_VERSION = "2.4" + +PACKAGES += "boost-python" +FILES_boost-python = "${libdir}/libboost_python.so.${PV}" + +# -dev last to pick up the remaining stuff +PACKAGES += "${PN}-dev" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# Oh yippee, a new build system, it's sooo cooool I could eat my own +# foot. inlining=on lets the compiler choose, I think. At least this +# stuff is documented... +# NOTE: if you leave <debug-symbols>on then in a debug build the build sys +# objcopy will be invoked, and that won't work. Building debug apparently +# requires hacking gcc-tools.jam +# +# Sometimes I wake up screaming. Famous figures are gathered in the nightmare, +# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just +# standing there, waiting, but the truely terrifying thing is what they carry +# in their hands. At first sight each seems to bear the same thing, but it is +# not so for the forms in their grasp are ever so slightly different one from +# the other. Each is twisted in some grotesque way from the other to make each +# an unspeakable perversion impossible to perceive without the onset of madness. +# True insanity awaits anyone who perceives all of these horrors together. +# +# Quotation marks, there might be an easier way to do this, but I can't find +# it. The problem is that the user.hpp configuration file must receive a +# pre-processor macro defined as the appropriate string - complete with "'s +# around it. (<> is a possibility here but the danger to that is that the +# failure case interprets the < and > as shell redirections, creating +# random files in the source tree.) +# +#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' +#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'" +SQD = '"' +EQD = '\"' +#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." +BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" + +# bzip2 and zip are disabled because... they're broken - the compilation simply +# isn't working with bjam. I guess they will fix it, but who needs it? This +# only affects the (new in 33) iostream library. +BJAM_TOOLS = "-sTOOLS=gcc \ + '-sGCC=${CC} '${BJAM_CONF} \ + '-sGXX=${CXX} '${BJAM_CONF} \ + '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ + '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ + '-sNO_BZIP2=1' \ + '-sNO_ZLIB=1' \ + '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ + '-sPYTHON_VERSION=${PYTHON_VERSION}' \ + '--layout=system' \ + " + +BJAM_OPTS = '${BJAM_TOOLS} \ + --builddir=${S}/${TARGET_SYS} \ + --with-python-root=${PYTHON_ROOT} \ + ${BJAM_EXTRA}' + + +do_configure_prepend() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp +} + +do_compile() { + set -ex + bjam ${BJAM_OPTS} --prefix=${prefix} \ + --exec-prefix=${exec_prefix} \ + --libdir=${libdir} \ + --includedir=${includedir} +} + +do_stage() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} \ + install +} + +do_install() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${D}${libdir} \ + --includedir=${D}${includedir} \ + install +} diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb index 44fd3f45fa..98ff0c204d 100644 --- a/packages/bootchart/bootchart_0.9.bb +++ b/packages/bootchart/bootchart_0.9.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" HOMEPAGE = "http://www.bootchart.org/" PR = "r1" -#this only installs the loggers, you will need to run the renderers on your workstation +#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 @@ -16,7 +16,7 @@ PACKAGE_ARCH = "all" SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\ file://handheld.patch;patch=1" - + do_install() { install -d ${D}/sbin install -d ${D}/etc diff --git a/packages/btsco/btsco-module.inc b/packages/btsco/btsco-module.inc new file mode 100644 index 0000000000..5c38fb1719 --- /dev/null +++ b/packages/btsco/btsco-module.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Bluetooth-alsa headset module" +SECTION = "kernel/modules" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +DEPENDS = "alsa-lib bluez-libs" + +inherit module + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz \ + file://makefile.patch;patch=1" + +S = "${WORKDIR}/btsco-${PV}/kernel" + +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +do_install() { + install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ +} diff --git a/packages/btsco/btsco-module_0.41.bb b/packages/btsco/btsco-module_0.41.bb index 4122bf86c4..46f647998b 100644 --- a/packages/btsco/btsco-module_0.41.bb +++ b/packages/btsco/btsco-module_0.41.bb @@ -1,20 +1,3 @@ -DESCRIPTION = "Bluetooth-alsa headset module" -SECTION = "kernel/modules" -HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" -LICENSE = "GPL" -DEPENDS = "alsa-lib bluez-libs" -PR = "r1" - -inherit module - -SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz \ - file://makefile.patch;patch=1" +require btsco-module.inc -S = "${WORKDIR}/btsco-${PV}/kernel" - -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" - -do_install() { - install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ -} +PR = "r1" diff --git a/packages/btsco/btsco-module_0.42.bb b/packages/btsco/btsco-module_0.42.bb index 68c13a33d0..85b7790342 100644 --- a/packages/btsco/btsco-module_0.42.bb +++ b/packages/btsco/btsco-module_0.42.bb @@ -1,20 +1 @@ -DESCRIPTION = "Bluetooth-alsa headset module" -SECTION = "kernel/modules" -HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" -LICENSE = "GPL" -DEPENDS = "alsa-lib bluez-libs" -PR = "r0" - -inherit module - -SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz \ - file://makefile.patch;patch=1" - -S = "${WORKDIR}/btsco-${PV}/kernel" - -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" - -do_install() { - install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ -} +require btsco-module.inc diff --git a/packages/btsco/btsco.inc b/packages/btsco/btsco.inc new file mode 100644 index 0000000000..32009b9a26 --- /dev/null +++ b/packages/btsco/btsco.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Bluetooth-alsa headset tool" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +DEPENDS = "alsa-lib bluez-libs" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" + +CFLAGS += " -I${STAGING_INCDIR} " diff --git a/packages/btsco/btsco_0.41.bb b/packages/btsco/btsco_0.41.bb index 04c8ae16ff..46c388a83f 100644 --- a/packages/btsco/btsco_0.41.bb +++ b/packages/btsco/btsco_0.41.bb @@ -1,11 +1,3 @@ -DESCRIPTION = "Bluetooth-alsa headset tool" -HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" -LICENSE = "GPL" -DEPENDS = "alsa-lib bluez-libs" -PR = "r2" - -inherit autotools pkgconfig +require btsco.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz" - -S = "${WORKDIR}/${PN}-${PV}" +PR = "r2" diff --git a/packages/btsco/btsco_0.42.bb b/packages/btsco/btsco_0.42.bb index a4dd11b197..3fa6b0636b 100644 --- a/packages/btsco/btsco_0.42.bb +++ b/packages/btsco/btsco_0.42.bb @@ -1,21 +1,9 @@ -DESCRIPTION = "Bluetooth-alsa headset tool" -HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" -LICENSE = "GPL" -DEPENDS = "alsa-lib bluez-libs" -PR = "r0" - -inherit autotools pkgconfig - -SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz" - -S = "${WORKDIR}/${PN}-${PV}" - -CFLAGS += " -I${STAGING_INCDIR} " +require btsco.inc #there are some bogus macros putting -I/usr/include into C(PP)FLAGS, lets fix that do_configure() { libtoolize --force - gnu-configize + gnu-configize sed -i 's:-I${bluez_prefix}/include::g' configure oe_runconf -} +} diff --git a/packages/busybox/busybox-1.2.1/df_rootfs.patch b/packages/busybox/busybox-1.2.1/df_rootfs.patch new file mode 100644 index 0000000000..486318a2cf --- /dev/null +++ b/packages/busybox/busybox-1.2.1/df_rootfs.patch @@ -0,0 +1,34 @@ +--- busybox-1.2.1/coreutils/df.c.orig 2006-11-11 13:25:00.000000000 -0600 ++++ busybox-1.2.1/coreutils/df.c 2006-11-11 13:23:15.000000000 -0600 +@@ -47,6 +47,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_opt_complementally = "h-km:k-hm:m-hk"; +@@ -112,16 +113,19 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ +- if ((device = find_block_device("/")) == NULL) { ++ if ((device = find_block_device(mount_point)) == NULL) { + goto SET_ERROR; + } + } + ++ if (strcmp(mount_point, "/") == 0) { ++ if (root_done) continue; ++ root_done = 1; ++ } ++ + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_printf("%-20s %9s ", device, + make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc new file mode 100644 index 0000000000..37a9676257 --- /dev/null +++ b/packages/busybox/busybox.inc @@ -0,0 +1,64 @@ +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" + +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://dhcp-hostname.patch;patch=1 \ + file://hwclock.sh \ + file://ifupdown-spurious-environ.patch;patch=1 \ + file://mount.busybox \ + file://syslog \ + file://syslog.conf \ + file://udhcpscript.patch;patch=1 \ + file://umount.busybox" + +SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" + +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_compile () { + unset CFLAGS + base_do_compile +} + +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 +} diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 296c4e080e..073a561e22 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -1,85 +1,36 @@ -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" +require busybox.inc + PR = "r37" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://add-getkey-applet.patch;patch=1 \ - file://udhcpscript.patch;patch=1 \ - file://dhcpretrytime.patch;patch=1 \ - file://hdparm_M.patch;patch=1 \ - file://udhcppidfile.patch;patch=1 \ - file://udhcppidfile-breakage.patch;patch=1 \ - file://readlink.patch;patch=1 \ - file://iproute-flush-cache.patch;patch=1;pnum=0 \ - file://rmmod.patch;patch=1 \ - file://df.patch;patch=1 \ - file://below.patch;patch=1 \ - file://fbset.patch;patch=1 \ - file://mount-all-type.patch;patch=1 \ - file://dhcp-hostname.patch;patch=1 \ - file://gzip-spurious-const.patch;patch=1 \ - file://ifupdown-spurious-environ.patch;patch=1 \ - file://uclibc_posix.patch;patch=1 \ - file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0 \ - file://unzip-endian-fixes.patch;patch=1;pnum=0 \ - file://start-stop-daemon-oknodo-support.patch;patch=1 \ +SRC_URI += "file://add-getkey-applet.patch;patch=1 \ + file://below.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" + file://df.patch;patch=1 \ + file://dhcpretrytime.patch;patch=1 \ + file://fbset.patch;patch=1 \ + file://gzip-spurious-const.patch;patch=1 \ + file://hdparm_M.patch;patch=1 \ + file://iproute-flush-cache.patch;patch=1;pnum=0 \ + file://mount-all-type.patch;patch=1 \ + file://readlink.patch;patch=1 \ + file://rmmod.patch;patch=1 \ + file://start-stop-daemon-oknodo-support.patch;patch=1 \ + file://uclibc_posix.patch;patch=1 \ + file://udhcppidfile-breakage.patch;patch=1 \ + file://udhcppidfile.patch;patch=1 \ + file://unzip-endian-fixes.patch;patch=1;pnum=0 \ + file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0" -SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" SRC_URI_append_mtx-1 = " file://linux-types.patch;patch=1" SRC_URI_append_mtx-2 = " file://linux-types.patch;patch=1" S = "${WORKDIR}/busybox-${PV}" -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 slugos (see slugos-init) -INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." - -inherit cml1 update-rc.d - do_configure () { install -m 0644 ${WORKDIR}/defconfig ${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 @@ -95,36 +46,36 @@ do_install () { 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 + 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 + 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_UDHCPD=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_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 + 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_UDHCPC=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_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}/ @@ -138,17 +89,6 @@ do_install () { 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 diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index 9c8b7e60c3..22e7e064a5 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -1,81 +1,32 @@ -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" +require busybox.inc + PR = "r12" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://udhcppidfile.patch;patch=1 \ - file://udhcppidfile-breakage.patch;patch=1 \ - file://add-getkey-applet.patch;patch=1 \ - file://below.patch;patch=1 \ - file://dhcp-hostname.patch;patch=1 \ - file://dhcpretrytime.patch;patch=1 \ - file://fbset.patch;patch=1 \ - file://hdparm_M.patch;patch=1 \ - file://ifupdown-spurious-environ.patch;patch=1 \ - file://iproute-flush-cache.patch;patch=1;pnum=0 \ - file://mount-all-type.patch;patch=1 \ - file://readlink.patch;patch=1 \ - file://rmmod.patch;patch=1 \ - file://udhcpscript.patch;patch=1 \ - file://thumb-bsdlabel.patch;patch=1 \ - file://glibc2.4-icmp6.patch;patch=1 \ - file://uclibc_posix.patch;patch=1 \ +SRC_URI += "file://add-getkey-applet.patch;patch=1 \ + file://below.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" + file://dhcpretrytime.patch;patch=1 \ + file://fbset.patch;patch=1 \ + file://glibc2.4-icmp6.patch;patch=1 \ + file://hdparm_M.patch;patch=1 \ + file://iproute-flush-cache.patch;patch=1;pnum=0 \ + file://mount-all-type.patch;patch=1 \ + file://readlink.patch;patch=1 \ + file://rmmod.patch;patch=1 \ + file://thumb-bsdlabel.patch;patch=1 \ + file://uclibc_posix.patch;patch=1 \ + file://udhcppidfile-breakage.patch;patch=1 \ + file://udhcppidfile.patch;patch=1" SRC_URI_append_slugos += " file://sysctl.conf " -SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" S = "${WORKDIR}/busybox-${PV}" -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 slugos (see slugos-init) -INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." - -inherit cml1 update-rc.d - do_configure () { install -m 0644 ${WORKDIR}/defconfig ${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 @@ -91,36 +42,36 @@ do_install () { 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 + 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 + 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_UDHCPD=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_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 + 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_UDHCPC=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_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}/ @@ -138,17 +89,6 @@ do_install_append_slugos() { install -m 0644 ${WORKDIR}/sysctl.conf ${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 diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb index d537406d08..db8dd68c01 100644 --- a/packages/busybox/busybox_1.2.0.bb +++ b/packages/busybox/busybox_1.2.0.bb @@ -1,63 +1,11 @@ -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" +require busybox.inc + PR = "r1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ -# file://udhcppidfile.patch;patch=1 \ -# file://udhcppidfile-breakage.patch;patch=1 \ -# file://below.patch;patch=1 \ - file://dhcp-hostname.patch;patch=1 \ -# file://fbset.patch;patch=1 \ -# file://hdparm_M.patch;patch=1 \ - file://ifupdown-spurious-environ.patch;patch=1 \ -# file://mount-all-type.patch;patch=1 \ -# file://rmmod.patch;patch=1 \ - file://udhcpscript.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" - -SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" +SRC_URI += "file://defconfig" S = "${WORKDIR}/busybox-1.2.0" -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 @@ -70,11 +18,6 @@ do_configure () { cml1_do_configure } -do_compile () { - unset CFLAGS - base_do_compile -} - do_install () { install -d ${D}${sysconfdir}/init.d oe_runmake "PREFIX=${D}" install @@ -93,36 +36,36 @@ do_install () { 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 + 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 + 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 + 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 + 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 + 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}/ @@ -136,17 +79,6 @@ do_install () { 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 diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 9893a17285..d7d28ffeb2 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,54 +1,10 @@ -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 = "r9" - -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" - -SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" - -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 +require busybox.inc + +PR = "r10" + +SRC_URI += "file://wget-long-options.patch;patch=1 \ + file://df_rootfs.patch;patch=1 \ + file://defconfig" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe @@ -62,11 +18,6 @@ do_configure () { cml1_do_configure } -do_compile () { - unset CFLAGS - base_do_compile -} - do_install () { install -d ${D}${sysconfdir}/init.d oe_runmake "PREFIX=${D}" install @@ -85,36 +36,36 @@ do_install () { 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 + 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 + 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 + 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 + 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 + 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}/ @@ -128,17 +79,6 @@ do_install () { 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 diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index 706e7ca3b5..59aa5f07fc 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,56 +1,9 @@ -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 = "r0" +require busybox.inc DEFAULT_PREFERENCE = "-1" -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" - -SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" - -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 +SRC_URI = "file://wget-long-options.patch;patch=1 \ + file://defconfig" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe @@ -64,11 +17,6 @@ do_configure () { cml1_do_configure } -do_compile () { - unset CFLAGS - base_do_compile -} - do_install () { install -d ${D}${sysconfdir}/init.d oe_runmake "PREFIX=${D}" install @@ -87,36 +35,36 @@ do_install () { 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 + 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 + 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 + 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 + 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 + 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}/ @@ -130,17 +78,6 @@ do_install () { 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 diff --git a/packages/gstreamer/gst-plugins-0.8.4/.mtn2git_empty b/packages/busybox/slingbox-1.3.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gst-plugins-0.8.4/.mtn2git_empty +++ b/packages/busybox/slingbox-1.3.1/.mtn2git_empty diff --git a/packages/busybox/slingbox-1.3.1/defconfig b/packages/busybox/slingbox-1.3.1/defconfig new file mode 100644 index 0000000000..7e1f0787cf --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/defconfig @@ -0,0 +1,675 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 1.3.1 +# Fri Dec 29 23:14:34 2006 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP 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=y +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +# CONFIG_FEATURE_DEVPTS is not set +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +CONFIG_FEATURE_HAVE_RPC=y +# 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 +# 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 +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_AR is not set +# 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=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_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_COMPRESS=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=y +# 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 is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +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=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +# CONFIG_ENV is not set +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +# CONFIG_FALSE is not set +# CONFIG_FOLD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_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 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 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 is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV 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 is not set +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +# CONFIG_STTY is not set +# 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 +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_TRUE is not set +# 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 is not set +# CONFIG_FEATURE_WC_LARGE is not set +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +# CONFIG_YES is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# 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=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +# CONFIG_RESET is not set +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_READLINK is not set +# CONFIG_FEATURE_READLINK_FOLLOW is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_AWK is not set +# CONFIG_FEATURE_AWK_MATH is not set +# 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 is not set +# 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 is not set +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +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_FEATURE_FIND_EXEC is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set +# 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=y +# 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_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SU_SYSLOG is not set +# 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 is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set +# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_2_6_MODULES is not set +CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=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=y +CONFIG_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_FEATURE_MINIX2 is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# 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_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# 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=y + +# +# 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 is not set +# 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 is not set +# 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_NMETER is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD 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_FEATURE_TASKSET_FANCY is not set +# CONFIG_TIME is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +# 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_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=y +# CONFIG_IFUPDOWN is not set +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# 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_RULE 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_IPRULE 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_SERVER is not set +# CONFIG_NC_EXTRA is not set +# CONFIG_NETSTAT is not set +# CONFIG_NSLOOKUP is not set +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 is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE 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 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_APP_UDHCPD is not set +# CONFIG_APP_DHCPRELAY is not set +# CONFIG_APP_DUMPLEASES is not set +# CONFIG_APP_UDHCPC is not set +# CONFIG_FEATURE_UDHCP_SYSLOG is not set +# 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 is not set + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 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_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# 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 is not set +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# 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 is not set +# 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 is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +# CONFIG_LOGGER is not set + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set diff --git a/packages/busybox/slingbox-1.3.1/df_rootfs.patch b/packages/busybox/slingbox-1.3.1/df_rootfs.patch new file mode 100644 index 0000000000..3819b59106 --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/df_rootfs.patch @@ -0,0 +1,44 @@ +--- busybox-1.3.1.orig/coreutils/df.c 2006-12-26 22:54:50.000000000 -0600 ++++ busybox-1.3.1/coreutils/df.c 2006-12-30 00:45:10.000000000 -0600 +@@ -47,6 +47,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + opt_complementary = "h-km:k-hm:m-hk"; +@@ -77,7 +78,7 @@ + + do { + const char *device; +- const char *mount_point; ++ char *mount_point; + + if (mount_table) { + mount_entry = getmntent(mount_table); +@@ -116,17 +117,20 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ +- device = find_block_device("/"); ++ device = find_block_device(mount_point); + if (!device) { + goto SET_ERROR; + } + } + ++ if (strcmp(mount_point, "/") == 0) { ++ if (root_done) continue; ++ root_done = 1; ++ } ++ + #ifdef CONFIG_FEATURE_HUMAN_READABLE + printf("%-20s %9s ", device, + make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/packages/busybox/slingbox-1.3.1/halt.patch b/packages/busybox/slingbox-1.3.1/halt.patch new file mode 100644 index 0000000000..729c3b7ecd --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/halt.patch @@ -0,0 +1,40 @@ +diff -Naur busybox-1.3.1.orig/init/halt.c busybox-1.3.1/init/halt.c +--- busybox-1.3.1.orig/init/halt.c 2006-12-26 22:56:38.000000000 -0600 ++++ busybox-1.3.1/init/halt.c 2006-12-29 22:48:18.000000000 -0600 +@@ -10,6 +10,8 @@ + #include "busybox.h" + #include <sys/reboot.h> + ++#include "init_shared.h" /* Linksys mods */ ++ + int halt_main(int argc, char *argv[]) + { + static const int magic[] = { +@@ -38,6 +40,12 @@ + if (flags & 1) sleep(xatou(delay)); + if (!(flags & 2)) sync(); + ++/* Linksys Halt code - adapted from the Linksys source for Busybox. */ ++ rc = bb_shutdown_system(magic[which]); ++ if (rc) bb_error_msg("No."); ++ return rc; /* Shrug */ ++/* End of Linksys code */ ++ + /* Perform action. */ + if (ENABLE_INIT && !(flags & 4)) { + if (ENABLE_FEATURE_INITRD) { +diff -Naur busybox-1.3.1.orig/init/init_shared.c busybox-1.3.1/init/init_shared.c +--- busybox-1.3.1.orig/init/init_shared.c 2006-12-26 22:56:38.000000000 -0600 ++++ busybox-1.3.1/init/init_shared.c 2006-12-29 22:48:18.000000000 -0600 +@@ -57,6 +57,11 @@ + + sync(); + ++/* Linksys Halt code - if poweroff or halt, invoke an external program ++ to do actually turn off the power. */ ++ if (magic != 0x01234567) system("/usr/bin/Set_Led power_off"); ++/* End of Linksys Halt code */ ++ + reboot(magic); + return 0; /* Shrug */ + } diff --git a/packages/busybox/slingbox-1.3.1/lazy_umount.patch b/packages/busybox/slingbox-1.3.1/lazy_umount.patch new file mode 100644 index 0000000000..0a38d1f098 --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/lazy_umount.patch @@ -0,0 +1,27 @@ +--- busybox-1.3.1.orig/util-linux/umount.c 2006-12-26 22:57:04.000000000 -0600 ++++ busybox-1.3.1/util-linux/umount.c 2006-12-29 22:48:08.000000000 -0600 +@@ -12,13 +12,14 @@ + #include <mntent.h> + #include <getopt.h> + +-#define OPTION_STRING "flDnravd" ++#define OPTION_STRING "flDnravdL" + #define OPT_FORCE 1 + #define OPT_LAZY 2 + #define OPT_DONTFREELOOP 4 + #define OPT_NO_MTAB 8 + #define OPT_REMOUNT 16 + #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0) ++#define OPT_LINKSYS_LAZY 256 + + int umount_main(int argc, char **argv) + { +@@ -41,6 +42,8 @@ + argc -= optind; + argv += optind; + ++ if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */ ++ + doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); + + /* Get a list of mount points from mtab. We read them all in now mostly diff --git a/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch b/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch new file mode 100644 index 0000000000..8012b584e4 --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch @@ -0,0 +1,14 @@ +--- busybox-1.3.1/include/libbb.h~ 2006-12-26 22:56:18.000000000 -0600 ++++ busybox-1.3.1/include/libbb.h 2006-12-30 01:13:51.000000000 -0600 +@@ -51,9 +51,9 @@ + + #include "pwd_.h" + #include "grp_.h" +-#if ENABLE_FEATURE_SHADOWPASSWDS ++//#if ENABLE_FEATURE_SHADOWPASSWDS + #include "shadow_.h" +-#endif ++//#endif + + /* Try to pull in PATH_MAX */ + #include <limits.h> diff --git a/packages/busybox/slingbox-1.3.1/slingbox.patch b/packages/busybox/slingbox-1.3.1/slingbox.patch new file mode 100644 index 0000000000..d0af78596a --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/slingbox.patch @@ -0,0 +1,49 @@ +--- busybox-1.3.1.orig/applets/install.sh 2006-12-26 22:56:43.000000000 -0600 ++++ busybox-1.3.1/applets/install.sh 2006-12-29 22:47:42.000000000 -0600 +@@ -39,8 +39,8 @@ + done + fi + +-if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then +- inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'` ++if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then ++ inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'` + sub_shell_it=` + cd "$prefix" + for d in usr/sbin usr/bin sbin bin ; do +@@ -54,28 +54,28 @@ + ` + fi + +-rm -f $prefix/bin/busybox || exit 1 ++rm -f $prefix/bin/slingbox || exit 1 + mkdir -p $prefix/bin || exit 1 +-install -m 755 busybox $prefix/bin/busybox || exit 1 ++install -m 755 busybox $prefix/bin/slingbox || exit 1 + + for i in $h ; do + appdir=`dirname $i` + mkdir -p $prefix/$appdir || exit 1 + if [ "$2" = "--hardlinks" ]; then +- bb_path="$prefix/bin/busybox" ++ bb_path="$prefix/bin/slingbox" + else + case "$appdir" in + /) +- bb_path="bin/busybox" ++ bb_path="bin/slingbox" + ;; + /bin) +- bb_path="busybox" ++ bb_path="slingbox" + ;; + /sbin) +- bb_path="../bin/busybox" ++ bb_path="../bin/slingbox" + ;; + /usr/bin|/usr/sbin) +- bb_path="../../bin/busybox" ++ bb_path="../../bin/slingbox" + ;; + *) + echo "Unknown installation directory: $appdir" diff --git a/packages/busybox/slingbox-1.3.1/slingbox_name.patch b/packages/busybox/slingbox-1.3.1/slingbox_name.patch new file mode 100644 index 0000000000..96652c1920 --- /dev/null +++ b/packages/busybox/slingbox-1.3.1/slingbox_name.patch @@ -0,0 +1,10 @@ +--- busybox-1.3.1.orig/applets/applets.c 2006-12-26 22:56:43.000000000 -0600 ++++ busybox-1.3.1/applets/applets.c 2006-12-29 22:52:31.000000000 -0600 +@@ -472,6 +472,7 @@ + if (ENABLE_FEATURE_SUID_CONFIG) parse_config_file(); + + if (!strncmp(name, "busybox", 7)) busybox_main(argc, argv); ++ if (!strncmp(name, "slingbox", 8)) busybox_main(argc, argv); + /* Do a binary search to find the applet entry given the name. */ + applet_using = find_applet_by_name(name); + if (applet_using) { diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb new file mode 100644 index 0000000000..89b189e325 --- /dev/null +++ b/packages/busybox/slingbox_1.3.1.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ +to enable ipkg to run on an Unslung NSLU2 device." +HOMEPAGE = "http://www.busybox.net" +LICENSE = "GPL" +SECTION = "base" +PRIORITY = "required" +PR = "r0" +COMPATIBLE_MACHINE = "nslu2" + +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://defconfig \ + file://shadow_h_is_required.patch;patch=1 \ + file://df_rootfs.patch;patch=1 \ + file://lazy_umount.patch;patch=1 \ + file://halt.patch;patch=1" \ + file://slingbox_name.patch;patch=1 \ + file://slingbox.patch;patch=1" + +# file://wget-long-options.patch;patch=1 \ + +S = "${WORKDIR}/busybox-${PV}" + +export EXTRA_CFLAGS = "${CFLAGS}" +EXTRA_OEMAKE_append = " V=1 ARCH=arm CROSS_COMPILE=${TARGET_PREFIX}" + +PACKAGES = "${PN}" +FILES_${PN} = "/" +FILES_${PN}-doc = "" +FILES_${PN}-dev = "" +FILES_${PN}-locale = "" + +inherit cml1 + +do_configure () { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + cml1_do_configure +} + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + base_do_compile +} + +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake "PREFIX=${D}" install + + # Just in case fdisk is compiled in, do not overwrite the Linksys one + rm -f ${S}/_install/sbin/fdisk + + cp -pPR ${S}/_install/* ${D}/ +} diff --git a/packages/cairo/cairo_1.3.6.bb b/packages/cairo/cairo.inc index d9454fadcd..e405257dfb 100644 --- a/packages/cairo/cairo_1.3.6.bb +++ b/packages/cairo/cairo.inc @@ -1,14 +1,9 @@ -#This is a development snapshot, so lets hint OE to use the releases -DEFAULT_PREFERENCE = "-1" - SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" - #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb deleted file mode 100644 index 8ec642f38d..0000000000 --- a/packages/cairo/cairo_0.5.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -# 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" - -SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" - -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/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb deleted file mode 100644 index 8ec642f38d..0000000000 --- a/packages/cairo/cairo_0.5.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -# 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" - -SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" - -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/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb deleted file mode 100644 index cfbb18ed0e..0000000000 --- a/packages/cairo/cairo_0.9.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libpng fontconfig libxrender" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" -PR = "r1" - -SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" - -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/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb deleted file mode 100644 index 0260c267dd..0000000000 --- a/packages/cairo/cairo_1.0.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libpng fontconfig libxrender" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" -PR = "r1" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb deleted file mode 100644 index cef51d2212..0000000000 --- a/packages/cairo/cairo_1.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libpng fontconfig libxrender" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" -PR = "r0" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ - file://gcc4-fix.patch;patch=1" - -inherit autotools pkgconfig - -do_stage () { -autotools_stage_all -} diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb deleted file mode 100644 index 700f425113..0000000000 --- a/packages/cairo/cairo_1.0.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libpng fontconfig libxrender" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { -autotools_stage_all -} diff --git a/packages/cairo/cairo_1.2.2.bb b/packages/cairo/cairo_1.2.2.bb index 762ee405b4..f6667eae1b 100644 --- a/packages/cairo/cairo_1.2.2.bb +++ b/packages/cairo/cairo_1.2.2.bb @@ -6,7 +6,7 @@ LICENSE = "MPL LGPL" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index f23e376d1c..e274387195 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff;patch=1 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/cairo_1.3.10.bb b/packages/cairo/cairo_1.3.10.bb new file mode 100644 index 0000000000..883884d15f --- /dev/null +++ b/packages/cairo/cairo_1.3.10.bb @@ -0,0 +1,7 @@ +#This is a development snapshot, so lets hint OE to use the releases +DEFAULT_PREFERENCE = "-1" + +require cairo.inc + +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" + diff --git a/packages/cairo/cairo_1.3.4.bb b/packages/cairo/cairo_1.3.4.bb index 6d9a7c43ab..19e3f7a872 100644 --- a/packages/cairo/cairo_1.3.4.bb +++ b/packages/cairo/cairo_1.3.4.bb @@ -10,7 +10,7 @@ LICENSE = "MPL LGPL" SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \ file://configure.in_requires_pkg-config-0.15.diff;patch=1;pnum=2" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb deleted file mode 100644 index ea20009e34..0000000000 --- a/packages/cairo/cairo_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "libs" -PRIORITY = "optional" -# 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" -DEFAULT_PREFERENCE = "-1" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo" -S = "${WORKDIR}/cairo" - -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/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb index 71c65cdb9e..55bdc019f0 100644 --- a/packages/cairo/cairo_git.bb +++ b/packages/cairo/cairo_git.bb @@ -7,11 +7,11 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PV = "1.3.5+git${SRCDATE}" +PV = "1.3.11+git${SRCDATE}" SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ " -inherit autotools pkgconfig +inherit autotools pkgconfig S = "${WORKDIR}/git" diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb index 438a630064..9cee27bf29 100644 --- a/packages/cairo/libsvg-cairo_0.1.5.bb +++ b/packages/cairo/libsvg-cairo_0.1.5.bb @@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library" SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" -inherit autotools pkgconfig +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/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb index 438a630064..9cee27bf29 100644 --- a/packages/cairo/libsvg-cairo_0.1.6.bb +++ b/packages/cairo/libsvg-cairo_0.1.6.bb @@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library" SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" -inherit autotools pkgconfig +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/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb index 7a1f35135a..55e439a3c5 100644 --- a/packages/cairo/libsvg-cairo_20050601.bb +++ b/packages/cairo/libsvg-cairo_20050601.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "1" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDSRCDATE}" S = "${WORKDIR}/libsvg-cairo" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb index a90447a1df..6f9111e31b 100644 --- a/packages/cairo/libsvg-cairo_cvs.bb +++ b/packages/cairo/libsvg-cairo_cvs.bb @@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo" S = "${WORKDIR}/libsvg-cairo" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb index 730f427c08..21127b77ff 100644 --- a/packages/cairo/libsvg_0.1.4.bb +++ b/packages/cairo/libsvg_0.1.4.bb @@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \ EXTRA_OECONF = "--with-expat" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb index 2f4bd8aaad..95b360c041 100644 --- a/packages/cairo/libsvg_cvs.bb +++ b/packages/cairo/libsvg_cvs.bb @@ -10,7 +10,7 @@ PR = "r2" EXTRA_OECONF = "--with-expat" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage () { autotools_stage_all diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb index 89677d01fc..8f4f4bfdc4 100644 --- a/packages/cairo/xsvg_cvs.bb +++ b/packages/cairo/xsvg_cvs.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/xsvg" # FIXME: add xcursor BROKEN = "1" -inherit autotools pkgconfig +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/camera-assistant/camera-assistant_0.2.0.bb b/packages/camera-assistant/camera-assistant_0.2.0.bb index db117e102c..fb5b6e1f4e 100644 --- a/packages/camera-assistant/camera-assistant_0.2.0.bb +++ b/packages/camera-assistant/camera-assistant_0.2.0.bb @@ -19,13 +19,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cameraassistant/camera-assistant_0.2.0.tar.gz \ file://g++-3.4-compile-fixes.patch;patch=1 \ file://ca.desktop \ file://ca.png " - + S = "${WORKDIR}/CameraAssistant" APPNAME = "ca" APPTYPE = "binary" -APPDESKTOP = "${WORKDIR}" +APPDESKTOP = "${WORKDIR}" do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/cbrpager/cbrpager_0.9.14.bb b/packages/cbrpager/cbrpager_0.9.14.bb index e0daf425ba..ccf2658f82 100644 --- a/packages/cbrpager/cbrpager_0.9.14.bb +++ b/packages/cbrpager/cbrpager_0.9.14.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" PR = "r2" DEPENDS = "gtk+ libgnomeui" -RDEPENDS = "unzip" +RDEPENDS = "unzip" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb index 4e9b00ee20..10c1f06511 100644 --- a/packages/cdparanoia/cdparanoia_9.8alpha.bb +++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb @@ -15,12 +15,12 @@ inherit autotools do_install() { oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } do_stage() { install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} diff --git a/packages/cdrtools/cdrtools-native_2.01.bb b/packages/cdrtools/cdrtools-native_2.01.bb index cd9aa7c431..9b148517d2 100644 --- a/packages/cdrtools/cdrtools-native_2.01.bb +++ b/packages/cdrtools/cdrtools-native_2.01.bb @@ -17,7 +17,7 @@ STAGE_TEMP="${WORKDIR}/stage_temp" do_stage() { install -d ${STAGE_TEMP} make install INS_BASE=${STAGE_TEMP} - + install -d ${STAGING_BINDIR} install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR} } diff --git a/packages/centericq/centericq.inc b/packages/centericq/centericq.inc new file mode 100644 index 0000000000..2773ac61fd --- /dev/null +++ b/packages/centericq/centericq.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ +AIM, IRC, Jabber and LiveJournal" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "openssl ncurses" + +inherit autotools + +SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" + +EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." diff --git a/packages/centericq/centericq_4.11.0.bb b/packages/centericq/centericq_4.11.0.bb index fa6633883b..dc227c4a93 100644 --- a/packages/centericq/centericq_4.11.0.bb +++ b/packages/centericq/centericq_4.11.0.bb @@ -1,15 +1,5 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" -LICENSE = "GPL" +require centericq.inc -inherit autotools - -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." acpaths = "-I ${S}/m4" # FIXME: ugly compile failures diff --git a/packages/centericq/centericq_4.9.10.bb b/packages/centericq/centericq_4.9.10.bb index 93e85b6c8b..6d02f2c787 100644 --- a/packages/centericq/centericq_4.9.10.bb +++ b/packages/centericq/centericq_4.9.10.bb @@ -1,12 +1,3 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" -LICENSE = "GPL" -inherit autotools +require centericq.inc -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." acpaths = "-I ${S}/m4" diff --git a/packages/centericq/centericq_4.9.7.bb b/packages/centericq/centericq_4.9.7.bb index 331d69c8d3..c4af2f4437 100644 --- a/packages/centericq/centericq_4.9.7.bb +++ b/packages/centericq/centericq_4.9.7.bb @@ -1,13 +1 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -LICENSE = "GPL" - -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." +require centericq.inc diff --git a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb index 00ad9743fd..28cc1bf277 100644 --- a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb +++ b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb @@ -3,7 +3,7 @@ PR = "r1" SRC_URI += "file://autofoo.patch;patch=1" -inherit autotools +inherit autotools do_compile() { oe_runmake daemon diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.7.bb index e721558efe..fec4ae59d8 100644 --- a/packages/clamav/clamav_0.88.5.bb +++ b/packages/clamav/clamav_0.88.7.bb @@ -1,3 +1,3 @@ require clamav.inc -PR = "r1" +PR = "r0" diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/clucene/clucene_0.8.12-pre.bb index 3bfbac9ed7..2c8122c921 100644 --- a/packages/clucene/clucene_0.8.12-pre.bb +++ b/packages/clucene/clucene_0.8.12-pre.bb @@ -7,7 +7,7 @@ SRC_URI = "cvs://anonymous@clucene.cvs.sourceforge.net/cvsroot/clucene;module=. file://compile-fix.patch;patch=1" S = "${WORKDIR}" -inherit autotools +inherit autotools do_stage() { oe_libinstall -C src libclucene ${STAGING_LIBDIR} diff --git a/packages/cmake/cmake-native_2.2.2.bb b/packages/cmake/cmake-native_2.2.3.bb index fa0b63067d..b4e84cc093 100644 --- a/packages/cmake/cmake-native_2.2.2.bb +++ b/packages/cmake/cmake-native_2.2.3.bb @@ -7,11 +7,11 @@ HOMEPAGE = "http://www.cmake.org/" LICENSE = "Berkely-style license" SECTION = "console/utils" -SRC_URI = "http://www.cmake.org/files/v2.2/cmake-2.2.1.tar.gz" +SRC_URI = "http://www.cmake.org/files/v2.2/cmake-${PV}.tar.gz" inherit autotools -S = "${WORKDIR}/cmake-2.2.1" +S = "${WORKDIR}/cmake-${PV}" inherit native diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb index 01c2e42a31..cd8021d9ef 100644 --- a/packages/console-tools/console-tools_0.3.2.bb +++ b/packages/console-tools/console-tools_0.3.2.bb @@ -25,7 +25,7 @@ do_compile () { oe_runmake 'SUBDIRS=${SUBDIRS}' } -inherit autotools +inherit autotools do_install () { autotools_do_install diff --git a/packages/coreutils/coreutils.inc b/packages/coreutils/coreutils.inc new file mode 100644 index 0000000000..481c32bb3d --- /dev/null +++ b/packages/coreutils/coreutils.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "A collection of core GNU utilities." +LICENSE = "GPL" +SECTION = "base" +RREPLACES = "textutils shellutils fileutils" +RPROVIDES = "textutils shellutils fileutils" + +inherit autotools diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb index c0e94329f2..74e27a8d70 100644 --- a/packages/coreutils/coreutils_5.0.bb +++ b/packages/coreutils/coreutils_5.0.bb @@ -1,14 +1,9 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \ file://malloc.patch;patch=1 \ file://configure.patch;patch=1" -inherit autotools - export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS=" diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb index f517fc8067..e8ae798691 100644 --- a/packages/coreutils/coreutils_5.1.1.bb +++ b/packages/coreutils/coreutils_5.1.1.bb @@ -1,10 +1,5 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2" - -inherit autotools diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 2f7476c2dd..da9b214af5 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -1,8 +1,5 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r8" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ @@ -10,8 +7,6 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://man.patch;patch=1 \ file://rename-eaccess.patch;patch=1" -inherit autotools - # [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ @@ -31,10 +26,10 @@ sbindir_progs= "chroot" do_install () { autotools_do_install - + # Renaming the utilities that should go in /usr/bin for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - + # Renaming and moving the utilities that should go in /bin (FHS) install -d ${D}${base_bindir} for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done @@ -50,7 +45,7 @@ do_install () { # hostname and uptime separated. busybox's versions are preferred mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - + } pkg_postinst_${PN} () { @@ -59,11 +54,11 @@ pkg_postinst_${PN} () { # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - + # The utilities in /usr/sbin for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. + # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb index fa05a83781..61d25543ab 100644 --- a/packages/coreutils/coreutils_5.3.0.bb +++ b/packages/coreutils/coreutils_5.3.0.bb @@ -1,18 +1,12 @@ -DESCRIPTION = "A collection of core GNU utilities." -LICENSE = "GPL" -SECTION = "base" -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ file://man.patch;patch=1 \ - file://rename-tee-for-glibc2.5.patch;patch=1" - -SRC_URI += "file://uptime-pow-lib.patch;patch=1" - -inherit autotools + file://rename-tee-for-glibc2.5.patch;patch=1 \ + file://uptime-pow-lib.patch;patch=1" # [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ @@ -33,10 +27,10 @@ sbindir_progs= "chroot" do_install () { autotools_do_install - + # Renaming the utilities that should go in /usr/bin for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - + # Renaming and moving the utilities that should go in /bin (FHS) install -d ${D}${base_bindir} for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done @@ -52,7 +46,7 @@ do_install () { # hostname and uptime separated. busybox's versions are preferred mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - + } pkg_postinst_${PN} () { @@ -61,11 +55,11 @@ pkg_postinst_${PN} () { # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - + # The utilities in /usr/sbin for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. + # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 diff --git a/packages/corsair/corsair_0.2.5.bb b/packages/corsair/corsair_0.2.6.bb index d765c51e37..125d419c22 100644 --- a/packages/corsair/corsair_0.2.5.bb +++ b/packages/corsair/corsair_0.2.6.bb @@ -3,7 +3,6 @@ SECTION = "opie/applications" LICENSE = "GPL" AUTHOR = "Joe Rumsey <joe@rumsey.org>" HOMEPAGE = "http://corsair.sf.net/" -DEPENDS = "opie-pics" RDEPENDS = "opie-pics" inherit palmtop diff --git a/packages/corsair/files/corsair-opie.patch b/packages/corsair/files/corsair-opie.patch index ea651bef44..d1f9401c19 100644 --- a/packages/corsair/files/corsair-opie.patch +++ b/packages/corsair/files/corsair-opie.patch @@ -1,11 +1,6 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - --- corsair/corsair.cpp~corsair-opie +++ corsair/corsair.cpp -@@ -172,7 +172,7 @@ +@@ -177,7 +177,7 @@ QString CorsairWindow::homeDir() { @@ -14,7 +9,7 @@ if(home == "/home" && option("homeReallyIsHome", "false") != "true") { home = "/media"; } -@@ -265,7 +265,8 @@ +@@ -274,7 +274,8 @@ QString corsairDir = topDir(); // Don't let device power off while downloading. Will be reenabled when download completes. @@ -24,7 +19,7 @@ Download *dl = NULL; -@@ -401,7 +402,8 @@ +@@ -410,7 +410,8 @@ if(m_runningDownloads.isEmpty()) { emit statusUpdate(res == Download::Success ? "Ready" : "Error"); @@ -34,32 +29,37 @@ } delete dl; ---- corsair/Makefile~corsair-opie -+++ corsair/Makefile -@@ -14,10 +14,10 @@ +--- corsair/Makefile 2006-07-12 09:13:51.000000000 +0200 ++++ corsair/Makefile.opie 2006-12-31 09:43:08.000000000 +0100 +@@ -13,12 +13,12 @@ + # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - +- -INCLUDES=-I/opt/Qtopia/include/ -CXXFLAGS=-O $(INCLUDES) -DQWS -fno-rtti -fno-exceptions -LDFLAGS=-L $(QTDIR)/lib/ -LIBS=-lqte -lqpe -lqtopia -ljpeg -luuid +- ++ +INCLUDES=-I$(QTDIR)/include +CXXFLAGS += $(INCLUDES) -DQWS -fno-rtti -fno-exceptions +LDFLAGS +=-L $(QTDIR)/lib/ +LIBS=-lqte -lqpe - ++ SOURCES = main.cpp corsair.cpp feeds.cpp download.cpp info.cpp MOCS = corsair_moc.cpp download_moc.cpp feeds_moc.cpp info_moc.cpp -@@ -28,12 +28,15 @@ + +@@ -28,12 +28,16 @@ ICONS=icons/newfeed.png \ icons/play.png %_moc.cpp: %.h - $(QTDIR)/bin/moc -o $@ $^ + $(OE_QMAKE_MOC) -o $@ $^ + -+#%.o: %.cpp ++# %.o: %.cpp +# $(CXX) $(CXXFLAGS) -I$(QTDIR)/include -c -o $@ $^ ++ OBJS = $(SOURCES:.cpp=.o) $(MOCS:.cpp=.o) @@ -69,10 +69,12 @@ install: corsair cp corsair.desktop $(QPEDIR)/apps/Applications -@@ -54,263 +57,3 @@ - web: - rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/ +@@ -52,291 +56,4 @@ depend: + makedepend $(INCLUDES) $(SOURCES) + web: +- rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/ +- -# DO NOT DELETE - -main.o: /opt/Qtopia/include/qmainwindow.h /opt/Qtopia/include/qwidget.h @@ -83,7 +85,9 @@ -main.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h -main.o: /usr/include/string.h /usr/include/features.h -main.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h +-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h -main.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h +-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h -main.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h -main.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h -main.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h @@ -106,7 +110,8 @@ -main.o: /opt/Qtopia/include/qtopia/qcom.h /opt/Qtopia/include/qtopia/quuid.h -main.o: /usr/include/memory.h /opt/Qtopia/include/qmetaobject.h -main.o: /opt/Qtopia/include/qconnection.h /opt/Qtopia/include/qstrlist.h --main.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h corsair.h +-main.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h +-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h corsair.h -main.o: feeds.h /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h -main.o: /opt/Qtopia/include/qtextstream.h /usr/include/stdio.h -main.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h @@ -124,7 +129,7 @@ -main.o: /opt/Qtopia/include/qsocketdevice.h -main.o: /opt/Qtopia/include/qhostaddress.h -main.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h --main.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h +-main.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h version.h -corsair.o: /opt/Qtopia/include/qmainwindow.h /opt/Qtopia/include/qwidget.h -corsair.o: /opt/Qtopia/include/qwindowdefs.h -corsair.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qglobal.h @@ -133,19 +138,21 @@ -corsair.o: /opt/Qtopia/include/qarray.h /opt/Qtopia/include/qgarray.h -corsair.o: /opt/Qtopia/include/qshared.h /usr/include/string.h -corsair.o: /usr/include/features.h /usr/include/sys/cdefs.h --corsair.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qnamespace.h --corsair.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h --corsair.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h --corsair.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h --corsair.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h --corsair.o: /opt/Qtopia/include/qstringlist.h /opt/Qtopia/include/qvaluelist.h --corsair.o: /opt/Qtopia/include/qdatastream.h /opt/Qtopia/include/qiodevice.h --corsair.o: /opt/Qtopia/include/qregexp.h /opt/Qtopia/include/qpaintdevice.h --corsair.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h --corsair.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h --corsair.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h --corsair.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h --corsair.o: /opt/Qtopia/include/qsizepolicy.h +-corsair.o: /usr/include/gnu/stubs.h +-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h +-corsair.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h +-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h +-corsair.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h +-corsair.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h +-corsair.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h +-corsair.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qstringlist.h +-corsair.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h +-corsair.o: /opt/Qtopia/include/qiodevice.h /opt/Qtopia/include/qregexp.h +-corsair.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h +-corsair.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h +-corsair.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h +-corsair.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h +-corsair.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h -corsair.o: /opt/Qtopia/include/qpe/qpeapplication.h -corsair.o: /opt/Qtopia/include/qtopia/qpeglobal.h -corsair.o: /opt/Qtopia/include/qapplication.h @@ -167,6 +174,7 @@ -corsair.o: /usr/include/bits/typesizes.h /usr/include/libio.h -corsair.o: /usr/include/_G_config.h /usr/include/wchar.h -corsair.o: /usr/include/bits/wchar.h /usr/include/gconv.h +-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h -corsair.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -corsair.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qvaluestack.h -corsair.o: /opt/Qtopia/include/qlistview.h /opt/Qtopia/include/qscrollview.h @@ -179,16 +187,17 @@ -corsair.o: /opt/Qtopia/include/qhostaddress.h -corsair.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h -corsair.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h --corsair.o: /opt/Qtopia/include/qtextbrowser.h /opt/Qtopia/include/qpixmap.h --corsair.o: /opt/Qtopia/include/qtextview.h /opt/Qtopia/include/qtoolbar.h --corsair.o: /opt/Qtopia/include/qtoolbutton.h /opt/Qtopia/include/qbutton.h --corsair.o: /opt/Qtopia/include/qiconset.h /opt/Qtopia/include/qstatusbar.h --corsair.o: /opt/Qtopia/include/qlineedit.h /opt/Qtopia/include/qhbox.h --corsair.o: /opt/Qtopia/include/qlayout.h +-corsair.o: version.h /opt/Qtopia/include/qtextbrowser.h +-corsair.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qtextview.h +-corsair.o: /opt/Qtopia/include/qtoolbar.h /opt/Qtopia/include/qtoolbutton.h +-corsair.o: /opt/Qtopia/include/qbutton.h /opt/Qtopia/include/qiconset.h +-corsair.o: /opt/Qtopia/include/qstatusbar.h /opt/Qtopia/include/qlineedit.h +-corsair.o: /opt/Qtopia/include/qhbox.h /opt/Qtopia/include/qlayout.h -corsair.o: /opt/Qtopia/include/qabstractlayout.h /opt/Qtopia/include/qlabel.h -corsair.o: /opt/Qtopia/include/qclipboard.h /opt/Qtopia/include/qpushbutton.h -corsair.o: /opt/Qtopia/include/qmenubar.h /opt/Qtopia/include/qpopupmenu.h -corsair.o: /opt/Qtopia/include/qmenudata.h /opt/Qtopia/include/qprogressbar.h +-corsair.o: /opt/Qtopia/include/qmessagebox.h /opt/Qtopia/include/qaccel.h -corsair.o: /opt/Qtopia/include/qtopia/resource.h /opt/Qtopia/include/qimage.h -corsair.o: /opt/Qtopia/include/qbitmap.h /opt/Qtopia/include/qtopia/config.h -corsair.o: /opt/Qtopia/include/qtopia/qtopiawinexport.h @@ -202,14 +211,17 @@ -feeds.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h -feeds.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h -feeds.o: /usr/include/features.h /usr/include/sys/cdefs.h --feeds.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h --feeds.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h --feeds.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h --feeds.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h --feeds.o: /usr/include/stdio.h /usr/include/bits/types.h --feeds.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h --feeds.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h +-feeds.o: /usr/include/gnu/stubs.h +-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h +-feeds.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h +-feeds.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h +-feeds.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h +-feeds.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h +-feeds.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h +-feeds.o: /usr/include/bits/typesizes.h /usr/include/libio.h +-feeds.o: /usr/include/_G_config.h /usr/include/wchar.h -feeds.o: /usr/include/bits/wchar.h /usr/include/gconv.h +-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h -feeds.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -feeds.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h -feeds.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h @@ -218,46 +230,52 @@ -feeds.o: /opt/Qtopia/include/qscrollview.h /opt/Qtopia/include/qframe.h -feeds.o: /opt/Qtopia/include/qwidget.h /opt/Qtopia/include/qwindowdefs.h -feeds.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qnamespace.h --feeds.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h --feeds.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h --feeds.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h --feeds.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h --feeds.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h --feeds.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h --feeds.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h --feeds.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h --feeds.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h --feeds.o: /opt/Qtopia/include/qscrollbar.h /opt/Qtopia/include/qrangecontrol.h --feeds.o: /opt/Qtopia/include/qdrawutil.h /opt/Qtopia/include/qpainter.h --feeds.o: /opt/Qtopia/include/qpen.h /opt/Qtopia/include/qpointarray.h --feeds.o: /opt/Qtopia/include/qwmatrix.h /opt/Qtopia/include/qdatetime.h log.h --feeds.o: download.h /opt/Qtopia/include/qsocket.h --feeds.o: /opt/Qtopia/include/qsocketdevice.h +-feeds.o: /usr/include/limits.h +-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h +-feeds.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h +-feeds.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h +-feeds.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h +-feeds.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qpaintdevice.h +-feeds.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h +-feeds.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h +-feeds.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h +-feeds.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h +-feeds.o: /opt/Qtopia/include/qsizepolicy.h /opt/Qtopia/include/qscrollbar.h +-feeds.o: /opt/Qtopia/include/qrangecontrol.h /opt/Qtopia/include/qdrawutil.h +-feeds.o: /opt/Qtopia/include/qpainter.h /opt/Qtopia/include/qpen.h +-feeds.o: /opt/Qtopia/include/qpointarray.h /opt/Qtopia/include/qwmatrix.h +-feeds.o: /opt/Qtopia/include/qdatetime.h log.h download.h +-feeds.o: /opt/Qtopia/include/qsocket.h /opt/Qtopia/include/qsocketdevice.h -feeds.o: /opt/Qtopia/include/qhostaddress.h -feeds.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h -feeds.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h --feeds.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h +-feeds.o: /opt/Qtopia/include/qfileinfo.h version.h +-feeds.o: /opt/Qtopia/include/qmainwindow.h -feeds.o: /opt/Qtopia/include/qtopia/resource.h -feeds.o: /opt/Qtopia/include/qtopia/qpeglobal.h /opt/Qtopia/include/qimage.h -feeds.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qbitmap.h -feeds.o: /opt/Qtopia/include/qiconset.h opmlparser.h feedparser.h +-feeds.o: /usr/include/ctype.h /usr/include/endian.h +-feeds.o: /usr/include/bits/endian.h -download.o: corsair.h feeds.h /opt/Qtopia/include/qstring.h -download.o: /opt/Qtopia/include/qcstring.h /opt/Qtopia/include/qarray.h -download.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h -download.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h -download.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h -download.o: /usr/include/features.h /usr/include/sys/cdefs.h --download.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h --download.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h --download.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h --download.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h --download.o: /usr/include/stdio.h /usr/include/bits/types.h --download.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h --download.o: /usr/include/libio.h /usr/include/_G_config.h --download.o: /usr/include/wchar.h /usr/include/bits/wchar.h --download.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h --download.o: /usr/include/bits/sys_errlist.h /opt/Qtopia/include/qfile.h --download.o: /opt/Qtopia/include/qstringlist.h +-download.o: /usr/include/gnu/stubs.h +-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h +-download.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h +-download.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h +-download.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h +-download.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h +-download.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h +-download.o: /usr/include/bits/typesizes.h /usr/include/libio.h +-download.o: /usr/include/_G_config.h /usr/include/wchar.h +-download.o: /usr/include/bits/wchar.h /usr/include/gconv.h +-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h +-download.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h +-download.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h -download.o: /opt/Qtopia/include/qvaluelist.h -download.o: /opt/Qtopia/include/qdatastream.h /opt/Qtopia/include/qregexp.h -download.o: /opt/Qtopia/include/qvaluestack.h /opt/Qtopia/include/qmap.h @@ -266,6 +284,7 @@ -download.o: /opt/Qtopia/include/qwindowdefs.h -download.o: /opt/Qtopia/include/qobjectdefs.h -download.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h +-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h -download.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h -download.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h -download.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h @@ -285,21 +304,25 @@ -download.o: /opt/Qtopia/include/qhostaddress.h -download.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h -download.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h --download.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h +-download.o: /opt/Qtopia/include/qfileinfo.h version.h +-download.o: /opt/Qtopia/include/qmainwindow.h -info.o: corsair.h feeds.h /opt/Qtopia/include/qstring.h -info.o: /opt/Qtopia/include/qcstring.h /opt/Qtopia/include/qarray.h -info.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h -info.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h -info.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h -info.o: /usr/include/features.h /usr/include/sys/cdefs.h --info.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h --info.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h --info.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h --info.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h --info.o: /usr/include/stdio.h /usr/include/bits/types.h --info.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h --info.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h +-info.o: /usr/include/gnu/stubs.h +-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h +-info.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h +-info.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h +-info.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h +-info.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h +-info.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h +-info.o: /usr/include/bits/typesizes.h /usr/include/libio.h +-info.o: /usr/include/_G_config.h /usr/include/wchar.h -info.o: /usr/include/bits/wchar.h /usr/include/gconv.h +-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h -info.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -info.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h -info.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h @@ -308,28 +331,34 @@ -info.o: /opt/Qtopia/include/qscrollview.h /opt/Qtopia/include/qframe.h -info.o: /opt/Qtopia/include/qwidget.h /opt/Qtopia/include/qwindowdefs.h -info.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qnamespace.h --info.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h --info.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h --info.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h --info.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h --info.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h --info.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h --info.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h --info.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h --info.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h --info.o: /opt/Qtopia/include/qscrollbar.h /opt/Qtopia/include/qrangecontrol.h --info.o: /opt/Qtopia/include/qdrawutil.h /opt/Qtopia/include/qpainter.h --info.o: /opt/Qtopia/include/qpen.h /opt/Qtopia/include/qpointarray.h --info.o: /opt/Qtopia/include/qwmatrix.h /opt/Qtopia/include/qdatetime.h log.h --info.o: download.h /opt/Qtopia/include/qsocket.h --info.o: /opt/Qtopia/include/qsocketdevice.h +-info.o: /usr/include/limits.h +-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h +-info.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h +-info.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h +-info.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h +-info.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qpaintdevice.h +-info.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h +-info.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h +-info.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h +-info.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h +-info.o: /opt/Qtopia/include/qsizepolicy.h /opt/Qtopia/include/qscrollbar.h +-info.o: /opt/Qtopia/include/qrangecontrol.h /opt/Qtopia/include/qdrawutil.h +-info.o: /opt/Qtopia/include/qpainter.h /opt/Qtopia/include/qpen.h +-info.o: /opt/Qtopia/include/qpointarray.h /opt/Qtopia/include/qwmatrix.h +-info.o: /opt/Qtopia/include/qdatetime.h log.h download.h +-info.o: /opt/Qtopia/include/qsocket.h /opt/Qtopia/include/qsocketdevice.h -info.o: /opt/Qtopia/include/qhostaddress.h -info.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h -info.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h --info.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h --info.o: info.h /opt/Qtopia/include/qtextbrowser.h --info.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qtextview.h --info.o: /opt/Qtopia/include/qtopia/qprocess.h +-info.o: /opt/Qtopia/include/qfileinfo.h version.h +-info.o: /opt/Qtopia/include/qmainwindow.h info.h +-info.o: /opt/Qtopia/include/qtextbrowser.h /opt/Qtopia/include/qpixmap.h +-info.o: /opt/Qtopia/include/qtextview.h /opt/Qtopia/include/qdialog.h +-info.o: /opt/Qtopia/include/qlayout.h /opt/Qtopia/include/qabstractlayout.h +-info.o: /opt/Qtopia/include/qlabel.h /opt/Qtopia/include/qlineedit.h +-info.o: /opt/Qtopia/include/qhbox.h /opt/Qtopia/include/qcheckbox.h +-info.o: /opt/Qtopia/include/qbutton.h /opt/Qtopia/include/qtopia/qprocess.h -info.o: /opt/Qtopia/include/qtopia/qpeglobal.h -info.o: /opt/Qtopia/include/qtopia/qcopenvelope_qws.h -info.o: /opt/Qtopia/include/qcopchannel_qws.h ++ rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/ diff --git a/packages/cpuburn/cpuburn_1.4.bb b/packages/cpuburn/cpuburn_1.4.bb index 9e85b6d6b7..a3d1264212 100644 --- a/packages/cpuburn/cpuburn_1.4.bb +++ b/packages/cpuburn/cpuburn_1.4.bb @@ -21,5 +21,5 @@ cpuburn_do_unpack () { do_install () { oe_runmake install DESTDIR=${D} } - + diff --git a/packages/cpufreqd/cpufreqd_1.1.2.bb b/packages/cpufreqd/cpufreqd_1.1.2.bb index 7cad9af62f..25573b832d 100644 --- a/packages/cpufreqd/cpufreqd_1.1.2.bb +++ b/packages/cpufreqd/cpufreqd_1.1.2.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \ file://nonrootinstall.patch;patch=1" -inherit autotools +inherit autotools FILES_${PN} = "${sbindir} ${sysconfdir} ${libdir}/libsys_*.so" FILES_${PN}-dev = "${libdir}/*.la ${libdir}/*.a" diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb index 102b72fb10..6c36c1fca6 100644 --- a/packages/crimsonfields/crimsonfields_0.4.8.bb +++ b/packages/crimsonfields/crimsonfields_0.4.8.bb @@ -8,7 +8,7 @@ SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \ file://native-tools.patch;patch=1" S = "${WORKDIR}/crimson-${PV}" -inherit autotools +inherit autotools HOST_TOOLS = "cfed mkdatafile mklocale mktileset mkunitset" diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index 36bfe5d89d..4d543de6c7 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -30,5 +30,5 @@ pkg_postinst() { pkg_postrm() { update-rc.d cron remove } - + diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb index 4cdbd6bd38..53be0cef76 100644 --- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb +++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb @@ -13,7 +13,7 @@ inherit autotools #INITSCRIPT_NAME = "ctrlproxy" #INITSCRIPT_PARAMS = "defaults 84" -# CONFFILES_${PN} = "${sysconfdir}/foo.conf" +# CONFFILES_${PN} = "${sysconfdir}/foo.conf" # To fix this error in autotools_do_configure (which arises after a # change to pkg-config pkg.m4): diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb index 28367139eb..1bafeb9d9b 100644 --- a/packages/cumulus/cumulus_1.2.1.bb +++ b/packages/cumulus/cumulus_1.2.1.bb @@ -22,7 +22,7 @@ do_compile() { echo "#define SHARP_PDA_WARNSOUND 4" >sharp_char.h qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro oe_runmake - qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro + qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro oe_runmake } diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb index a56ad5e15d..133e0e704f 100644 --- a/packages/cumulus/cumulus_cvs.bb +++ b/packages/cumulus/cumulus_cvs.bb @@ -25,7 +25,7 @@ do_compile() { echo "#define SHARP_PDA_WARNSOUND 4" >sharp_char.h qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro oe_runmake - qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro + qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro oe_runmake } diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb index e49a4466a5..acd735705c 100644 --- a/packages/cups/cups_1.2.7.bb +++ b/packages/cups/cups_1.2.7.bb @@ -24,7 +24,7 @@ do_configure() { gnu-configize libtoolize --force oe_runconf -} +} do_compile () { sed -i s:STRIP:NOSTRIP: Makedefs diff --git a/packages/curl/curl_7.16.0.bb b/packages/curl/curl_7.16.0.bb new file mode 100644 index 0000000000..ae42cb42e3 --- /dev/null +++ b/packages/curl/curl_7.16.0.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +LICENSE = "MIT" +DEPENDS = "zlib gnutls" +SECTION = "console/network" +PR = "r0" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2" +S = "${WORKDIR}/curl-${PV}" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ + --with-gnutls=${STAGING_BINDIR_CROSS}/ \ + --without-ssl \ + --with-random=/dev/urandom \ + --without-idn \ + --enable-crypto-auth \ + " + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac +} + +do_stage () { + install -d ${STAGING_INCDIR}/curl + install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} +} + +PACKAGES += "libcurl libcurl-dev libcurl-doc" +FILES_${PN} = "${bindir}/curl \ + ${datadir}/curl/curl-ca-bundle.crt" +FILES_${PN}-doc = "${mandir}/man1/curl.1" +FILES_lib${PN} = "${libdir}/lib*.so.*" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + diff --git a/packages/cvs/cvs_1.12.8.bb b/packages/cvs/cvs_1.12.8.bb index 51aa9de2fb..b472a451eb 100644 --- a/packages/cvs/cvs_1.12.8.bb +++ b/packages/cvs/cvs_1.12.8.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "" LICENSE = "GPL" -SRC_URI = "https://cvs.cvshome.org/files/documents/19/170/cvs-${PV}.tar.bz2 \ +SRC_URI = "http://musthave.sunbase.org/progs/ccvs/Old/cvs-${PV}/cvs-${PV}.tar.bz2 \ file://m4.patch;patch=1" inherit autotools gettext diff --git a/packages/cxcrypt/cxcrypt_1.0.bb b/packages/cxcrypt/cxcrypt_1.0.bb index 11fbadae0c..705859319b 100644 --- a/packages/cxcrypt/cxcrypt_1.0.bb +++ b/packages/cxcrypt/cxcrypt_1.0.bb @@ -10,7 +10,7 @@ CFLAGS_prepend = "-g -Wall -ansi -pedantic " LDFLAGS_prepend = "-L. -lcxio " do_compile() { - oe_runmake + oe_runmake } do_install() { diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb index 381486bc81..81bac22855 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz \ file://configure.patch;patch=1" -inherit autotools +inherit autotools acpaths = "-I ${S}/cmulocal -I ${S}/config -I ." CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include" diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb index 0295b2eb09..e95dceee39 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb @@ -5,7 +5,7 @@ LICENSE = "BSD" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz" -inherit autotools +inherit autotools acpaths = "-I ${S}/cmulocal -I ${S}/config -I ." CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include" diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb index f3148233e5..cf7ce75b99 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb @@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ file://berkdb.m4.patch;patch=1 \ file://client.c.patch;patch=1" -inherit autotools +inherit autotools acpaths = "-I ${S}/cmulocal -I ${S}/config -I ." CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include" diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb index 5ed112087c..310ccabb32 100644 --- a/packages/davfs2/davfs2_0.2.7.bb +++ b/packages/davfs2/davfs2_0.2.7.bb @@ -19,7 +19,7 @@ inherit autotools ALTERNATIVE_NAME = "mount.davfs" ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}" ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" +ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" EXTRA_OECONF = "--with-neon" diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb index f5a6f3458d..ecb7034042 100644 --- a/packages/davfs2/davfs2_0.2.8.bb +++ b/packages/davfs2/davfs2_0.2.8.bb @@ -17,7 +17,7 @@ inherit autotools ALTERNATIVE_NAME = "mount.davfs" ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}" ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" +ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" EXTRA_OECONF = "--with-neon" diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb index 928b6b6ab3..820700d56e 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -7,7 +7,7 @@ DEPENDS = "uicmoc3-native" SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/dcopidl" +S = "${WORKDIR}/dcopidl" inherit native qmake qt3e diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb index e520d3f97c..29a4f71d3c 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -8,7 +8,7 @@ DEPENDS = "uicmoc3-native" SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " #\ # file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/dcopidl2cpp" +S = "${WORKDIR}/dcopidl2cpp" inherit native qmake qt3e diff --git a/packages/desktop-file-utils/desktop-file-utils_0.3.bb b/packages/desktop-file-utils/desktop-file-utils_0.3.bb index 0e77f64942..9bb74caf46 100644 --- a/packages/desktop-file-utils/desktop-file-utils_0.3.bb +++ b/packages/desktop-file-utils/desktop-file-utils_0.3.bb @@ -7,4 +7,4 @@ DEPENDS = "popt glib-2.0" SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools +inherit autotools diff --git a/packages/desktop-file-utils/desktop-file-utils_0.6.bb b/packages/desktop-file-utils/desktop-file-utils_0.6.bb index 34f7b73451..f68dfa7423 100644 --- a/packages/desktop-file-utils/desktop-file-utils_0.6.bb +++ b/packages/desktop-file-utils/desktop-file-utils_0.6.bb @@ -6,4 +6,4 @@ DEPENDS = "popt glib-2.0 gnome-vfs" SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz" -inherit autotools +inherit autotools diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb index aefbf882d9..8cf060e287 100644 --- a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb +++ b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb @@ -5,7 +5,7 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t dhcp-relay from ISC and has a smaller foot print." HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/" LICENSE = "GPLv2" - + SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \ file://init \ file://dhcp-fwd.cfg" diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb index aefbf882d9..8cf060e287 100644 --- a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb +++ b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb @@ -5,7 +5,7 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t dhcp-relay from ISC and has a smaller foot print." HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/" LICENSE = "GPLv2" - + SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \ file://init \ file://dhcp-fwd.cfg" diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb index 8150e16214..8eff692026 100644 --- a/packages/dillo/dillo_0.8.6.bb +++ b/packages/dillo/dillo_0.8.6.bb @@ -7,7 +7,7 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \ file://dillo-i18n.diff;patch=1 \ file://dillo.desktop \ file://dillo.png" - + PRIORITY = "optional" diff --git a/packages/dosbox/dosbox_0.63.bb b/packages/dosbox/dosbox_0.63.bb index decb3e5f07..9d68e27515 100644 --- a/packages/dosbox/dosbox_0.63.bb +++ b/packages/dosbox/dosbox_0.63.bb @@ -8,5 +8,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \ file://nocdrom.patch;patch=1" CXXFLAGS_append = " -DC_SDL_NOCDROM" -inherit autotools +inherit autotools diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb index 9f15c72282..7f0a9a181e 100644 --- a/packages/e17/entrance_0.9.0.007.bb +++ b/packages/e17/entrance_0.9.0.007.bb @@ -29,9 +29,9 @@ FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}" do_install_append() { install -d ${D}/etc/X11/Xsession.d install -d ${D}/etc/X11/Sessions - + install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions install -d ${D}/etc/X11/login-managers/ - mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance + mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance } diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc new file mode 100644 index 0000000000..03f9c8dc22 --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "EXT2 Filesystem Utilities" +LICENSE = "GPL" +SECTION = "base" +PRIORITY = "optional" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ + file://m4.patch;patch=1" + +S = "${WORKDIR}/e2fsprogs-libs-${PV}" +FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" + +do_stage () { + for i in libcom_err libss libuuid libblkid; do + oe_libinstall -a -C lib $i ${STAGING_LIBDIR} + done + install -d ${STAGING_INCDIR}/et \ + ${STAGING_INCDIR}/ss \ + ${STAGING_INCDIR}/uuid \ + ${STAGING_INCDIR}/blkid + install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ + install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ + install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ + install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ + install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ + install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ + install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ +} diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb index 90ed15e3f0..38449667fe 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb @@ -1,31 +1 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" - -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} +require e2fsprogs-libs.inc diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb index 4d4a432b22..738d1ee206 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb @@ -1,37 +1,8 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +require e2fsprogs-libs.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools +SRC_URI += "file://ldflags.patch;patch=1" do_compile_prepend () { find ./ -print|xargs chmod u=rwX ( cd util; ${BUILD_CC} subst.c -o subst ) } - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb index 9809ac5a6e..0d7d25e2cc 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb @@ -1,17 +1,6 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +require e2fsprogs-libs.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools +SRC_URI += "file://ldflags.patch;patch=1" EXTRA_OECONF=" --enable-elf-shlibs " @@ -19,20 +8,3 @@ do_compile_prepend () { find ./ -print|xargs chmod u=rwX ( cd util; ${BUILD_CC} subst.c -o subst ) } - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc new file mode 100644 index 0000000000..b6bb469cd3 --- /dev/null +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "EXT2 Filesystem Utilities" +HOMEPAGE = "http://e2fsprogs.sf.net" +LICENSE = "GPL" +SECTION = "base" + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = " --enable-dynamic-e2fsck" + + diff --git a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb index 875dafdc4a..a0a449042f 100644 --- a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb +++ b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb @@ -2,7 +2,7 @@ DESCRIPTION="EXT2 Filesystem Utilities" SECTION="base" PRIORITY="optional" RDEPENDS="libc6" -DEPENDS=virtual/libc +DEPENDS=virtual/libc SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ file://${FILESDIR}/ln.patch;patch=1 \ diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb index 63732aac4b..80572a0d41 100644 --- a/packages/e2fsprogs/e2fsprogs_1.33.bb +++ b/packages/e2fsprogs/e2fsprogs_1.33.bb @@ -1,20 +1,12 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -SECTION = "base" -LICENSE = "GPL" -PRIORITY = "optional" -DEPENDS = "" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb index 9171d39c6b..837cf962a0 100644 --- a/packages/e2fsprogs/e2fsprogs_1.34.bb +++ b/packages/e2fsprogs/e2fsprogs_1.34.bb @@ -1,20 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1 \ file://ldflags.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb index 9171d39c6b..837cf962a0 100644 --- a/packages/e2fsprogs/e2fsprogs_1.35.bb +++ b/packages/e2fsprogs/e2fsprogs_1.35.bb @@ -1,20 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1 \ file://ldflags.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index ec28bff31a..a909419437 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -1,18 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -HOMEPAGE = "http://e2fsprogs.sourceforge.net" -LICENSE = "GPL" -SECTION = "base" +require e2fsprogs.inc + PR = "r6" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://no-hardlinks.patch;patch=1" +SRC_URI += "file://no-hardlinks.patch;patch=1" S = "${WORKDIR}/e2fsprogs-${PV}" PARALLEL_MAKE = "" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}" +EXTRA_OECONF += " --sbindir=${base_sbindir}" do_compile_prepend () { find ./ -print|xargs chmod u=rwX @@ -49,4 +44,4 @@ FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" -FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
\ No newline at end of file +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" diff --git a/packages/eds/eds-dbus/no_libedataserverui-20060126.patch b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch new file mode 100644 index 0000000000..bb6f78d9f7 --- /dev/null +++ b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch @@ -0,0 +1,13 @@ +Index: Makefile.am +=================================================================== +--- trunk/Makefile.am (revision 306) ++++ trunk/Makefile.am (working copy) +@@ -16,7 +16,7 @@ + endif + + if ENABLE_DBUS +-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po ++SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po + else + SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po + endif diff --git a/packages/eds/eds-dbus/no_libedataserverui.patch b/packages/eds/eds-dbus/no_libedataserverui.patch index bb6f78d9f7..766c547a56 100644 --- a/packages/eds/eds-dbus/no_libedataserverui.patch +++ b/packages/eds/eds-dbus/no_libedataserverui.patch @@ -6,8 +6,8 @@ Index: Makefile.am endif if ENABLE_DBUS --SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po -+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po +-SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui docs art po ++SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) docs art po else SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po endif diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index e56b41e595..b97ed984bc 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,18 +1,17 @@ DESCRIPTION = "Evolution database backend server" HOMEPAGE = "http://projects.o-hand.com/eds" LICENSE = "LGPL" -DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib" +DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool" PV = "1.4.0+svn${SRCDATE}" -PR = "r17" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libdb.patch;patch=1 \ file://no_iconv_test.patch;patch=1 \ - file://no_libedataserverui.patch;patch=1 \ - file://disable_orbit.patch;patch=1;maxdate=20060126 \ + file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \ + file://no_libedataserverui.patch;patch=1;mindate=20061215 \ + file://disable_orbit.patch;patch=1;maxdate=20061214 \ file://iconv-detect.h" - S = "${WORKDIR}/trunk" inherit autotools pkgconfig @@ -38,7 +37,6 @@ FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \ do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " do_stage () { - autotools_stage_all + autotools_stage_all } - diff --git a/packages/eel/eel_2.6.1.bb b/packages/eel/eel_2.6.1.bb index a9a50cf172..f123a4aa93 100644 --- a/packages/eel/eel_2.6.1.bb +++ b/packages/eel/eel_2.6.1.bb @@ -37,9 +37,9 @@ headers="eel-accessibility.h eel-graphic-effects.h \ do_stage() { install -d ${edir} - for file in ${headers}; do + for file in ${headers}; do install -m 0644 eel/$file ${edir}/$file done - + oe_libinstall -C eel libeel-2 ${STAGING_LIBDIR} } diff --git a/packages/efl++/efl++-fb_0.1.0.bb b/packages/efl++/efl++-fb_0.1.0.bb deleted file mode 100644 index a2e3a7dd34..0000000000 --- a/packages/efl++/efl++-fb_0.1.0.bb +++ /dev/null @@ -1 +0,0 @@ -require efl++.inc diff --git a/packages/efl++/efl++-x11_0.1.0.bb b/packages/efl++/efl++-x11_0.1.0.bb deleted file mode 100644 index 7f6c942790..0000000000 --- a/packages/efl++/efl++-x11_0.1.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require efl++.inc - -EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index cea3114dc7..e0e65b69c0 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -12,6 +12,7 @@ inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ + file://ecore_kernel_input_header.patch;patch=1 \ ${E_CVS};module=e17/libs/ecore/m4;date=20060101" S = "${WORKDIR}/ecore-${PV}" diff --git a/packages/efl/ecore/ecore_kernel_input_header.patch b/packages/efl/ecore/ecore_kernel_input_header.patch new file mode 100644 index 0000000000..99f57ddcff --- /dev/null +++ b/packages/efl/ecore/ecore_kernel_input_header.patch @@ -0,0 +1,23 @@ +Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c +=================================================================== +--- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100 ++++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000 +@@ -1,6 +1,18 @@ + #include "Ecore_Fb.h" + #include "ecore_fb_private.h" + ++struct input_absinfo { ++ __s32 value; ++ __s32 minimum; ++ __s32 maximum; ++ __s32 fuzz; ++ __s32 flat; ++}; ++ ++ ++#define EV_SYN 0x00 ++#define EV_PWR 0x16 ++#define EV_FF_STATUS 0x17 + + /* Copyright (C) Brad Hards (1999-2002). + * this macro is used to tell if "bit" is set in "array" diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.036.bb index 9909811448..c66639d25e 100644 --- a/packages/efl/edje-native_0.5.0.036.bb +++ b/packages/efl/edje-native_0.5.0.036.bb @@ -6,11 +6,6 @@ inherit native DEPENDS = "evas-native ecore-native eet-native embryo-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" -EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ - --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ - --with-eet-config=${STAGING_BINDIR}/eet-config-native \ - --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" - do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 4577535aaa..f065d944f8 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -9,7 +9,7 @@ PROVIDES += "virtual/evas" inherit efl -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ diff --git a/packages/emelfm2/emelfm2_0.0.8.bb b/packages/emelfm2/emelfm2_0.0.8.bb index 092488d5ea..dfc80895c2 100644 --- a/packages/emelfm2/emelfm2_0.0.8.bb +++ b/packages/emelfm2/emelfm2_0.0.8.bb @@ -13,7 +13,7 @@ DEPENDS="gtk+" FILES_${PN} += " /usr/lib/emelfm2/plugins/ /usr/share/pixmaps/emelfm2/" do_compile() { - oe_runmake PREFIX=/usr all + oe_runmake PREFIX=/usr all } do_install() { diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index adc6e5fef7..8151c86865 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -9,7 +9,7 @@ SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \ file://configure-hack.patch;patch=1 \ file://dont-run-tests.patch;patch=1 " -inherit autotools +inherit autotools do_configure_append() { sed -i s:-I/usr/include::g Makefile diff --git a/packages/evince/evince_0.6.1.bb b/packages/evince/evince_0.6.1.bb index 2184d1c0f0..3b3c5984ab 100644 --- a/packages/evince/evince_0.6.1.bb +++ b/packages/evince/evince_0.6.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." LICENSE = "GPL" SECTION = "x11/office" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" PR = "r0" diff --git a/packages/expat/expat.inc b/packages/expat/expat.inc new file mode 100644 index 0000000000..6d27b77b19 --- /dev/null +++ b/packages/expat/expat.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Jim Clarkes XML parser library." +HOMEPAGE = "http://expat.sf.net/" +SECTION = "libs" +LICENSE = "MIT" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ + " +S = "${WORKDIR}/expat-${PV}" + +export LTCC = "${CC}" + +inherit autotools + diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb index a6ac0f5b00..576ad76a55 100644 --- a/packages/expat/expat_1.95.6.bb +++ b/packages/expat/expat_1.95.6.bb @@ -1,13 +1,6 @@ -SECTION = "libs" -DESCRIPTION = "Jim Clarkes XML parser library." -LICENSE = "MIT" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz" -S = "${WORKDIR}/expat-${PV}" +require expat.inc -inherit autotools -export LTCC = "${CC}" +PR = "r1" do_stage () { install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb index c3bbb8981b..a4dda4dcb6 100644 --- a/packages/expat/expat_1.95.7.bb +++ b/packages/expat/expat_1.95.7.bb @@ -1,15 +1,9 @@ -SECTION = "libs" -DESCRIPTION = "Jim Clarkes XML parser library." -HOMEPAGE = "http://expat.sourceforge.net/" -LICENSE = "MIT" +require expat.inc PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - file://autotools.patch;patch=1" -S = "${WORKDIR}/expat-${PV}" +SRC_URI += "file://autotools.patch;patch=1" -inherit autotools lib_package -export LTCC = "${CC}" +inherit lib_package do_configure () { rm -f ${S}/conftools/libtool.m4 diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb index 4f98d3cde9..0fd825ee24 100644 --- a/packages/expat/expat_2.0.0.bb +++ b/packages/expat/expat_2.0.0.bb @@ -1,15 +1,9 @@ -DESCRIPTION = "Jim Clarkes XML parser library." -HOMEPAGE = "http://expat.sourceforge.net/" -SECTION = "libs" -LICENSE = "MIT" +require expat.inc PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - file://autotools.patch;patch=1" -S = "${WORKDIR}/expat-${PV}" +SRC_URI += "file://autotools.patch;patch=1" -inherit autotools lib_package -export LTCC = "${CC}" +inherit lib_package do_configure() { rm -f ${S}/conftools/libtool.m4 diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb new file mode 100644 index 0000000000..5919f28a11 --- /dev/null +++ b/packages/ezx/ezx-boot-usb-native_0.1.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage" +DEPENDS = "libusb-native" +SECTION = "devel" +AUTHOR = "Harald Welte" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2" +S = "${WORKDIR}/boot_usb-${PV}" + +inherit native + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index 5fe3294fee..64e8a486e0 100644 --- a/packages/ezx/ezx-boot-usb-native_1877.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -5,7 +5,12 @@ AUTHOR = "Harald Welte" LICENSE = "GPL" PR = "r1" -SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}" +DEFAULT_PREFERENCE = "-1" + +REV = "1922" +PV = "0.1.0+r${REV}" + +SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}" S = "${WORKDIR}/boot_usb" inherit native diff --git a/packages/gstreamer/gst-plugins-0.8.7/.mtn2git_empty b/packages/ezx/opentapi/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gst-plugins-0.8.7/.mtn2git_empty +++ b/packages/ezx/opentapi/.mtn2git_empty diff --git a/packages/ezx/opentapi/opentapi.init b/packages/ezx/opentapi/opentapi.init new file mode 100644 index 0000000000..6b78c1574c --- /dev/null +++ b/packages/ezx/opentapi/opentapi.init @@ -0,0 +1,82 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# init.d script for opentapi + +set -e + +DAEMON=/usr/bin/opentapi +NAME=opentapi +PIDDIR=/var/run/opentapi +PIDFILE=$PIDDIR/pid +DESC="OpenTAPI server" + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/opentapi ]; then + . /etc/default/opentapis +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $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 \ + -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 + + # 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/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb new file mode 100644 index 0000000000..a617f5b45b --- /dev/null +++ b/packages/ezx/opentapi_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Open implementation of motorola's tapisrc" +LICENSE = "GPLv2" + +PV = "0.0+svn${SRCDATE}" + +SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ + file://opentapi.init \ + " + +inherit update-rc.d + +INITSCRIPT_NAME = "opentapi" +INITSCRIPT_PARAMS = "defaults" + + +S = "${WORKDIR}/${PN}" + +do_install() { + install -d ${D}${bindir} + install -m 755 opentapi ${D}${bindir} + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/opentapi.init ${D}${sysconfdir}/init.d/opentapi +} + diff --git a/packages/faac/faac_1.24.bb b/packages/faac/faac_1.24.bb index ceee00931d..253310d1c5 100644 --- a/packages/faac/faac_1.24.bb +++ b/packages/faac/faac_1.24.bb @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" PACKAGES = "${PN} lib${PN} lib${PN}-dev" FILES_${PN} = " ${bindir}/faac " -FILES_lib${PN} = " ${libdir}/libfaac.so.0 ${libdir}/libfaac.so.0.0.0 " +FILES_lib${PN} = " ${libdir}/libfaac.so.0 ${libdir}/libfaac.so.0.0.0 " FILES_lib${PN}-dev = " ${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la ${libdir}/libfaac.a " do_stage() { diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb index a856a1e45f..363da9d144 100644 --- a/packages/faad2/faad2_2.0.bb +++ b/packages/faad2/faad2_2.0.bb @@ -18,7 +18,7 @@ do_configure_prepend() { mv ${WORKDIR}/Makefile.am ${S}/ } -PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" +PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" FILES_${PN} = "${bindir}/faad" diff --git a/packages/fam/fam_2.6.10.bb b/packages/fam/fam_2.6.10.bb index 60f9ac901e..870c67719f 100644 --- a/packages/fam/fam_2.6.10.bb +++ b/packages/fam/fam_2.6.10.bb @@ -6,7 +6,7 @@ LICENSE = "GPL LGPL" SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \ file://rpcsvc.patch;patch=1" -inherit autotools +inherit autotools CPPFLAGS_append = " -DNDEBUG" diff --git a/packages/fam/fam_2.7.0.bb b/packages/fam/fam_2.7.0.bb index b3265bbd96..653aea6d3c 100644 --- a/packages/fam/fam_2.7.0.bb +++ b/packages/fam/fam_2.7.0.bb @@ -6,7 +6,7 @@ LICENSE = "GPL LGPL" SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \ file://compile-fix.patch;patch=1" -inherit autotools +inherit autotools CPPFLAGS_append = " -DNDEBUG" diff --git a/packages/fbgrab/fbgrab_1.0.bb b/packages/fbgrab/fbgrab_1.0.bb index 331fa260c3..8790fe0a28 100644 --- a/packages/fbgrab/fbgrab_1.0.bb +++ b/packages/fbgrab/fbgrab_1.0.bb @@ -2,10 +2,14 @@ SECTION = "console/network" DESCRIPTION = "framebuffer screenshot program" LICENSE = "GPL" +PR = "r1" + DEPENDS = " zlib libpng " SRC_URI = "http://hem.bredband.net/gmogmo/fbgrab/fbgrab-${PV}.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1 \ + http://people.openezx.org/ao2/fbgrab_network_mode.diff;patch=1 \ + " do_install() { install -d ${D}${bindir} ${D}${mandir}/man1/ diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb index 09abb86dc8..b849df0c6f 100644 --- a/packages/fbpanel/fbpanel_4.3.bb +++ b/packages/fbpanel/fbpanel_4.3.bb @@ -23,7 +23,7 @@ do_install () { install -m 0755 fbpanel ${D}${bindir} install -d ${D}${datadir}/fbpanel/ install -d ${D}${datadir}/fbpanel/plugins - install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins + install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins install -m 644 systray/tray.so ${D}${datadir}/fbpanel/plugins install -m 644 config/default ${D}${datadir}/fbpanel/default install -d ${D}${datadir}/fbpanel/images diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb index c03096102b..ab505110e4 100644 --- a/packages/fbset/fbset_2.1.bb +++ b/packages/fbset/fbset_2.1.bb @@ -6,40 +6,27 @@ # Date: 28-May-06 DESCRIPTION = "The fbset console tool" -HOMEPAGE = "" LICENSE = "GPL" -###################################################################################### +PR = "r2" SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1" -###################################################################################### +inherit autotools update-alternatives -PR = "r1" -PARALLEL_MAKE="" - -###################################################################################### - -inherit autotools - -###################################################################################### +PARALLEL_MAKE = "" do_install() { - install -d ${D}/usr/sbin ${D}/usr/share/man/man8 ${D}/usr/share/man/man5 - - install -m 0755 ${WORKDIR}/${P}/fbset ${D}/usr/sbin/fbset.real - - install -m 0644 ${WORKDIR}/${P}/*.5 ${D}/usr/share/man/man5 - install -m 0644 ${WORKDIR}/${P}/*.8 ${D}/usr/share/man/man8 + install -d ${D}/usr/sbin ${D}/usr/share/man/man8 ${D}/usr/share/man/man5 + install -m 0755 ${WORKDIR}/${P}/fbset ${D}/usr/sbin/fbset.real + install -m 0644 ${WORKDIR}/${P}/*.5 ${D}/usr/share/man/man5 + install -m 0644 ${WORKDIR}/${P}/*.8 ${D}/usr/share/man/man8 } -###################################################################################### +ALTERNATIVE_NAME = "fbset" +ALTERNATIVE_LINK = "${sbindir}/${ALTERNATIVE_NAME}" +ALTERNATIVE_PATH = "${sbindir}/fbset.real" +ALTERNATIVE_PRIORITY = "55" -pkg_postinst_${PN}() { - update-alternatives --install /usr/sbin/fbset fbset /usr/sbin/fbset.real 55 -} -pkg_postrm_${PN}() { - update-alternatives --remove fbset /usr/sbin/fbset.real -} diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb index 44bdd9b04f..9e1fc13da6 100644 --- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb @@ -8,7 +8,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://paths.patch;patch=1 \ file://kernelinclude.patch;patch=1 \ file://ipaq.patch;patch=1" - + S = "${WORKDIR}/fbvncserver-${PV}" inherit module diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb index 66b7349df7..e7c8151e18 100644 --- a/packages/fbvncserver/fbvncserver_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver_0.9.4.bb @@ -16,7 +16,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://buildfix.patch;patch=1 \ file://ipaq.patch;patch=1 \ file://init" - + S = "${WORKDIR}/fbvncserver-${PV}" export INCLUDES = "-I${STAGING_INCDIR}" @@ -43,10 +43,10 @@ do_install () { install -d ${D}${bindir} install -m 0755 ${FBVNCSERVER_SYSTEM}_fbvncserver ${D}${bindir}/fbvncserver install -m 0755 ${FBVNCSERVER_SYSTEM}_tssimd ${D}${bindir}/tssimd - + install -d ${D}${datadir}/fbvncserver install -m 0644 ${FBVNCSERVER_SYSTEM}_panel.jpg ${D}${datadir}/fbvncserver/ - + install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/fbvncinput } diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb index 61d9a018cd..6705039555 100644 --- a/packages/fdclock/fdclock_cvs.bb +++ b/packages/fdclock/fdclock_cvs.bb @@ -8,4 +8,4 @@ DESCRIPTION = "The freedesktop.org clock" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=fdclock" S = "${WORKDIR}/fdclock" -inherit autotools +inherit autotools diff --git a/packages/fget/fget_1.3.3.bb b/packages/fget/fget_1.3.3.bb index fe1f71ce88..165167e6dc 100644 --- a/packages/fget/fget_1.3.3.bb +++ b/packages/fget/fget_1.3.3.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" SRC_URI = "ftp://ftp.feep.net/pub/software/fget/fget-${PV}.tar.gz" -inherit autotools +inherit autotools do_configure() { oe_runconf diff --git a/packages/file/file_4.16.bb b/packages/file/file_4.16.bb index 3e579c5ef4..b2c2e6ed91 100644 --- a/packages/file/file_4.16.bb +++ b/packages/file/file_4.16.bb @@ -7,7 +7,7 @@ DEPENDS = "file-native" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" S = "${WORKDIR}/file-${PV}" -inherit autotools +inherit autotools do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am diff --git a/packages/file/file_4.18.bb b/packages/file/file_4.18.bb index 697d4ffb9f..a98c68009e 100644 --- a/packages/file/file_4.18.bb +++ b/packages/file/file_4.18.bb @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://filesystems" S = "${WORKDIR}/file-${PV}" -inherit autotools +inherit autotools do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am diff --git a/packages/findutils/findutils-4.1.20/configure.patch b/packages/findutils/findutils-4.1.20/configure.patch deleted file mode 100644 index de9d6afae4..0000000000 --- a/packages/findutils/findutils-4.1.20/configure.patch +++ /dev/null @@ -1,90 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- findutils-4.1.20/./configure.in~configure -+++ findutils-4.1.20/./configure.in -@@ -1,5 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(find/pred.c) -+AC_INIT -+AC_CONFIG_SRCDIR([find/pred.c]) - AM_CONFIG_HEADER(config.h) - AC_CANONICAL_HOST - -@@ -23,7 +24,7 @@ - AC_AIX - AC_MINIX - AC_ISC_POSIX --AC_PROG_CC_STDC -+ - AM_C_PROTOTYPES - AC_PROG_INSTALL - AC_PROG_RANLIB -@@ -48,25 +49,25 @@ - AC_MSG_CHECKING(how to get filesystem type) - fstype=no - # The order of these tests is important. --AC_TRY_CPP([#include <sys/statvfs.h> --#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_STATVFS, 1, [Define to use SVR4 statvfs to get filesystem type.]) fstype=SVR4) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statvfs.h> -+#include <sys/fstyp.h>]])],[AC_DEFINE(FSTYPE_STATVFS, 1, Define to use SVR4 statvfs to get filesystem type.) fstype=SVR4],[]) - if test $fstype = no; then --AC_TRY_CPP([#include <sys/statfs.h> --#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_USG_STATFS, 1, [Define to use SVR3.2 statfs to get filesystem type.]) fstype=SVR3) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h> -+#include <sys/fstyp.h>]])],[AC_DEFINE(FSTYPE_USG_STATFS, 1, Define to use SVR3.2 statfs to get filesystem type.) fstype=SVR3],[]) - fi - if test $fstype = no; then --AC_TRY_CPP([#include <sys/statfs.h> --#include <sys/vmount.h>], AC_DEFINE(FSTYPE_AIX_STATFS, 1, [Define to use AIX3 statfs to get filesystem type.]) fstype=AIX) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h> -+#include <sys/vmount.h>]])],[AC_DEFINE(FSTYPE_AIX_STATFS, 1, Define to use AIX3 statfs to get filesystem type.) fstype=AIX],[]) - fi - if test $fstype = no; then --AC_TRY_CPP([#include <mntent.h>], AC_DEFINE(FSTYPE_MNTENT, 1, [Define to use 4.3BSD getmntent to get filesystem type.]) fstype=4.3BSD) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mntent.h>]])],[AC_DEFINE(FSTYPE_MNTENT, 1, Define to use 4.3BSD getmntent to get filesystem type.) fstype=4.3BSD],[]) - fi - if test $fstype = no; then - AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, 1, [Define to use 4.4BSD and OSF1 statfs to get filesystem type.]) fstype=4.4BSD/OSF1) - fi - if test $fstype = no; then --AC_TRY_CPP([#include <sys/mount.h> --#include <sys/fs_types.h>], AC_DEFINE(FSTYPE_GETMNT, 1, [Define to use Ultrix getmnt to get filesystem type.]) fstype=Ultrix) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/mount.h> -+#include <sys/fs_types.h>]])],[AC_DEFINE(FSTYPE_GETMNT, 1, Define to use Ultrix getmnt to get filesystem type.) fstype=Ultrix],[]) - fi - AC_MSG_RESULT($fstype) - -@@ -105,11 +106,11 @@ - # the ANSI2KNR-filtering rules. - #LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'` - AC_CONFIG_SUBDIRS(gnulib) --AC_OUTPUT( -- Makefile -+AC_CONFIG_FILES([Makefile - find/Makefile find/testsuite/Makefile - xargs/Makefile xargs/testsuite/Makefile - locate/Makefile locate/testsuite/Makefile - intl/Makefile po/Makefile.in po/Makefile - doc/Makefile lib/Makefile -- ) -+ ]) -+AC_OUTPUT ---- findutils-4.1.20/./gnulib/configure.ac~configure -+++ findutils-4.1.20/./gnulib/configure.ac -@@ -1,5 +1,5 @@ - # Process this file with autoconf to produce a configure script. --AC_INIT(dummy,0) -+AC_INIT([dummy],[0]) - AM_INIT_AUTOMAKE - - AM_CONFIG_HEADER(config.h) -@@ -95,4 +95,5 @@ - gl_YESNO - - --AC_OUTPUT([Makefile lib/Makefile m4/Makefile po/Makefile]) -+AC_CONFIG_FILES([Makefile lib/Makefile m4/Makefile po/Makefile]) -+AC_OUTPUT diff --git a/packages/findutils/findutils-4.1.20/make.patch b/packages/findutils/findutils-4.1.20/make.patch deleted file mode 100644 index ecebe3b460..0000000000 --- a/packages/findutils/findutils-4.1.20/make.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: findutils-4.1.20/locate/testsuite/Makefile.am -=================================================================== ---- findutils-4.1.20.orig/locate/testsuite/Makefile.am 2001-06-05 02:10:07.000000000 -0400 -+++ findutils-4.1.20/locate/testsuite/Makefile.am 2005-03-11 19:29:30.827233552 -0500 -@@ -13,6 +13,6 @@ - locate.gnu/ignore_case3.exp \ - locate.gnu/ignore_case3.xo - --DIST_SUBDIRS = config inputs locate.gnu -+DIST_SUBDIRS = config locate.gnu - - CLEANFILES = *.log *.sum site.exp site.bak diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.2.29.bb index 5a268cda92..cb6d72f1e9 100644 --- a/packages/findutils/findutils-native_4.1.20.bb +++ b/packages/findutils/findutils-native_4.2.29.bb @@ -1,4 +1,7 @@ -require findutils_${PV}.bb +require findutils.inc + inherit native + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" + S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/findutils/findutils.inc b/packages/findutils/findutils.inc new file mode 100644 index 0000000000..e054dd0cc7 --- /dev/null +++ b/packages/findutils/findutils.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "find, locate, and xargs binaries." +SECTION = "console/utils" +LICENSE = "GPL" + +SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" + +inherit autotools gettext + +# diffutils assumes non-glibc compilation with uclibc and +# this causes it to generate its own implementations of +# standard functionality. regex.c actually breaks compilation +# because it uses __mempcpy, there are other things (TBD: +# see diffutils.mk in buildroot) +EXTRA_OECONF_linux-uclibc = "--without-included-regex" diff --git a/packages/findutils/findutils_4.1.20.bb b/packages/findutils/findutils_4.1.20.bb deleted file mode 100644 index 0ea93f44d3..0000000000 --- a/packages/findutils/findutils_4.1.20.bb +++ /dev/null @@ -1,30 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DESCRIPTION = "find, locate, and xargs binaries." -PR = "r3" - -SRC_URI = "ftp://alpha.gnu.org/gnu/findutils/findutils-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://make.patch;patch=1" - -inherit autotools gettext - -# diffutils assumes non-glibc compilation with uclibc and -# this causes it to generate its own implementations of -# standard functionality. regex.c actually breaks compilation -# because it uses __mempcpy, there are other things (TBD: -# see diffutils.mk in buildroot) -EXTRA_OECONF_linux-uclibc = "--without-included-regex" - -do_install_append () { - mv ${D}${bindir}/find ${D}${bindir}/find.${PN} - mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN} -} - -pkg_postinst_${PN} () { - for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done -} - -pkg_prerm_${PN} () { - for i in find xargs; do update-alternatives --remove $i $i.${PN}; done -} diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb new file mode 100644 index 0000000000..2f40d03bd4 --- /dev/null +++ b/packages/findutils/findutils_4.2.29.bb @@ -0,0 +1,14 @@ +require findutils.inc + +do_install_append () { + mv ${D}${bindir}/find ${D}${bindir}/find.${PN} + mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN} +} + +pkg_postinst_${PN} () { + for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done +} + +pkg_prerm_${PN} () { + for i in find xargs; do update-alternatives --remove $i $i.${PN}; done +} diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb index 293455f2e1..cdd96bbf2d 100644 --- a/packages/flac/flac_1.1.2.bb +++ b/packages/flac/flac_1.1.2.bb @@ -7,7 +7,7 @@ PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ file://disable-xmms-plugin.patch;patch=1 \ file://xmms.m4" - + S = "${WORKDIR}/flac-${PV}" inherit autotools @@ -39,7 +39,7 @@ do_stage () { oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ install -d ${STAGING_INCDIR}/OggFLAC install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h - + install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index 42051d5014..556cd2b47c 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-rel file://fix-read-only-assignments.patch;patch=1" S = "${WORKDIR}/flite-${PV}-release" -inherit autotools +inherit autotools EXTRA_OECONF = "--with-audio=oss --enable-shared" diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb index 08ce8080cb..39e3279a4f 100644 --- a/packages/fltk/fltk_1.1.4.bb +++ b/packages/fltk/fltk_1.1.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.fltk.org" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "jpeg libpng zlib" +DEPENDS = "jpeg libpng mesa zlib" PR = "FLDevice-r0" @@ -13,7 +13,9 @@ S = "${WORKDIR}/fltk-${PV}-Fl_Device" inherit autotools binconfig lib_package -EXTRA_OECONF = "--enable-shared --disable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" +CXXFLAGS = "" + +EXTRA_OECONF = "--enable-shared --enable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" do_configure() { oe_runconf diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index 81d2952e23..3f271a57a4 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -70,25 +70,25 @@ do_install_append() { install -d ${D}/usr/share/fluxbox install -d ${D}/usr/share/fluxbox/styles install -d ${D}/etc - + install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin - install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin - install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc + install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin + install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc } ###################################################################################### -pkg_postinst_${PN}-gpe() { +pkg_postinst_${PN}-gpe() { update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox 15 update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15 } -pkg_postrm_${PN}-gpe() { +pkg_postrm_${PN}-gpe() { update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb index 56e799a272..ffaa7da5b4 100644 --- a/packages/fluxbox/fluxbox_svn.bb +++ b/packages/fluxbox/fluxbox_svn.bb @@ -71,25 +71,25 @@ do_install_append() { install -d ${D}/usr/share/fluxbox install -d ${D}/usr/share/fluxbox/styles install -d ${D}/etc - + install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin - install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin - install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc + install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin + install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc } ###################################################################################### -pkg_postinst_${PN}-gpe() { +pkg_postinst_${PN}-gpe() { update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox 15 update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15 } -pkg_postrm_${PN}-gpe() { +pkg_postrm_${PN}-gpe() { update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb index 58589ae124..541b74634c 100644 --- a/packages/fontconfig/fontconfig-native_2.2.95.bb +++ b/packages/fontconfig/fontconfig-native_2.2.95.bb @@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" EXTRA_OEMAKE = "" -EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" do_stage () { oe_runmake install diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb index 58589ae124..541b74634c 100644 --- a/packages/fontconfig/fontconfig-native_2.3.91.bb +++ b/packages/fontconfig/fontconfig-native_2.3.91.bb @@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" EXTRA_OEMAKE = "" -EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" do_stage () { oe_runmake install diff --git a/packages/freedoom/freedoom_0.3.bb b/packages/freedoom/freedoom_0.3.bb index 0bdc05def8..daef13fc8a 100644 --- a/packages/freedoom/freedoom_0.3.bb +++ b/packages/freedoom/freedoom_0.3.bb @@ -12,17 +12,17 @@ PR = "r1" FILES_${PN} = "/usr/share/games/doom/*" FILES_${PN}-doc = "/usr/share/doc/freedoom/*" - -do_install() { + +do_install() { install -d ${D}/usr/share/games/doom install -d ${D}/usr/share/doc/freedoom - + install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/doom2.wad ${D}/usr/share/games/doom/ install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/* ${D}/usr/share/doc/freedoom rm ${D}/usr/share/doc/freedoom/*.wad - - - - + + + + } diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb index c048751d59..669187e0c7 100644 --- a/packages/frodo/frodo_4.1b.bb +++ b/packages/frodo/frodo_4.1b.bb @@ -12,7 +12,7 @@ SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \ file://frodo.desktop" S = "${WORKDIR}/Frodo-${PV}/Src" -inherit autotools +inherit autotools EXTRA_OECONF = "--disable-sdltest --enable-qtopia" diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb index 0c7772d729..b3a4463451 100644 --- a/packages/frodo/frodo_4.2.bb +++ b/packages/frodo/frodo_4.2.bb @@ -12,7 +12,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \ file://frodorc \ file://Frodo.png \ file://frodo.desktop" - + S = "${WORKDIR}/Frodo4/Src" inherit autotools diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb index 2a6722c422..8e2724ce4b 100644 --- a/packages/fs/fs_cvs.bb +++ b/packages/fs/fs_cvs.bb @@ -7,7 +7,7 @@ DEPENDS = "libxfont xtrans" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS" S = "${WORKDIR}/FS" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { oe_runmake install prefix=${STAGING_DIR} \ diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb index f4ec5ca919..a84237f263 100644 --- a/packages/fstests/fstests.bb +++ b/packages/fstests/fstests.bb @@ -14,5 +14,5 @@ S = "${WORKDIR}/fstests/tests" do_install() { install -d ${D}${bindir} - find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \; + find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \; } diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb index 4d582107bb..4c71b0b9f9 100644 --- a/packages/fuse/fuse-module_2.5.3.bb +++ b/packages/fuse/fuse-module_2.5.3.bb @@ -1,36 +1,29 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" +require fuse.inc -LICENSE = "GPL" - - -DEPENDS = "fakeroot-native" RRECOMMENDS = "fuse" - PR = "r1" -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" S = "${WORKDIR}/fuse-${PV}" - -inherit autotools pkgconfig module +FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" EXTRA_OECONF = " --with-kernel=${STAGING_KERNEL_DIR}" +inherit module + do_configure() { -cd ${S} ; oe_runconf + cd ${S} ; oe_runconf } do_compile(){ -LDFLAGS="" -cd ${S}/kernel -oe_runmake + LDFLAGS="" + cd ${S}/kernel + oe_runmake } fakeroot do_install() { -LDFLAGS="" -install -d ${D}${sysconfdir}/udev/rules.d/ -install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ -cd ${S}/kernel -oe_runmake install DESTDIR=${D} + LDFLAGS="" + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ + cd ${S}/kernel + oe_runmake install DESTDIR=${D} } -FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" diff --git a/packages/fuse/fuse.inc b/packages/fuse/fuse.inc new file mode 100644 index 0000000000..abc408561a --- /dev/null +++ b/packages/fuse/fuse.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" +HOMEPAGE = "http://fuse.sf.net" +LICENSE = "GPL" +DEPENDS = "fakeroot-native" +RRECOMMENDS_fuse = "fuse-module kernel-module-fuse" + +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" + +inherit autotools pkgconfig + +fakeroot do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index b423e962ae..5f5ce701d3 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -1,31 +1,17 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" - -LICENSE_${PN} = "LGPL" +require fuse.inc PR = "r1" -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" - -#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils +#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" FILES_${PN} = "${libdir}/*.so*" FILES_${PN}-dev += "${libdir}/*.la" FILES_fuse-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME_fuse-utils = "1" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - -inherit autotools pkgconfig EXTRA_OECONF = " --disable-kernel-module" -fakeroot do_install() { -oe_runmake install DESTDIR=${D} -} - fakeroot do_stage() { -autotools_stage_all + autotools_stage_all } diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb index 74dd994720..7eff4dce46 100644 --- a/packages/fuse/fuse_2.6.0.bb +++ b/packages/fuse/fuse_2.6.0.bb @@ -1,30 +1,15 @@ -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -HOMEPAGE = "http://fuse.sf.net" -LICENSE = "LGPL" +require fuse.inc -PR = "r0" +SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" - -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \ - file://not-run-updaterc.d-on-host.patch;patch=1" - - -inherit autotools pkgconfig EXTRA_OECONF = " --disable-kernel-module" -fakeroot do_install() { - oe_runmake install DESTDIR=${D} -} - #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES =+ "lib${PN} libulockmgr" FILES_${PN}-dev += "${libdir}/*.la" FILES_lib${PN} = "${libdir}/libfuse*.so.*" FILES_libulockmgr = "${libdir}/libulockmgr.so.*" - fakeroot do_stage() { autotools_stage_all } diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb index 2980a63ea8..adb0b3586f 100644 --- a/packages/fuse/sshfs-fuse_1.3.bb +++ b/packages/fuse/sshfs-fuse_1.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protoc LICENSE_${PN} = "LGPL" -DEPENDS = "fakeroot-native fuse" +DEPENDS = "fakeroot-native fuse" RRECOMMENDS_${PN} = "fuse-module" SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" diff --git a/packages/galculator/galculator_1.2.3.bb b/packages/galculator/galculator_1.2.3.bb index 7cc87ebfc1..3348b9ece4 100644 --- a/packages/galculator/galculator_1.2.3.bb +++ b/packages/galculator/galculator_1.2.3.bb @@ -13,7 +13,7 @@ PRIORITY = "optional" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://desktop-categories.patch;patch=1 \ file://Makefile.am.patch;patch=1 \ - file://src-ui.c.patch;patch=1;pnum=0" + file://src-ui.c.patch;patch=1;pnum=0" LDFLAGS += '-Wl,--export-dynamic' diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb index 1e2c36b711..9aba2a2f0a 100644 --- a/packages/gallery/gallery_1.5.5.bb +++ b/packages/gallery/gallery_1.5.5.bb @@ -1,21 +1,23 @@ -SECTION = "apps" DESCRIPTION = "The Gallery v1 web image gallery" +SECTION = "apps" LICENSE = "GPL" -# RDEPENDS = "apache2 modphp imagemagick jhead" - PR = "r1" + +SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz" + S = "${WORKDIR}/gallery" -HTTPCONF=/etc/apache2/httpd.conf -DEST_DIR=/usr/share/apache2/htdocs/ + +inherit autotools + +HTTPCONF = "/etc/apache2/httpd.conf" +DEST_DIR = "/usr/share/apache2/htdocs/" + # # don't list the albums as a file - it might get auto-deleted # FILES_${PN} = "${DEST_DIR}/gallery /etc/apache2/modules.d" -SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz" - -inherit autotools # No configure step for gallery do_configure() { diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb index 04b5a25caa..49a2f21399 100644 --- a/packages/gammu/gammu_1.07.00.bb +++ b/packages/gammu/gammu_1.07.00.bb @@ -32,28 +32,28 @@ do_stage() { oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ - install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc - install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding - install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone - install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at - install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex - install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia - install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 + install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc + install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding + install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone + install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at + install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex + install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia + install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku - install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian - install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel - install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service - install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms - install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup - install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device - install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda - install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth - install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial - install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol - install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at - install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex - install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia - install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian + install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian + install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel + install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service + install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms + install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup + install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device + install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda + install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth + install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial + install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol + install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at + install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex + install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia + install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel } @@ -70,6 +70,6 @@ PACKAGES_DYNAMIC = "gammu-locale-*" python populate_packages_prepend () { help_dir = bb.data.expand('${datadir}/gammu/', d) - + do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') } diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb deleted file mode 100644 index 1f6ecaf661..0000000000 --- a/packages/gbluezconf/gbluezconf_00.10.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "GTK panel applet to control bluetooth stuff" -LICENSE = "GPLv2" - -DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+" -SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz" - -inherit autotools pkgconfig - - - - diff --git a/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch b/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch deleted file mode 100644 index c4897c0330..0000000000 --- a/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Dimitry Andric <dimitry@andric.com>, 2004-05-01 -# -# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed -# anymore. (The required functions are now in libgcc.) -# -# Fixes errors like -# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat -# collect2: ld returned 1 exit status -# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 -# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat - -Index: gcc-4.0.2/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 -+++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 -@@ -56,7 +56,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add - the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch b/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch deleted file mode 100644 index c86c83ed15..0000000000 --- a/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gcc-4.0.2/gcc/config/arm/t-linux -=================================================================== ---- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 -+++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 -@@ -4,7 +4,10 @@ - LIBGCC2_DEBUG_CFLAGS = -g0 - - LIB1ASMSRC = arm/lib1funcs.asm --LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx -+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ -+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ -+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ -+ _fixsfsi _fixunssfsi _floatdidf _floatdisf - - # MULTILIB_OPTIONS = mhard-float/msoft-float - # MULTILIB_DIRNAMES = hard-float soft-float diff --git a/packages/gcc/gcc-4.1-20060217/ldflags.patch b/packages/gcc/gcc-4.1-20060217/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/packages/gcc/gcc-4.1-20060217/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch deleted file mode 100644 index 6afb10d6ef..0000000000 --- a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: gcc-4.0.2/gcc/c-incpath.c -=================================================================== ---- gcc-4.0.2.orig/gcc/c-incpath.c 2005-01-23 16:05:27.000000000 +0100 -+++ gcc-4.0.2/gcc/c-incpath.c 2006-05-15 21:23:02.000000000 +0200 -@@ -350,6 +350,26 @@ - p->construct = 0; - p->user_supplied_p = user_supplied_p; - -+#ifdef CROSS_COMPILE -+ /* A common error when cross compiling is including -+ host headers. This code below will try to fail fast -+ for cross compiling. Currently we consider /usr/include, -+ /opt/include and /sw/include as harmful. */ -+ { -+ /* printf("Adding Path: %s\n", p->name ); */ -+ if( strstr(p->name, "/usr/include" ) == p->name ) { -+ fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name); -+ abort(); -+ } else if( strstr(p->name, "/sw/include") == p->name ) { -+ fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name); -+ abort(); -+ } else if( strstr(p->name, "/opt/include") == p->name ) { -+ fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name); -+ abort(); -+ } -+ } -+#endif -+ - add_cpp_dir_path (p, chain); - } - diff --git a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch deleted file mode 100644 index 8b53f653c6..0000000000 --- a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.1/gcc-4.1.1-pr13685-1.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch new file mode 100644 index 0000000000..c1e1dec408 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch @@ -0,0 +1,26 @@ +Submitted By: Alexander E. Patrakov +Date: 2006-12-11 +Initial Package Version: 4.1.1 +Upstream Status: backport +Origin: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28621 +Description: Fix crash of programs compiled with -Os -ffast-math +(affects procps on the LiveCD) +--- gcc-4.1.1/gcc/config/i386/i386.c ++++ gcc-4.1.1/gcc/config/i386/i386.c +@@ -1502,12 +1502,10 @@ + } + + /* Validate -mpreferred-stack-boundary= value, or provide default. +- The default of 128 bits is for Pentium III's SSE __m128, but we +- don't want additional code to keep the stack aligned when +- optimizing for code size. */ +- ix86_preferred_stack_boundary = (optimize_size +- ? TARGET_64BIT ? 128 : 32 +- : 128); ++ The default of 128 bits is for Pentium III's SSE __m128, We can't ++ change it because of optimize_size. Otherwise, we can't mix object ++ files compiled with -Os and -On. */ ++ ix86_preferred_stack_boundary = 128; + if (ix86_preferred_stack_boundary_string) + { + i = atoi (ix86_preferred_stack_boundary_string); diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb deleted file mode 100644 index 037f3032a6..0000000000 --- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb +++ /dev/null @@ -1,29 +0,0 @@ -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} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb deleted file mode 100644 index d2dc240126..0000000000 --- a/packages/gcc/gcc-cross_4.1-20060217.bb +++ /dev/null @@ -1,16 +0,0 @@ -require gcc_${PV}.bb -# path mangling, needed by the cross packaging -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 = "r1" - -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 -require gcc3-build-cross.inc -# cross packaging -require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 2f29e172a3..5721dee50b 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ 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 = "r8" +PR = "r9" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb deleted file mode 100644 index 6889f04a36..0000000000 --- a/packages/gcc/gcc_4.1-20060217.bb +++ /dev/null @@ -1,20 +0,0 @@ -PR = "r0" -DESCRIPTION = "The GNU cc and gcc C compilers." -HOMEPAGE = "http://www.gnu.org/software/gcc/" -SECTION = "devel" -LICENSE = "GPL" -DEFAULT_PREFERENCE = "-99999" - -inherit autotools gettext - -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 " - -require gcc4-build.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 862a1dfe5b..47253cc8d5 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -24,4 +24,4 @@ FORTRAN = "" HAS_GFORTRAN = "" HAS_G2C = "no" - + diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 81b81eebcd..ee8bfb00d9 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -30,18 +30,19 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ - " + file://gcc-4.1.1-pr13685-1.patch;patch=1 \ + " SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " #Set the fortran bits -# 'fortran' or '', not 'f77' like gcc3 had -FORTRAN = "" +# 'fortran' or '', not 'f77' like gcc3 had +FORTRAN = "" HAS_GFORTRAN = "no" HAS_G2C = "no" #Set the java bits -JAVA_arm = "" +JAVA_arm = "" JAVA = "" LANGUAGES = "c,c++${FORTRAN}${JAVA}" @@ -49,4 +50,4 @@ 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 8960469a18..85fe468bc0 100644 --- a/packages/gcc/gcc_4.2-20060513.bb +++ b/packages/gcc/gcc_4.2-20060513.bb @@ -24,4 +24,4 @@ FORTRAN = "" HAS_GFORTRAN = "" HAS_G2C = "no" - + diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb index 70f435603c..2a97cfe81d 100644 --- a/packages/gdal/gdal_1.3.2.bb +++ b/packages/gdal/gdal_1.3.2.bb @@ -34,5 +34,5 @@ do_compile() { do_package_prepend() { # the brokenness.... os.system('cp -pPR ${D}${D}* ${D}../') -} +} diff --git a/packages/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb deleted file mode 100644 index 8ab16527ac..0000000000 --- a/packages/gdb/gdb-cross_6.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" -DEPENDS = "ncurses-native" - -inherit autotools sdk - -S = "${WORKDIR}/gdb-${PV}" -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install.patch;patch=1" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -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}" - -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" - -EXTRA_OECONF = "--with-curses --with-readline" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_stage() { - : -} diff --git a/packages/gdb/gdb-cross_6.2.bb b/packages/gdb/gdb-cross_6.2.bb deleted file mode 100644 index 8ab16527ac..0000000000 --- a/packages/gdb/gdb-cross_6.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" -DEPENDS = "ncurses-native" - -inherit autotools sdk - -S = "${WORKDIR}/gdb-${PV}" -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install.patch;patch=1" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -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}" - -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" - -EXTRA_OECONF = "--with-curses --with-readline" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_stage() { - : -} diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 45cb196d9d..9cc72cca69 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -1,7 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" +require gdb.inc + SECTION = "base" -PRIORITY = "optional" DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb index 7c9180ad6a..3a108d568b 100644 --- a/packages/gdb/gdb-cross_6.4.bb +++ b/packages/gdb/gdb-cross_6.4.bb @@ -1,8 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" +require gdb.inc + SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" DEPENDS = "ncurses-native" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.6.bb index 32076b529e..32076b529e 100644 --- a/packages/gdb/gdb-cross_6.2.1.bb +++ b/packages/gdb/gdb-cross_6.6.bb diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc new file mode 100644 index 0000000000..168e85f5ba --- /dev/null +++ b/packages/gdb/gdb.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb deleted file mode 100644 index 797148f262..0000000000 --- a/packages/gdb/gdb_6.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" -DEPENDS = "ncurses readline" - -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://uclibc.patch;patch=1" - -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 --with-readline --disable-sim \ - --program-prefix=''" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_install () { - make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 - oe_runmake install \ - 'prefix=${D}${prefix}' 'exec_prefix=${D}${prefix}' 'bindir=${D}${bindir}' \ - 'sbindir=${D}${sbindir}' 'infodir=${D}${infodir}' 'libdir=${D}${libdir}' \ - 'mandir=${D}${mandir}' 'includedir=${D}${includedir}' - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} - -# -# patch description -# -# readline.patch: -# gdb 5.3 provides its own readline source which tends to conflict with -# readline package. we override readline included from gdb source -# with packaged readline and fix up extern tilde_expand in gdb/defs.h -# diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb deleted file mode 100644 index 809c90173f..0000000000 --- a/packages/gdb/gdb_6.2.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "gdb - GNU debugger" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" -PR = "r1" -DEPENDS = "ncurses readline" - -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://uclibc.patch;patch=1" - -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 install \ - 'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}${base_bindir}' \ - 'sbindir=${D}${base_sbindir}' 'infodir=${D}/share/info' 'libdir=${D}${base_libdir}' \ - 'mandir=${D}/share/man' 'includedir=${D}/include' - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index bce00f42f1..a1c9f9ede4 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" PR = "r2" diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb index b32891d2c5..0452fda1a1 100644 --- a/packages/gdb/gdb_6.4.bb +++ b/packages/gdb/gdb_6.4.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" diff --git a/packages/gdb/gdb_6.2.1.bb b/packages/gdb/gdb_6.6.bb index d8aa548d8f..1bfe3dfecf 100644 --- a/packages/gdb/gdb_6.2.1.bb +++ b/packages/gdb/gdb_6.6.bb @@ -4,14 +4,18 @@ LICENSE="GPL" SECTION = "devel" PRIORITY = "optional" DEPENDS = "ncurses readline" +PR = "r0" PACKAGES =+ 'gdbserver ' FILES_gdbserver = '${bindir}/gdbserver' +RRECOMMENDS_gdb = "glibc-thread-db" + inherit autotools gettext SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://uclibc.patch;patch=1 \ +#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" diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index 22d1285e8d..f3beb47b41 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -10,7 +10,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ file://libtool-mode.patch;patch=1" -inherit autotools +inherit autotools do_stage () { oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} diff --git a/packages/genext2fs/genext2fs_1.3.bb b/packages/genext2fs/genext2fs_1.3.bb index ab74a76a25..e57f78ae50 100644 --- a/packages/genext2fs/genext2fs_1.3.bb +++ b/packages/genext2fs/genext2fs_1.3.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/genext2fs-${PV}.orig" do_compile () { oe_runmake -} +} do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/geoclue/geoclue_svn.bb b/packages/geoclue/geoclue_svn.bb index e07b01d2ca..f0d8bc16d8 100644 --- a/packages/geoclue/geoclue_svn.bb +++ b/packages/geoclue/geoclue_svn.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/trunk" do_install_append() { mkdir -p ${D}/usr/share/ - cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share + cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share rm -rf ${D}${STAGING_DATADIR}/ } diff --git a/packages/geode-drivers/geode-aeslx_2.6.11.bb b/packages/geode-drivers/geode-aeslx_2.6.11.bb index 85fffc1cdf..fdcbdbf20b 100644 --- a/packages/geode-drivers/geode-aeslx_2.6.11.bb +++ b/packages/geode-drivers/geode-aeslx_2.6.11.bb @@ -13,7 +13,7 @@ require geode-modules.inc FILES_${PN} += " /etc" -do_install_append(){ +do_install_append(){ install -d ${D}/etc/modules.d echo options geodeaes rsvd_mem=0x200000 > ${D}/etc/modules.d/aes } diff --git a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb deleted file mode 100644 index 8b775a703c..0000000000 --- a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb +++ /dev/null @@ -1,16 +0,0 @@ -# V4L2 OE build file for the AMD Geode LX -# Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Linux video capture/overlay driver for the AMD Geode LX" -HOMEPAGE = "http://www.amd.com/embedded" - -PR = "r0" -AMD_DRIVER_VERSION = "03.02.0100" -AMD_DRIVER_LABEL = "Graphics_Video4Linux2_LX_${AMD_DRIVER_VERSION}" - -require geode-modules.inc - -S="${WORKDIR}/${AMD_DRIVER_LABEL}/lxv4l2" - -export EXTRA_CFLAGS += " -DLINUX_2_6=1"
\ No newline at end of file diff --git a/packages/gif2png/gif2png_2.5.1.bb b/packages/gif2png/gif2png_2.5.1.bb index 1cc27b62d8..9ba886ecbd 100644 --- a/packages/gif2png/gif2png_2.5.1.bb +++ b/packages/gif2png/gif2png_2.5.1.bb @@ -6,5 +6,5 @@ DEPENDS = "zlib libpng" SRC_URI = "http://www.catb.org/~esr/gif2png/gif2png-${PV}.tar.gz" -inherit autotools +inherit autotools diff --git a/packages/gift/gift_0.11.4.bb b/packages/gift/gift_0.11.4.bb index bca8d60006..6446398311 100644 --- a/packages/gift/gift_0.11.4.bb +++ b/packages/gift/gift_0.11.4.bb @@ -8,7 +8,7 @@ FILES_gift_append = " ${datadir}/giFT" SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2" -inherit autotools +inherit autotools EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \ --with-vorbis-includes=${STAGING_INCDIR}" diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb index bca8d60006..6446398311 100644 --- a/packages/gift/gift_0.11.5.bb +++ b/packages/gift/gift_0.11.5.bb @@ -8,7 +8,7 @@ FILES_gift_append = " ${datadir}/giFT" SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2" -inherit autotools +inherit autotools EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \ --with-vorbis-includes=${STAGING_INCDIR}" diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb index eb6e385201..10242e23df 100644 --- a/packages/gimp/gimp_2.2.10.bb +++ b/packages/gimp/gimp_2.2.10.bb @@ -13,9 +13,9 @@ inherit autotools pkgconfig EXTRA_OECONF = " --disable-gtktest \ --without-libtiff \ --disable-print \ - --enable-mp" + --enable-mp" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } - + diff --git a/packages/git/files/Makefile.patch b/packages/git/files/Makefile.patch deleted file mode 100644 index e360ae917d..0000000000 --- a/packages/git/files/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git-snapshot-20051008/Makefile -=================================================================== ---- git-snapshot-20051008.orig/Makefile 2005-10-06 00:57:23.000000000 +0100 -+++ git-snapshot-20051008/Makefile 2005-10-08 22:03:50.000000000 +0100 -@@ -332,7 +332,7 @@ - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - git-%$X: %.o $(LIB_FILE) -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) - - git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV) - $(SIMPLE_PROGRAMS) : $(LIB_FILE) diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.4.4.2.bb new file mode 100644 index 0000000000..f91fd03ab1 --- /dev/null +++ b/packages/git/git-native_1.4.4.2.bb @@ -0,0 +1,3 @@ +require git.inc +inherit native +DEPENDS = "openssl-native curl-native" diff --git a/packages/git/git-native_snapshot.bb b/packages/git/git-native_snapshot.bb deleted file mode 100644 index 84e6f96686..0000000000 --- a/packages/git/git-native_snapshot.bb +++ /dev/null @@ -1,9 +0,0 @@ -require git_snapshot.bb -inherit native -DEPENDS = "expat-native openssl-native curl-native" - -do_stage () { - oe_runmake install bindir=${STAGING_BINDIR} \ - template_dir=${STAGING_DIR}/${BUILD_SYS}/share/git-core/templates/ \ - GIT_PYTHON_DIR=${STAGING_DIR}/${BUILD_SYS}/share/git-core/python -} diff --git a/packages/git/git.inc b/packages/git/git.inc new file mode 100644 index 0000000000..384dfaaeec --- /dev/null +++ b/packages/git/git.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +SECTION = "console/utils" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2" +S = "${WORKDIR}/git-${PV}" + +do_install () { + oe_runmake install prefix=${D} bindir=${D}${bindir} \ + template_dir=${D}${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${D}${datadir}/git-core/python +} + +FILES_${PN} += "${datadir}/git-core" + diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.4.4.2.bb new file mode 100644 index 0000000000..37f71cfb04 --- /dev/null +++ b/packages/git/git_1.4.4.2.bb @@ -0,0 +1,3 @@ +require git.inc +DEPENDS = "openssl curl" +RDEPENDS = "perl perl-module-file-path" diff --git a/packages/git/git_snapshot.bb b/packages/git/git_snapshot.bb deleted file mode 100644 index c9048a4673..0000000000 --- a/packages/git/git_snapshot.bb +++ /dev/null @@ -1,30 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DESCRIPTION = "The git revision control system used by the Linux kernel developers" -DEPENDS = "openssl curl" -RDEPENDS = "perl \ - perl-module-file-path \ - " - -PR = "r2" - -def get_git_pkgdate(d): - import bb - srcdate = bb.data.getVar('SRCDATE', d, 1) - return "-".join([srcdate[0:4], srcdate[4:6], srcdate[6:8]]) - -PKGDATE = "${@get_git_pkgdate(d)}" - -SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" -PV = "1.4.3.5+snapshot${PKGDATE}" - -S = "${WORKDIR}/git-${PKGDATE}" - -FILES_${PN} += "${datadir}/git-core" - -do_install () { - oe_runmake install prefix=${D} bindir=${D}${bindir} \ - template_dir=${D}${datadir}/git-core/templates \ - GIT_PYTHON_DIR=${D}${datadir}/git-core/python -} - diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb index c5b23c4939..3208a06f00 100644 --- a/packages/gkdial/gkdial_1.8.1.bb +++ b/packages/gkdial/gkdial_1.8.1.bb @@ -18,7 +18,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \ FILES_${PN} = "${sysconfdir}/chatscripts ${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} += " ${datadir}/gkdial ${datadir}/gkdial/glade ${sysconfdir}/gconf/schemas" - + CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include -D_GNU_SOURCE" LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/glib-2.0/glib-2.0_2.12.6.bb b/packages/glib-2.0/glib-2.0_2.12.6.bb new file mode 100644 index 0000000000..4d8e59b355 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.6.bb @@ -0,0 +1,6 @@ +require glib.inc + +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" + diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc new file mode 100644 index 0000000000..6a33291d52 --- /dev/null +++ b/packages/glib-2.0/glib.inc @@ -0,0 +1,40 @@ +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" +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +require glib-2.0.inc + +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-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb index 882684e9b7..752164d968 100644 --- a/packages/glibc/glibc-initial_2.2.5.bb +++ b/packages/glibc/glibc-initial_2.2.5.bb @@ -18,7 +18,7 @@ do_configure () { --enable-hacker-mode if grep -q GLIBC_2.3 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb index 78bdaadd9a..389c4616d6 100644 --- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb @@ -17,7 +17,7 @@ do_configure () { --enable-hacker-mode if grep -q GLIBC_2.3 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb index 4433ced868..261f87b288 100644 --- a/packages/glibc/glibc-initial_2.3.2.bb +++ b/packages/glibc/glibc-initial_2.3.2.bb @@ -17,7 +17,7 @@ do_configure () { --enable-hacker-mode if grep -q GLIBC_2.3 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb index f13419a413..b6bf3ece51 100644 --- a/packages/glibc/glibc-initial_2.4.bb +++ b/packages/glibc/glibc-initial_2.4.bb @@ -15,7 +15,7 @@ do_configure () { --enable-hacker-mode if grep -q GLIBC_2.3 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb index f13419a413..64f8d4a21e 100644 --- a/packages/glibc/glibc-initial_2.5.bb +++ b/packages/glibc/glibc-initial_2.5.bb @@ -9,13 +9,14 @@ PACKAGES = "" do_configure () { sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure chmod +x ${S}/configure + unset CFLAGS CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ --without-cvs --disable-sanity-checks \ --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ --enable-hacker-mode - if grep -q GLIBC_2.3 ${S}/ChangeLog; then + if grep -q GLIBC_2.5 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb index 70c7e161a4..1a3dfe84d1 100644 --- a/packages/glibc/glibc-initial_cvs.bb +++ b/packages/glibc/glibc-initial_cvs.bb @@ -16,7 +16,7 @@ do_configure () { --enable-hacker-mode if grep -q GLIBC_2.3 ${S}/ChangeLog; then # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # Fortunately, we don't need errlist-compat.c, since we just need .h files, # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. # Another workaround might be to tell configure to not use any cross options to $(CC). # The real fix would be to get install-headers to not generate errlist-compat.c. diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc new file mode 100644 index 0000000000..4e785d8275 --- /dev/null +++ b/packages/glibc/glibc.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "GNU C Library" +HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" +SECTION = "libs" +PRIORITY = "required" +LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 10e2e2e351..6f00011d00 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,10 +1,7 @@ +require glibc.inc + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r10" -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" DEFAULT_PREFERENCE_sh3 = "-99" @@ -134,8 +131,8 @@ glibc_do_unpack () { } python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('glibc_do_unpack', d) + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('glibc_do_unpack', d) } do_configure () { diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 471262373c..40fef7bed4 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 9f42e00e35..12db1928c6 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc + PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index a6950c558d..9286fce398 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index aa119f0a7b..6382d12e57 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 4d401d11f0..f955a6e0a0 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc + DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 22ae2c5c38..7c2bf09e4e 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,9 +1,6 @@ +require glibc.inc + PR = "r8" -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 8e86c6457b..985df1dfaa 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index c33cef74ca..4cf0b82b92 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc + PR = "r12" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 815038f0a6..23230392e9 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,8 +1,7 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc + +ARM_INSTRUCTION_SET = "arm" + PR = "r4" # the -isystem in bitbake.conf screws up glibc do_stage diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 26f03ab0c1..c85aa500f1 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" PR = "r5" diff --git a/packages/gmp/gmp.inc b/packages/gmp/gmp.inc index ad179165f3..71ea128bc5 100644 --- a/packages/gmp/gmp.inc +++ b/packages/gmp/gmp.inc @@ -9,6 +9,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ inherit autotools +ARM_INSTRUCTION_SET = "arm" + acpaths = "" do_stage () { diff --git a/packages/gnet/gnet_cvs.bb b/packages/gnet/gnet_cvs.bb index 28b9f1e2e3..b36df17c18 100644 --- a/packages/gnet/gnet_cvs.bb +++ b/packages/gnet/gnet_cvs.bb @@ -12,3 +12,7 @@ S = "${WORKDIR}/gnet" EXTRA_OECONF = "--disable-pthreads" inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index 865379b71c..6128eac3e2 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -33,5 +33,5 @@ do_install_append () { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ install -d ${D}/${datadir}/dbus-1.0/services/ - install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index d4d9cde477..87daa1d227 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -43,5 +43,5 @@ do_install_append () { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ install -d ${D}/${datadir}/dbus-1.0/services/ - install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } diff --git a/packages/gnome/gdm_2.14.9.bb b/packages/gnome/gdm_2.14.9.bb index 76a6a1028d..8af27fd407 100644 --- a/packages/gnome/gdm_2.14.9.bb +++ b/packages/gnome/gdm_2.14.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Graphical login manager" LICENSE = "GPL" -DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" +DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" inherit gnome diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb new file mode 100644 index 0000000000..647e751c57 --- /dev/null +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -0,0 +1,20 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +PR = "r1" +DESCRIPTION = "GNOME library for reading .desktop files" +inherit gnome pkgconfig + +DEPENDS = "gnome-common gnome-doc-utils libgnomeui" + +EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" + +do_configure_prepend () { + cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} +} + +FILES_${PN} += "${datadir}/gnome-about" + + +do_stage () { + autotools_stage_all +} diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb index d385068c59..54a6559d05 100644 --- a/packages/gnome/gnome-desktop_2.7.90.bb +++ b/packages/gnome/gnome-desktop_2.7.90.bb @@ -19,6 +19,6 @@ do_stage () { # install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ # install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR} - - + + } diff --git a/packages/gnome/gnome-keyring_0.4.4.bb b/packages/gnome/gnome-keyring_0.4.4.bb index 366e450c1d..d0efaaf608 100644 --- a/packages/gnome/gnome-keyring_0.4.4.bb +++ b/packages/gnome/gnome-keyring_0.4.4.bb @@ -4,7 +4,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/0.4/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig -DEPENDS = "" +DEPENDS = "gtk+" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb new file mode 100644 index 0000000000..30e0abc14f --- /dev/null +++ b/packages/gnome/gnome-menus_2.16.1.bb @@ -0,0 +1,14 @@ +DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+" +LICENSE = "GPL" + + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} + +PACKAGES += "${PN}-python" +FILES_${PN} += "${datadir}/desktop-directories/" +FILES_${PN}-python = "${libdir}/python*" + diff --git a/packages/gnome/gnome-panel_2.12.1.bb b/packages/gnome/gnome-panel_2.12.1.bb new file mode 100644 index 0000000000..3bb11dc052 --- /dev/null +++ b/packages/gnome/gnome-panel_2.12.1.bb @@ -0,0 +1,8 @@ +LICENSE = "GPL" +DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty +++ b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty diff --git a/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch index 3dbc130ddc..3dbc130ddc 100644 --- a/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch +++ b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch diff --git a/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch @@ -0,0 +1,51 @@ +removes kerberos completely to avoid conflicts with installed kerberos +--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 ++++ configure.in 2007-01-05 19:42:56.604261797 +0200 +@@ -436,47 +436,6 @@ + ]) + AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) + AC_SUBST(CDDA_LIBS) +- +-dnl GSSAPI +-dnl Check for Kerberos installation +-have_gssapi=no +-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) +- +-if test "x$KRB5_CONFIG" != "xnone"; then +- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" +- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" +- +- saved_CPPFLAGS="$CPPFLAGS" +- saved_LIBS="$LIBS" +- LIBS="$LIBS $GSSAPI_LIBS" +- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" +- # MIT and Heimdal put gssapi.h in different places +- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ +- AC_CHECK_FUNCS(gss_init_sec_context, [ +- AC_MSG_NOTICE([GSSAPI authentication support enabled]) +- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) +- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) +- have_gssapi=yes +- +- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE +- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, +- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, +- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) +- ], [ +- #ifdef HAVE_GSSAPI_GSSAPI_H +- #include <gssapi/gssapi.h> +- #else +- #include <gssapi.h> +- #endif +- ]) +- ]) +- break +- ]) +- LIBS="$saved_LIBS" +- CPPFLAGS="$saved_CPPFLAGS" +-fi +-AC_SUBST(GSSAPI_LIBS) +-AC_SUBST(GSSAPI_CFLAGS) + + dnl ****************************** + dnl http-method (neon checks) diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch deleted file mode 100644 index 38480c21e1..0000000000 --- a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- 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/glib-after-nameser.patch b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch deleted file mode 100644 index 87bf7c3939..0000000000 --- a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/libgnomevfs/gnome-vfs-resolve.c.orig 2006-02-08 19:18:43.000000000 +0100 -+++ trunk/libgnomevfs/gnome-vfs-resolve.c 2006-02-08 19:21:42.000000000 +0100 -@@ -23,7 +23,6 @@ - - #include <errno.h> - #include <string.h> --#include <glib.h> - #ifndef G_OS_WIN32 - /* Keep <sys/types.h> above the network includes for FreeBSD. */ - #include <sys/types.h> -@@ -48,6 +47,7 @@ - #define RELOAD_TIMEVAL 2 - #endif - -+#include <glib.h> - #include <glib-object.h> - - #include <libgnomevfs/gnome-vfs-resolve.h> diff --git a/packages/gnome/gnome-vfs-dbus/gssapi.patch b/packages/gnome/gnome-vfs-dbus/gssapi.patch deleted file mode 100644 index a4fcd605f2..0000000000 --- a/packages/gnome/gnome-vfs-dbus/gssapi.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- gnome-vfs-dbus-2.8.4.4/configure.in~gssapi -+++ gnome-vfs-dbus-2.8.4.4/configure.in -@@ -456,6 +456,10 @@ - ]) - LIBS="$saved_LIBS" - CPPFLAGS="$saved_CPPFLAGS" -+ if test "x$have_gssapi" != "xyes"; then -+ GSSAPI_LIBS= -+ GSSAPI_CFLAGS= -+ fi - fi - AC_SUBST(GSSAPI_LIBS) - AC_SUBST(GSSAPI_CFLAGS) diff --git a/packages/gnome/gnome-vfs-dbus/werror_compile.patch b/packages/gnome/gnome-vfs-dbus/werror_compile.patch deleted file mode 100644 index f2eba7d712..0000000000 --- a/packages/gnome/gnome-vfs-dbus/werror_compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-vfs-dbus-2.8.4.4/configure.in.old 2006-01-26 11:56:09.000000000 +0100 -+++ gnome-vfs-dbus-2.8.4.4/configure.in 2006-01-26 11:45:02.000000000 +0100 -@@ -279,7 +279,7 @@ - - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - echo "enable compile warnings = $set_more_warnings" -- VFS_CFLAGS="-Wall -Werror \ -+ VFS_CFLAGS="-Wall \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith" - diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb deleted file mode 100644 index 5717115ebc..0000000000 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ /dev/null @@ -1,91 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" -RPROVIDES = "gnome-vfs" - -inherit gnome pkgconfig - -DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a" -RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" - - -SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \ - file://gssapi.patch;patch=1;pnum=1 \ - file://gconftool-lossage.patch;patch=1;pnum=1" - -EXTRA_OECONF = "--with-ipc=dbus" - -FILES_${PN} += " ${libdir}/vfs" -FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include" -FILES_${PN}-doc += " ${datadir}/gtk-doc" - -GNOME_VFS_HEADERS = " \ -gnome-vfs-utils.h \ -gnome-vfs-application-registry.h \ -gnome-vfs-async-ops.h \ -gnome-vfs-ops.h \ -gnome-vfs-uri.h \ -gnome-vfs-standard-callbacks.h \ -gnome-vfs-module-callback.h \ -gnome-vfs-context.h \ -gnome-vfs-file-info.h \ -gnome-vfs-directory.h \ -gnome-vfs-mime-monitor.h \ -gnome-vfs-mime-handlers.h \ -gnome-vfs-result.h \ -gnome-vfs-job-limit.h \ -gnome-vfs-file-size.h \ -gnome-vfs-mime-utils.h \ -gnome-vfs-find-directory.h \ -gnome-vfs-init.h \ -gnome-vfs-handle.h \ -gnome-vfs.h \ -gnome-vfs-cancellation.h \ -gnome-vfs-xfer.h \ -gnome-vfs-monitor.h \ -gnome-vfs-types.h \ -gnome-vfs-volume-monitor.h \ -gnome-vfs-drive.h \ -gnome-vfs-volume.h \ -gnome-vfs-enum-types.h \ -gnome-vfs-address.h \ -gnome-vfs-dns-sd.h \ -gnome-vfs-mime-info-cache.h \ -gnome-vfs-resolve.h" - -GNOME_VFS_MODULE_HEADERS = " \ -gnome-vfs-mime-info.h \ -gnome-vfs-transform.h \ -gnome-vfs-ssl.h \ -gnome-vfs-inet-connection.h \ -gnome-vfs-socket.h \ -gnome-vfs-parse-ls.h \ -gnome-vfs-method.h \ -gnome-vfs-cancellable-ops.h \ -gnome-vfs-module.h \ -gnome-vfs-module-shared.h \ -gnome-vfs-module-callback-module-api.h \ -gnome-vfs-mime.h \ -gnome-vfs-socket-buffer.h" - -do_stage() { - oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs - for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done - install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs - for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} - -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" - -python populate_packages_prepend () { - print bb.data.getVar('FILES_gnome-vfs', d, 1) - - plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb deleted file mode 100644 index 7a48fb6ca3..0000000000 --- a/packages/gnome/gnome-vfs-dbus_svn.bb +++ /dev/null @@ -1,110 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" -RPROVIDES = "gnome-vfs" - -PV = "2.8.4.4+svn${SRCDATE}" - -inherit gnome pkgconfig - -DEPENDS = "gtk-doc-native libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a" -RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" - - -SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \ - file://gssapi.patch;patch=1;pnum=1 \ - file://gconftool-lossage.patch;patch=1;pnum=1 \ - 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://dbus-api-change.patch;patch=1" - -EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc" -S = "${WORKDIR}/trunk" - -FILES_${PN} += " ${libdir}/vfs" -FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include" -#FILES_${PN}-doc += " ${datadir}/gtk-doc" - -GNOME_VFS_HEADERS = " \ -gnome-vfs-utils.h \ -gnome-vfs-application-registry.h \ -gnome-vfs-async-ops.h \ -gnome-vfs-ops.h \ -gnome-vfs-uri.h \ -gnome-vfs-standard-callbacks.h \ -gnome-vfs-module-callback.h \ -gnome-vfs-context.h \ -gnome-vfs-file-info.h \ -gnome-vfs-directory.h \ -gnome-vfs-mime-monitor.h \ -gnome-vfs-mime-handlers.h \ -gnome-vfs-mime-deprecated.h \ -gnome-vfs-result.h \ -gnome-vfs-job-limit.h \ -gnome-vfs-file-size.h \ -gnome-vfs-mime-utils.h \ -gnome-vfs-find-directory.h \ -gnome-vfs-init.h \ -gnome-vfs-handle.h \ -gnome-vfs.h \ -gnome-vfs-cancellation.h \ -gnome-vfs-xfer.h \ -gnome-vfs-monitor.h \ -gnome-vfs-types.h \ -gnome-vfs-volume-monitor.h \ -gnome-vfs-drive.h \ -gnome-vfs-volume.h \ -gnome-vfs-enum-types.h \ -gnome-vfs-address.h \ -gnome-vfs-dns-sd.h \ -gnome-vfs-mime-info-cache.h \ -gnome-vfs-resolve.h" - -GNOME_VFS_MODULE_HEADERS = " \ -gnome-vfs-mime-info.h \ -gnome-vfs-transform.h \ -gnome-vfs-ssl.h \ -gnome-vfs-inet-connection.h \ -gnome-vfs-socket.h \ -gnome-vfs-parse-ls.h \ -gnome-vfs-method.h \ -gnome-vfs-cancellable-ops.h \ -gnome-vfs-module.h \ -gnome-vfs-module-shared.h \ -gnome-vfs-module-callback-module-api.h \ -gnome-vfs-mime.h \ -gnome-vfs-socket-buffer.h" - -do_configure_prepend() { - mkdir -p m4 - install ${WORKDIR}/gtk-doc.m4 ./m4/ - install ${WORKDIR}/gtk-doc.make ./ -} - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:-Werror::' -} - -do_stage() { - oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs - for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done - install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs - for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} - -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" - -python populate_packages_prepend () { - print bb.data.getVar('FILES_gnome-vfs', d, 1) - - plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb new file mode 100644 index 0000000000..6efbe7249d --- /dev/null +++ b/packages/gnome/gnome-vfs_2.16.3.bb @@ -0,0 +1,37 @@ +LICENSE = "GPL" +DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" +RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" + +PR = "r1" + +inherit gnome + +# This is to provide compatibility with the gnome-vfs DBus fork +PROVIDES = "gnome-vfs-plugin-dbus" +RRPEPLACES = "gnome-vfs-dbus" + +SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ + file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" + +EXTRA_OECONF = " \ + --disable-openssl \ + --enable-gnutls \ + --enable-avahi \ + " + +FILES_${PN} += " ${libdir}/vfs" +FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" +FILES_${PN}-doc += " ${datadir}/gtk-doc" + +do_stage () { +autotools_stage_all +} + +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + +python populate_packages_prepend () { + print bb.data.getVar('FILES_gnome-vfs', d, 1) + + plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') +} diff --git a/packages/gnome/gnomebaker_0.6.0.bb b/packages/gnome/gnomebaker_0.6.0.bb new file mode 100644 index 0000000000..692ed2ee6c --- /dev/null +++ b/packages/gnome/gnomebaker_0.6.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Gnomebaker is a GTK2/GNOME cd burning application. " +LICENSE = "GPLv2" + +DEPENDS = "gtk+ libnotify libgnome libgnomeui libxml2 libglade gstreamer" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/icons" + + diff --git a/packages/gnome/kanjipad_svn.bb b/packages/gnome/kanjipad_svn.bb new file mode 100644 index 0000000000..95bd174b6d --- /dev/null +++ b/packages/gnome/kanjipad_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition" +LICENSE = "GPLv2" + +DEPENDS = "gtk perl-native" + +PV = "2.0.0+svn${SRCDATE}" + +inherit pkgconfig + +SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk" + +S = "${WORKDIR}/trunk" + +do_compile_prepend() { + export CFLAGS='${TARGET_CFLAGS} -DFOR_PILOT_COMPAT -DKP_LIBDIR="${libdir}/kanjipad" -DBINDIR="${bindir}" `pkg-config --cflags gtk+-2.0` `pkg-config --cflags glib-2.0`' +} + + + diff --git a/packages/gstreamer/gstreamer-0.8.9/.mtn2git_empty b/packages/gnome/libart-lgpl/powerpc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gstreamer-0.8.9/.mtn2git_empty +++ b/packages/gnome/libart-lgpl/powerpc/.mtn2git_empty diff --git a/packages/gnome/libart-lgpl/powerpc/art_config.h b/packages/gnome/libart-lgpl/powerpc/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/packages/gnome/libart-lgpl/powerpc/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_svn.bb index cbe1a9ad47..2f36c3d808 100644 --- a/packages/gnome/libbacon_cvs.bb +++ b/packages/gnome/libbacon_svn.bb @@ -3,17 +3,17 @@ LICENSE = "GPLv2" DEPENDS = "glib-2.0" -PV = "0.0+cvs${SRCDATE}" +PV = "0.0+svn${SRCDATE}" inherit gnome -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}" +SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/trunk" do_stage() { autotools_stage_all -} +} diff --git a/packages/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.98.bb index 581644ede5..2cddb02ac4 100644 --- a/packages/gnome/libsoup_2.2.98.bb +++ b/packages/gnome/libsoup_2.2.98.bb @@ -13,6 +13,7 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/" FILES_${PN}-doc = "${datadir}/" do_stage() { + rm -f ${STAGING_DATADIR}/pkgconfig/libsoup* autotools_stage_all ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } diff --git a/packages/gnome/libwnck_2.10.2.bb b/packages/gnome/libwnck_2.10.2.bb index b07bc09b86..17f5c673d6 100644 --- a/packages/gnome/libwnck_2.10.2.bb +++ b/packages/gnome/libwnck_2.10.2.bb @@ -4,6 +4,6 @@ HOMEPAGE = "" inherit gnome -do_stage() { - autotools_stage_all +do_stage() { + autotools_stage_all } diff --git a/packages/gnome/libwnck_2.12.1.bb b/packages/gnome/libwnck_2.12.1.bb index 46d5a868a5..1830a7540a 100644 --- a/packages/gnome/libwnck_2.12.1.bb +++ b/packages/gnome/libwnck_2.12.1.bb @@ -5,6 +5,6 @@ HOMEPAGE = "" inherit gnome -do_stage() { - autotools_stage_all +do_stage() { + autotools_stage_all } diff --git a/packages/gnome/libwnck_2.8.1.bb b/packages/gnome/libwnck_2.8.1.bb index 82a7004fbe..052e20fe32 100644 --- a/packages/gnome/libwnck_2.8.1.bb +++ b/packages/gnome/libwnck_2.8.1.bb @@ -4,8 +4,8 @@ HOMEPAGE = "" inherit gnome -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} +do_stage() { + autotools_stage_includes + install -d ${STAGING_LIBDIR} install -m 755 libwnck/.libs/libwnck-1.so.4.9.0 ${STAGING_LIBDIR}/libwnck-1.so } diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc index c4aadb55eb..d362981f3c 100644 --- a/packages/gnupg/gnupg2.inc +++ b/packages/gnupg/gnupg2.inc @@ -24,12 +24,6 @@ FILES_${PN} += "${datadir}/gnupg" EXTRA_OECONF = "--disable-ldap \ --with-zlib=${STAGING_LIBDIR}/.. \ - --with-gpg-error-prefix=${STAGING_BINDIR}/.. \ - --with-libgcrypt-prefix=${STAGING_BINDIR}/.. \ - --with-libassuan-prefix=${STAGING_BINDIR}/.. \ - --with-pth-prefix=${STAGING_BINDIR}/.. \ - --with-opensc-prefix=${STAGING_BINDIR}/.. \ - --with-ksba-prefix=${STAGING_BINDIR}/.. \ --disable-threads \ --disable-gpgsm \ --disable-scdaemon" diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index ae97097e15..150fc8d6e5 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ file://gnuplot.desktop \ file://gnuplot.png" -inherit autotools +inherit autotools PACKAGES =+ "${PN}-x11" DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb index 0bacbddf47..8b22c0e5d5 100644 --- a/packages/gnuplot/qtplot_0.2.bb +++ b/packages/gnuplot/qtplot_0.2.bb @@ -17,7 +17,7 @@ APPDESKTOP = "${S}" inherit opie do_install_prepend() { - install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/pics install -d ${D}${palmtopdir}/help/html install -m 644 Qtplot.png ${D}${palmtopdir}/pics/ diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb index 326fae9257..b228b3d7b2 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb @@ -4,5 +4,5 @@ RDEPENDS = "hotplug-dbus" LICENSE = "GPL" inherit gpe - + SRC_URI += " file://dbus-new-api.patch;patch=1" diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb index 0cdafb7275..9790d8ebad 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb @@ -15,7 +15,7 @@ SRC_URI = "file://splash-e-portrait.svg \ #FIXME: please use an gpe-bootsplash-theme.inc to reduce duplication do_install() { - install -d "${D}/usr/share/gpe" + install -d "${D}/usr/share/gpe" install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe } @@ -26,7 +26,7 @@ pkg_postinst() { pkg_postrm() { update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg - update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg } FILES_${PN} = "/usr/share/gpe/splash-${THEME}-*" diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb index c19ed49e69..293766a0b6 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb @@ -15,7 +15,7 @@ SRC_URI = "file://*.svg \ #FIXME: please use an gpe-bootsplash-theme.inc to reduce duplication do_install(){ - install -d "${D}/usr/share/gpe" + install -d "${D}/usr/share/gpe" install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe install -m 0644 ${WORKDIR}/${THEME}-logo.png ${D}/usr/share/gpe } @@ -27,7 +27,7 @@ pkg_postinst() { pkg_postrm() { update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg - update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg } FILES_${PN} = "/usr/share/gpe/splash-${THEME}-* \ diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index c07ef46363..d9b4141204 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -26,5 +26,5 @@ pkg_postinst() { pkg_postrm() { update-alternatives --remove bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg - update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg } diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb index ededb292e8..08ef7af2d7 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Buttonbox for gpe" DEPENDS = "libgpewidget libgpelaunch" GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools +inherit gpe autotools FILES_${PN} += "${datadir}/gpe" diff --git a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty b/packages/gpe-expenses/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty +++ b/packages/gpe-expenses/.mtn2git_empty diff --git a/packages/gpe-expenses/gpe-expenses_0.0.6.bb b/packages/gpe-expenses/gpe-expenses_0.0.6.bb new file mode 100644 index 0000000000..90b189149c --- /dev/null +++ b/packages/gpe-expenses/gpe-expenses_0.0.6.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Equivalent for Expenses on the Palm. Supports payment types, categories, expense types (mileage, meals, parking, etc.), notes, currency selection etc." +LICENSE = "GPL" + +DEPENDS = "qof libgpewidget" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + " + +inherit autotools pkgconfig + + diff --git a/packages/gpe-login/files/removeblue-fontsize8.patch b/packages/gpe-login/files/removeblue-fontsize8.patch index 4962c8401f..d9db311a2c 100644 --- a/packages/gpe-login/files/removeblue-fontsize8.patch +++ b/packages/gpe-login/files/removeblue-fontsize8.patch @@ -11,4 +11,4 @@ - -widget "*" style "default" +gtk-font-name = "Sans 8" -+include "/usr/share/themes/Industrial/gtk-2.0/gtkrc" ++include "/usr/share/themes/Clearlooks/gtk-2.0/gtkrc" diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb index b548a1ad6b..1674e0c8be 100644 --- a/packages/gpe-login/gpe-login_0.87.bb +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r1" +PR = "r2" SRC_URI += "file://removeblue-fontsize8.patch;patch=1" diff --git a/packages/gpe-mileage/gpe-mileage_0.1.bb b/packages/gpe-mileage/gpe-mileage_0.1.bb deleted file mode 100644 index 2e452219df..0000000000 --- a/packages/gpe-mileage/gpe-mileage_0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "A mileage calculator for GPE" -LICENSE = "GPL" -PRIORITY = "optional" -SECTION = "gpe" - -DEPENDS = "glib-2.0 gtk+ libglade sqlite" - -inherit gpe autotools diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb index 14f5313bcc..6f1ba31274 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb index 14f5313bcc..5f3d1f4d1b 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb @@ -1,8 +1,9 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb index 23d8939e9d..3069730fbb 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb @@ -1,8 +1,9 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser.inc b/packages/gpe-mini-browser/gpe-mini-browser.inc new file mode 100644 index 0000000000..733654bebc --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser.inc @@ -0,0 +1,2 @@ +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb index 5430139677..faa6bca828 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb @@ -1,3 +1,5 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "http://stag.mind.be/gpe-mini-browser-${PV}.tar.bz2" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb index 82308e82a6..68d0fbfb98 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "http://handhelds.org/~philippe/gpe-mini-browser-${PV}.tar.bz2" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit" S = "${WORKDIR}/gpe-mini-browser" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb index 2745e5f8a9..06e910af53 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r1" SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit libgpewidget" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb index ee41ff26c2..35cca41d18 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r1" SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb index 4a09fb827d..99523c08f8 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb @@ -1,6 +1,6 @@ +require gpe-mini-browser.inc + SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb index 4a09fb827d..99523c08f8 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb @@ -1,6 +1,6 @@ +require gpe-mini-browser.inc + SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb index 566b9820ba..225a12d4ae 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb @@ -1,9 +1,8 @@ +require gpe-mini-browser.inc + SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" -RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" - +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 62b93667b8..dc5c022580 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -1,7 +1,6 @@ -DEFAULT_PREFERENCE = "-1" +require gpe-mini-browser.inc -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb index 373a3fec75..2eb1b947a8 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb @@ -9,5 +9,5 @@ PR = "r1" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb index 0b83e82397..e0709fe1ed 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb @@ -11,5 +11,5 @@ SRC_URI += "file://fixloop.patch;patch=1;pnum=0" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb index f0a57bd29f..f04b9c19be 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb @@ -9,5 +9,5 @@ PR = "r0" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb index f0a57bd29f..f04b9c19be 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb @@ -9,5 +9,5 @@ PR = "r0" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb index f0a57bd29f..f04b9c19be 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb @@ -9,5 +9,5 @@ PR = "r0" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb index f0a57bd29f..f04b9c19be 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb @@ -9,5 +9,5 @@ PR = "r0" do_stage () { oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/packages/gpe-scap/gpe-scap_1.0.bb b/packages/gpe-scap/gpe-scap_1.2.bb index 6f0c7746ef..d53f041bbe 100644 --- a/packages/gpe-scap/gpe-scap_1.0.bb +++ b/packages/gpe-scap/gpe-scap_1.2.bb @@ -6,7 +6,7 @@ PR = "r0" RREPLACES = "gpe-screenshot" -DEPENDS = "glib-2.0 gtk+ libglade" +DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index cb5ea6c5c6..2cf63737bd 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -24,7 +24,7 @@ SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" do_configure_append_angstrom() { sed -i s:Default:Clearlooks:g X11/xsettings.default sed -i s:Industrial:Clearlooks:g X11/xsettings.default -} +} do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d @@ -36,16 +36,16 @@ do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite - + mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox } -pkg_postinst_${PN}() { +pkg_postinst_${PN}() { update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.matchbox 10 } -pkg_postrm_${PN}() { - update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox +pkg_postrm_${PN}() { + update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox } # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index 1b59f29f62..796fc0ccae 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -12,7 +12,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -PpR ${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 3c9403d08d..8af15beb94 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -12,7 +12,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -PpR ${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 index b509e3d4ec..3c3752af46 100644 --- a/packages/gpe-themes/gpe-theme-e17_0.1.bb +++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb @@ -10,7 +10,7 @@ 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/ +cp -R ${WORKDIR}/usr/share/themes/e17-bling/ ${D}${datadir}/themes/ } diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb index 5d0a4b8da9..1a57e03d03 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb @@ -11,7 +11,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ +cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ } diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb index 79941664b8..1a0b8f49a8 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb @@ -12,7 +12,7 @@ SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ -cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ +cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ } diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb index d16d8df590..d0aa30477a 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb @@ -18,7 +18,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix FILES_${PN} += "${datadir}/${PN}" FILES_gpsdrive-add = "${libdir}" - + EXTRA_OECONF = "--disable-garmin" do_install_append () { diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb index 6fbba4be15..cb651aaf39 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -20,7 +20,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix FILES_${PN} += "${datadir}/${PN}" FILES_gpsdrive-add = "${libdir}" - + EXTRA_OECONF = "--disable-garmin" do_install_append () { diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index 430a0f52fb..6cb78065ea 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -23,7 +23,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix FILES_${PN} += "${datadir}/${PN}" FILES_gpsdrive-add = "${libdir}" - + EXTRA_OECONF = "--disable-garmin" do_install_append () { diff --git a/packages/granule/granule.inc b/packages/granule/granule.inc new file mode 100644 index 0000000000..7f211b3de1 --- /dev/null +++ b/packages/granule/granule.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "Generic memory training with flash cards. Automatic scheduling algorithm." +AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>" +HOMEPAGE = "http://granule.sf.net" +SECTION = "x11/apps" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" + +inherit autotools pkgconfig diff --git a/packages/granule/granule_1.2.2.bb b/packages/granule/granule_1.2.2.bb index 95f440c274..8e68118fa6 100644 --- a/packages/granule/granule_1.2.2.bb +++ b/packages/granule/granule_1.2.2.bb @@ -1,12 +1,4 @@ -DESCRIPTION = "Generic memory training with flash cards. Automatic scheduling algorithm." -AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>" -HOMEPAGE = "http://granule.sf.net" -SECTION = "x11/apps" -PRIORITY = "optional" -LICENSE = "GPLv2" -DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" -PR = "r0" +require granule.inc SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" -inherit autotools pkgconfig diff --git a/packages/granule/granule_cvs.bb b/packages/granule/granule_cvs.bb new file mode 100644 index 0000000000..f4da91f840 --- /dev/null +++ b/packages/granule/granule_cvs.bb @@ -0,0 +1,17 @@ +require granule.inc + +PV = "1.2.4+cvs${SRCDATE}" + +EXTRA_OECONF_append_h3600 = " --enable-pda=yes " +EXTRA_OECONF_append_h3900 = " --enable-pda=yes " +EXTRA_OECONF_append_h2200 = " --enable-pda=yes " +EXTRA_OECONF_append_h4000 = " --enable-pda=yes " +EXTRA_OECONF_append_collie = " --enable-pda=yes " +EXTRA_OECONF_append_poodle = " --enable-pda=yes " +EXTRA_OECONF_append_mnci = " --enable-pda=yes " +EXTRA_OECONF_append_integral13 = " --enable-pda=yes " + +SRC_URI = "cvs://anonymous@granule.cvs.sourceforge.net/cvsroot/granule;method=pserver;module=granule" + +S = "${WORKDIR}/granule" + diff --git a/packages/grip/grip_3.2.0.bb b/packages/grip/grip_3.2.0.bb index 710624d584..063803138d 100644 --- a/packages/grip/grip_3.2.0.bb +++ b/packages/grip/grip_3.2.0.bb @@ -8,4 +8,4 @@ LICENSE="GPL" SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz" DEPENDS="libgnomeui vte curl cdparanoia id3lib" -inherit autotools +inherit autotools diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb index 55dcfbf8cb..42b0d80d15 100644 --- a/packages/groff/groff_1.19.1.bb +++ b/packages/groff/groff_1.19.1.bb @@ -7,7 +7,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://groff.patch;patch=1" PARALLEL_MAKE = "" -# prefix and exec-prefix are broken and the .in file is broken too +# prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb index 1099714686..e6046ae189 100644 --- a/packages/groff/groff_1.19.2.bb +++ b/packages/groff/groff_1.19.2.bb @@ -9,7 +9,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://groff.patch;patch=1" PARALLEL_MAKE = "" -# prefix and exec-prefix are broken and the .in file is broken too +# prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools diff --git a/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch b/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch deleted file mode 100644 index 22949f5e20..0000000000 --- a/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gst-plugins-0.8.1/ext/ivorbis/vorbis.c.old 2004-06-02 09:12:54.000000000 +0100 -+++ gst-plugins-0.8.1/ext/ivorbis/vorbis.c 2004-06-02 09:12:32.000000000 +0100 -@@ -21,7 +21,8 @@ - #include <config.h> - #endif - --#include <vorbisenc.h> -+#include <gst/gst.h> -+#include <tremor/ivorbiscodec.h> - - extern GType ivorbisfile_get_type (void); - diff --git a/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch deleted file mode 100644 index 6f2a300254..0000000000 --- a/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst-plugins-0.8.7/configure.ac.orig 2005-03-03 16:40:45.000000000 +0100 -+++ gst-plugins-0.8.7/configure.ac 2005-03-03 16:41:55.000000000 +0100 -@@ -1197,7 +1197,7 @@ - LAME_LIBS="-lmp3lame -lm" - dnl is lame presets available - LAME_CFLAGS="" -- AC_TRY_RUN([ -+ AC_TRY_COMPILE([ - #include <lame/lame.h> - int main (int argc, char *argv[]) - { diff --git a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch deleted file mode 100644 index 553c7b4270..0000000000 --- a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gst-plugins-0.8.8.orig/gst-libs/gst/gconf/gconf.c 2005-02-02 09:14:01.000000000 +0100 -+++ gst-plugins-0.8.8/gst-libs/gst/gconf/gconf.c 2005-08-13 23:28:36.000000000 +0200 -@@ -205,9 +205,13 @@ - if (!ret) { - ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL); - -- if (!ret) -- g_warning ("No GConf default audio sink key and %s doesn't work", -- DEFAULT_AUDIOSINK); -+ if (!ret) { -+ ret = gst_element_factory_make ("esdsink", NULL); -+ -+ if (!ret) -+ g_warning ("No GConf default audio sink key and neither %s nor esdsink work", -+ DEFAULT_AUDIOSINK); -+ } - } - - return ret; diff --git a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch deleted file mode 100644 index 6f2a300254..0000000000 --- a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst-plugins-0.8.7/configure.ac.orig 2005-03-03 16:40:45.000000000 +0100 -+++ gst-plugins-0.8.7/configure.ac 2005-03-03 16:41:55.000000000 +0100 -@@ -1197,7 +1197,7 @@ - LAME_LIBS="-lmp3lame -lm" - dnl is lame presets available - LAME_CFLAGS="" -- AC_TRY_RUN([ -+ AC_TRY_COMPILE([ - #include <lame/lame.h> - int main (int argc, char *argv[]) - { diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 009eef67ed..a7f0d6d7e6 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -4,6 +4,8 @@ PRIORITY = "optional" DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe" PR = "r1" +PACKAGES_DYNAMIC = "gst-plugin-*" + # until we have decided for a final naming scheme, # keep using version 0.8 DEFAULT_PREFERENCE = "-1" diff --git a/packages/gstreamer/gst-plugins_0.8.4.bb b/packages/gstreamer/gst-plugins_0.8.4.bb deleted file mode 100644 index 31630d9e4c..0000000000 --- a/packages/gstreamer/gst-plugins_0.8.4.bb +++ /dev/null @@ -1,57 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Plugins for GStreamer" -SECTION = "x11/libs" -PRIORITY = "optional" -PR = "r2" - -DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ - file://ivorbis.patch;patch=1 \ - file://try-esdsink.patch;patch=1 \ - file://lame-autoconf.patch;patch=1" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \ - --disable-artsc --disable-libfame --disable-sdl --disable-shout2 \ - --disable-gnome_vfs " - -inherit autotools pkgconfig gconf - -acpaths = "-I ${S}/common/m4 -I ${S}/m4" - -LIBV = "0.8" - -plugin_postinst() { - if [ x"$D" = "x" ]; then - gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml - fi -} - -PACKAGES_DYNAMIC = "gst-plugin-*" - -python populate_packages_prepend () { - gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) - postinst = bb.data.getVar('plugin_postinst', d, 1) - - do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) - do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') -} - -do_stage() { - autotools_stage_includes - while read a b; do - oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR} - done <<EOF -. interfaces-0.8 -audio audio -audio audiofilter -gconf gconf-0.8 -idct idct -media-info media-info-0.8 -play play-0.8 -resample resample -riff riff -video video -xwindowlistener xwindowlistener -EOF -} diff --git a/packages/gstreamer/gst-plugins_0.8.6.bb b/packages/gstreamer/gst-plugins_0.8.6.bb deleted file mode 100644 index 89de3b8939..0000000000 --- a/packages/gstreamer/gst-plugins_0.8.6.bb +++ /dev/null @@ -1,56 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Plugins for GStreamer" -SECTION = "x11/libs" -PRIORITY = "optional" -PR = "r2" - -DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ - file://try-esdsink.patch;patch=1 \ - file://lame-autoconf.patch;patch=1" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \ - --disable-artsc --disable-libfame --disable-sdl --disable-shout2 \ - --disable-gnome_vfs --disable-gconf --disable-libcaca" - -inherit autotools pkgconfig gconf - -acpaths = "-I ${S}/common/m4 -I ${S}/m4" - -LIBV = "0.8" - -plugin_postinst() { - if [ x"$D" = "x" ]; then - gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml - fi -} - -PACKAGES_DYNAMIC = "gst-plugin-*" - -python populate_packages_prepend () { - gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) - postinst = bb.data.getVar('plugin_postinst', d, 1) - - do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) - do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') -} - -do_stage() { - autotools_stage_includes - while read a b; do - oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR} - done <<EOF -. interfaces-0.8 -audio audio -audio audiofilter -gconf gconf-0.8 -idct idct -media-info media-info-0.8 -play play-0.8 -resample resample -riff riff -video video -xwindowlistener xwindowlistener -EOF -} diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb deleted file mode 100644 index 22b7e7dac2..0000000000 --- a/packages/gstreamer/gst-plugins_0.8.7.bb +++ /dev/null @@ -1,58 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Plugins for GStreamer" -SECTION = "x11/libs" -PRIORITY = "optional" -PR = "r3" - -DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ - file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \ - file://lame-autoconf.patch;patch=1 \ - file://try-esdsink.patch;patch=1" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \ - --disable-artsc --disable-jack --disable-libfame --disable-sdl --disable-shout2 \ - --disable-gnome_vfs --disable-gconf --disable-libcaca --disable-directfb \ - --disable-cairo" - -inherit autotools pkgconfig gconf - -acpaths = "-I ${S}/common/m4 -I ${S}/m4" - -LIBV = "0.8" - -plugin_postinst() { - if [ x"$D" = "x" ]; then - gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml - fi -} - -PACKAGES_DYNAMIC = "gst-plugin-*" - -python populate_packages_prepend () { - gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) - postinst = bb.data.getVar('plugin_postinst', d, 1) - - do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) - do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') -} - -do_stage() { - autotools_stage_includes - while read a b; do - oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR} - done <<EOF -. interfaces-0.8 -audio audio -audio audiofilter -gconf gconf-0.8 -idct idct -media-info media-info-0.8 -play play-0.8 -resample resample -riff riff -video video -xwindowlistener xwindowlistener -EOF -} diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb deleted file mode 100644 index 074522d173..0000000000 --- a/packages/gstreamer/gst-plugins_0.8.8.bb +++ /dev/null @@ -1,60 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Plugins for GStreamer" -SECTION = "x11/libs" -PRIORITY = "optional" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ - file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \ - file://lame-autoconf.patch;patch=1 \ - file://gst-plugins-0.8.8-try-esdsink.patch;patch=1" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \ - --disable-artsc --disable-jack --disable-libfame --disable-sdl --disable-shout2 \ - --disable-gnome_vfs --disable-gconf --disable-libcaca --disable-directfb \ - --disable-cairo" - -inherit autotools pkgconfig gconf - -acpaths = "-I ${S}/common/m4 -I ${S}/m4" - -LIBV = "0.8" - -plugin_postinst() { - if [ x"$D" = "x" ]; then - gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml - fi -} - -PACKAGES_DYNAMIC = "gst-plugin-*" - -python populate_packages_prepend () { - gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) - postinst = bb.data.getVar('plugin_postinst', d, 1) - - do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) - do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') -} - -do_stage() { - autotools_stage_includes - while read a b; do - oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR} - done <<EOF -. interfaces-0.8 -audio audio -audio audiofilter -gconf gconf-0.8 -idct idct -media-info media-info-0.8 -play play-0.8 -resample resample -riff riff -video video -xwindowlistener xwindowlistener -EOF -} diff --git a/packages/gstreamer/gstreamer-0.8.9/libm.patch b/packages/gstreamer/gstreamer-0.8.9/libm.patch deleted file mode 100644 index 21ee09fc90..0000000000 --- a/packages/gstreamer/gstreamer-0.8.9/libm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gstreamer-0.8.9/configure.ac.old 2005-02-28 02:52:28.401347752 +0000 -+++ gstreamer-0.8.9/configure.ac 2005-02-28 02:52:29.728146048 +0000 -@@ -588,7 +588,7 @@ - dnl Private vars for libgst only - GST_LIB_CFLAGS="$GST_PKG_CFLAGS $GST_INT_CFLAGS \ - $VALGRIND_CFLAGS -I\$(top_srcdir)" --GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL $VALGRIND_LIBS" -+GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL $VALGRIND_LIBS -lm" - GST_LIB_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION $EXPORT_LDFLAGS" - AC_SUBST(GST_LIB_CFLAGS) - AC_SUBST(GST_LIB_LIBS) diff --git a/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch deleted file mode 100644 index c676c2387f..0000000000 --- a/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure ---- gstreamer-0.8.9/configure 2005-02-08 04:45:25.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/configure 2005-03-03 22:34:09.213409312 -0500 -@@ -25655,10 +25655,10 @@ - - - --if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" -+if test "x$GST_DISABLE_LOADSAVE" = "xyes" - then -- { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5 --echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;} -+ { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5 -+echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;} - else - - LIBXML2_REQ=2.4.9 -diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac ---- gstreamer-0.8.9/configure.ac 2005-02-08 04:44:47.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/configure.ac 2005-03-03 22:34:09.215409008 -0500 -@@ -275,9 +275,9 @@ - AC_SUBST(GLIB_ONLY_LIBS) - - dnl === libxml 2 === --if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" -+if test "x$GST_DISABLE_LOADSAVE" = "xyes" - then -- AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2]) -+ AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2]) - else - dnl check for libxml2 with minimum req version - GST_LIBXML2_CHECK(2.4.9) -diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in ---- gstreamer-0.8.9/gst/gstconfig.h.in 2004-07-26 06:09:02.000000000 -0400 -+++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in 2005-03-03 22:36:13.860460080 -0500 -@@ -61,10 +61,11 @@ - - /***** Deal with XML stuff, we have to handle both loadsave and registry *****/ - --#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) -+#if (! defined(GST_DISABLE_LOADSAVE) ) - # include <libxml/parser.h> - #else --# define GST_DISABLE_LOADSAVE_REGISTRY -+/* misnomer but we cannot rename symbols */ -+# define GST_DISABLE_LOADSAVE_REGISTRY - #endif - - #ifdef WIN32 -Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig -diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c ---- gstreamer-0.8.9/gst/indexers/gstindexers.c 2004-03-15 14:20:30.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c 2005-03-03 22:34:09.228407032 -0500 -@@ -30,7 +30,9 @@ - gboolean res = TRUE; - - res &= gst_mem_index_plugin_init (plugin); -+#ifndef GST_DISABLE_LOADSAVE_REGISTRY - res &= gst_file_index_plugin_init (plugin); -+#endif - - return res; - } -diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h ---- gstreamer-0.8.9/gst/registries/gstxmlregistry.h 2004-03-15 10:08:32.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h 2005-03-03 22:34:09.229406880 -0500 -@@ -25,6 +25,7 @@ - #define __GST_XML_REGISTRY_H__ - - #include <gst/gstregistry.h> -+#include <stdio.h> - - G_BEGIN_DECLS - -Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig diff --git a/packages/gstreamer/gstreamer_0.8.7.bb b/packages/gstreamer/gstreamer.inc index b01c57ae5c..36c7dcfac7 100644 --- a/packages/gstreamer/gstreamer_0.8.7.bb +++ b/packages/gstreamer/gstreamer.inc @@ -1,22 +1,21 @@ -LICENSE = "LGPL" -PR = "r0" - DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -DEPENDS = "glib-2.0 gettext-native libxml2 popt" -SECTION = "base" +SECTION = "multimedia" PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "libxml2 glib-2.0 gettext-native popt" -FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://gstreamer.xsession" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking" +# until we have decided a final naming scheme, +# don't use 0.10.x package as a replacement for +# version 0.8 +DEFAULT_PREFERENCE = "-1" inherit autotools pkgconfig +SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" +EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" + do_stage() { oe_runmake install prefix=${STAGING_DIR} \ bindir=${STAGING_BINDIR} \ @@ -26,8 +25,5 @@ do_stage() { mandir=${STAGING_DIR}/share/man } -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d - install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register -} - +FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb index d44630fbe2..59e224eab5 100644 --- a/packages/gstreamer/gstreamer_0.10.11.bb +++ b/packages/gstreamer/gstreamer_0.10.11.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "libxml2 glib-2.0 gettext-native popt" PR = "r0" -# until we have decided a final naming scheme, +# until we have decided a final naming scheme, # don't use this package as a replacement for # version 0.8 DEFAULT_PREFERENCE = "-1" diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb index 1b930cf5aa..fcb5ad79ba 100644 --- a/packages/gstreamer/gstreamer_0.10.4.bb +++ b/packages/gstreamer/gstreamer_0.10.4.bb @@ -1,27 +1 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "glib-2.0 gettext-native popt" - -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +require gstreamer.inc diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb index 3273690400..fcb5ad79ba 100644 --- a/packages/gstreamer/gstreamer_0.10.5.bb +++ b/packages/gstreamer/gstreamer_0.10.5.bb @@ -1,30 +1 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "glib-2.0 gettext-native popt" - -PR = "r0" -# until we have decided a final naming scheme, -# don't use this package as a replacement for -# version 0.8 -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +require gstreamer.inc diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb index d44630fbe2..fcb5ad79ba 100644 --- a/packages/gstreamer/gstreamer_0.10.6.bb +++ b/packages/gstreamer/gstreamer_0.10.6.bb @@ -1,30 +1 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "libxml2 glib-2.0 gettext-native popt" - -PR = "r0" -# until we have decided a final naming scheme, -# don't use this package as a replacement for -# version 0.8 -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +require gstreamer.inc diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb index d44630fbe2..fcb5ad79ba 100644 --- a/packages/gstreamer/gstreamer_0.10.8.bb +++ b/packages/gstreamer/gstreamer_0.10.8.bb @@ -1,30 +1 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "libxml2 glib-2.0 gettext-native popt" - -PR = "r0" -# until we have decided a final naming scheme, -# don't use this package as a replacement for -# version 0.8 -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +require gstreamer.inc diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb deleted file mode 100644 index 9369258018..0000000000 --- a/packages/gstreamer/gstreamer_0.8.10.bb +++ /dev/null @@ -1,35 +0,0 @@ -LICENSE = "LGPL" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -DEPENDS = "glib-2.0 gettext-native popt" -SECTION = "base" -PRIORITY = "optional" - -FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://filesrc-uri.patch;patch=1 \ - file://gstreamer.xsession" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d - install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register -} - diff --git a/packages/gstreamer/gstreamer_0.8.5.bb b/packages/gstreamer/gstreamer_0.8.5.bb deleted file mode 100644 index f55828d15b..0000000000 --- a/packages/gstreamer/gstreamer_0.8.5.bb +++ /dev/null @@ -1,34 +0,0 @@ -LICENSE = "LGPL" -PR = "r0" - -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -DEPENDS = "glib-2.0 libxml2 popt" -SECTION = "x11/network" -PRIORITY = "optional" - -FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://gstreamer.xsession \ - file://configure-largefile.patch;patch=1;pnum=0" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking" - -inherit autotools pkgconfig gettext - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d - install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register -} - diff --git a/packages/gstreamer/gstreamer_0.8.9.bb b/packages/gstreamer/gstreamer_0.8.9.bb deleted file mode 100644 index 02e93b78ec..0000000000 --- a/packages/gstreamer/gstreamer_0.8.9.bb +++ /dev/null @@ -1,36 +0,0 @@ -LICENSE = "LGPL" -PR = "r4" - -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -DEPENDS = "glib-2.0 gettext-native popt" -SECTION = "base" -PRIORITY = "optional" - -FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://libm.patch;patch=1 \ - file://no-libxml2.patch;patch=1 \ - file://filesrc-uri.patch;patch=1 \ - file://gstreamer.xsession" - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d - install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register -} - diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb index 95de5f56a6..51a79598dd 100644 --- a/packages/gtk+/gtk+_2.10.3.bb +++ b/packages/gtk+/gtk+_2.10.3.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c PR = "r3" # disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb index 82549b028b..33be0019cb 100644 --- a/packages/gtk+/gtk+_2.10.6.bb +++ b/packages/gtk+/gtk+_2.10.6.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c PR = "r7" # disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -28,7 +28,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://spinbutton.patch;patch=1 \ file://gtk+-handhelds.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-update-icon-cache \ diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb deleted file mode 100644 index 68a5119aa1..0000000000 --- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "x11/base" -DESCRIPTION = "Industrial theme engine for GTK" -LICENSE = "GPL2" -DEPENDS = "gtk+" - -SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \ - file://no-gtk1.patch;patch=1" - -PACKAGES += "gtk-theme-industrial" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so" -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" -FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes" - -inherit autotools - -do_configure_prepend() { - for i in `ls gtk-common`; do - ln -sf ../gtk-common/$i gtk2-engine/$i - done -} - diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb deleted file mode 100644 index 68a5119aa1..0000000000 --- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "x11/base" -DESCRIPTION = "Industrial theme engine for GTK" -LICENSE = "GPL2" -DEPENDS = "gtk+" - -SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \ - file://no-gtk1.patch;patch=1" - -PACKAGES += "gtk-theme-industrial" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so" -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" -FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes" - -inherit autotools - -do_configure_prepend() { - for i in `ls gtk-common`; do - ln -sf ../gtk-common/$i gtk2-engine/$i - done -} - diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb deleted file mode 100644 index 68a5119aa1..0000000000 --- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "x11/base" -DESCRIPTION = "Industrial theme engine for GTK" -LICENSE = "GPL2" -DEPENDS = "gtk+" - -SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \ - file://no-gtk1.patch;patch=1" - -PACKAGES += "gtk-theme-industrial" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so" -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" -FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes" - -inherit autotools - -do_configure_prepend() { - for i in `ls gtk-common`; do - ln -sf ../gtk-common/$i gtk2-engine/$i - done -} - diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb index 6f4f3df5b7..434c39fde3 100644 --- a/packages/gtk-webcore/osb-jscore_0.5.0.bb +++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb @@ -28,7 +28,7 @@ do_stage () { oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb index ce97046c84..f024bbfa02 100644 --- a/packages/gtk-webcore/osb-jscore_20050430.bb +++ b/packages/gtk-webcore/osb-jscore_20050430.bb @@ -30,7 +30,7 @@ do_stage () { oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb index 6900dc392a..b5aa879a18 100644 --- a/packages/gtk-webcore/osb-jscore_20060212.bb +++ b/packages/gtk-webcore/osb-jscore_20060212.bb @@ -32,7 +32,7 @@ do_stage () { oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb new file mode 100644 index 0000000000..a7f6201aa2 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Gtk+ WebCore - JavaScriptCore" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" + +DEFAULT_PREFERENCE = "-1" + +PV = "0.5.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ + file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" + +S = "${WORKDIR}/JavaScriptCore" + +inherit autotools pkgconfig + +# zap CPPFLAGS to avoid trouble with internal vs. pcre from staging +CPPFLAGS = "" + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/JavaScriptCore + for i in ${S}/kjs/*.h ${S}/kjs/new; do + install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore + done +} diff --git a/packages/gtk-webcore/osb-nrcit_0.5.0.bb b/packages/gtk-webcore/osb-nrcit_0.5.0.bb index 34607b02c4..ca0a845c2a 100644 --- a/packages/gtk-webcore/osb-nrcit_0.5.0.bb +++ b/packages/gtk-webcore/osb-nrcit_0.5.0.bb @@ -23,7 +23,7 @@ do_stage () { oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb index 1b9183a492..261b52f01b 100644 --- a/packages/gtk-webcore/osb-nrcit_20050430.bb +++ b/packages/gtk-webcore/osb-nrcit_20050430.bb @@ -32,7 +32,7 @@ do_stage () { oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb index 7449d0d845..3bfec98924 100644 --- a/packages/gtk-webcore/osb-nrcit_20060212.bb +++ b/packages/gtk-webcore/osb-nrcit_20060212.bb @@ -32,7 +32,7 @@ do_stage () { oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} autotools_stage_includes - + install -d ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb new file mode 100644 index 0000000000..fefb4e8283 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -0,0 +1,12 @@ +require osb-nrcore.inc + +DEFAULT_PREFERENCE = "-1" + +PV = "0.5.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ + file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1" + +S = "${WORKDIR}/NRCore" + diff --git a/packages/gtkextra/gtk+extra_2.1.1.bb b/packages/gtkextra/gtk+extra_2.1.1.bb index 60b34544ed..bc822f7176 100644 --- a/packages/gtkextra/gtk+extra_2.1.1.bb +++ b/packages/gtkextra/gtk+extra_2.1.1.bb @@ -6,4 +6,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scigraphica/gtk+extra-${PV}.tar.gz" DEPENDS = "gtk+" inherit autotools - + diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 7af6879042..14e6818e7b 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -6,7 +6,7 @@ PR = "r1" inherit gnome -SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" +SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" S = "${WORKDIR}/gtkhtml-${PV}" diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc new file mode 100644 index 0000000000..843274fdc5 --- /dev/null +++ b/packages/gtkmm/gtkmm.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "C++ bindings for the GTK+ toolkit." +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "glibmm" + +inherit autotools pkgconfig flow-lossage + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/" + +LIBV = "2.4.0" diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb index c16dde33b0..1c5a2a2b10 100644 --- a/packages/gtkmm/gtkmm_2.4.8.bb +++ b/packages/gtkmm/gtkmm_2.4.8.bb @@ -1,19 +1,6 @@ -LICENSE = "LGPL" -DESCRIPTION = "C++ bindings for the GTK+ toolkit." -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glibmm" -PR = "r0" +require gtkmm.inc -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-${PV}.tar.bz2" - -inherit autotools pkgconfig flow-lossage - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/" - -LIBV = "2.4.0" +SRC_URI = "${GNOME_MIRROR}/gtkmm/2.4/gtkmm-${PV}.tar.bz2" do_stage () { oe_libinstall -so -C atk/atkmm libatkmm-1.6 ${STAGING_LIBDIR} diff --git a/packages/gtkmm/gtkmm_2.8.3.bb b/packages/gtkmm/gtkmm_2.8.3.bb index 41285736b5..dae68298c8 100644 --- a/packages/gtkmm/gtkmm_2.8.3.bb +++ b/packages/gtkmm/gtkmm_2.8.3.bb @@ -1,19 +1,8 @@ -LICENSE = "LGPL" -DESCRIPTION = "C++ bindings for the GTK+ toolkit." -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glibmm" -PR = "r1" - -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-${PV}.tar.bz2" +require gtkmm.inc -inherit autotools pkgconfig flow-lossage - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/" +PR = "r1" -LIBV = "2.4.0" +SRC_URI = "${GNOME_MIRROR}/gtkmm/2.8/gtkmm-${PV}.tar.bz2" do_stage () { autotools_stage_all diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb index 7f2bfedf3b..057b8a48eb 100644 --- a/packages/gxine/gxine_0.4.1.bb +++ b/packages/gxine/gxine_0.4.1.bb @@ -28,7 +28,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-dmx-ogg \ libxine-plugin-dmx-image \ libxine-plugin-dmx-avi" - + SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \ file://disable-browser-plugin.patch;patch=1" diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb index ee0d50126b..7245d1de13 100644 --- a/packages/gxine/gxine_0.4.1enhanced.bb +++ b/packages/gxine/gxine_0.4.1enhanced.bb @@ -26,7 +26,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-dmx-ogg \ libxine-plugin-dmx-image \ libxine-plugin-dmx-avi" - + S = "${WORKDIR}/${PN}-0.4.1/" SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \ diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb index f4298d9d07..9ec5fb5539 100644 --- a/packages/havp/havp_0.82.bb +++ b/packages/havp/havp_0.82.bb @@ -26,7 +26,7 @@ do_configure_append () { sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \ -e 's:/usr/local/etc:/etc:' \ etc/havp/havp.config > etc/havp/havp.config.oe -} +} do_install () { install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \ ${D}${sysconfdir}/init.d ${D}${docdir}/havp \ diff --git a/packages/hibernate-script/hibernate-script_1.12.bb b/packages/hibernate-script/hibernate-script_1.12.bb index e5c912d3d9..3d6f428d90 100644 --- a/packages/hibernate-script/hibernate-script_1.12.bb +++ b/packages/hibernate-script/hibernate-script_1.12.bb @@ -23,7 +23,7 @@ do_install () { ${S}/install.sh ln -s ./hibernate ${D}/usr/sbin/hibernate-standby - ln -s ./hibernate ${D}/usr/sbin/hibernate-ram + ln -s ./hibernate ${D}/usr/sbin/hibernate-ram #Override conf files from ${WORKDIR} install -m 0644 ${WORKDIR}/hibernate.conf ${D}/etc/hibernate/ diff --git a/packages/horizon/horizon_cvs.bb b/packages/horizon/horizon_cvs.bb index c6a33cbac7..bfa26b54a1 100644 --- a/packages/horizon/horizon_cvs.bb +++ b/packages/horizon/horizon_cvs.bb @@ -18,11 +18,11 @@ CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL -I. -Isrc -L${STAGING_LI do_compile() { #yes, this is a hack to work around a faulty makefile - oe_runmake horizon -} + oe_runmake horizon +} do_install() { install -d ${D}${bindir} install -m 755 horizon ${D}${bindir} -} +} diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb index b95b3dd2c4..dc40be49d7 100644 --- a/packages/hostap/hostap-conf_1.0.bb +++ b/packages/hostap/hostap-conf_1.0.bb @@ -12,7 +12,7 @@ SRC_URI = "file://hostap_cs.conf \ do_compile() { } -do_install() { +do_install() { install -d ${D}${sysconfdir}/pcmcia install -d ${D}${sysconfdir}/modutils diff --git a/packages/hotplug-qcop/hotplug-qcop_cvs.bb b/packages/hotplug-qcop/hotplug-qcop_cvs.bb index f8692f352f..5c0d238453 100644 --- a/packages/hotplug-qcop/hotplug-qcop_cvs.bb +++ b/packages/hotplug-qcop/hotplug-qcop_cvs.bb @@ -14,7 +14,7 @@ sbindir="/sbin" do_install() { install -d ${D}${sbindir} install -m 0755 hotplug-qcop ${D}${sbindir} - + install -d ${D}${sysconfdir}/hotplug.d/default/ ln -sf /sbin/hotplug-qcop ${D}${sysconfdir}/hotplug.d/default/11-qcop.hotplug } diff --git a/packages/httppc/httppc_0.8.5.bb b/packages/httppc/httppc_0.8.5.bb index a96cafbaa6..5dd5742686 100644 --- a/packages/httppc/httppc_0.8.5.bb +++ b/packages/httppc/httppc_0.8.5.bb @@ -10,4 +10,4 @@ LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/httppc/httppc-${PV}.tar.gz \ file://install.patch;patch=1" -inherit autotools +inherit autotools diff --git a/packages/hvsc/hvsc_5.8.bb b/packages/hvsc/hvsc_45.bb index 45d212fe07..085c4aa959 100644 --- a/packages/hvsc/hvsc_5.8.bb +++ b/packages/hvsc/hvsc_45.bb @@ -3,12 +3,12 @@ Commodore 64 music for the masses" LICENSE = "PD" SECTION = "multimedia" -SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.zip" +SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.rar" S = "${WORKDIR}" do_install() { install -d ${D}${datadir}/hvsc - unzip -d ${D}${datadir}/hvsc C64Music.zip + cd ${D}${datadir}/hvsc && unrar x ${S}/HVSC_${PV}-all-of-them.rar } PACKAGE_ARCH = "all" diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb index 8ed18620b2..ede48ffe3b 100644 --- a/packages/ica/ica-bin_8.0.bb +++ b/packages/ica/ica-bin_8.0.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libx11 libxaw rpm2cpio-native" HOMEPAGE="www.citrix.com/download/" -SRC_URI="file://${DL_DIR}/ICAClient-8.0-1.i386.rpm" +SRC_URI="file://${DL_DIR}/ICAClient-8.0-1.i386.rpm" S="${WORKDIR}" PACKAGES= "${PN}" @@ -17,9 +17,9 @@ python ica_do_fetch() { def dowarn(str,d): out = bb.data.expand(str, d) bb.note(out) - + file = bb.data.getVar('A', d) - basen = os.path.basename(file) + basen = os.path.basename(file) if not os.path.exists(file): dowarn('You need to perform the following steps to build this package:',d) @@ -44,7 +44,7 @@ do_compile() { DDIR="${D}/usr/lib/ICAClient" do_install () { - for file in `find usr/lib/ICAClient/ -type d`; do + for file in `find usr/lib/ICAClient/ -type d`; do install -d ${D}/$file done diff --git a/packages/ipac-ng/.mtn2git_empty b/packages/icecc-create-env/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipac-ng/.mtn2git_empty +++ b/packages/icecc-create-env/.mtn2git_empty diff --git a/packages/icecc-create-env/icecc-create-env_0.1.bb b/packages/icecc-create-env/icecc-create-env_0.1.bb new file mode 100644 index 0000000000..89730e55d9 --- /dev/null +++ b/packages/icecc-create-env/icecc-create-env_0.1.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ +make it work with OE." +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + + +inherit native + + +SRC_URI = "http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz" + +S = "${WORKDIR}/icecc-create-env-${PV}" + +do_stage() { + install -d ${STAGING_DIR}/ice + install -m 0755 ${WORKDIR}/icecc-create-env ${STAGING_DIR}/ice/icecc-create-env +} diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb index 76fa2abf79..4da5da5146 100644 --- a/packages/icewm/icewm_1.2.20.bb +++ b/packages/icewm/icewm_1.2.20.bb @@ -2,7 +2,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r1" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb index 1454ae00f0..47d4fc8189 100644 --- a/packages/icewm/icewm_1.2.26.bb +++ b/packages/icewm/icewm_1.2.26.bb @@ -2,7 +2,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r0" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ diff --git a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch b/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch deleted file mode 100644 index f90e312694..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ifupdown-0.6.4/execute.c~gcc34-fix 2004-04-28 00:16:45.000000000 +0200 -+++ ifupdown-0.6.4/execute.c 2004-04-28 00:17:11.000000000 +0200 -@@ -167,7 +167,7 @@ - case 0: /* child */ - execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ); - exit(127); -- default: /* parent */ -+ default:; /* parent */ - } - waitpid(child, &status, 0); - if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
\ No newline at end of file diff --git a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty +++ b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty diff --git a/packages/ifupdown/ifupdown-0.6.4/busybox.patch b/packages/ifupdown/ifupdown-0.6.8/busybox.patch index 5619ab7c0a..5619ab7c0a 100644 --- a/packages/ifupdown/ifupdown-0.6.4/busybox.patch +++ b/packages/ifupdown/ifupdown-0.6.8/busybox.patch diff --git a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch index a86a25d2fb..a86a25d2fb 100644 --- a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch +++ b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch diff --git a/packages/ifupdown/ifupdown-0.6.4/init b/packages/ifupdown/ifupdown-0.6.8/init index d258d51ff4..d258d51ff4 100644 --- a/packages/ifupdown/ifupdown-0.6.4/init +++ b/packages/ifupdown/ifupdown-0.6.8/init diff --git a/packages/ifupdown/ifupdown-0.6.4/interfaces b/packages/ifupdown/ifupdown-0.6.8/interfaces index f1bd92ed2b..f1bd92ed2b 100644 --- a/packages/ifupdown/ifupdown-0.6.4/interfaces +++ b/packages/ifupdown/ifupdown-0.6.8/interfaces diff --git a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch index 39a6b3349d..5b662e7988 100644 --- a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch +++ b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch @@ -1,18 +1,20 @@ ---- ifupdown/inet.defn.orig 2004-04-29 20:16:07.000000000 +0200 -+++ ifupdown/inet.defn 2004-04-29 20:16:13.000000000 +0200 +Index: ifupdown-0.6.8/inet.defn +=================================================================== +--- ifupdown-0.6.8.orig/inet.defn 2007-01-04 09:11:43.000000000 +0100 ++++ ifupdown-0.6.8/inet.defn 2007-01-04 09:12:51.000000000 +0100 @@ -81,8 +81,7 @@ elsif (execable("/sbin/dhclient")) pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) - udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ -- [[-c %clientid%]] \ +- [[-c %client%]] \ + udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \ elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0)) - dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \ + dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ [[-l %leasetime%]] %iface% \ @@ -91,11 +90,11 @@ down - dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \ + dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \ + kill -TERM `cat /var/run/dhclient.%iface%.pid` \ @@ -23,4 +25,4 @@ + kill -TERM `cat /var/run/udhcpc.%iface%.pid` \ elsif (execable("/sbin/udhcpc")) dhcpcd -k %iface% \ - elsif (execable("/sbin/dhcpcd"))
\ No newline at end of file + elsif (execable("/sbin/dhcpcd")) diff --git a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch index 33745db6ff..33745db6ff 100644 --- a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch +++ b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.8.bb index 0d37223eaf..53ccb5fe6c 100644 --- a/packages/ifupdown/ifupdown_0.6.4.bb +++ b/packages/ifupdown/ifupdown_0.6.8.bb @@ -1,6 +1,3 @@ -BROKEN = "1" -# Debian moved to 0.6.7 - DESCRIPTION = "High level tools to configure network interfaces \ This package provides the tools ifup and ifdown which may be used to \ configure (or, respectively, deconfigure) network interfaces, based on \ @@ -9,12 +6,10 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz \ file://busybox.patch;patch=1 \ file://udhcpc.patch;patch=1 \ file://zeroconf.patch;patch=1 \ - file://gcc34-fix.patch;patch=1 \ file://init \ file://interfaces" @@ -28,9 +23,14 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/network \ + ${D}${mandir}/man8 \ + ${D}${mandir}/man5 \ ${D}${base_sbindir} install -m 0755 ifup ${D}${base_sbindir}/ ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces + install -m 0644 ifup.8 ${D}${mandir}/man8 + install -m 0644 interfaces.5 ${D}${mandir}/man5 + cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb index cac16329c4..33748a005e 100644 --- a/packages/imagemagick/imagemagick_6.2.9.bb +++ b/packages/imagemagick/imagemagick_6.2.9.bb @@ -10,7 +10,8 @@ S = "${WORKDIR}/ImageMagick-${PV}" inherit autotools -EXTRA_OECONF="-without-x " +EXTRA_OECONF="--without-x" +EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl" LEAD_SONAME="libMagick.so.*" diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index 00a1e391c6..dea254eaa5 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,10 +1,10 @@ export IMAGE_BASENAME = "bootstrap-image-bootchart" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart" RDEPENDS = "acct" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb index 5731d94159..1ff60e60e1 100644 --- a/packages/images/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb @@ -1,10 +1,10 @@ export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" DEPENDS = "${MACHINE_TASK_PROVIDER}" -inherit image_ipk +inherit image FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb index a6687d2f46..c4636b12aa 100644 --- a/packages/images/dvb-image.bb +++ b/packages/images/dvb-image.bb @@ -4,8 +4,8 @@ IMAGE_LINGUAS = "" DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb" -export IPKG_INSTALL = "${DVB_PACKAGES}" +export PACKAGE_INSTALL = "${DVB_PACKAGES}" DEPENDS = "${DVB_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb index f41f04ee23..c713437361 100644 --- a/packages/images/e-image-core.bb +++ b/packages/images/e-image-core.bb @@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" PREFERRED_PROVIDER_libx11 = "libx11" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" -inherit image_ipk +inherit image diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index e42df3f35b..2f0bef98ef 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -3,7 +3,7 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager a PR = "r5" export IMAGE_BASENAME = "e-image" -export IPKG_INSTALL += "task-e-x11-core \ +export PACKAGE_INSTALL += "task-e-x11-core \ gpe-task-pim \ gpe-task-settings \ gpe-task-apps \ @@ -32,4 +32,4 @@ export IPKG_INSTALL += "task-e-x11-core \ DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb index 2388a0e3f7..9544b82ead 100644 --- a/packages/images/essential-image.bb +++ b/packages/images/essential-image.bb @@ -15,7 +15,7 @@ PR = "r0" ###################################################################################### -inherit image_ipk +inherit image ###################################################################################### @@ -25,4 +25,4 @@ DEPENDS = "task-essential-to-boot" export IMAGE_BASENAME = "essential-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-essential-to-boot" +export PACKAGE_INSTALL = "task-essential-to-boot" diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index 04f74aacf5..70ce1e119a 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -15,7 +15,7 @@ PR = "r0" ###################################################################################### -inherit image_ipk +inherit image ###################################################################################### @@ -28,9 +28,9 @@ MACHINE_TASKS_akita = "task-essential-to-boot \ task-essential-usbhost task-essential-usbclient \ task-essential-sound task-essential-irda \ task-essential-sd" - + ###################################################################################### export IMAGE_BASENAME = "essential-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASKS}" +export PACKAGE_INSTALL = "${MACHINE_TASKS}" diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index 53c6d5f8f9..b448c0a9b1 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -25,9 +25,9 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" -export IPKG_INSTALL = "\ +export PACKAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ @@ -38,5 +38,5 @@ export IPKG_INSTALL = "\ #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/meta/jlime-opie.bb b/packages/images/jlime-opie.bb index 0d81066778..a6f8b7989a 100644 --- a/packages/meta/jlime-opie.bb +++ b/packages/images/jlime-opie.bb @@ -17,7 +17,7 @@ INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ task-opie-bluetooth task-opie-irda \ ${extra_stuff}" -export IPKG_INSTALL = "${INSTALL_PACKAGES}" +export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { @@ -30,11 +30,11 @@ merge_feeds() { echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" exit 1 fi - + # comment out existing feed-sources inserted by ipkg-collateral cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - + # extract, then delete destinations cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ @@ -46,23 +46,23 @@ merge_feeds() { # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf done - + # remove temporary files and rebuild ipkg.conf echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - + # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf fi } # merge feed-sources into ipkg.conf and create /etc/timestamp from build date IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" -inherit image_ipk +inherit image diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb index d0368cb025..2153e427c1 100644 --- a/packages/images/maemo-image.bb +++ b/packages/images/maemo-image.bb @@ -19,9 +19,9 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb index 9bfedcf222..49e6b5ae2b 100644 --- a/packages/images/mythfront-image.bb +++ b/packages/images/mythfront-image.bb @@ -6,8 +6,8 @@ IMAGE_LINGUAS = "" MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront" -export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}" +export PACKAGE_INSTALL = "${MYTHFRONT_PACKAGES}" DEPENDS = "${MYTHFRONT_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb index 18329c913c..7cfad432a3 100644 --- a/packages/images/nslu2-linksys-image.bb +++ b/packages/images/nslu2-linksys-image.bb @@ -3,12 +3,12 @@ USE_DEVFS = "1" IMAGE_BASENAME = "nslu2-linksys" -IPKG_INSTALL = "nslu2-linksys-ramdisk" +PACKAGE_INSTALL = "nslu2-linksys-ramdisk" -DEPENDS = "nslu2-linksys-kernel ${IPKG_INSTALL}" +DEPENDS = "nslu2-linksys-kernel ${PACKAGE_INSTALL}" NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}" EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index c87e669532..120cff5822 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,4 +1,4 @@ -inherit image_ipk +inherit image inherit nylon-image LICENSE = "MIT" @@ -21,7 +21,7 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils ## kernel 2.6 ## RDEPENDS_append_mtx-3 = " module-init-tools udev" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index e3ac80720d..e6acd1f2dc 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -1,5 +1,5 @@ export IMAGE_BASENAME = "nylon-mini" - + NYLON_BASE = "base-files base-passwd busybox \ dropbear \ miniinit \ @@ -11,9 +11,9 @@ NYLON_BASE = "base-files base-passwd busybox \ RDEPENDS = "kernel \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index 4bd7b2b99e..29e29cd1eb 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -23,6 +23,6 @@ NYLON_STANDARD = "\ DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" - + RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \ ${NYLON_STANDARD}" diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index ba25af373a..faec2664ca 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -18,11 +18,18 @@ USE_DEVFS = "1" # dev entries!) SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the -# kernel image is removed from the root file system to recover the space used - -# SlugOS is assumed to boot from a separate kernel image in flash (not in the -# root file system), if this is not the case the following must not be done! -IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/uImage*;" +# IMAGE_PREPROCESS_COMMAND is run before making the image. +# We use this to do a few things: +# . remove the uImage, which is in a separate part of the flash already. +# . adjust the default run level (sysvinit is 5 by default, we like 3) +# . set a default root password, which is no more secure than a blank one +# (since it is documented, in case you were wondering) +# . make the boot more verbose +# +IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/uImage-*;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" # Always just make a new flash image. PACK_IMAGE = 'storcenter_pack_image;' @@ -76,7 +83,7 @@ OPENPROTIUM_KERNEL = "kernel-module-dummy \ RDEPENDS = " \ kernel base-files base-passwd netbase \ - busybox initscripts-openprotium slugos-init \ + busybox initscripts-openprotium openprotium-init \ update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ @@ -96,16 +103,13 @@ RDEPENDS = " \ ${OPENPROTIUM_KERNEL} " # ${SLUGOS_EXTRA_RDEPENDS}" -IPKG_INSTALL = "${RDEPENDS}" +PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image storcenter_pack_image() { - ls -ltr ${DEPLOY_DIR_IMAGE}/uImage* - pwd - echo ${IMAGE_NAME} # find latest kernel - KERNEL=`ls -ltr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1 | awk '{print $9}'` + KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1` if [ -z "$KERNEL" ]; then oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-storcenter to create one." exit 1 diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index e22200abc5..3613ccafde 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -17,7 +17,7 @@ INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-apple INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" -export IPKG_INSTALL = "${INSTALL_PACKAGES}" +export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { @@ -30,11 +30,11 @@ merge_feeds() { echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" exit 1 fi - + # comment out existing feed-sources inserted by ipkg-collateral cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - + # extract, then delete destinations cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ @@ -46,23 +46,23 @@ merge_feeds() { # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf done - + # remove temporary files and rebuild ipkg.conf echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - + # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf fi } # merge feed-sources into ipkg.conf and create /etc/timestamp from build date IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" -inherit image_ipk +inherit image diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 7fdc22126b..477d924c2c 100644 --- a/packages/images/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb @@ -7,4 +7,4 @@ export IMAGE_BASENAME = "opie-kdepim-image" INSTALL_PACKAGES += "kopi kapi kammu kopi-applet" -export IPKG_INSTALL = "${INSTALL_PACKAGES}" +export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" diff --git a/packages/images/ossie-image.bb b/packages/images/ossie-image.bb index 59f49cf06c..7f7cfbd2e0 100644 --- a/packages/images/ossie-image.bb +++ b/packages/images/ossie-image.bb @@ -1,6 +1,6 @@ export IMAGE_BASENAME = "ossie-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" DEPENDS = "${MACHINE_TASK_PROVIDER} task-ossie" @@ -14,6 +14,6 @@ FEED_URIS += " \ ${MACHINE}##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 50634e0353..78c3d7a6e9 100644 --- a/packages/images/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb @@ -1,11 +1,11 @@ export IMAGE_BASENAME = "pivotboot-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-pivotboot" +export PACKAGE_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" PR = "r1" -inherit image_ipk +inherit image FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb index 0e8f8567f5..d6a0b4b881 100644 --- a/packages/images/sdl-image.bb +++ b/packages/images/sdl-image.bb @@ -4,6 +4,6 @@ export IMAGE_BASENAME = "sdl-image" DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" -inherit image_ipk +inherit image diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index 9a068bf9db..fa16437662 100644 --- a/packages/images/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb @@ -21,9 +21,9 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" -export IPKG_INSTALL = "\ +export PACKAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ @@ -34,5 +34,5 @@ export IPKG_INSTALL = "\ ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " -inherit image_ipk +inherit image diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 82cd6f2b73..cf7d580928 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r41" +PR = "r43" COMPATIBLE_MACHINE = "nslu2" @@ -91,9 +91,9 @@ RDEPENDS = "kernel ixp4xx-npe \ ${SLUGOS_KERNEL} \ ${SLUGOS_EXTRA_RDEPENDS}" -IPKG_INSTALL = "${RDEPENDS}" +PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image python () { # Don't build slugos images unless the configuration is set up @@ -111,32 +111,63 @@ python () { # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. -PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" +PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" NSLU2_SLUGIMAGE_ARGS ?= "" -nslu2_pack_image() { - if test '${SLUGOS_FLASH_IMAGE}' = nslu2 - then - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \ - ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \ - -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ - ${NSLU2_SLUGIMAGE_ARGS} - rm -rf ${DEPLOY_DIR_IMAGE}/slug - fi +slugos_pack_image() { + install -d ${DEPLOY_DIR_IMAGE}/slug + install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \ + ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 + install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ + cd ${DEPLOY_DIR_IMAGE}/slug + slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \ + -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin \ + ${NSLU2_SLUGIMAGE_ARGS} + rm -rf ${DEPLOY_DIR_IMAGE}/slug + + # Create an image for the DSM-G600 as well + install -d ${DEPLOY_DIR_IMAGE}/firmupgrade + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${ARCH_BYTE_SEX} \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz + touch ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + chmod 0644 ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + echo "hwid=1.0.1" >${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "model=dsm-g600" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "vendor=dlink" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + chmod 0744 ${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + tar -c -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dsmg600.bin \ + -C ${DEPLOY_DIR_IMAGE} firmupgrade + rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade + + # Create an image for the NAS 100d as well + install -d ${DEPLOY_DIR_IMAGE}/firmupgrade + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${ARCH_BYTE_SEX} \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz + touch ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + chmod 0644 ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + echo "hwid=1.0.1" >${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "model=koala" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "vendor=iomega" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + chmod 0744 ${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + tar -c -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nas100d.bin \ + -C ${DEPLOY_DIR_IMAGE} firmupgrade + rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } # upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb index b2f3ec4c43..a0e68c9bb8 100644 --- a/packages/images/twin-image.bb +++ b/packages/images/twin-image.bb @@ -7,12 +7,12 @@ DEPENDS = '${MACHINE_TASK_PROVIDER} \ vim \ mutt' -export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \ +export PACKAGE_INSTALL = '${MACHINE_TASK_PROVIDER} \ twin \ orpheus \ nano \ vim \ mutt' -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb index 1983d03849..43afa3059d 100644 --- a/packages/images/uml-image.bb +++ b/packages/images/uml-image.bb @@ -6,7 +6,7 @@ OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2" OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar" DEPENDS = "${MACHINE_TASK_PROVIDER}" -export IPKG_INSTALL = "${DEPENDS}" +export PACKAGE_INSTALL = "${DEPENDS}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index ce946e7677..b56f007523 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -18,7 +18,7 @@ RDEPENDS = "kernel update-modules unslung-rootfs \ # findutils \ ${UNSLUNG_EXTRA_RDEPENDS}" -IPKG_INSTALL = "kernel update-modules unslung-rootfs \ +PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg \ libipkg \ # cpio \ @@ -27,8 +27,8 @@ IPKG_INSTALL = "kernel update-modules unslung-rootfs \ ${UNSLUNG_EXTRA_INSTALL}" IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " - -inherit image_ipk + +inherit image # Note that anything in this function must be repeatable without having to rebuild the rootfs unslung_clean_image () { diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index a681428aa6..42b0907b2b 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -8,8 +8,8 @@ X_RDEPENDS = "xserver-kdrive-fbdev" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" -export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" +export PACKAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" DEPENDS = "${X_DEPENDS} ${XFCE_DEPENDS}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb index 174766edfa..3b4576e5bb 100644 --- a/packages/images/xterminal-image.bb +++ b/packages/images/xterminal-image.bb @@ -4,8 +4,8 @@ IMAGE_LINGUAS = "" XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal" -export IPKG_INSTALL = "${XTERMINAL_PACKAGES}" +export PACKAGE_INSTALL = "${XTERMINAL_PACKAGES}" DEPENDS = "${XTERMINAL_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/imposter/imposter_0.3.bb b/packages/imposter/imposter_0.3.bb index 209dd93220..1e742190c8 100644 --- a/packages/imposter/imposter_0.3.bb +++ b/packages/imposter/imposter_0.3.bb @@ -4,4 +4,4 @@ LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" DEPENDS = "gtk+" -inherit autotools pkgconfig +inherit autotools pkgconfig diff --git a/packages/initscripts/initscripts-1.0/openprotium/checkroot.sh b/packages/initscripts/initscripts-1.0/openprotium/checkroot.sh new file mode 100755 index 0000000000..c69a773482 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/openprotium/checkroot.sh @@ -0,0 +1,212 @@ +# +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 </etc/fstab +rootmode=rw +rootopts=rw +test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" +swap_on_md=no +devfs= +while read fs mnt type opts dump pass junk +do + case "$fs" in + ""|\#*) + continue; + ;; + /dev/md*) + # Swap on md device. + test "$type" = swap && swap_on_md=yes + ;; + /dev/*) + ;; + *) + # Might be a swapfile. + test "$type" = swap && swap_on_md=yes + ;; + esac + + test "$type" = devfs && devfs="$fs" + + # Currently we do not care about the other entries + if test "$mnt" = "/" + then + #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" + + rootopts="$opts" + roottype="$type" + + #The "spinner" is broken on busybox sh + TERM=dumb + + test "$pass" = 0 -o "$pass" = "" && rootcheck=no + + # Enable fsck for ext2 and ext3 rootfs, disable for everything else + case "$type" in + ext2|ext3) rootcheck=yes;; + *) rootcheck=no;; + esac + + if test "$rootcheck" = yes + then + if ! test -x "/sbin/fsck.${roottype}" + then + echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" + rootcheck=no + fi + fi + + case "$opts" in + ro|ro,*|*,ro|*,ro,*) + rootmode=ro + ;; + esac + fi +done +exec 0>&9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +doswap=no +test -d /proc/1 || mount -n /proc +case "`uname -r`" in + 2.[0123].*) + if test $swap_on_md = yes && grep -qs resync /proc/mdstat + then + test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" + else + doswap=yes + fi + ;; + *) + doswap=yes + ;; +esac +if test $doswap = yes +then + test "$VERBOSE" != no && echo "Activating swap" + swapon -a 2> /dev/null +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test $rootcheck = no +then + test $rootcheck = yes && echo "Fast boot, no filesystem check" +else + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test `uname -m` = s390 && spinner="" # This should go away + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + + echo "RETURNCODE: [$RTC]" + + if test "$RTC" -gt 3 + then + + # Since this script is run very early in the boot-process, it should be safe to assume that the + # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot + # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal + chvt 1 + + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. " + echo "Please note that the root filesystem is currently " + echo "mounted read-only. To remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell" + echo "and REBOOT the system." + echo + # Start a single user shell on the console + /sbin/sulogin $CONSOLE + reboot -f + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi +fi + +devrootfound=$(grep "/dev/root" /proc/mounts | \ + awk '{if ($4 = /rw/) print "found";}' ) + +if [ -n "$devrootfound" -a "$devrootfound" = "found" ]; then + echo "Read/write /dev/root found." + exit 0 +fi + +if mount -vf -o remount / 2> /dev/null | \ + awk '{if ($6 ~ /rw/) exit 0; else exit 1; }' && \ + ! touch -c / 2> /dev/null + then + echo " Remounting root filesystem read/write" + mount -n -o remount,$rootmode / +fi + +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/openprotium/devices.patch b/packages/initscripts/initscripts-1.0/openprotium/devices.patch deleted file mode 100644 index 2583b62f48..0000000000 --- a/packages/initscripts/initscripts-1.0/openprotium/devices.patch +++ /dev/null @@ -1,52 +0,0 @@ -# -# Patch to allow /dev to reside permanently in the file -# system. -# ---- old/devices 2005-05-28 21:51:39.012078699 -0700 -+++ new/devices 2005-06-12 00:16:29.222686303 -0700 -@@ -6,7 +6,7 @@ - . /etc/default/rcS - - # exit without doing anything if udev is active --if test -e /dev/.udev -o -e /dev/.udevdb; then -+if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then - exit 0 - fi - -@@ -37,12 +37,20 @@ - 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 -+ if test -e /dev/.noram -+ then -+ # There should be no files, any files will damage the -+ # makedevs script below. -+ rm $(find /dev -type f -print) -+ :>/dev/.noram - else -- if test "$VERBOSE" != "no"; then echo "done"; fi -+ 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 - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / -@@ -60,6 +68,10 @@ - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi -+ if test -e /dev/.noram -+ then -+ :>/dev/.permanent -+ fi - fi - fi - diff --git a/packages/initscripts/initscripts-openprotium_1.0.bb b/packages/initscripts/initscripts-openprotium_1.0.bb index 4266211dba..83e89ef7a1 100644 --- a/packages/initscripts/initscripts-openprotium_1.0.bb +++ b/packages/initscripts/initscripts-openprotium_1.0.bb @@ -23,7 +23,7 @@ SRC_URI += "file://openprotium/devices" SRC_URI += "file://openprotium/halt" SRC_URI += "file://openprotium/reboot" SRC_URI += "file://openprotium/flashclean" -SRC_URI += "file://openprotium/devices.patch;patch=1" +SRC_URI += "file://openprotium/checkroot.sh" # Without this it is not possible to patch checkroot.sh S = "${WORKDIR}" @@ -43,6 +43,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/openprotium/reboot ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/openprotium/devices ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/openprotium/flashclean ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/openprotium/checkroot.sh ${D}${sysconfdir}/init.d # Remove the do install links (this detects a change to the # initscripts .bb file - it will cause a build failure here.) @@ -56,7 +57,7 @@ do_install_append() { # rm ${D}${sysconfdir}/rc6.d/S30urandom rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh rm ${D}${sysconfdir}/rc6.d/S40umountfs - rm ${D}${sysconfdir}/rcS.d/S30ramdisk + rm ${D}${sysconfdir}/rcS.d/S30ramdisk rm ${D}${sysconfdir}/rc6.d/S90reboot rm ${D}${sysconfdir}/rc0.d/S20sendsigs # rm ${D}${sysconfdir}/rc0.d/S30urandom @@ -133,7 +134,7 @@ do_install_append() { # urandom is currently disabled from S 55 (and won't work with tmpfs /var) # ipkg-cl configure runs at S 98 - update-rc.d -r ${D} finish start 99 S . + update-rc.d -r ${D} finish start 99 S . # # User (2-5) links - UNCHANGED @@ -141,7 +142,7 @@ do_install_append() { update-rc.d -r ${D} rmnologin start 99 2 3 4 5 . update-rc.d -r ${D} flashclean start 99 5 . - # + # # Shutdown (0,6) links - !!!CHANGED!!! # # The problem here is that netbase installs K40networking but portmap diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index b73eed2b20..ed5f37f348 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -43,7 +43,7 @@ do_install_append() { # rm ${D}${sysconfdir}/rc6.d/S30urandom rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh rm ${D}${sysconfdir}/rc6.d/S40umountfs - rm ${D}${sysconfdir}/rcS.d/S30ramdisk + rm ${D}${sysconfdir}/rcS.d/S30ramdisk rm ${D}${sysconfdir}/rc6.d/S90reboot rm ${D}${sysconfdir}/rc0.d/S20sendsigs # rm ${D}${sysconfdir}/rc0.d/S30urandom @@ -120,14 +120,14 @@ do_install_append() { # urandom is currently disabled from S 55 (and won't work with tmpfs /var) # ipkg-cl configure runs at S 98 - update-rc.d -r ${D} finish start 99 S . + update-rc.d -r ${D} finish start 99 S . # # User (2-5) links - UNCHANGED # rmnologin is the only thing added to user levels update-rc.d -r ${D} rmnologin start 99 2 3 4 5 . - # + # # Shutdown (0,6) links - !!!CHANGED!!! # # The problem here is that netbase installs K40networking but portmap diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 39662eb31a..838c479cb1 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -82,7 +82,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -112,7 +112,7 @@ do_install () { ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs # udev will run at S55 if installed - ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk + ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom @@ -121,7 +121,7 @@ do_install () { # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh - ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh diff --git a/packages/interbench/interbench_0.30.bb b/packages/interbench/interbench_0.30.bb index 84bd88dbc2..77d4862f7e 100644 --- a/packages/interbench/interbench_0.30.bb +++ b/packages/interbench/interbench_0.30.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux interactivity benchmark" HOMEPAGE = "http://members.optusnet.com.au/ckolivas/interbench/" LICENSE = "GPL" -SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2" inherit autotools diff --git a/packages/intercom/intercom_0.15.bb b/packages/intercom/intercom_0.15.bb index 0f8d530718..28764c6411 100644 --- a/packages/intercom/intercom_0.15.bb +++ b/packages/intercom/intercom_0.15.bb @@ -4,11 +4,12 @@ DESCRIPTION="A flexible audio communication utility" SECTION = "console/telephony" - -SRC_URI="http://mirror.optusnet.com.au/sourceforge/i/in/intercom/intercom-${PV}.tar.gz" LICENSE="GPL" + PR = "r1" +SRC_URI="ftp://ftp.cm.nu/pub/people/shane/intercom/intercom-${PV}.tar.gz" + inherit autotools -EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}" +EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}" diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb index 7d4f83e94e..de8705ccf0 100644 --- a/packages/intltool/intltool_0.35.0.bb +++ b/packages/intltool/intltool_0.35.0.bb @@ -4,6 +4,10 @@ LICENSE = "GPL" DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" +PR = "r1" + +RRECOMMENDS = "perl-modules" + SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" S = "${WORKDIR}/intltool-${PV}" diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb new file mode 100644 index 0000000000..daba37a9da --- /dev/null +++ b/packages/intltool/intltool_0.35.2.bb @@ -0,0 +1,18 @@ +SECTION = "devel" +DESCRIPTION = "Utility scripts for internationalizing XML" +LICENSE = "GPL" +DEPENDS = "libxml-parser-perl-native" +#RDEPENDS = "libxml-parser-perl" + +PR = "r0" + +RRECOMMENDS = "perl-modules" + +SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/iozone3/iozone3_263.bb b/packages/iozone3/iozone3_263.bb index 9389386afc..c32e1daf4e 100644 --- a/packages/iozone3/iozone3_263.bb +++ b/packages/iozone3/iozone3_263.bb @@ -40,10 +40,10 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" # LICENSE: # # Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott -# -# License to freely use and distribute this software is hereby granted -# by the author, subject to the condition that this copyright notice -# remains intact. The author retains the exclusive right to publish +# +# License to freely use and distribute this software is hereby granted +# by the author, subject to the condition that this copyright notice +# remains intact. The author retains the exclusive right to publish # derivative works based on this work, including, but not limited to # revised versions of this work. # @@ -55,25 +55,25 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" # ======================================================================== # # Marcin, -# +# # Re-distribution is permitted as long as the copyright is # maintained and the source code is not changed. I do not # see a problem with your mods to enable fileop for Linux-arm, # as these mods have been returned to the Iozone folks, # and they have been accepted for inclusion in the next # release :-) -# +# # Thank you for your contribution, # Don Capps -# -# ----- Original Message ----- +# +# ----- Original Message ----- # From: "Marcin Juszkiewicz" <firma@hrw.one.pl> -# To: "Don Capps" <don.capps2@verizon.net>; "William D. Norcott" +# To: "Don Capps" <don.capps2@verizon.net>; "William D. Norcott" # <wnorcott@us.oracle.com> # Sent: Sunday, October 29, 2006 4:55 PM # Subject: iozone3 263 patch for arm and License question -# -# +# +# # > Morning # > # > I want to include iozone3 in OpenEmbedded [1] metadata to give it for @@ -95,6 +95,6 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" # > 1. http://www.openembedded.org/ # > # > Regards -# > -- +# > -- # > JID: hrw-jabber.org # > OpenEmbedded developer/consultant diff --git a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff b/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff deleted file mode 100644 index 1f2aa1307c..0000000000 --- a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.o 2004-10-10 14:14:59.022179096 +0200 -+++ Makefile.in 2004-10-10 14:15:18.952149280 +0200 -@@ -93,7 +93,7 @@ - - - subst: subst.c -- $(CC) $(CFLAGS) -o subst subst.c -+ $(BUILD_CC) $(BUILD_CFLAGS) -o subst subst.c - - fetchipac: fetchipac.o storagetable.o billtable.o agenttable.o batch.tab.o libipac.a batch.yy.o\ - conffile.tab.o conffile.yy.o\ diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb deleted file mode 100644 index 3315c44ae7..0000000000 --- a/packages/ipac-ng/ipac-ng_1.30.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux" -HOMEPAGE = "http://ipac-ng.sourceforge.net/" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \ - file://makefile-build-cc.diff;patch=1;pnum=0" -RDEPENDS = "perl libgd-perl" -LICENSE = "GPL" - -inherit autotools - -do_configure() { - oe_runconf -} - -do_install_append() { - install -d ${D}${sysconfdir}/ipac-ng - install -m 644 ${S}/doc/ipac.conf.sample ${D}${sysconfdir}/ipac-ng - install -m 644 ${S}/doc/rules.conf.sample ${D}${sysconfdir}/ipac-ng -} diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb index 5d8a834b20..02509aa962 100644 --- a/packages/ipkg/ipkg_0.99.163.bb +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -10,9 +10,9 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ 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/ + for f in *.h + do + install -m 0644 $f ${STAGING_INCDIR}/libipkg/ done } diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc new file mode 100644 index 0000000000..006b27b60f --- /dev/null +++ b/packages/iproute2/iproute2.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "kernel routing and traffic control utilities" +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "flex-native bison-native" + +# Set DATE in the .bb file +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" + +S = "${WORKDIR}/${P}-${DATE}" + +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" + +do_install () { + oe_runmake DESTDIR=${D} install +} + +FILES_${PN} += "/usr/lib/tc/*" +FILES_${PN}-dbg += "/usr/lib/tc/.debug" diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb index d71421d1e4..ddd5ef71dd 100644 --- a/packages/iproute2/iproute2_2.6.16.bb +++ b/packages/iproute2/iproute2_2.6.16.bb @@ -1,20 +1,8 @@ -SECTION = "base" -DESCRIPTION = "kernel routing and traffic control utilities" -LICENSE = "GPL" -DEPENDS = "flex-native bison-native" +PR = "r1" -DATE="060323" -SRC_URI="http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \ - file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" -PR="r1" -S="${WORKDIR}/${P}-${DATE}" - -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ + file://new-flex-fix.patch;patch=1" -do_install () { - oe_runmake DESTDIR=${D} install -} +require iproute2.inc -FILES_${PN} += "/usr/lib/tc/*" -FILES_${PN}-dbg += "/usr/lib/tc/.debug" +DATE = "060323" diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb index f73c05e939..ee3ff29550 100644 --- a/packages/iproute2/iproute2_2.6.18.bb +++ b/packages/iproute2/iproute2_2.6.18.bb @@ -1,21 +1,8 @@ -DESCRIPTION = "kernel routing and traffic control utilities" -SECTION = "base" -LICENSE = "GPL" -DEPENDS = "flex-native bison-native" PR = "r0" -DATE = "061002" -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \ - file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" - -S = "${WORKDIR}/${P}-${DATE}" +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ + file://new-flex-fix.patch;patch=1" -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" +require iproute2.inc -do_install () { - oe_runmake DESTDIR=${D} install -} - -FILES_${PN} += "/usr/lib/tc/*" -FILES_${PN}-dbg += "/usr/lib/tc/.debug" +DATE = "061002" diff --git a/packages/iproute2/iproute2_2.6.8.bb b/packages/iproute2/iproute2_2.6.8.bb index d904ea5a97..339471d62d 100644 --- a/packages/iproute2/iproute2_2.6.8.bb +++ b/packages/iproute2/iproute2_2.6.8.bb @@ -6,7 +6,7 @@ SRC_URI="http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730 file://iproute2-2.6.8_no_strip.diff;patch=1;pnum=0" PR="r1" - + EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" do_install () { diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb index 98d28b60a3..5c64b2dd96 100644 --- a/packages/irda-utils/irdadump_0.9.16.bb +++ b/packages/irda-utils/irdadump_0.9.16.bb @@ -10,7 +10,7 @@ S="${WORKDIR}/irda-utils-${PV}/irdadump" EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/" EXTRA_LDFLAGS += "-lglib" -inherit autotools +inherit autotools do_compile() { oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" diff --git a/packages/irssi/irssi_0.8.10.bb b/packages/irssi/irssi_0.8.10.bb index 729c756e47..2c8b226d0e 100644 --- a/packages/irssi/irssi_0.8.10.bb +++ b/packages/irssi/irssi_0.8.10.bb @@ -33,18 +33,18 @@ do_configure () { # create help files echo "Creating help files..." perl syntax.pl - + files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'` cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am - + files=`echo $files|sed 's/\.in//g'` cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am - + # .HTML -> .txt with lynx # echo "Documentation: html -> txt..." # lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt > docs/faq.txt - + autotools_do_configure } diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb index 1fe2619ca1..38f4d3fb26 100644 --- a/packages/irssi/irssi_svn.bb +++ b/packages/irssi/irssi_svn.bb @@ -35,18 +35,18 @@ do_configure () { # create help files echo "Creating help files..." perl syntax.pl - + files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'` cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am - + files=`echo $files|sed 's/\.in//g'` cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am - + # .HTML -> .txt with lynx # echo "Documentation: html -> txt..." # lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt > docs/faq.txt - + autotools_do_configure } diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb index d09c5955f3..17a48e9b76 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb @@ -10,7 +10,7 @@ DEPENDS = "ixp-osal" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" -SRC_URI = "ftp://aiedownload.intel.com/df-support/9519/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5_1.zip" +SRC_URI = "http://downloadmirror.intel.com/df-support/10159/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5_1.zip" SRC_URI += "file://2.6.14.patch;patch=1" SRC_URI += "file://2.6.15.patch;patch=1" SRC_URI += "file://device-name.patch;patch=1" diff --git a/packages/jack/jack_0.99.0.bb b/packages/jack/jack_0.99.0.bb index 12d5bff0e0..a4988fdef0 100644 --- a/packages/jack/jack_0.99.0.bb +++ b/packages/jack/jack_0.99.0.bb @@ -4,7 +4,7 @@ device, as well as allowing them to share audio between \ themselves." SECTION = "libs/multimedia" PRIORITY = "optional" -LICENSE = "GPL LGPL" +LICENSE = "GPL LGPL" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/jackit/jack-audio-connection-kit-${PV}.tar.gz" diff --git a/packages/jhead/jhead_2.6.0.bb b/packages/jhead/jhead_2.6.0.bb index 9089b6f46f..3779c1ec34 100644 --- a/packages/jhead/jhead_2.6.0.bb +++ b/packages/jhead/jhead_2.6.0.bb @@ -1,12 +1,18 @@ SECTION = "apps" - -S = ${WORKDIR}/jhead-2.6 PR = "r0" + SRC_URI = "http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1" + +S = "${WORKDIR}/jhead-2.6" -inherit autotools +inherit autotools do_configure() { : } + +do_install() { + install -d ${D}/bin + autotools_do_install +} diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 978ae10be5..d725284694 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://paths.patch;patch=1" S = "${WORKDIR}/jpeg-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF="--enable-static --enable-shared" EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' diff --git a/packages/kbdd/kbdd_svn.bb b/packages/kbdd/kbdd_svn.bb index 5a1d8d5858..b9468593da 100644 --- a/packages/kbdd/kbdd_svn.bb +++ b/packages/kbdd/kbdd_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://projects.linuxtogo.org/svn/kbdd;module=trunk;proto=svn \ file://kbdd-modules" S = "${WORKDIR}/trunk" -inherit update-rc.d +inherit update-rc.d INITSCRIPT_NAME = "kbdd" INITSCRIPT_PARAMS = "defaults" diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index e5f0b35b22..8b6d2b5aa2 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -28,10 +28,10 @@ do_install_append() { export CVSBUILD="no" -pkg_postinst_${PN}() { +pkg_postinst_${PN}() { update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10 } -pkg_postrm_${PN}() { +pkg_postrm_${PN}() { update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox } diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index c219ed7641..8303672240 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -20,6 +20,6 @@ FILES_keymap-extension-fi = "/etc/*-fi.map" do_install() { install -d ${D}/${sysconfdir} - + install -m 0644 ${WORKDIR}/*.map ${D}/${sysconfdir} } diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb index 0756ca80e6..02403bc2e1 100644 --- a/packages/keyring/keyring_0.6.8.bb +++ b/packages/keyring/keyring_0.6.8.bb @@ -15,7 +15,7 @@ QPEDIR = "${OPIEDIR}" do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/keyring + ${D}${palmtopdir}/pics/keyring install -m 0755 keyring ${D}${palmtopdir}/bin/ install -m 0644 keyring.desktop \ ${D}${palmtopdir}/apps/Applications/ diff --git a/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf b/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf deleted file mode 100644 index 233aec378a..0000000000 --- a/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf +++ /dev/null @@ -1,328 +0,0 @@ -# Kismet config file -# Most of the "static" configs have been moved to here -- the command line -# config was getting way too crowded and cryptic. We want functionality, -# not continually reading --help! - -# Version of Kismet config -version=2004.03.devel.a - -# Name of server (Purely for organiational purposes) -servername=Kismet - -# User to setid to (should be your normal user) -suiduser=your_user_here - -# Sources are defined as: -# source=cardtype,interface,name[,initialchannel] -# Card types and required drivers are listed in the README. -# The initial channel is optional, if hopping is not enabled it can be used -# to set the channel the interface listens on. -source=hostap,wlan0,wlan0 -source=hostap,wlan1,wlan1 -# Other common source configs: -# source=prism2,wlan0,prism2source -# source=prism2_avs,wlan0,newprism2source -# source=orinoco,eth0,orinocosource -# An example source line with an initial channel: -# source=orinoco,eth0,silver,11 - -# Comma-separated list of sources to enable. This is only needed if you defined -# multiple sources and only want to enable some of them. By default, all defined -# sources are enabled. -# For example: -# enablesources=prismsource,ciscosource - -# Do we channelhop? -channelhop=true - -# How many channels per second do we hop? (1-10) -channelvelocity=5 - -# By setting the dwell time for channel hopping we override the channelvelocity -# setting above and dwell on each channel for the given number of seconds. -#channeldwell=10 - -# Do we split channels between cards on the same spectrum? This means if -# multiple 802.11b capture sources are defined, they will be offset to cover -# the most possible spectrum at a given time. This also controls splitting -# fine-tuned sourcechannels lines which cover multiple interfaces (see below) -channelsplit=true - -# Basic channel hopping control: -# These define the channels the cards hop through for various frequency ranges -# supported by Kismet. More finegrain control is available via the -# "sourcechannels" configuration option. -# -# Don't change the IEEE80211<x> identifiers or channel hopping won't work. - -# Users outside the US might want to use this list: -# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12 -defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11g uses the same channels as 802.11b... -defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11a channels are non-overlapping so sequential is fine. You may want to -# adjust the list depending on the channels your card actually supports. -# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 -defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64 - -# Combo cards like Atheros use both 'a' and 'b/g' channels. Of course, you -# can also explicitly override a given source. You can use the script -# extras/listchan.pl to extract all the channels your card supports. -defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64 - -# Fine-tuning channel hopping control: -# The sourcechannels option can be used to set the channel hopping for -# specific interfaces, and to control what interfaces share a list of -# channels for split hopping. This can also be used to easily lock -# one card on a single channel while hopping with other cards. -# Any card without a sourcechannel definition will use the standard hopping -# list. -# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN - -# ie, for us channels on the source 'prism2source' (same as normal channel -# hopping behavior): -# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10 - -# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay -# on channel 6 and prism2b to hop normally. By not setting a sourcechannels -# line for prism2b, it will use the standard hopping. -# sourcechannels=prism2a:6 - -# To assign the same custom hop channel to multiple sources, or to split the -# same custom hop channel over two sources (if splitchannels is true), list -# them all on the same sourcechannels line: -# sourcechannels=prism2a,prism2b,prism2c:1,6,11 - -# Port to serve GUI data -tcpport=2501 -# People allowed to connect, comma seperated IP addresses or network/mask -# blocks. Netmasks can be expressed as dotted quad (/255.255.255.0) or as -# numbers (/24) -allowedhosts=127.0.0.1 -# Maximum number of concurrent GUI's -maxclients=5 - -# Do we have a GPS? -gps=true -# Host:port that GPSD is running on. This can be localhost OR remote! -gpshost=localhost:2947 -# Do we lock the mode? This overrides coordinates of lock "0", which will -# generate some bad information until you get a GPS lock, but it will -# fix problems with GPS units with broken NMEA that report lock 0 -gpsmodelock=false - -# Packet filtering options: -# filter_tracker - Packets filtered from the tracker are not processed or -# recorded in any way. -# filter_dump - Packets filtered at the dump level are tracked, displayed, -# and written to the csv/xml/network/etc files, but not -# recorded in the packet dump -# filter_export - Controls what packets influence the exported CSV, network, -# xml, gps, etc files. -# All filtering options take arguments containing the type of address and -# addresses to be filtered. Valid address types are 'ANY', 'BSSID', -# 'SOURCE', and 'DEST'. Filtering can be inverted by the use of '!' before -# the address. For example, -# filter_tracker=ANY(!00:00:DE:AD:BE:EF) -# has the same effect as the previous mac_filter config file option. -# filter_tracker=... -# filter_dump=... -# filter_export=... - -# Alerts to be reported and the throttling rates. -# alert=name,throttle/unit,burst -# The throttle/unit describes the number of alerts of this type that are -# sent per time unit. Valid time units are second, minute, hour, and day. -# Burst describes the number of alerts sent before throttling takes place. -# For example: -# alert=FOO,10/min,5 -# Would allow 5 alerts through before throttling is enabled, and will then -# limit the number of alerts to 10 per minute. -# A throttle rate of 0 disables throttling of the alert. -# See the README for a list of alert types. -alert=NETSTUMBLER,5/min,2 -alert=WELLENREITER,5/min,2 -alert=LUCENTTEST,5/min,2 -alert=DEAUTHFLOOD,5/min,4 -alert=BCASTDISCON,5/min,4 -alert=CHANCHANGE,5/min,4 -alert=AIRJACKSSID,5/min,2 -alert=PROBENOJOIN,5/min,2 -alert=DISASSOCTRAFFIC,5/min,2 -alert=NULLPROBERESP,5/min,5 - -# Known WEP keys to decrypt, bssid,hexkey. This is only for networks where -# the keys are already known, and it may impact throughput on slower hardware. -# Multiple wepkey lines may be used for multiple BSSIDs. -# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900 - -# Is transmission of the keys to the client allowed? This may be a security -# risk for some. If you disable this, you will not be able to query keys from -# a client. -allowkeytransmit=true - -# How often (in seconds) do we write all our data files (0 to disable) -writeinterval=300 - -# Do we use sound? -# Not to be confused with GUI sound parameter, this controls wether or not the -# server itself will play sound. Primarily for headless or automated systems. -sound=false -# Path to sound player -soundplay=/usr/bin/play -# Optional parameters to pass to the player -# soundopts=--volume=.3 -# New network found -sound_new=/usr/share/kismet/wav/new_network.wav -# Wepped new network -# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav -# Network traffic sound -sound_traffic=/usr/share/kismet/wav/traffic.wav -# Network junk traffic found -sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav -# GPS lock aquired sound -# sound_gpslock=/usr/share/kismet/wav/foo.wav -# GPS lock lost sound -# sound_gpslost=/usr/share/kismet/wav/bar.wav -# Alert sound -sound_alert=/usr/share/kismet/wav/alert.wav - -# Does the server have speech? (Again, not to be confused with the GUI's speech) -speech=false -# Server's path to Festival -festival=/usr/bin/festival -# How do we speak? Valid options: -# speech Normal speech -# nato NATO spellings (alpha, bravo, charlie) -# spell Spell the letters out (aye, bee, sea) -speech_type=nato -# speech_encrypted and speech_unencrypted - Speech templates -# Similar to the logtemplate option, this lets you customize the speech output. -# speech_encrypted is used for an encrypted network spoken string -# speech_unencrypted is used for an unencrypted network spoken string -# -# %b is replaced by the BSSID (MAC) of the network -# %s is replaced by the SSID (name) of the network -# %c is replaced by the CHANNEL of the network -# %r is replaced by the MAX RATE of the network -speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted. -speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open. - -# Where do we get our manufacturer fingerprints from? Assumed to be in the -# default config directory if an absolute path is not given. -ap_manuf=ap_manuf -client_manuf=client_manuf - -# Use metric measurements in the output? -metric=false - -# Do we write waypoints for gpsdrive to load? Note: This is NOT related to -# recent versions of GPSDrive's native support of Kismet. -waypoints=false -# GPSMap waypoint file. This WILL be truncated. -waypointdata=%h/.gpsdrive/way_kismet.txt - -# How many alerts do we backlog for new clients? Only change this if you have -# a -very- low memory system and need those extra bytes, or if you have a high -# memory system and a huge number of alert conditions. -alertbacklog=50 - -# File types to log, comma seperated -# dump - raw packet dump -# network - plaintext detected networks -# csv - plaintext detected networks in CSV format -# xml - XML formatted network and cisco log -# weak - weak packets (in airsnort format) -# cisco - cisco equipment CDP broadcasts -# gps - gps coordinates -logtypes=dump,network,csv,xml,weak,cisco,gps - -# Do we track probe responses and merge probe networks into their owners? -# This isn't always desireable, depending on the type of monitoring you're -# trying to do. -trackprobenets=true - -# Do we log "noise" packets that we can't decipher? I tend to not, since -# they don't have anything interesting at all in them. -noiselog=false - -# Do we log corrupt packets? Corrupt packets have enough header information -# to see what they are, but someting is wrong with them that prevents us from -# completely dissecting them. Logging these is usually not a bad idea. -corruptlog=true - -# Do we log beacon packets or do we filter them out of the dumpfile -beaconlog=true - -# Do we log PHY layer packets or do we filter them out of the dumpfile -phylog=true - -# Do we mangle packets if we can decrypt them or if they're fuzzy-detected -mangledatalog=true - -# Do we do "fuzzy" crypt detection? (byte-based detection instead of 802.11 -# frame headers) -# valid option: Comma seperated list of card types to perform fuzzy detection -# on, or 'all' -fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext - -# What type of dump do we generate? -# valid option: "wiretap" -dumptype=wiretap -# Do we limit the size of dump logs? Sometimes ethereal can't handle big ones. -# 0 = No limit -# Anything else = Max number of packets to log to a single file before closing -# and opening a new one. -dumplimit=0 - -# Do we write data packets to a FIFO for an external data-IDS (such as Snort)? -# See the docs before enabling this. -#fifo=/tmp/kismet_dump - -# Default log title -logdefault=Kismet - -# logtemplate - Filename logging template. -# This is, at first glance, really nasty and ugly, but you'll hardly ever -# have to touch it so don't complain too much. -# -# %n is replaced by the logging instance name -# %d is replaced by the current date as Mon-DD-YYYY -# %D is replaced by the current date as YYYYMMDD -# %t is replaced by the starting log time -# %i is replaced by the increment log in the case of multiple logs -# %l is replaced by the log type (dump, status, crypt, etc) -# %h is replaced by the home directory -# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand -# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and -# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated. -# %h/netlots/%n-%d-%i.dump could expand to -# /home/foo/netlogs/Pok-Dec-20-01-2.dump -# -# Other possibilities: Sorting by directory -# logtemplate=%l/%n-%d-%i -# Would expand to, for example, -# dump/Pok-Dec-20-01-1 -# crypt/Pok-Dec-20-01-1 -# and so on. The "dump", "crypt", etc, dirs must exist before kismet is run -# in this case. -logtemplate=/tmp/%n-%d-%i.%l - -# Where do we store the pid file of the server? -piddir=/var/run/ - -# Where state info, etc, is stored. You shouldnt ever need to change this. -# This is a directory. -configdir=%h/.kismet/ - -# cloaked SSID file. You shouldn't ever need to change this. -ssidmap=ssid_map - -# Group map file. You shouldn't ever need to change this. -groupmap=group_map - -# IP range map file. You shouldn't ever need to change this. -ipmap=ip_map - diff --git a/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf b/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf deleted file mode 100644 index 233aec378a..0000000000 --- a/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf +++ /dev/null @@ -1,328 +0,0 @@ -# Kismet config file -# Most of the "static" configs have been moved to here -- the command line -# config was getting way too crowded and cryptic. We want functionality, -# not continually reading --help! - -# Version of Kismet config -version=2004.03.devel.a - -# Name of server (Purely for organiational purposes) -servername=Kismet - -# User to setid to (should be your normal user) -suiduser=your_user_here - -# Sources are defined as: -# source=cardtype,interface,name[,initialchannel] -# Card types and required drivers are listed in the README. -# The initial channel is optional, if hopping is not enabled it can be used -# to set the channel the interface listens on. -source=hostap,wlan0,wlan0 -source=hostap,wlan1,wlan1 -# Other common source configs: -# source=prism2,wlan0,prism2source -# source=prism2_avs,wlan0,newprism2source -# source=orinoco,eth0,orinocosource -# An example source line with an initial channel: -# source=orinoco,eth0,silver,11 - -# Comma-separated list of sources to enable. This is only needed if you defined -# multiple sources and only want to enable some of them. By default, all defined -# sources are enabled. -# For example: -# enablesources=prismsource,ciscosource - -# Do we channelhop? -channelhop=true - -# How many channels per second do we hop? (1-10) -channelvelocity=5 - -# By setting the dwell time for channel hopping we override the channelvelocity -# setting above and dwell on each channel for the given number of seconds. -#channeldwell=10 - -# Do we split channels between cards on the same spectrum? This means if -# multiple 802.11b capture sources are defined, they will be offset to cover -# the most possible spectrum at a given time. This also controls splitting -# fine-tuned sourcechannels lines which cover multiple interfaces (see below) -channelsplit=true - -# Basic channel hopping control: -# These define the channels the cards hop through for various frequency ranges -# supported by Kismet. More finegrain control is available via the -# "sourcechannels" configuration option. -# -# Don't change the IEEE80211<x> identifiers or channel hopping won't work. - -# Users outside the US might want to use this list: -# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12 -defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11g uses the same channels as 802.11b... -defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11a channels are non-overlapping so sequential is fine. You may want to -# adjust the list depending on the channels your card actually supports. -# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 -defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64 - -# Combo cards like Atheros use both 'a' and 'b/g' channels. Of course, you -# can also explicitly override a given source. You can use the script -# extras/listchan.pl to extract all the channels your card supports. -defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64 - -# Fine-tuning channel hopping control: -# The sourcechannels option can be used to set the channel hopping for -# specific interfaces, and to control what interfaces share a list of -# channels for split hopping. This can also be used to easily lock -# one card on a single channel while hopping with other cards. -# Any card without a sourcechannel definition will use the standard hopping -# list. -# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN - -# ie, for us channels on the source 'prism2source' (same as normal channel -# hopping behavior): -# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10 - -# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay -# on channel 6 and prism2b to hop normally. By not setting a sourcechannels -# line for prism2b, it will use the standard hopping. -# sourcechannels=prism2a:6 - -# To assign the same custom hop channel to multiple sources, or to split the -# same custom hop channel over two sources (if splitchannels is true), list -# them all on the same sourcechannels line: -# sourcechannels=prism2a,prism2b,prism2c:1,6,11 - -# Port to serve GUI data -tcpport=2501 -# People allowed to connect, comma seperated IP addresses or network/mask -# blocks. Netmasks can be expressed as dotted quad (/255.255.255.0) or as -# numbers (/24) -allowedhosts=127.0.0.1 -# Maximum number of concurrent GUI's -maxclients=5 - -# Do we have a GPS? -gps=true -# Host:port that GPSD is running on. This can be localhost OR remote! -gpshost=localhost:2947 -# Do we lock the mode? This overrides coordinates of lock "0", which will -# generate some bad information until you get a GPS lock, but it will -# fix problems with GPS units with broken NMEA that report lock 0 -gpsmodelock=false - -# Packet filtering options: -# filter_tracker - Packets filtered from the tracker are not processed or -# recorded in any way. -# filter_dump - Packets filtered at the dump level are tracked, displayed, -# and written to the csv/xml/network/etc files, but not -# recorded in the packet dump -# filter_export - Controls what packets influence the exported CSV, network, -# xml, gps, etc files. -# All filtering options take arguments containing the type of address and -# addresses to be filtered. Valid address types are 'ANY', 'BSSID', -# 'SOURCE', and 'DEST'. Filtering can be inverted by the use of '!' before -# the address. For example, -# filter_tracker=ANY(!00:00:DE:AD:BE:EF) -# has the same effect as the previous mac_filter config file option. -# filter_tracker=... -# filter_dump=... -# filter_export=... - -# Alerts to be reported and the throttling rates. -# alert=name,throttle/unit,burst -# The throttle/unit describes the number of alerts of this type that are -# sent per time unit. Valid time units are second, minute, hour, and day. -# Burst describes the number of alerts sent before throttling takes place. -# For example: -# alert=FOO,10/min,5 -# Would allow 5 alerts through before throttling is enabled, and will then -# limit the number of alerts to 10 per minute. -# A throttle rate of 0 disables throttling of the alert. -# See the README for a list of alert types. -alert=NETSTUMBLER,5/min,2 -alert=WELLENREITER,5/min,2 -alert=LUCENTTEST,5/min,2 -alert=DEAUTHFLOOD,5/min,4 -alert=BCASTDISCON,5/min,4 -alert=CHANCHANGE,5/min,4 -alert=AIRJACKSSID,5/min,2 -alert=PROBENOJOIN,5/min,2 -alert=DISASSOCTRAFFIC,5/min,2 -alert=NULLPROBERESP,5/min,5 - -# Known WEP keys to decrypt, bssid,hexkey. This is only for networks where -# the keys are already known, and it may impact throughput on slower hardware. -# Multiple wepkey lines may be used for multiple BSSIDs. -# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900 - -# Is transmission of the keys to the client allowed? This may be a security -# risk for some. If you disable this, you will not be able to query keys from -# a client. -allowkeytransmit=true - -# How often (in seconds) do we write all our data files (0 to disable) -writeinterval=300 - -# Do we use sound? -# Not to be confused with GUI sound parameter, this controls wether or not the -# server itself will play sound. Primarily for headless or automated systems. -sound=false -# Path to sound player -soundplay=/usr/bin/play -# Optional parameters to pass to the player -# soundopts=--volume=.3 -# New network found -sound_new=/usr/share/kismet/wav/new_network.wav -# Wepped new network -# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav -# Network traffic sound -sound_traffic=/usr/share/kismet/wav/traffic.wav -# Network junk traffic found -sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav -# GPS lock aquired sound -# sound_gpslock=/usr/share/kismet/wav/foo.wav -# GPS lock lost sound -# sound_gpslost=/usr/share/kismet/wav/bar.wav -# Alert sound -sound_alert=/usr/share/kismet/wav/alert.wav - -# Does the server have speech? (Again, not to be confused with the GUI's speech) -speech=false -# Server's path to Festival -festival=/usr/bin/festival -# How do we speak? Valid options: -# speech Normal speech -# nato NATO spellings (alpha, bravo, charlie) -# spell Spell the letters out (aye, bee, sea) -speech_type=nato -# speech_encrypted and speech_unencrypted - Speech templates -# Similar to the logtemplate option, this lets you customize the speech output. -# speech_encrypted is used for an encrypted network spoken string -# speech_unencrypted is used for an unencrypted network spoken string -# -# %b is replaced by the BSSID (MAC) of the network -# %s is replaced by the SSID (name) of the network -# %c is replaced by the CHANNEL of the network -# %r is replaced by the MAX RATE of the network -speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted. -speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open. - -# Where do we get our manufacturer fingerprints from? Assumed to be in the -# default config directory if an absolute path is not given. -ap_manuf=ap_manuf -client_manuf=client_manuf - -# Use metric measurements in the output? -metric=false - -# Do we write waypoints for gpsdrive to load? Note: This is NOT related to -# recent versions of GPSDrive's native support of Kismet. -waypoints=false -# GPSMap waypoint file. This WILL be truncated. -waypointdata=%h/.gpsdrive/way_kismet.txt - -# How many alerts do we backlog for new clients? Only change this if you have -# a -very- low memory system and need those extra bytes, or if you have a high -# memory system and a huge number of alert conditions. -alertbacklog=50 - -# File types to log, comma seperated -# dump - raw packet dump -# network - plaintext detected networks -# csv - plaintext detected networks in CSV format -# xml - XML formatted network and cisco log -# weak - weak packets (in airsnort format) -# cisco - cisco equipment CDP broadcasts -# gps - gps coordinates -logtypes=dump,network,csv,xml,weak,cisco,gps - -# Do we track probe responses and merge probe networks into their owners? -# This isn't always desireable, depending on the type of monitoring you're -# trying to do. -trackprobenets=true - -# Do we log "noise" packets that we can't decipher? I tend to not, since -# they don't have anything interesting at all in them. -noiselog=false - -# Do we log corrupt packets? Corrupt packets have enough header information -# to see what they are, but someting is wrong with them that prevents us from -# completely dissecting them. Logging these is usually not a bad idea. -corruptlog=true - -# Do we log beacon packets or do we filter them out of the dumpfile -beaconlog=true - -# Do we log PHY layer packets or do we filter them out of the dumpfile -phylog=true - -# Do we mangle packets if we can decrypt them or if they're fuzzy-detected -mangledatalog=true - -# Do we do "fuzzy" crypt detection? (byte-based detection instead of 802.11 -# frame headers) -# valid option: Comma seperated list of card types to perform fuzzy detection -# on, or 'all' -fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext - -# What type of dump do we generate? -# valid option: "wiretap" -dumptype=wiretap -# Do we limit the size of dump logs? Sometimes ethereal can't handle big ones. -# 0 = No limit -# Anything else = Max number of packets to log to a single file before closing -# and opening a new one. -dumplimit=0 - -# Do we write data packets to a FIFO for an external data-IDS (such as Snort)? -# See the docs before enabling this. -#fifo=/tmp/kismet_dump - -# Default log title -logdefault=Kismet - -# logtemplate - Filename logging template. -# This is, at first glance, really nasty and ugly, but you'll hardly ever -# have to touch it so don't complain too much. -# -# %n is replaced by the logging instance name -# %d is replaced by the current date as Mon-DD-YYYY -# %D is replaced by the current date as YYYYMMDD -# %t is replaced by the starting log time -# %i is replaced by the increment log in the case of multiple logs -# %l is replaced by the log type (dump, status, crypt, etc) -# %h is replaced by the home directory -# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand -# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and -# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated. -# %h/netlots/%n-%d-%i.dump could expand to -# /home/foo/netlogs/Pok-Dec-20-01-2.dump -# -# Other possibilities: Sorting by directory -# logtemplate=%l/%n-%d-%i -# Would expand to, for example, -# dump/Pok-Dec-20-01-1 -# crypt/Pok-Dec-20-01-1 -# and so on. The "dump", "crypt", etc, dirs must exist before kismet is run -# in this case. -logtemplate=/tmp/%n-%d-%i.%l - -# Where do we store the pid file of the server? -piddir=/var/run/ - -# Where state info, etc, is stored. You shouldnt ever need to change this. -# This is a directory. -configdir=%h/.kismet/ - -# cloaked SSID file. You shouldn't ever need to change this. -ssidmap=ssid_map - -# Group map file. You shouldn't ever need to change this. -groupmap=group_map - -# IP range map file. You shouldn't ever need to change this. -ipmap=ip_map - diff --git a/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff deleted file mode 100644 index 6b2b5f74a6..0000000000 --- a/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.o 2004-10-18 13:37:48.208863080 +0200 -+++ configure 2004-10-18 13:39:16.298471424 +0200 -@@ -5805,9 +5805,9 @@ - if test "$wireless" = "yes"; then - # If we're compiling under linux and we need the wireless extentions, - # then we should try to look in the current kernel module build dir, too. -- if test "$linux" = "yes"; then -- CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/" -- fi -+ #if test "$linux" = "yes"; then -+ # CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/" -+ #fi - - echo "$as_me:$LINENO: checking that linux/wireless.h is what we expect" >&5 - echo $ECHO_N "checking that linux/wireless.h is what we expect... $ECHO_C" >&6 diff --git a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch deleted file mode 100644 index 1b72cf8ce7..0000000000 --- a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kismet-2004-04-R1/packet.h.orig 2005-02-04 09:12:36.000000000 +0000 -+++ kismet-2004-04-R1/packet.h 2005-02-04 09:13:14.000000000 +0000 -@@ -550,7 +550,7 @@ - // This isn't quite like STL iterators, because I'm too damned lazy to deal with all - // the nasty STL hoop-jumping. This does provide a somewhat-stl-ish interface to - // iterating through the singleton and masked maps -- friend class iterator { -+ class iterator { - friend class macmap; - - public: -@@ -643,6 +643,7 @@ - int vector_itr; - macmap<T> *owner; - }; -+ friend class iterator; - - iterator begin() { - iterator ret(this); diff --git a/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf b/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf deleted file mode 100644 index 233aec378a..0000000000 --- a/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf +++ /dev/null @@ -1,328 +0,0 @@ -# Kismet config file -# Most of the "static" configs have been moved to here -- the command line -# config was getting way too crowded and cryptic. We want functionality, -# not continually reading --help! - -# Version of Kismet config -version=2004.03.devel.a - -# Name of server (Purely for organiational purposes) -servername=Kismet - -# User to setid to (should be your normal user) -suiduser=your_user_here - -# Sources are defined as: -# source=cardtype,interface,name[,initialchannel] -# Card types and required drivers are listed in the README. -# The initial channel is optional, if hopping is not enabled it can be used -# to set the channel the interface listens on. -source=hostap,wlan0,wlan0 -source=hostap,wlan1,wlan1 -# Other common source configs: -# source=prism2,wlan0,prism2source -# source=prism2_avs,wlan0,newprism2source -# source=orinoco,eth0,orinocosource -# An example source line with an initial channel: -# source=orinoco,eth0,silver,11 - -# Comma-separated list of sources to enable. This is only needed if you defined -# multiple sources and only want to enable some of them. By default, all defined -# sources are enabled. -# For example: -# enablesources=prismsource,ciscosource - -# Do we channelhop? -channelhop=true - -# How many channels per second do we hop? (1-10) -channelvelocity=5 - -# By setting the dwell time for channel hopping we override the channelvelocity -# setting above and dwell on each channel for the given number of seconds. -#channeldwell=10 - -# Do we split channels between cards on the same spectrum? This means if -# multiple 802.11b capture sources are defined, they will be offset to cover -# the most possible spectrum at a given time. This also controls splitting -# fine-tuned sourcechannels lines which cover multiple interfaces (see below) -channelsplit=true - -# Basic channel hopping control: -# These define the channels the cards hop through for various frequency ranges -# supported by Kismet. More finegrain control is available via the -# "sourcechannels" configuration option. -# -# Don't change the IEEE80211<x> identifiers or channel hopping won't work. - -# Users outside the US might want to use this list: -# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12 -defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11g uses the same channels as 802.11b... -defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11a channels are non-overlapping so sequential is fine. You may want to -# adjust the list depending on the channels your card actually supports. -# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 -defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64 - -# Combo cards like Atheros use both 'a' and 'b/g' channels. Of course, you -# can also explicitly override a given source. You can use the script -# extras/listchan.pl to extract all the channels your card supports. -defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64 - -# Fine-tuning channel hopping control: -# The sourcechannels option can be used to set the channel hopping for -# specific interfaces, and to control what interfaces share a list of -# channels for split hopping. This can also be used to easily lock -# one card on a single channel while hopping with other cards. -# Any card without a sourcechannel definition will use the standard hopping -# list. -# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN - -# ie, for us channels on the source 'prism2source' (same as normal channel -# hopping behavior): -# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10 - -# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay -# on channel 6 and prism2b to hop normally. By not setting a sourcechannels -# line for prism2b, it will use the standard hopping. -# sourcechannels=prism2a:6 - -# To assign the same custom hop channel to multiple sources, or to split the -# same custom hop channel over two sources (if splitchannels is true), list -# them all on the same sourcechannels line: -# sourcechannels=prism2a,prism2b,prism2c:1,6,11 - -# Port to serve GUI data -tcpport=2501 -# People allowed to connect, comma seperated IP addresses or network/mask -# blocks. Netmasks can be expressed as dotted quad (/255.255.255.0) or as -# numbers (/24) -allowedhosts=127.0.0.1 -# Maximum number of concurrent GUI's -maxclients=5 - -# Do we have a GPS? -gps=true -# Host:port that GPSD is running on. This can be localhost OR remote! -gpshost=localhost:2947 -# Do we lock the mode? This overrides coordinates of lock "0", which will -# generate some bad information until you get a GPS lock, but it will -# fix problems with GPS units with broken NMEA that report lock 0 -gpsmodelock=false - -# Packet filtering options: -# filter_tracker - Packets filtered from the tracker are not processed or -# recorded in any way. -# filter_dump - Packets filtered at the dump level are tracked, displayed, -# and written to the csv/xml/network/etc files, but not -# recorded in the packet dump -# filter_export - Controls what packets influence the exported CSV, network, -# xml, gps, etc files. -# All filtering options take arguments containing the type of address and -# addresses to be filtered. Valid address types are 'ANY', 'BSSID', -# 'SOURCE', and 'DEST'. Filtering can be inverted by the use of '!' before -# the address. For example, -# filter_tracker=ANY(!00:00:DE:AD:BE:EF) -# has the same effect as the previous mac_filter config file option. -# filter_tracker=... -# filter_dump=... -# filter_export=... - -# Alerts to be reported and the throttling rates. -# alert=name,throttle/unit,burst -# The throttle/unit describes the number of alerts of this type that are -# sent per time unit. Valid time units are second, minute, hour, and day. -# Burst describes the number of alerts sent before throttling takes place. -# For example: -# alert=FOO,10/min,5 -# Would allow 5 alerts through before throttling is enabled, and will then -# limit the number of alerts to 10 per minute. -# A throttle rate of 0 disables throttling of the alert. -# See the README for a list of alert types. -alert=NETSTUMBLER,5/min,2 -alert=WELLENREITER,5/min,2 -alert=LUCENTTEST,5/min,2 -alert=DEAUTHFLOOD,5/min,4 -alert=BCASTDISCON,5/min,4 -alert=CHANCHANGE,5/min,4 -alert=AIRJACKSSID,5/min,2 -alert=PROBENOJOIN,5/min,2 -alert=DISASSOCTRAFFIC,5/min,2 -alert=NULLPROBERESP,5/min,5 - -# Known WEP keys to decrypt, bssid,hexkey. This is only for networks where -# the keys are already known, and it may impact throughput on slower hardware. -# Multiple wepkey lines may be used for multiple BSSIDs. -# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900 - -# Is transmission of the keys to the client allowed? This may be a security -# risk for some. If you disable this, you will not be able to query keys from -# a client. -allowkeytransmit=true - -# How often (in seconds) do we write all our data files (0 to disable) -writeinterval=300 - -# Do we use sound? -# Not to be confused with GUI sound parameter, this controls wether or not the -# server itself will play sound. Primarily for headless or automated systems. -sound=false -# Path to sound player -soundplay=/usr/bin/play -# Optional parameters to pass to the player -# soundopts=--volume=.3 -# New network found -sound_new=/usr/share/kismet/wav/new_network.wav -# Wepped new network -# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav -# Network traffic sound -sound_traffic=/usr/share/kismet/wav/traffic.wav -# Network junk traffic found -sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav -# GPS lock aquired sound -# sound_gpslock=/usr/share/kismet/wav/foo.wav -# GPS lock lost sound -# sound_gpslost=/usr/share/kismet/wav/bar.wav -# Alert sound -sound_alert=/usr/share/kismet/wav/alert.wav - -# Does the server have speech? (Again, not to be confused with the GUI's speech) -speech=false -# Server's path to Festival -festival=/usr/bin/festival -# How do we speak? Valid options: -# speech Normal speech -# nato NATO spellings (alpha, bravo, charlie) -# spell Spell the letters out (aye, bee, sea) -speech_type=nato -# speech_encrypted and speech_unencrypted - Speech templates -# Similar to the logtemplate option, this lets you customize the speech output. -# speech_encrypted is used for an encrypted network spoken string -# speech_unencrypted is used for an unencrypted network spoken string -# -# %b is replaced by the BSSID (MAC) of the network -# %s is replaced by the SSID (name) of the network -# %c is replaced by the CHANNEL of the network -# %r is replaced by the MAX RATE of the network -speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted. -speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open. - -# Where do we get our manufacturer fingerprints from? Assumed to be in the -# default config directory if an absolute path is not given. -ap_manuf=ap_manuf -client_manuf=client_manuf - -# Use metric measurements in the output? -metric=false - -# Do we write waypoints for gpsdrive to load? Note: This is NOT related to -# recent versions of GPSDrive's native support of Kismet. -waypoints=false -# GPSMap waypoint file. This WILL be truncated. -waypointdata=%h/.gpsdrive/way_kismet.txt - -# How many alerts do we backlog for new clients? Only change this if you have -# a -very- low memory system and need those extra bytes, or if you have a high -# memory system and a huge number of alert conditions. -alertbacklog=50 - -# File types to log, comma seperated -# dump - raw packet dump -# network - plaintext detected networks -# csv - plaintext detected networks in CSV format -# xml - XML formatted network and cisco log -# weak - weak packets (in airsnort format) -# cisco - cisco equipment CDP broadcasts -# gps - gps coordinates -logtypes=dump,network,csv,xml,weak,cisco,gps - -# Do we track probe responses and merge probe networks into their owners? -# This isn't always desireable, depending on the type of monitoring you're -# trying to do. -trackprobenets=true - -# Do we log "noise" packets that we can't decipher? I tend to not, since -# they don't have anything interesting at all in them. -noiselog=false - -# Do we log corrupt packets? Corrupt packets have enough header information -# to see what they are, but someting is wrong with them that prevents us from -# completely dissecting them. Logging these is usually not a bad idea. -corruptlog=true - -# Do we log beacon packets or do we filter them out of the dumpfile -beaconlog=true - -# Do we log PHY layer packets or do we filter them out of the dumpfile -phylog=true - -# Do we mangle packets if we can decrypt them or if they're fuzzy-detected -mangledatalog=true - -# Do we do "fuzzy" crypt detection? (byte-based detection instead of 802.11 -# frame headers) -# valid option: Comma seperated list of card types to perform fuzzy detection -# on, or 'all' -fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext - -# What type of dump do we generate? -# valid option: "wiretap" -dumptype=wiretap -# Do we limit the size of dump logs? Sometimes ethereal can't handle big ones. -# 0 = No limit -# Anything else = Max number of packets to log to a single file before closing -# and opening a new one. -dumplimit=0 - -# Do we write data packets to a FIFO for an external data-IDS (such as Snort)? -# See the docs before enabling this. -#fifo=/tmp/kismet_dump - -# Default log title -logdefault=Kismet - -# logtemplate - Filename logging template. -# This is, at first glance, really nasty and ugly, but you'll hardly ever -# have to touch it so don't complain too much. -# -# %n is replaced by the logging instance name -# %d is replaced by the current date as Mon-DD-YYYY -# %D is replaced by the current date as YYYYMMDD -# %t is replaced by the starting log time -# %i is replaced by the increment log in the case of multiple logs -# %l is replaced by the log type (dump, status, crypt, etc) -# %h is replaced by the home directory -# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand -# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and -# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated. -# %h/netlots/%n-%d-%i.dump could expand to -# /home/foo/netlogs/Pok-Dec-20-01-2.dump -# -# Other possibilities: Sorting by directory -# logtemplate=%l/%n-%d-%i -# Would expand to, for example, -# dump/Pok-Dec-20-01-1 -# crypt/Pok-Dec-20-01-1 -# and so on. The "dump", "crypt", etc, dirs must exist before kismet is run -# in this case. -logtemplate=/tmp/%n-%d-%i.%l - -# Where do we store the pid file of the server? -piddir=/var/run/ - -# Where state info, etc, is stored. You shouldnt ever need to change this. -# This is a directory. -configdir=%h/.kismet/ - -# cloaked SSID file. You shouldn't ever need to change this. -ssidmap=ssid_map - -# Group map file. You shouldn't ever need to change this. -groupmap=group_map - -# IP range map file. You shouldn't ever need to change this. -ipmap=ip_map - diff --git a/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf b/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf deleted file mode 100644 index 233aec378a..0000000000 --- a/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf +++ /dev/null @@ -1,328 +0,0 @@ -# Kismet config file -# Most of the "static" configs have been moved to here -- the command line -# config was getting way too crowded and cryptic. We want functionality, -# not continually reading --help! - -# Version of Kismet config -version=2004.03.devel.a - -# Name of server (Purely for organiational purposes) -servername=Kismet - -# User to setid to (should be your normal user) -suiduser=your_user_here - -# Sources are defined as: -# source=cardtype,interface,name[,initialchannel] -# Card types and required drivers are listed in the README. -# The initial channel is optional, if hopping is not enabled it can be used -# to set the channel the interface listens on. -source=hostap,wlan0,wlan0 -source=hostap,wlan1,wlan1 -# Other common source configs: -# source=prism2,wlan0,prism2source -# source=prism2_avs,wlan0,newprism2source -# source=orinoco,eth0,orinocosource -# An example source line with an initial channel: -# source=orinoco,eth0,silver,11 - -# Comma-separated list of sources to enable. This is only needed if you defined -# multiple sources and only want to enable some of them. By default, all defined -# sources are enabled. -# For example: -# enablesources=prismsource,ciscosource - -# Do we channelhop? -channelhop=true - -# How many channels per second do we hop? (1-10) -channelvelocity=5 - -# By setting the dwell time for channel hopping we override the channelvelocity -# setting above and dwell on each channel for the given number of seconds. -#channeldwell=10 - -# Do we split channels between cards on the same spectrum? This means if -# multiple 802.11b capture sources are defined, they will be offset to cover -# the most possible spectrum at a given time. This also controls splitting -# fine-tuned sourcechannels lines which cover multiple interfaces (see below) -channelsplit=true - -# Basic channel hopping control: -# These define the channels the cards hop through for various frequency ranges -# supported by Kismet. More finegrain control is available via the -# "sourcechannels" configuration option. -# -# Don't change the IEEE80211<x> identifiers or channel hopping won't work. - -# Users outside the US might want to use this list: -# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12 -defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11g uses the same channels as 802.11b... -defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10 - -# 802.11a channels are non-overlapping so sequential is fine. You may want to -# adjust the list depending on the channels your card actually supports. -# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 -defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64 - -# Combo cards like Atheros use both 'a' and 'b/g' channels. Of course, you -# can also explicitly override a given source. You can use the script -# extras/listchan.pl to extract all the channels your card supports. -defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64 - -# Fine-tuning channel hopping control: -# The sourcechannels option can be used to set the channel hopping for -# specific interfaces, and to control what interfaces share a list of -# channels for split hopping. This can also be used to easily lock -# one card on a single channel while hopping with other cards. -# Any card without a sourcechannel definition will use the standard hopping -# list. -# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN - -# ie, for us channels on the source 'prism2source' (same as normal channel -# hopping behavior): -# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10 - -# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay -# on channel 6 and prism2b to hop normally. By not setting a sourcechannels -# line for prism2b, it will use the standard hopping. -# sourcechannels=prism2a:6 - -# To assign the same custom hop channel to multiple sources, or to split the -# same custom hop channel over two sources (if splitchannels is true), list -# them all on the same sourcechannels line: -# sourcechannels=prism2a,prism2b,prism2c:1,6,11 - -# Port to serve GUI data -tcpport=2501 -# People allowed to connect, comma seperated IP addresses or network/mask -# blocks. Netmasks can be expressed as dotted quad (/255.255.255.0) or as -# numbers (/24) -allowedhosts=127.0.0.1 -# Maximum number of concurrent GUI's -maxclients=5 - -# Do we have a GPS? -gps=true -# Host:port that GPSD is running on. This can be localhost OR remote! -gpshost=localhost:2947 -# Do we lock the mode? This overrides coordinates of lock "0", which will -# generate some bad information until you get a GPS lock, but it will -# fix problems with GPS units with broken NMEA that report lock 0 -gpsmodelock=false - -# Packet filtering options: -# filter_tracker - Packets filtered from the tracker are not processed or -# recorded in any way. -# filter_dump - Packets filtered at the dump level are tracked, displayed, -# and written to the csv/xml/network/etc files, but not -# recorded in the packet dump -# filter_export - Controls what packets influence the exported CSV, network, -# xml, gps, etc files. -# All filtering options take arguments containing the type of address and -# addresses to be filtered. Valid address types are 'ANY', 'BSSID', -# 'SOURCE', and 'DEST'. Filtering can be inverted by the use of '!' before -# the address. For example, -# filter_tracker=ANY(!00:00:DE:AD:BE:EF) -# has the same effect as the previous mac_filter config file option. -# filter_tracker=... -# filter_dump=... -# filter_export=... - -# Alerts to be reported and the throttling rates. -# alert=name,throttle/unit,burst -# The throttle/unit describes the number of alerts of this type that are -# sent per time unit. Valid time units are second, minute, hour, and day. -# Burst describes the number of alerts sent before throttling takes place. -# For example: -# alert=FOO,10/min,5 -# Would allow 5 alerts through before throttling is enabled, and will then -# limit the number of alerts to 10 per minute. -# A throttle rate of 0 disables throttling of the alert. -# See the README for a list of alert types. -alert=NETSTUMBLER,5/min,2 -alert=WELLENREITER,5/min,2 -alert=LUCENTTEST,5/min,2 -alert=DEAUTHFLOOD,5/min,4 -alert=BCASTDISCON,5/min,4 -alert=CHANCHANGE,5/min,4 -alert=AIRJACKSSID,5/min,2 -alert=PROBENOJOIN,5/min,2 -alert=DISASSOCTRAFFIC,5/min,2 -alert=NULLPROBERESP,5/min,5 - -# Known WEP keys to decrypt, bssid,hexkey. This is only for networks where -# the keys are already known, and it may impact throughput on slower hardware. -# Multiple wepkey lines may be used for multiple BSSIDs. -# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900 - -# Is transmission of the keys to the client allowed? This may be a security -# risk for some. If you disable this, you will not be able to query keys from -# a client. -allowkeytransmit=true - -# How often (in seconds) do we write all our data files (0 to disable) -writeinterval=300 - -# Do we use sound? -# Not to be confused with GUI sound parameter, this controls wether or not the -# server itself will play sound. Primarily for headless or automated systems. -sound=false -# Path to sound player -soundplay=/usr/bin/play -# Optional parameters to pass to the player -# soundopts=--volume=.3 -# New network found -sound_new=/usr/share/kismet/wav/new_network.wav -# Wepped new network -# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav -# Network traffic sound -sound_traffic=/usr/share/kismet/wav/traffic.wav -# Network junk traffic found -sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav -# GPS lock aquired sound -# sound_gpslock=/usr/share/kismet/wav/foo.wav -# GPS lock lost sound -# sound_gpslost=/usr/share/kismet/wav/bar.wav -# Alert sound -sound_alert=/usr/share/kismet/wav/alert.wav - -# Does the server have speech? (Again, not to be confused with the GUI's speech) -speech=false -# Server's path to Festival -festival=/usr/bin/festival -# How do we speak? Valid options: -# speech Normal speech -# nato NATO spellings (alpha, bravo, charlie) -# spell Spell the letters out (aye, bee, sea) -speech_type=nato -# speech_encrypted and speech_unencrypted - Speech templates -# Similar to the logtemplate option, this lets you customize the speech output. -# speech_encrypted is used for an encrypted network spoken string -# speech_unencrypted is used for an unencrypted network spoken string -# -# %b is replaced by the BSSID (MAC) of the network -# %s is replaced by the SSID (name) of the network -# %c is replaced by the CHANNEL of the network -# %r is replaced by the MAX RATE of the network -speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted. -speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open. - -# Where do we get our manufacturer fingerprints from? Assumed to be in the -# default config directory if an absolute path is not given. -ap_manuf=ap_manuf -client_manuf=client_manuf - -# Use metric measurements in the output? -metric=false - -# Do we write waypoints for gpsdrive to load? Note: This is NOT related to -# recent versions of GPSDrive's native support of Kismet. -waypoints=false -# GPSMap waypoint file. This WILL be truncated. -waypointdata=%h/.gpsdrive/way_kismet.txt - -# How many alerts do we backlog for new clients? Only change this if you have -# a -very- low memory system and need those extra bytes, or if you have a high -# memory system and a huge number of alert conditions. -alertbacklog=50 - -# File types to log, comma seperated -# dump - raw packet dump -# network - plaintext detected networks -# csv - plaintext detected networks in CSV format -# xml - XML formatted network and cisco log -# weak - weak packets (in airsnort format) -# cisco - cisco equipment CDP broadcasts -# gps - gps coordinates -logtypes=dump,network,csv,xml,weak,cisco,gps - -# Do we track probe responses and merge probe networks into their owners? -# This isn't always desireable, depending on the type of monitoring you're -# trying to do. -trackprobenets=true - -# Do we log "noise" packets that we can't decipher? I tend to not, since -# they don't have anything interesting at all in them. -noiselog=false - -# Do we log corrupt packets? Corrupt packets have enough header information -# to see what they are, but someting is wrong with them that prevents us from -# completely dissecting them. Logging these is usually not a bad idea. -corruptlog=true - -# Do we log beacon packets or do we filter them out of the dumpfile -beaconlog=true - -# Do we log PHY layer packets or do we filter them out of the dumpfile -phylog=true - -# Do we mangle packets if we can decrypt them or if they're fuzzy-detected -mangledatalog=true - -# Do we do "fuzzy" crypt detection? (byte-based detection instead of 802.11 -# frame headers) -# valid option: Comma seperated list of card types to perform fuzzy detection -# on, or 'all' -fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext - -# What type of dump do we generate? -# valid option: "wiretap" -dumptype=wiretap -# Do we limit the size of dump logs? Sometimes ethereal can't handle big ones. -# 0 = No limit -# Anything else = Max number of packets to log to a single file before closing -# and opening a new one. -dumplimit=0 - -# Do we write data packets to a FIFO for an external data-IDS (such as Snort)? -# See the docs before enabling this. -#fifo=/tmp/kismet_dump - -# Default log title -logdefault=Kismet - -# logtemplate - Filename logging template. -# This is, at first glance, really nasty and ugly, but you'll hardly ever -# have to touch it so don't complain too much. -# -# %n is replaced by the logging instance name -# %d is replaced by the current date as Mon-DD-YYYY -# %D is replaced by the current date as YYYYMMDD -# %t is replaced by the starting log time -# %i is replaced by the increment log in the case of multiple logs -# %l is replaced by the log type (dump, status, crypt, etc) -# %h is replaced by the home directory -# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand -# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and -# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated. -# %h/netlots/%n-%d-%i.dump could expand to -# /home/foo/netlogs/Pok-Dec-20-01-2.dump -# -# Other possibilities: Sorting by directory -# logtemplate=%l/%n-%d-%i -# Would expand to, for example, -# dump/Pok-Dec-20-01-1 -# crypt/Pok-Dec-20-01-1 -# and so on. The "dump", "crypt", etc, dirs must exist before kismet is run -# in this case. -logtemplate=/tmp/%n-%d-%i.%l - -# Where do we store the pid file of the server? -piddir=/var/run/ - -# Where state info, etc, is stored. You shouldnt ever need to change this. -# This is a directory. -configdir=%h/.kismet/ - -# cloaked SSID file. You shouldn't ever need to change this. -ssidmap=ssid_map - -# Group map file. You shouldn't ever need to change this. -groupmap=group_map - -# IP range map file. You shouldn't ever need to change this. -ipmap=ip_map - diff --git a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff deleted file mode 100644 index 9be6fd3bd0..0000000000 --- a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.orig 2005-02-21 12:12:23.061566024 +0000 -+++ configure 2005-02-21 12:12:34.560817872 +0000 -@@ -6225,9 +6225,9 @@ - if test "$wireless" = "yes"; then - # If we're compiling under linux and we need the wireless extentions, - # then we should try to look in the current kernel module build dir, too. -- if test "$linux" = "yes"; then -- CPPFLAGS="$CPPFLAGS -I/lib/modules/$(uname -r)/build/include/" -- fi -+ #if test "$linux" = "yes"; then -+ # CPPFLAGS="$CPPFLAGS -I/lib/modules/$(uname -r)/build/include/" -+ #fi - - echo "$as_me:$LINENO: checking that linux/wireless.h is what we expect" >&5 - echo $ECHO_N "checking that linux/wireless.h is what we expect... $ECHO_C" >&6 diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb deleted file mode 100644 index 30e31075fd..0000000000 --- a/packages/kismet/kismet_2004-04-R1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -LICENSE = "GPLv2" -DEPENDS = "expat gmp" - -SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \ - file://no-strip.diff;patch=1;pnum=0 \ - file://no-chmod.diff;patch=1;pnum=0 \ - file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \ - file://packet_friend_fix.patch;patch=1 \ - file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0" - -SRC_URI_append_mtx-1 = " file://kismet.conf" -SRC_URI_append_mtx-2 = " file://kismet.conf" - -EXTRA_OECONF = "--with-pcap=linux --disable-setuid" - -inherit autotools - -do_configure() { - unset CFLAGS CPPFLAGS - oe_runconf -} - -do_install_append() { - if test -e ${WORKDIR}/kismet.conf; then - install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ - fi -} - -PACKAGES =+ "kismet-sounds" -FILES_kismet-sounds = "${datadir}/kismet/wav" - -CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf" diff --git a/packages/kismet/kismet_2005-01-R1.bb b/packages/kismet/kismet_2005-01-R1.bb deleted file mode 100644 index 792cc38384..0000000000 --- a/packages/kismet/kismet_2005-01-R1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -LICENSE = "GPLv2" -DEPENDS = "expat gmp" - -SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-01-R1.tar.gz \ - file://no-strip.diff;patch=1;pnum=0 \ - file://no-chmod.diff;patch=1;pnum=0 \ - file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \ - file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0" - - -EXTRA_OECONF = "--with-pcap=linux --disable-setuid" - -inherit autotools - -do_configure() { - oe_runconf -} - - -do_install_append() { - if test -e ${WORKDIR}/kismet.conf; then - install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ - fi -} - -PACKAGES =+ "kismet-sounds" -FILES_kismet-sounds = "/usr/share/kismet/wav" - -CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf" diff --git a/packages/kismet/kismet_2005-04-R1.bb b/packages/kismet/kismet_2005-04-R1.bb index 752789a0ba..2b29af51df 100644 --- a/packages/kismet/kismet_2005-04-R1.bb +++ b/packages/kismet/kismet_2005-04-R1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz \ file://no-strip.diff;patch=1;pnum=0 \ file://no-chmod.diff;patch=1;pnum=0 \ file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0" - + EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include" diff --git a/packages/kismet/kismet_2005-08-R1.bb b/packages/kismet/kismet_2005-08-R1.bb index 9c8c444991..c5e58b6edb 100644 --- a/packages/kismet/kismet_2005-08-R1.bb +++ b/packages/kismet/kismet_2005-08-R1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-08-R1.tar.gz \ file://no-strip.diff;patch=1;pnum=0 \ file://no-chmod.diff;patch=1;pnum=0 \ file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0" - + EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include" diff --git a/packages/kismet/kismet_2006-04-R1.bb b/packages/kismet/kismet_2006-04-R1.bb index ac32560286..aa51f2afa9 100644 --- a/packages/kismet/kismet_2006-04-R1.bb +++ b/packages/kismet/kismet_2006-04-R1.bb @@ -6,7 +6,7 @@ DEPENDS = "expat gmp" SRC_URI = "http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz \ file://no-chmod.patch;patch=1" - + EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include" diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index 29ca1685c1..4e86824eac 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -66,6 +66,8 @@ do_stage() { # use the staged libraries and include files. sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \ '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' + # Perhaps other binaries need to be moved to cross? + mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}' } do_install() { diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index 4cc1f8d4fe..e73a0e206d 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -8,7 +8,7 @@ PR = "r5" # Note if this .bb files fails with the error: # "No rule to make target `-lpcre', needed by `konqueror'. Stop." -# a workaround is to install the libpcre3-dev package onto your build +# a workaround is to install the libpcre3-dev package onto your build # machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel). SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \ @@ -50,8 +50,8 @@ do_compile_prepend() { do_install() { install -d ${D}${palmtopdir}/share/ install -d ${D}${palmtopdir}/share/config/ - + install -m 0644 ${WORKDIR}/konq-embedrc ${D}${palmtopdir}/share/config/ - + autotools_do_install } diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 0b7e0aff8b..159b6dd625 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -71,7 +71,7 @@ do_configure_prepend() { then ln -s ../kdelibs/admin admin fi - make -f Makefile.cvs + make -f Makefile.cvs } do_compile_prepend() { diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb index 6eb3249821..1f8a5d8196 100644 --- a/packages/kphonepi/kphonepi_1.0.0.bb +++ b/packages/kphonepi/kphonepi_1.0.0.bb @@ -21,7 +21,7 @@ do_configure_prepend() { do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/kphone/ + ${D}${palmtopdir}/pics/kphone/ install -m 0644 ${S}/bin/kdepim/kphone/*.png ${D}${palmtopdir}/pics/kphone/ install -m 0644 ${S}/kphone.desktop ${D}${palmtopdir}/apps/Applications/ diff --git a/packages/lftp/lftp_3.5.1.bb b/packages/lftp/lftp_3.5.1.bb index a45b75fe35..df184ae9ca 100644 --- a/packages/lftp/lftp_3.5.1.bb +++ b/packages/lftp/lftp_3.5.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://lftp.yar.ru" SECTION = "console/network" DEPENDS = "readline gnutls" -SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/file-transfer/lftp-3.5.1.tar.gz" +SRC_URI = "ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2" EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no" diff --git a/packages/liba52/liba52_0.7.4.bb b/packages/liba52/liba52_0.7.4.bb index f6894ab4d4..3093f57a6a 100644 --- a/packages/liba52/liba52_0.7.4.bb +++ b/packages/liba52/liba52_0.7.4.bb @@ -14,7 +14,7 @@ EXTRA_OECONF = " --enable-shared " PACKAGES = "${PN} ${PN}-dev a52dec a52dec-doc" -FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " +FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a " FILES_a52dec = " ${bindir}/* " FILES_a52dec-doc = " ${mandir}/man1/* " diff --git a/packages/libaio/libaio-oracle_0.3.0.bb b/packages/libaio/libaio-oracle_0.3.0.bb index d5a6c300fd..04cacae4fd 100644 --- a/packages/libaio/libaio-oracle_0.3.0.bb +++ b/packages/libaio/libaio-oracle_0.3.0.bb @@ -31,4 +31,4 @@ do_stage() { rm -f ${STAGE_TEMP}/usr/lib/*.la oe_libinstall -a -so -C ${STAGE_TEMP}/usr/lib libaio-oracle ${STAGING_LIBDIR} } - + diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb index 15991b3212..b0bc73617e 100644 --- a/packages/libaio/libaio_0.3.103.bb +++ b/packages/libaio/libaio_0.3.103.bb @@ -18,7 +18,7 @@ inherit kernel-arch DEPENDS_append = " rpm2cpio-native" do_unpack() { - + if ! test -f libaio-${PV}.tar.gz ; then rpm2cpio.pl ${DL_DIR}/${P}-3.src.rpm | cpio -i --make-directories tar xzvf libaio-${PV}.tar.gz @@ -26,12 +26,12 @@ do_unpack() { } do_stage () { - #make install prefix='${STAGING_DIR}/${TARGET_SYS}' + #make install prefix='${STAGING_DIR}/${TARGET_SYS}' install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h oe_libinstall -so -C src libaio ${STAGING_LIBDIR} - + } do_install () { - make install prefix='${D}/usr' + make install prefix='${D}/usr' } diff --git a/packages/libassuan/libassuan_0.6.7.bb b/packages/libassuan/libassuan_0.6.7.bb index 5682022acc..f423502043 100644 --- a/packages/libassuan/libassuan_0.6.7.bb +++ b/packages/libassuan/libassuan_0.6.7.bb @@ -7,7 +7,7 @@ inherit autotools binconfig do_stage() { autotools_stage_includes - + install -d ${STAGING_LIBDIR} oe_libinstall -C src -a libassuan ${STAGING_LIBDIR} diff --git a/packages/libassuan/libassuan_0.6.9.bb b/packages/libassuan/libassuan_0.6.9.bb index 6080600073..d20d8371bf 100644 --- a/packages/libassuan/libassuan_0.6.9.bb +++ b/packages/libassuan/libassuan_0.6.9.bb @@ -6,7 +6,7 @@ inherit autotools binconfig do_stage() { autotools_stage_includes - + install -d ${STAGING_LIBDIR} oe_libinstall -C src -a libassuan ${STAGING_LIBDIR} diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb index ed55bd3306..2baf7eaac9 100644 --- a/packages/libchm/chmlib_0.38.bb +++ b/packages/libchm/chmlib_0.38.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." LICENSE = "GPLv2" HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/" diff --git a/packages/libdbi/libdbi-drivers_0.7.1.bb b/packages/libdbi/libdbi-drivers_0.7.1.bb index 2d1d057be8..d36643dc22 100644 --- a/packages/libdbi/libdbi-drivers_0.7.1.bb +++ b/packages/libdbi/libdbi-drivers_0.7.1.bb @@ -26,7 +26,7 @@ FILES_libdbd-sqlite = "/usr/lib/dbd/libsqlite.so \ /usr/lib/dbd/libsqlite.a" DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi" - + do_configure_old () { ./configure \ --build=${BUILD_SYS} \ @@ -37,4 +37,4 @@ do_configure_old () { --with-sqlite-libdir=${STAGING_LIBDIR} \ --with-sqlite-incdir=${STAGING_INCDIR} } -
\ No newline at end of file + diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb index e8b8c65953..40888df6c3 100644 --- a/packages/libexif/libexif_0.6.13.bb +++ b/packages/libexif/libexif_0.6.13.bb @@ -8,12 +8,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" inherit autotools pkgconfig -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h exif-data-type.h exif-mem.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done +do_stage() { + autotools_stage_all } diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb index 0a10054eb3..74947ab0ff 100644 --- a/packages/libfakekey/libfakekey_svn.bb +++ b/packages/libfakekey/libfakekey_svn.bb @@ -12,8 +12,8 @@ S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext do_stage () { - install -d ${STAGING_INCDIR}/fakekey + install -d ${STAGING_INCDIR}/fakekey install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey - oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} + oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} } diff --git a/packages/libflv/libflv_0.2.bb b/packages/libflv/libflv_0.2.bb index e8e64f0d0b..a9456f2188 100644 --- a/packages/libflv/libflv_0.2.bb +++ b/packages/libflv/libflv_0.2.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/${PN}/src" CFLAGS += " -L${STAGING_LIBDIR} " do_compile() { - oe_runmake + oe_runmake } do_install() { diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb index 143b62dcec..e99a38f396 100644 --- a/packages/libgc/libgc_6.5.bb +++ b/packages/libgc/libgc_6.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/" DEPENDS = "sed-native" SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz" -S = "${WORKDIR}/gc6.5" +S = "${WORKDIR}/gc6.5" FILES_${PN}-doc += "/usr/share/gc/" inherit autotools diff --git a/packages/libgc/libgc_6.7.bb b/packages/libgc/libgc_6.7.bb index 243bff39e7..1182f93191 100644 --- a/packages/libgc/libgc_6.7.bb +++ b/packages/libgc/libgc_6.7.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/" DEPENDS = "sed-native" SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.7.tar.gz" -S = "${WORKDIR}/gc6.7" +S = "${WORKDIR}/gc6.7" FILES_${PN}-doc += "/usr/share/gc/" inherit autotools diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb index 3f4942cae5..3cca30a6bb 100644 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ b/packages/libgcrypt/libgcrypt_1.2.3.bb @@ -14,6 +14,8 @@ inherit autotools binconfig EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" +ARM_INSTRUCTION_SET = "arm" + do_stage() { oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} diff --git a/packages/libglade/libglade_2.0.1.bb b/packages/libglade/libglade_2.0.1.bb index a923f38c30..535396c5a0 100644 --- a/packages/libglade/libglade_2.0.1.bb +++ b/packages/libglade/libglade_2.0.1.bb @@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar file://glade-cruft.patch;patch=1;pnum=0 \ file://gtk-2.0.m4" -inherit autotools pkgconfig +inherit autotools pkgconfig headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h" diff --git a/packages/libgmime/libgmime_2.1.7.bb b/packages/libgmime/libgmime_2.1.7.bb index 64ce486dd6..39a682eb73 100644 --- a/packages/libgmime/libgmime_2.1.7.bb +++ b/packages/libgmime/libgmime_2.1.7.bb @@ -10,7 +10,7 @@ PR = "r1" SRC_URI = "http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-${PV}.tar.gz \ file://skip-iconv-detect.patch;patch=1 \ file://configure-ldflags-cross.patch;patch=1" - + S = "${WORKDIR}/gmime-${PV}" PACKAGES += " ${PN}-bin" diff --git a/packages/libgpelaunch/libgpelaunch_0.14.bb b/packages/libgpelaunch/libgpelaunch_0.14.bb index e6d82c1ee0..24ee20a1c6 100644 --- a/packages/libgpelaunch/libgpelaunch_0.14.bb +++ b/packages/libgpelaunch/libgpelaunch_0.14.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" -FILES_${PN}-dbg += "/usr/libexec/libgpelaunch/.debug" +FILES_${PN}-dbg += "/usr/libexec/libgpelaunch/.debug" do_stage() { autotools_stage_all diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb index 0fa3b84cc6..e00a1142c6 100644 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ b/packages/libgpeplugin/libgpeplugin_cvs.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgpewidget" PV = "0.0+cvs${SRCDATE}" PR = "r0" -#put examples in a seperate package +#put examples in a seperate package PACKAGES += "${PN}-examples" FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*" FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb index b062efb51b..059ec61fc1 100644 --- a/packages/libgpewidget/libgpewidget_0.114.bb +++ b/packages/libgpewidget/libgpewidget_0.114.bb @@ -15,7 +15,7 @@ FILES_libgpewidget-bin = "${bindir}/*" EXTRA_OECONF = "--enable-cairo" -LDFLAGS += " -L${STAGING_LIBDIR}" +LDFLAGS += " -L${STAGING_LIBDIR}" do_stage () { autotools_stage_all diff --git a/packages/libid3tag/libid3tag_0.15.0b.bb b/packages/libid3tag/libid3tag_0.15.0b.bb index 840c7f8ae7..226a3cca5f 100644 --- a/packages/libid3tag/libid3tag_0.15.0b.bb +++ b/packages/libid3tag/libid3tag_0.15.0b.bb @@ -8,7 +8,7 @@ PR = "r2" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz " S = "${WORKDIR}/libid3tag-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF = "-enable-speed" diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index e743247390..2ca114be2c 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -20,10 +20,14 @@ do_stage() { libdir=${STAGING_LIBDIR} \ datadir=${STAGING_DATADIR} \ infodir=${STAGING_INFODIR} - + cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 + + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2 + fi } FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += " ${bindir}" +FILES_${PN}-dev += " ${bindir}" diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 16e95ac3d6..916bfb6e5f 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -16,7 +16,12 @@ do_stage() { autotools_stage_all cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 + + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2 + fi + } FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += " ${bindir}" +FILES_${PN}-dev += " ${bindir}" diff --git a/packages/liblockfile/liblockfile-1.05/configure.patch b/packages/liblockfile/liblockfile-1.05/configure.patch deleted file mode 100644 index ea13e11d25..0000000000 --- a/packages/liblockfile/liblockfile-1.05/configure.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/./configure.in~configure -+++ liblockfile-1.05/./configure.in -@@ -1,4 +1,5 @@ --AC_INIT(lockfile.c) -+AC_INIT -+AC_CONFIG_SRCDIR([lockfile.c]) - AC_CONFIG_HEADER(autoconf.h) - AC_REVISION($Revision: 1.0 $)dnl - -@@ -111,7 +112,8 @@ - AC_SUBST(INSTALL_TARGETS) - AC_SUBST(nfslockdir) - --AC_OUTPUT(\ -+AC_CONFIG_FILES([\ - ./Makefile \ - ./maillock.h \ --) -+]) -+AC_OUTPUT diff --git a/packages/liblockfile/liblockfile-1.05/install.patch b/packages/liblockfile/liblockfile-1.05/install.patch deleted file mode 100644 index a9319ff1e3..0000000000 --- a/packages/liblockfile/liblockfile-1.05/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir = @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ -- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ -- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ install -d $(ROOT)$(bindir) -+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) -+ install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 - install -m 644 *.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib -+ install -d $(ROOT)$(nfslockdir) - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - diff --git a/packages/liblockfile/liblockfile-1.05/ldflags.patch b/packages/liblockfile/liblockfile-1.05/ldflags.patch deleted file mode 100644 index eb1d1478b8..0000000000 --- a/packages/liblockfile/liblockfile-1.05/ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~ldflags -+++ liblockfile-1.05/Makefile.in -@@ -34,11 +34,11 @@ - - liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ -- -o liblockfile.so lockfile.o -lc -+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc - - nfslock.so.$(VER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ -- -o nfslock.so.$(NVER) nfslock.o -+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - - dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o diff --git a/packages/liblockfile/liblockfile_1.05.bb b/packages/liblockfile/liblockfile_1.05.bb deleted file mode 100644 index c4d72fcc23..0000000000 --- a/packages/liblockfile/liblockfile_1.05.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "File locking library." -LICENSE = "LGPL" -SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \ - file://install.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://ldflags.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--enable-shared --enable-static" - -do_stage () { - install -m 644 ${S}/lockfile.h ${S}/maillock.h ${STAGING_INCDIR}/ - oe_libinstall -a -so liblockfile ${STAGING_LIBDIR} -# oe_libinstall -so nfslock ${STAGING_LIBDIR} -} - -do_install () { - oe_runmake 'ROOT=${D}' INSTGRP='' install -} diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb index d6e6dda1d6..005e89eb5e 100644 --- a/packages/libmad/libmad_0.15.0b.bb +++ b/packages/libmad/libmad_0.15.0b.bb @@ -8,7 +8,7 @@ PR = "r2" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz" S = "${WORKDIR}/libmad-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF = "-enable-speed --enable-shared" # The ASO's don't take any account of thumb... diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb index aac3736135..9de296635e 100644 --- a/packages/libmad/libmad_0.15.1b.bb +++ b/packages/libmad/libmad_0.15.1b.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz" S = "${WORKDIR}/libmad-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF = "-enable-speed --enable-shared" # The ASO's don't take any account of thumb... diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb index 31793f9e16..3df2fb149b 100644 --- a/packages/libmailwrapper/libmailwrapper_1.2.2.bb +++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper " diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb index e7e84bb913..467a3b1d74 100644 --- a/packages/libmatchbox/libmatchbox_1.2.bb +++ b/packages/libmatchbox/libmatchbox_1.2.bb @@ -2,5 +2,5 @@ require libmatchbox.inc PR = "r2" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb index 45a35b6190..7213e71542 100644 --- a/packages/libmatchbox/libmatchbox_1.3.bb +++ b/packages/libmatchbox/libmatchbox_1.3.bb @@ -2,5 +2,5 @@ require libmatchbox.inc PR = "r1" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb index 45a35b6190..7213e71542 100644 --- a/packages/libmatchbox/libmatchbox_1.4.bb +++ b/packages/libmatchbox/libmatchbox_1.4.bb @@ -2,5 +2,5 @@ require libmatchbox.inc PR = "r1" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/libmikey/libmikey0_0.3.2.bb index 2f8ce60834..214faef40f 100644 --- a/packages/libmikey/libmikey0_0.3.2.bb +++ b/packages/libmikey/libmikey0_0.3.2.bb @@ -13,7 +13,7 @@ S="${WORKDIR}/libmikey-${PV}" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " do_stage() { oe_libinstall -a -so libmikey ${STAGING_LIBDIR} diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb index 112c117dcd..663b639b3d 100644 --- a/packages/libmikey/libmikey0_svn.bb +++ b/packages/libmikey/libmikey0_svn.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/libmikey" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " do_stage() { oe_libinstall -a -so libmikey ${STAGING_LIBDIR} diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/libmikey/libmikey_0.1a.bb index a9389eaab7..e00ce25594 100644 --- a/packages/libmikey/libmikey_0.1a.bb +++ b/packages/libmikey/libmikey_0.1a.bb @@ -8,7 +8,7 @@ DEPENDS = "openssl" SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz" S = "${WORKDIR}/libmikey-0.1" -inherit autotools +inherit autotools do_configure() { gnu-configize diff --git a/packages/libmikmod/libmikmod_3.1.11.bb b/packages/libmikmod/libmikmod_3.1.11.bb index ad3f895db8..6c8dc8e064 100644 --- a/packages/libmikmod/libmikmod_3.1.11.bb +++ b/packages/libmikmod/libmikmod_3.1.11.bb @@ -6,7 +6,7 @@ SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \ file://m4.patch;patch=1 \ file://autofoo.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \ --enable-oss --disable-sam9407 --disable-ultra \ diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/libmnetutil/libmnetutil0_0.2.2.bb index e201bf806b..a7866b35ec 100644 --- a/packages/libmnetutil/libmnetutil0_0.2.2.bb +++ b/packages/libmnetutil/libmnetutil0_0.2.2.bb @@ -13,7 +13,7 @@ S="${WORKDIR}/libmnetutil-${PV}" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " do_stage() { oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb index ad75634000..a8e156bc13 100644 --- a/packages/libmnetutil/libmnetutil0_svn.bb +++ b/packages/libmnetutil/libmnetutil0_svn.bb @@ -15,7 +15,7 @@ S="${WORKDIR}/libmnetutil" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " do_stage() { oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/libmsip/libmsip0_0.2.2.bb index 64b5ae49c3..8d8bb905db 100644 --- a/packages/libmsip/libmsip0_0.2.2.bb +++ b/packages/libmsip/libmsip0_0.2.2.bb @@ -13,7 +13,7 @@ S="${WORKDIR}/libmsip-${PV}" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " do_stage() { oe_libinstall -a -so libmsip ${STAGING_LIBDIR} diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb index f27c05ca14..4418757ba2 100644 --- a/packages/libmsip/libmsip0_svn.bb +++ b/packages/libmsip/libmsip0_svn.bb @@ -15,7 +15,7 @@ S="${WORKDIR}/libmsip" PACKAGES = "${PN}" -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " +FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " do_stage() { oe_libinstall -a -so libmsip ${STAGING_LIBDIR} diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb index 6e6067cf8f..c4e4396e1a 100644 --- a/packages/libnet/libnet_1.0.2a.bb +++ b/packages/libnet/libnet_1.0.2a.bb @@ -9,11 +9,12 @@ PR = "r1" # There are major API changes beween libnet v1.0 and libnet v1.1 PROVIDES = "libnet-1.0" -SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \ +#SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet0/libnet0_${PV}.orig.tar.gz \ file://configure.patch;patch=1 \ file://configure.uclibc.patch;patch=1 \ " -S = "${WORKDIR}/Libnet-${PV}" +S = "${WORKDIR}/libnet-${PV}.orig" inherit autotools diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb index 92457a8ff4..f9464ae8bb 100644 --- a/packages/libnet/libnet_1.1.2.1.bb +++ b/packages/libnet/libnet_1.1.2.1.bb @@ -8,7 +8,7 @@ DEPENDS = "libpcap" PROVIDES = "libnet-1.1" PR = "r1" -SRC_URI = "http://www.packetfactory.net/libnet/dist/libnet-${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \ file://support-uclibc.patch;patch=1 \ file://fix-endianess-test.patch;patch=1" @@ -31,6 +31,7 @@ do_stage () { oe_runmake -C include/libnet 'DESTDIR=${STAGING_INCDIR}' 'includedir=' install-libnetincludeHEADERS } +#static build PACKAGES = "${PN}-dev ${PN}-doc" FILES_${PN}-dev += "${bindir}/libnet-config" diff --git a/packages/liboil/liboil_0.3.10.bb b/packages/liboil/liboil_0.3.10.bb new file mode 100644 index 0000000000..94471a26fc --- /dev/null +++ b/packages/liboil/liboil_0.3.10.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." +HOMEPAGE = "http://liboil.freedesktop.org/" +LICENSE = "various" + +SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb index 18bc4aa66e..2dc33b6f2a 100644 --- a/packages/libol/libol_0.3.16.bb +++ b/packages/libol/libol_0.3.16.bb @@ -12,4 +12,4 @@ do_stage() { ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 install ${S}/src/*.h ${STAGING_INCDIR}/libol/ } - + diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 6ae22316c5..8fcc2fba0a 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -5,5 +5,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ 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/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb index a1813423c0..8a4211384a 100644 --- a/packages/libpcre/libpcre-native_4.4.bb +++ b/packages/libpcre/libpcre-native_4.4.bb @@ -5,4 +5,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" # NOTE: multiple providers are available (libpcre, libpcre-native); # NOTE: consider defining PREFERRED_PROVIDER_pcre -PROVIDES = "" +PROVIDES = "" diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb index a9bff9d2f6..6cedbf480d 100644 --- a/packages/libpixman/libpixman_0.1.5.bb +++ b/packages/libpixman/libpixman_0.1.5.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" -inherit autotools pkgconfig +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/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb index a9bff9d2f6..6cedbf480d 100644 --- a/packages/libpixman/libpixman_0.1.6.bb +++ b/packages/libpixman/libpixman_0.1.6.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" -inherit autotools pkgconfig +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/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb index 62ffdc94f3..956f652454 100644 --- a/packages/libpixman/libpixman_cvs.bb +++ b/packages/libpixman/libpixman_cvs.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/libpixman" DEFAULT_PREFERENCE = "-1" -inherit autotools pkgconfig +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/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb index f2ea872158..21ffea194e 100644 --- a/packages/libqpe/libqpe-opie_1.2.2.bb +++ b/packages/libqpe/libqpe-opie_1.2.2.bb @@ -1,7 +1,7 @@ require ${PN}.inc PR = "r1" -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ file://fix-titleheight.patch;patch=1" diff --git a/packages/libqtaux/libqtaux2_1.2.2.bb b/packages/libqtaux/libqtaux2_1.2.2.bb index c05c40f5ae..5d971e35d1 100644 --- a/packages/libqtaux/libqtaux2_1.2.2.bb +++ b/packages/libqtaux/libqtaux2_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux" diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb index 4813ef3d1d..aaf01d8a17 100644 --- a/packages/libqtaux/libqtaux2_cvs.bb +++ b/packages/libqtaux/libqtaux2_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux" diff --git a/packages/libsamplerate/libsamplerate0_0.1.2.bb b/packages/libsamplerate/libsamplerate0_0.1.2.bb index b961d30b36..78a7f403d4 100644 --- a/packages/libsamplerate/libsamplerate0_0.1.2.bb +++ b/packages/libsamplerate/libsamplerate0_0.1.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An audio Sample Rate Conversion library" SECTION = "libs" LICENSE = "GPL libsamplerate" -PR = "r1" +PR = "r2" SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz" S = "${WORKDIR}/libsamplerate-${PV}" @@ -12,6 +12,3 @@ do_stage() { oe_libinstall -a -so -C src libsamplerate ${STAGING_LIBDIR} install -m 0644 ${S}/src/samplerate.h ${STAGING_INCDIR}/ } - -PACKAGES = "${PN}" -FILES_${PN} = "${libdir}/libsamplerate.so*" diff --git a/packages/libschedule/libschedule_0.15.bb b/packages/libschedule/libschedule_0.15.bb index ef57a74a90..77c6a97f81 100644 --- a/packages/libschedule/libschedule_0.15.bb +++ b/packages/libschedule/libschedule_0.15.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "glib-2.0 sqlite" GPE_TARBALL_SUFFIX = "gz" -inherit autotools pkgconfig gpe +inherit autotools pkgconfig gpe do_stage () { diff --git a/packages/libschedule/libschedule_0.16.bb b/packages/libschedule/libschedule_0.16.bb index ab71dd4521..ad8cb72712 100644 --- a/packages/libschedule/libschedule_0.16.bb +++ b/packages/libschedule/libschedule_0.16.bb @@ -1,15 +1,14 @@ -LICENSE = "LGPL" -PR = "r0" DESCRIPTION = "RTC alarm handling library for GPE" SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "glib-2.0 sqlite" -GPE_TARBALL_SUFFIX = "bz2" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 sqlite libgpewidget" +PR = "r0" -inherit autotools pkgconfig gpe +GPE_TARBALL_SUFFIX = "bz2" +inherit autotools pkgconfig gpe do_stage () { -autotools_stage_all + autotools_stage_all } - diff --git a/packages/libsidplay/libsidplay_1.36.59.bb b/packages/libsidplay/libsidplay_1.36.59.bb index dcb7be2056..5dbc34c158 100644 --- a/packages/libsidplay/libsidplay_1.36.59.bb +++ b/packages/libsidplay/libsidplay_1.36.59.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz" -inherit autotools +inherit autotools do_stage() { oe_libinstall -so -C src libsidplay ${STAGING_LIBDIR} diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb index 8ef0556377..baf8feab67 100644 --- a/packages/libtiff/tiff_3.7.2.bb +++ b/packages/libtiff/tiff_3.7.2.bb @@ -7,9 +7,9 @@ SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz" inherit autotools -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so +do_stage() { + autotools_stage_includes + install -d ${STAGING_LIBDIR} + install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so -} +} diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb index 81a4990d28..fdc8f6ffaf 100644 --- a/packages/libtool/libtool-cross_1.5.10.bb +++ b/packages/libtool/libtool-cross_1.5.10.bb @@ -13,6 +13,7 @@ S = "${WORKDIR}/libtool-${PV}" prefix = "${STAGING_DIR}" exec_prefix = "${prefix}/${BUILD_SYS}" +bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { : diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb index 1202279524..20929a7fa2 100644 --- a/packages/libtool/libtool_1.5.10.bb +++ b/packages/libtool/libtool_1.5.10.bb @@ -10,7 +10,7 @@ PR = "r3" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://autotools.patch;patch=1 \ file://uclibc.patch;patch=1 \ - file://3figures.patch;patch=1" + file://3figures.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" PACKAGES = "libltdl libltdl-dev ${PN}" diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb index a62d9ae83e..8648f96571 100644 --- a/packages/libusb/libusb_0.1.10a.bb +++ b/packages/libusb/libusb_0.1.10a.bb @@ -22,6 +22,11 @@ do_stage() { install -m 755 ${S}/libusb-config ${STAGING_BINDIR} perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + install -d ${STAGING_BINDIR_CROSS}/ + mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config + fi + install -d ${STAGING_INCDIR}/ for X in usb.h do diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb index fea8e57ccf..43c6ea92bd 100644 --- a/packages/libusb/libusb_0.1.12.bb +++ b/packages/libusb/libusb_0.1.12.bb @@ -9,24 +9,25 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz" S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" +export CXXFLAGS += "-lstdc++" + do_stage() { - oe_libinstall -a -so libusb ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR} + autotools_stage_all install -m 755 ${S}/libusb-config ${STAGING_BINDIR} # can we get rid of that? wouldn't a sed statement do as well? - perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + install -d ${STAGING_BINDIR_CROSS}/ + mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config + fi - install -d ${STAGING_INCDIR}/ - for X in usb.h - do - install -m 0644 ${S}/$X ${STAGING_INCDIR}/$X - done } PACKAGES =+ "libusbpp" diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 692c55cf9f..1115b6e961 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -37,7 +37,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --without-v4l --without-arts --without-sdl \ --without-xv --without-xxmc --without-xvmc \ --with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}" - + do_compile() { oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool } diff --git a/packages/libxml/libxml2-native_2.6.10.bb b/packages/libxml/libxml2-native_2.6.10.bb index 3f4b1ca11b..df3ab07460 100644 --- a/packages/libxml/libxml2-native_2.6.10.bb +++ b/packages/libxml/libxml2-native_2.6.10.bb @@ -5,7 +5,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig +inherit autotools native pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n" diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb index dcbb181de4..df3ab07460 100644 --- a/packages/libxml/libxml2-native_2.6.9.bb +++ b/packages/libxml/libxml2-native_2.6.9.bb @@ -1,11 +1,11 @@ DESCRIPTION = "GNOME XML library" -SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig +inherit autotools native pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n" diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb index 9f9e8bbac2..aabcb926ff 100644 --- a/packages/libxml/libxml2_2.6.26.bb +++ b/packages/libxml/libxml2_2.6.26.bb @@ -9,6 +9,8 @@ inherit autotools pkgconfig binconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" +export LDFLAGS += "-ldl" + do_stage() { autotools_stage_all install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/ diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 7707d91761..cfec0904e9 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -2,7 +2,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" DEPENDS = "libxsettings virtual/libx11 libxt" -# libxt is required to stop configure breaking builds by +# libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. PR="r1" diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb index 0643c5f14d..41f3e8f6e4 100644 --- a/packages/libxsettings-client/libxsettings-client_0.17.bb +++ b/packages/libxsettings-client/libxsettings-client_0.17.bb @@ -2,7 +2,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" -# libxt is required to stop configure breaking builds by +# libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. PR="r1" diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb index 816b3fdd04..9c59407ebf 100644 --- a/packages/libxslt/libxslt_1.1.12.bb +++ b/packages/libxslt/libxslt_1.1.12.bb @@ -8,7 +8,7 @@ PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" @@ -31,11 +31,11 @@ do_stage () { install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i done - cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \ - -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \ + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ - -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config - chmod a+rx ${STAGING_BINDIR}/xslt-config + -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config + chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb index 816b3fdd04..9c59407ebf 100644 --- a/packages/libxslt/libxslt_1.1.17.bb +++ b/packages/libxslt/libxslt_1.1.17.bb @@ -8,7 +8,7 @@ PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" @@ -31,11 +31,11 @@ do_stage () { install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i done - cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \ - -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \ + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ - -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config - chmod a+rx ${STAGING_BINDIR}/xslt-config + -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config + chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libzvbi/libzvbi_0.2.24.bb b/packages/libzvbi/libzvbi_0.2.24.bb new file mode 100644 index 0000000000..c14376387b --- /dev/null +++ b/packages/libzvbi/libzvbi_0.2.24.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "The Zapping VBI library, in short ZVBI, provides functions to \ +capture and decode VBI data. It is written in plain ANSI C with few dependencies \ +on other tools and libraries." +HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html" +LICENSE = "GPL" +SECTION = "libs/multimedia" +DEPENDS = "libpng" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2" +S = "${WORKDIR}/zvbi-${PV}" + +EXTRA_OECONF = "--without-x" + +inherit autotools + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/links/links-x11_2.1pre23.bb b/packages/links/links-x11_2.0+2.1pre26.bb index ba9e531ca2..c026ca7e02 100644 --- a/packages/links/links-x11_2.1pre23.bb +++ b/packages/links/links-x11_2.0+2.1pre26.bb @@ -1,20 +1,10 @@ -DESCRIPTION = "Links is graphics and text mode WWW \ -browser, similar to Lynx." -HOMEPAGE = "http://links.twibright.com/" -SECTION = "console/network" -LICENSE = "GPL" -DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" +require links.inc + +DEPENDS += "virtual/libx11" RCONFLICTS = "links" PR = "r0" -SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ - file://ac-prog-cxx.patch;patch=1 \ - file://cookies-save-0.96.patch;patch=1 \ - file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \ - file://links2.desktop \ - http://www.xora.org.uk/oe/links2.png" -S = "${WORKDIR}/links-${PV}" - -inherit autotools +SRC_URI += " file://links2.desktop \ + http://www.xora.org.uk/oe/links2.png" EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ diff --git a/packages/links/links.inc b/packages/links/links.inc new file mode 100644 index 0000000000..2d299d3b57 --- /dev/null +++ b/packages/links/links.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Links is graphics and text mode WWW \ +browser, similar to Lynx." +HOMEPAGE = "http://links.twibright.com/" +SECTION = "console/network" +LICENSE = "GPL" +DEPENDS = "jpeg libpng flex openssl zlib" + +LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}" + +SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \ + file://ac-prog-cxx.patch;patch=1 \ + file://cookies-save-0.96.patch;patch=1 \ + file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1" + +inherit autotools + +S = "${WORKDIR}/links-${LPV}" + diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb new file mode 100644 index 0000000000..6fcf8cef84 --- /dev/null +++ b/packages/links/links_2.0+2.1pre26.bb @@ -0,0 +1,11 @@ +require links.inc + +DEPENDS += "gpm" +RCONFLICTS="links-x11" +PR = "r0" + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x --without-sdl" diff --git a/packages/links/links_2.1pre23.bb b/packages/links/links_2.1pre23.bb deleted file mode 100644 index d8519950c6..0000000000 --- a/packages/links/links_2.1pre23.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Links is graphics and text mode WWW \ -browser, similar to Lynx." -HOMEPAGE = "http://links.twibright.com/" -SECTION = "console/network" -LICENSE = "GPL" -DEPENDS = "jpeg libpng gpm flex openssl zlib" -RCONFLICTS="links-x11" -PR = "r0" -SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ - file://ac-prog-cxx.patch;patch=1 \ - file://cookies-save-0.96.patch;patch=1 \ - file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x --without-sdl" diff --git a/packages/linux-atm/linux-atm_2.4.1.bb b/packages/linux-atm/linux-atm_2.4.1.bb index ed88f3227b..2643c742d5 100644 --- a/packages/linux-atm/linux-atm_2.4.1.bb +++ b/packages/linux-atm/linux-atm_2.4.1.bb @@ -22,7 +22,7 @@ binarys_bin="test/aread maint/atmdiag maint/atmdump test/awrite maint/saaldump m do_compile_prepend() { - oe_runmake -C ${S}/src/qgen AR='${BUILD_AR}' CPP='${BUILD_CPP}' CC='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' CPPFLAGS='${BUILD_CPPFLAGS}' LD='${BUILD_LD}' LDFLAGS='${BUILD_LDFLAGS}' qgen q.dump + oe_runmake -C ${S}/src/qgen AR='${BUILD_AR}' CPP='${BUILD_CPP}' CC='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' CPPFLAGS='${BUILD_CPPFLAGS}' LD='${BUILD_LD}' LDFLAGS='${BUILD_LDFLAGS}' qgen q.dump oe_runmake -C ${S}/src/qgen DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' all } @@ -37,11 +37,11 @@ do_stage () { install -m 0644 src/arpd/$i ${STAGING_INCDIR}/$i done - for i in ${binarys_sbin}; do + for i in ${binarys_sbin}; do install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i` done - for i in ${binarys_bin}; do + for i in ${binarys_bin}; do install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i` done } diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc new file mode 100644 index 0000000000..d9f4d687ee --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers.inc @@ -0,0 +1,3 @@ +DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." +SECTION = "devel" +LICENSE = "GPL" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb index c43664094d..4ef77a0453 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb @@ -1,12 +1,11 @@ -SECTION = "devel" -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." +require linux-libc-headers.inc + HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" -# license note from the package: +# license note from the package: # Linux-libc-headers are derived from linux kernel headers. For license of a # particular header, check it's content, and if copyright notice isn't present, -# standard linux kernel license applies. +# standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here -LICENSE = "GPL" INHIBIT_DEFAULT_DEPS = "1" PR = "r2" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb index 28926f0264..898bb120ae 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb @@ -1,17 +1,16 @@ -SECTION = "devel" -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." +require linux-libc-headers.inc + # This package is derived from the original linux-libc-headers at # http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ -# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with +# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with # the official linux patches (where applicable) and then fixed up just # enough to build glibc-2.4. BEWARE! # -# license note from the linux-libc-headers package: +# license note from the linux-libc-headers package: # Linux-libc-headers are derived from linux kernel headers. For license of a # particular header, check it's content, and if copyright notice isn't present, -# standard linux kernel license applies. +# standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here -LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" PR = "r4" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb index 2e9e7eac82..c4125ee75a 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb @@ -1,9 +1,7 @@ -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." -SECTION = "devel" -LICENSE = "GPL" +require linux-libc-headers.inc + DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" -PR = "r0" SRC_URI = " \ ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 6767d7aac9..8e1c5dc3e8 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -1,6 +1,5 @@ -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." -SECTION = "devel" -LICENSE = "GPL" +require linux-libc-headers.inc + INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "unifdef-native" PR = "r1" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb index 1b0296c494..b56900b9d6 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb @@ -1,8 +1,7 @@ -SECTION = "devel" -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." +require linux-libc-headers.inc + INHIBIT_DEFAULT_DEPS = "1" PR = "r3" -LICENSE = "GPL" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb index cb04c92192..1f36aa2e92 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb @@ -1,12 +1,11 @@ -SECTION = "devel" -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." +require linux-libc-headers.inc + HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" -# license note from the package: +# license note from the package: # Linux-libc-headers are derived from linux kernel headers. For license of a # particular header, check it's content, and if copyright notice isn't present, -# standard linux kernel license applies. +# standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here -LICENSE = "GPL" INHIBIT_DEFAULT_DEPS = "1" PR = "r7" @@ -16,7 +15,7 @@ PACKAGES = "" SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \ file://mips-asm-atomic-system.diff;patch=1;pnum=0 \ file://keyboard.patch;patch=1" - + S = "${WORKDIR}/linux-libc-headers-${PV}" do_configure () { diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index 5e6f664bc2..0e9a43d9b6 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -3,10 +3,13 @@ DESCRIPTION = "Linux kernel for the Compulab PXA270 system" LICENSE = "GPL" PR = "r2" +# Note, the compulab package contains a binary NAND driver that is not +# EABI compatible + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://linux-2.6.16.patch;patch=1 \ file://defconfig \ - http://www.compulab.co.il/x270/download/x270-linux-drv.zip" + http://www.compulab.co.il/x270/download/x270-linux-drv.zip;md5sum=ac57536294406223e527367af5aefce2" S = "${WORKDIR}/linux-2.6.16" diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index 09926ce5c0..7fd152ab40 100644 --- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage" do_configure() { rm -f ${S}/.config - + if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." fi - + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else + else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - + sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ '${WORKDIR}/defconfig' >>'${S}/.config' - + yes '' | oe_runmake oldconfig diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb index 875f47c99c..f17f3168c0 100644 --- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -1,5 +1,5 @@ BROKEN = "1" -#linux-2.6.5-gnalm1-gum0.patch is not fetchable +#linux-2.6.5-gnalm1-gum0.patch is not fetchable SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index a75beee997..69e2098055 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.bb @@ -1,7 +1,7 @@ # Kernel for IXP4xx # -# This bitbake file pulls patches and the defconfig straight -# from the NSLU2-Linux SVN repository. Information about this +# This bitbake file pulls patches and the defconfig straight +# from the NSLU2-Linux SVN repository. Information about this # repository can be found at: # http://trac.nslu2-linux.org/kernel/ # diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb index 470fabc6c7..6ee29d3d9a 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19.bb @@ -1,12 +1,12 @@ # Kernel for IXP4xx # -# This bitbake file pulls patches and the defconfig straight -# from the NSLU2-Linux SVN repository. Information about this +# This bitbake file pulls patches and the defconfig straight +# from the NSLU2-Linux SVN repository. Information about this # repository can be found at: # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "605" +IXP4XX_KERNEL_SVN_REV = "647" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux-dht-walnut_2.6.12.bb b/packages/linux/linux-dht-walnut_2.6.12.bb index cdf0c62561..7d362ea659 100644 --- a/packages/linux/linux-dht-walnut_2.6.12.bb +++ b/packages/linux/linux-dht-walnut_2.6.12.bb @@ -30,7 +30,7 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf" do_configure_prepend() { install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config -# oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available." +# oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available." # oe_runmake oldconfig } diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig index 41529d9678..05a06b6c5e 100644 --- a/packages/linux/linux-efika/defconfig +++ b/packages/linux/linux-efika/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19-rc6 -# Mon Nov 27 17:09:56 2006 +# Sun Dec 31 01:46:08 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -1413,6 +1413,11 @@ CONFIG_SND_VIA82XX_MODEM=m # # +# ALSA PPC devices +# +CONFIG_SND_PPC_MPC52xx_AC97=m + +# # USB devices # CONFIG_SND_USB_AUDIO=m diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb index ff9b958eb3..679bd667d5 100644 --- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb +++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb @@ -6,8 +6,11 @@ PR = "r1" COMPATIBLE_MACHINE = "efika" SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \ + http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \ + http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \ file://defconfig \ " +# http://lkml.org/lkml/2006/11/29/335;patch=1 \ S = "${WORKDIR}/linux-2.6.19-rc6_efika" diff --git a/packages/linux/linux-ezx/defconfig-rokr-e2 b/packages/linux/linux-ezx/defconfig-rokr-e2 new file mode 100644 index 0000000000..6345a77a34 --- /dev/null +++ b/packages/linux/linux-ezx/defconfig-rokr-e2 @@ -0,0 +1,904 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19.1 +# Thu Jan 4 18:45:14 2007 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=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_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# 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_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# 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_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX 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_PNX4008 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 + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +CONFIG_ARCH_EZX=y +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_ARCH_EZX_SUMATRA=y +# CONFIG_ARCH_EZX_A780 is not set +CONFIG_PXA27x=y + +# +# 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 +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# 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_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=tty0 video=pxafb:mode:240x320-8,active root=/dev/mmcblk0p1 rootdelay=1" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE 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 is not set +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +# CONFIG_UNIX is not set +# CONFIG_NET_KEY is not set +# CONFIG_INET is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER 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_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 is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR 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 is not set +# CONFIG_MTD_PARTITIONS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC 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 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=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_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# 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 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 is not set +# CONFIG_BLK_DEV_INITRD is not set +# 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 +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA 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 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 +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +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 is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_PXA is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_I2C_CHARDEV is not set + +# +# 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_PXA is not set +# CONFIG_I2C_OCORES 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_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=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_PXA2XX=y + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# + +# +# Graphics support +# +# CONFIG_FIRMWARE_EDID is not set +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_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX 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 is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +CONFIG_FONT_6x11=y +# 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_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=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +# CONFIG_HID 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=y +CONFIG_USB_PXA2XX=y +# CONFIG_USB_PXA2XX_SMALL 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_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 +# CONFIG_USB_MIDI_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_TIFM_SD is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +# CONFIG_EXT2_FS is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# 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_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# 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_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 +# + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf-8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# 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 is not set +# 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 is not set +# 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_ENABLE_MUST_CHECK is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 58d98c37f1..0f4863e125 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -68,7 +68,7 @@ do_configure() { if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else + else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi @@ -90,7 +90,7 @@ do_configure() { # do_compile_append() { size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1294336 ]; then + if [ $size -ge 1294336 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} echo "Size is $size" die "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular." @@ -103,7 +103,7 @@ do_compile_append() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } do_deploy[dirs] = "${S}" diff --git a/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb b/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb new file mode 100644 index 0000000000..8b65609687 --- /dev/null +++ b/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb @@ -0,0 +1,124 @@ +DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680" +SECTION = "kernel" +AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>" +HOMEPAGE = "http://www.openezx.org" +LICENSE = "GPL" +DEPENDS += "quilt-native" +EZX = "ezx0" +PR = "${EZX}-r1" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_rokr-e2 = "1" + +inherit kernel + +KERNEL_RELEASE = "2.6.20-rc2" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-ezx" + +RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" +DMSRC = "http://people.openezx.org/dotmonkey/patch" + +############################################################## +# source and patches +# +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.20-rc2.bz2;patch=1 \ + ${DMSRC}/Kconfig.patch;patch=1;pnum=5 \ + ${DMSRC}/Makefile.patch;patch=1;pnum=5 \ + ${DMSRC}/head-xscale.S.patch;patch=1;pnum=5 \ + ${DMSRC}/sumatra.c.patch;patch=1;pnum=1 \ + ${DMSRC}/uncompress.h.patch;patch=1;pnum=5 \ + file://logo_linux_clut224.ppm \ + file://defconfig-${MACHINE}" + +S = "${WORKDIR}/linux-2.6.19" + +############################################################## +# kernel image resides on a seperate flash partition (for now) +# +FILES_kernel-image = "" +ALLOW_EMPTY = "1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(a780|e680|a1200|rokr-e2)' + +CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd" +CMDLINE_CON_rokr-e2 = "video=pxafb:mode:240x320-8,active console=ttyS2,115200n8 console=tty1" + +CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" +# uncomment if you want to boot over NFS +#CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3" +# uncomment to enable dyntick +#CMDLINE_OTHER = "dyntick=enable" +CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' +CMDLINE_IP = "ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off" +CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000" +CMDLINE_rokr-e2 = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" + +############################################################### +# module configs specific to this kernel +# +module_autoload_pxaficp_ir = "pxaficp_ir" +module_autoload_snd-pcm-oss = "snd-pcm-oss" + +do_ezxpatch() { + #mv ${WORKDIR}/patches ${S} && cd ${S} && quilt push -av + #rm -Rf patches .pc + : +} + +do_configure() { + install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm + + if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then + die "No default configuration for ${MACHINE} available." + fi + + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \ + -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \ + -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \ + -e '/CONFIG_MTDRAM_ABS_POS=/d' \ + '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config' + + yes '' | oe_runmake oldconfig +} + +############################################################### +# check the kernel is below the 1024*1024 byte limit for the boot-over usb +# +do_compile_append() { + size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` + if [ $size -ge 1294336 ]; then + rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + echo "Size is $size" + die "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular." + fi +} + +############################################################### +# put into deploy directory +# +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_package after do_install +addtask ezxpatch before do_patch after do_unpack diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb index c58e0d46bc..70cb5f4fd7 100644 --- a/packages/linux/linux-geodegx_2.4.24.bb +++ b/packages/linux/linux-geodegx_2.4.24.bb @@ -14,12 +14,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ S = "${WORKDIR}/linux-${KV}" -inherit kernel +inherit kernel ARCH = "i386" KERNEL_IMAGETYPE = "bzImage" do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config oe_runmake oldconfig } diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb index f84ceb7f1e..890aa9483a 100644 --- a/packages/linux/linux-geodelx_2.6.11.bb +++ b/packages/linux/linux-geodelx_2.6.11.bb @@ -14,7 +14,7 @@ KV = "${PV}" S = "${WORKDIR}/linux-${KV}" -inherit kernel +inherit kernel ARCH = "i386" KERNEL_IMAGETYPE = "bzImage" @@ -24,6 +24,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ file://defconfig" do_configure_prepend() { - - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + + install -m 0644 ${WORKDIR}/defconfig ${S}/.config } diff --git a/packages/kismet/kismet-2004-04-R1/.mtn2git_empty b/packages/linux/linux-hackndev-2.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/.mtn2git_empty +++ b/packages/linux/linux-hackndev-2.6/.mtn2git_empty diff --git a/packages/kismet/kismet-2004-04-R1/mtx-1/.mtn2git_empty b/packages/linux/linux-hackndev-2.6/palmld/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/mtx-1/.mtn2git_empty +++ b/packages/linux/linux-hackndev-2.6/palmld/.mtn2git_empty diff --git a/packages/linux/linux-hackndev-2.6/palmld/defconfig b/packages/linux/linux-hackndev-2.6/palmld/defconfig new file mode 100644 index 0000000000..e09cfed091 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmld/defconfig @@ -0,0 +1,1105 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-hnd0 +# Sun Oct 1 12:34:11 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +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_MINIMAL_OOPS 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_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_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# 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=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_LOGICPD_PXA270 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 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 +# CONFIG_ARCH_ROVERP5P is not set +CONFIG_MACH_XSCALE_PALMLD=y +CONFIG_PALMLD_PCMCIA=m +# CONFIG_PALMLD_USB is not set +CONFIG_PALMLD_IDE=m +# CONFIG_MACH_TUNGE2 is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_XSCALE_PALMTT5 is not set +# CONFIG_MACH_XSCALE_PALMTX is not set +# CONFIG_MACH_PALMZ72 is not set +# CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA27x=y +CONFIG_PXA_RTC_EPOCH=1904 +# 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_ARMBOOT_PROC is not set +CONFIG_XSCALE_PMU=y +# CONFIG_KEXEC is not set + +# +# Compaq/iPAQ Platforms +# + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_HAMCOP is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m +CONFIG_PCMCIA_DEBUG=y +CONFIG_PCMCIA=m +# CONFIG_PCMCIA_LOAD_CIS is not set +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=m + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# 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="" +# 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 is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +CONFIG_PM_DEBUG=y +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +CONFIG_NET_KEY=y +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=y +CONFIG_INET_TCP_DIAG=y +# 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=y + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=y +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +# CONFIG_PXA_FICP is not set +# CONFIG_BT is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP 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=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# 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 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 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=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# 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=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_CS=m +# 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 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 is not set +# 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=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=480 +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_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_PALMIR=y +CONFIG_KEYBOARD_PXA27X=y +# 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_TOUCHSCREEN_WM97XX=m +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_WM97XX_PXA=y +CONFIG_TOUCHSCREEN_WM97XX_ACC=y +# 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_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 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG 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 + +# +# 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 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# 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 + +# +# Misc devices +# +CONFIG_BATTERY_MONITOR=y + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# 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=y +# 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=y +# CONFIG_FB_PXA_PARAMETERS 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 is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_PXA2xx_I2SOUND is not set +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME 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 is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +# CONFIG_MMC_ASIC3 is not set +# CONFIG_MMC_WBSD_PALMT3 is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# 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 is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# 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_CRAMFS is not set +# CONFIG_SQUASHFS 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 +# CONFIG_UNION_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# 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="utf-8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=y +CONFIG_NLS_CODEPAGE_775=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_855=y +CONFIG_NLS_CODEPAGE_857=y +CONFIG_NLS_CODEPAGE_860=y +CONFIG_NLS_CODEPAGE_861=y +CONFIG_NLS_CODEPAGE_862=y +CONFIG_NLS_CODEPAGE_863=y +CONFIG_NLS_CODEPAGE_864=y +CONFIG_NLS_CODEPAGE_865=y +CONFIG_NLS_CODEPAGE_866=y +CONFIG_NLS_CODEPAGE_869=y +# 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=y +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=y +CONFIG_NLS_ISO8859_6=y +CONFIG_NLS_ISO8859_7=y +CONFIG_NLS_ISO8859_9=y +CONFIG_NLS_ISO8859_13=y +CONFIG_NLS_ISO8859_14=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_KOI8_R=y +CONFIG_NLS_KOI8_U=y +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_SMALLOOPS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_DEBUG_USER is not set + +# +# 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 is not set +# 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 is not set +# 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=m +# 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 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m diff --git a/packages/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty b/packages/linux/linux-hackndev-2.6/palmtx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty +++ b/packages/linux/linux-hackndev-2.6/palmtx/.mtn2git_empty diff --git a/packages/linux/linux-hackndev-2.6/palmtx/busybox-config b/packages/linux/linux-hackndev-2.6/palmtx/busybox-config new file mode 100644 index 0000000000..1f4708b018 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtx/busybox-config @@ -0,0 +1,571 @@ +# +# 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 is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_FEATURE_DEVFS is not set +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 + +# +# Build Options +# +CONFIG_STATIC=y +# CONFIG_LFS is not set +EXTRA_CFLAGS_OPTIONS="" +CONFIG_FEATURE_SUSv2=y +# CONFIG_FEATURE_SUSv2_OBSOLETE is not set + +# +# 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" + +# +# Archival Utilities +# +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +# CONFIG_GUNZIP is not set +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +# CONFIG_GZIP is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_BZIP2 is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_GZIP is not set +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNZIP is not set +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set + +# +# Coreutils +# +# CONFIG_BASENAME is not set +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CHGRP is not set +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_CHROOT is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_CUT is not set +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_DD is not set +# CONFIG_DF is not set +# CONFIG_DIRNAME is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +# CONFIG_DU is not set +# CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_EXPR=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +# CONFIG_HEAD is not set +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_INSTALL is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +# CONFIG_LS is not set +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set +# CONFIG_FEATURE_LS_RECURSIVE is not set +# CONFIG_FEATURE_LS_SORTFILES is not set +# CONFIG_FEATURE_LS_TIMESTAMPS is not set +# CONFIG_FEATURE_LS_USERNAME is not set +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +# CONFIG_MD5SUM is not set +CONFIG_MKDIR=y +# CONFIG_MKFIFO is not set +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV 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 is not set +# CONFIG_SORT is not set +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +# CONFIG_STTY is not set +# CONFIG_SUM is not set +CONFIG_SYNC=y +# CONFIG_TAIL is not set +# CONFIG_FEATURE_FANCY_TAIL is not set +# CONFIG_TEE is not set +# 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 is not set +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +# CONFIG_TTY is not set +# CONFIG_UNAME is not set +# CONFIG_UNIQ is not set +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +# CONFIG_WC is not set +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y +# CONFIG_FEATURE_AUTOWIDTH is not set +# CONFIG_FEATURE_HUMAN_READABLE is not set +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +# CONFIG_RESET is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_SETKEYCODES is not set + +# +# Debian Utilities +# +# CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_READLINK is not set +# CONFIG_FEATURE_READLINK_FOLLOW is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_WHICH is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +CONFIG_E2FSCK=y +# 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 + +# +# Editors +# +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_MATH is not set +# CONFIG_PATCH is not set +CONFIG_SED=y +# CONFIG_VI is not set +# CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_YANKMARK is not set +# CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_USE_SIGNALS is not set +# 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 is not set +# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set + +# +# Finding Utilities +# +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_GREP is not set +# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set +# 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_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_HALT is not set +# CONFIG_MESG is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT 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_UTMP is not set +# 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 + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# 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_EJECT is not set +# CONFIG_LAST is not set +# CONFIG_LESS is not set +# 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 +# BB_APPLET_RUNLEVEL is not set +# CONFIG_RX is not set +# CONFIG_STRINGS is not set +# CONFIG_SETSID is not set +# CONFIG_TIME is not set +# CONFIG_WATCHDOG 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 is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set + +# +# 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 + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +# CONFIG_ARPING 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_HOSTNAME is not set +# 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_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI 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 is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFUPDOWN is not set +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# 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_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_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_IPCALC_FANCY is not set +# 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 is not set +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +# CONFIG_NETSTAT is not set +# CONFIG_NSLOOKUP is not set +# CONFIG_PING is not set +# CONFIG_FEATURE_FANCY_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +# CONFIG_ROUTE is not set +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# 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_FEATURE_TFTP_DEBUG is not set +# CONFIG_TRACEROUTE is not set +# 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 is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set + +# +# udhcp Server/Client +# +# CONFIG_UDHCPD is not set +# CONFIG_UDHCPC is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCP_SYSLOG is not set +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +# CONFIG_FREE is not set +# CONFIG_FUSER is not set +# CONFIG_KILL is not set +# CONFIG_KILLALL is not set +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PS is not set +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# 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=y +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_BUILTIN_ECHO 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 is not set +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +# CONFIG_FEATURE_COMMAND_EDITING is not set +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=0 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_SH_FANCY_PROMPT is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set +# CONFIG_LOGGER is not set + +# +# Linux System Utilities +# +# CONFIG_DMESG is not set +# 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 is not set +# CONFIG_HEXDUMP is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_MKSWAP is not set +# CONFIG_MORE is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +# CONFIG_PIVOT_ROOT is not set +CONFIG_SWITCH_ROOT=y +# CONFIG_RDATE is not set +# 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/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig new file mode 100644 index 0000000000..536133f6aa --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -0,0 +1,1127 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-hnd0 +# Thu Dec 14 14:24:35 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +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_MINIMAL_OOPS is not set +# CONFIG_RELAY is not set +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# 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_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# 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=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_LOGICPD_PXA270 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 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 +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_TUNGE2 is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_XSCALE_PALMTT5 is not set +CONFIG_MACH_XSCALE_PALMTX=y +CONFIG_PALMTX_AC97=m +CONFIG_PALMTX_LCD=m +# CONFIG_PALMTX_PCMCIA is not set +# CONFIG_PALMTX_DEBUG is not set +# CONFIG_MACH_PALMZ72 is not set +# CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA27x=y +CONFIG_PXA_RTC_EPOCH=1970 +# 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_ARMBOOT_PROC is not set +CONFIG_XSCALE_PMU=y +# CONFIG_KEXEC is not set + +# +# Compaq/iPAQ Platforms +# + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_HAMCOP is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +# 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="mem=32M" +# 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 is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +CONFIG_NET_KEY=y +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=y +CONFIG_INET_TCP_DIAG=y +# 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=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +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_PXA_FICP=m +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +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 is not set +# 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=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# 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=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=m +# 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_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_PXA27x=m +CONFIG_KEYBOARD_PALMIR=m +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 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_TOUCHSCREEN_WM97XX=m +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_WM97XX_PXA=y +CONFIG_TOUCHSCREEN_WM97XX_ACC=y +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_UINPUT is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=m +CONFIG_SERIO_SERPORT=m +# 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 +CONFIG_I2C_ALGOPXA=y + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELV is not set +CONFIG_I2C_PXA=y +CONFIG_I2C_PXA_SLAVE=y +# 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_I2C_ADCM2650 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_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 + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_NVRAM=m +CONFIG_SA1100_RTC=m +# 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 + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_PXA2XX=y + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=m +# 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 is not set +# 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 + +# +# Misc devices +# +CONFIG_BATTERY_MONITOR=m + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# 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=y +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS 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 is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_A716 is not set +# CONFIG_SND_H1910 is not set +# CONFIG_SND_H2200 is not set +# CONFIG_SND_H4000 is not set +# 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=m +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME 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=m +# 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_PXA27X=y +CONFIG_USB_PXA27X=m +# CONFIG_USB_PXA27X_DMA 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_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=m +# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_CHAR=m + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +# CONFIG_MMC_ASIC3 is not set +# CONFIG_MMC_WBSD_PALMT3 is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m + +# +# 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_SA1100=m +# CONFIG_RTC_DRV_TEST is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# 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=m +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# 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=m +# 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_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_EMBEDDED=y +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_SQUASHFS_VMALLOC=y +# 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 +CONFIG_UNION_FS=m + +# +# Network File Systems +# +CONFIG_NFS_FS=m +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=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=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 is not set +# 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 is not set +# 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 is not set +# CONFIG_SMALLOOPS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m diff --git a/packages/linux/linux-hackndev-2.6/palmtx/init b/packages/linux/linux-hackndev-2.6/palmtx/init new file mode 100755 index 0000000000..fe4a191603 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtx/init @@ -0,0 +1,195 @@ +#!/bin/sh +# $Id: $ +# authors: Cristiano P. +# + +# TODO: echo only if VERBOSE +# TODO: check the whole thing ... + +# defaults: +VERBOSE=true +FORCE_FSCK=false +UMOUNT_FILES_DEV=false + +FILES_DEV=/dev/mmcblk0p1 +FILES_MNT=/mnt/mmc +ROOT_DEV=$FILES_MNT/opie-image-v0.8.4-palmtx.rootfs.ext2 +SWAP_DEV=none + +MODULES_DIR="/lib/modules" +POST_MODULES_SCRIPT="" + +echo mounting sysfs +mount -n -t sysfs sys /sys >/dev/null 2>&1 || mount -t sysfs sys /sys + +echo mounting proc filesystem +mount -n -t proc none /proc >/dev/null 2>&1 || mount -t proc none /proc + +# try to get model name from /proc/cpuinfo +MODEL_NAME=`awk -F: '/Hardware/ { print $2 }' </proc/cpuinfo | sed 's/^ *//;s/ *$//'` + +[ $VERBOSE = "true" ] && echo Model name: $MODEL_NAME + +# device specific configuration +case $MODEL_NAME in + "Palm TX") + FILES_MNT=/media/mmc1 + ;; + + "Palm LifeDrive") + HDD_DEV=/dev/hda + HDD_OFFSET=91814912 + LOOP_DEV=/dev/loop0 + ;; + + *) + ;; +esac + +echo initram init started + +if [ -f /etc/modules.initrd ]; then + echo loading initial modules + cat /etc/modules.initrd | while read module; do + echo loading module: $module + /sbin/insmod $MODULES_DIR/$module > /dev/null + done +fi + + +# device specific actions ... +case $MODEL_NAME in + "Palm LifeDrive") + echo Mounting LifeDrive data partition... + losetup -o $HDD_OFFSET $LOOP_DEV $HDD_DEV + FILES_DEV=$LOOP_DEV + FILES_MNT=/mnt/hda + ;; + + *) + ;; +esac + + +if [ -b $FILES_DEV ]; then + FILES_DEV_MOUNTED=false + echo -n "attempting to mount $FILES_DEV: " + /bin/mount -t vfat -o rw $FILES_DEV $FILES_MNT > /dev/null 2>&1 + [ $? ] && FILES_DEV_MOUNTED=true + + if [ $FILES_DEV_MOUNTED = "true" ]; then + echo "mounted on $FILES_MNT." + /bin/sleep 1 + echo -n "sourcing linux.boot.cfg: " + # todo: check parameters/files? + if [ -f $FILES_MNT/linux.boot.cfg ]; then + echo found. + . $FILES_MNT/linux.boot.cfg + + if [ -f $FILES_MNT/modules.initrd ]; then + echo loading additional modules now: + cat $FILES_MNT/modules.initrd | while read module; do + loading module: $module + /sbin/insmod $MODULES_DIR/$module > /dev/null + done + fi + else + echo not found. + fi + else + echo "could not mount." + FILES_DEV_MOUNTED=false + fi +else + echo device $FILES_DEV not found. + FILES_DEV_MOUNTED=false +fi + +# this script could be used to update the rootfs before booting familiar (new modules, scripts, config, ...) +echo -n "post_module script: " +if [ -n "$POST_MODULES_SCRIPT" ]; then + if [ -f "$POST_MODULES_SCRIPT" ]; then + echo found $POST_MODULES_SCRIPT . + $POST_MODULES_SCRIPT + fi +else + echo not found. +fi + +# probably swap should/can be enabled by familiar (add to /etc/fstab?) +# is it the right place to mount swap? +if [ -n "$SWAP_DEV" -a $SWAP_DEV != "none" ]; then + echo -n "mount swap at $SWAP_DEV: " + + if [ -f $SWAP_DEV -o -b $SWAP_DEV ]; then + /sbin/swapon $SWAP_DEV > /dev/null 2>&1 + echo done. + else + echo not found. + fi +else + echo "no swap specified." +fi + +# force fsck if specified +if [ $FORCE_FSCK = "true" ]; then + echo "checking rootfs [$ROOT_DEV]" + if [ $VERBOSE = "true" ]; then + /sbin/e2fsck -f -y $ROOT_DEV + else + /sbin/e2fsck -f -y $ROOT_DEV > /dev/null 2>&1 + fi +fi + +echo -n "mounting rootfs: " + +# todo: calculate root dev id? (256*major + minor) +if [ -f $ROOT_DEV ]; then + #echo 0x701 > /proc/sys/kernel/real-root-dev + mount -n $ROOT_DEV /newroot -o rw loop 2>/dev/null + [ $? ] && ROOT_MOUNTED=true + # this shouldn't be possible if image is on FILES_DEV + UMOUNT_FILES_DEV=false +elif [ -b $ROOT_DEV ]; then + mount -n $ROOT_DEV /newroot -o rw 2>/dev/null + [ $? ] && ROOT_MOUNTED=true +else + echo "not a file or a block device." + ROOT_MOUNTED=false +fi + +# TODO: should initial /dev (/oldroot/dev) be unmounted after init by GPE? +if [ $ROOT_MOUNTED = "true" ]; then + echo mounted + + # umount mmc if forced by UMOUNT_FILES_DEV + if [ $UMOUNT_FILES_DEV = "true" -a $FILES_DEV_MOUNTED = "true" ]; then + umount -l $FILES_DEV + [ $? ] && FILES_DEV_MOUNTED=false + [ $FILES_DEV_MOUNTED = "false" ] && echo "$FILES_DEV umounted" + fi + + # move mmc's mount point on new rootfs + if [ $FILES_DEV_MOUNTED = "true" ]; then + echo moving $FILES_MNT to /newroot$FILES_MNT + mount --move $FILES_MNT /newroot$FILES_MNT + fi + + # force umount sys and proc + umount -l /sys + umount -l /proc + + # method 2: use switch_root (needs initramfs) + exec /sbin/switch_root -c /dev/console /newroot /sbin/init 5 + + echo "* * * switch_root failed! * * *" +else + echo "failed!" + echo could not mount root fs: init failed! + echo please, reset, check your configuration and retry. + sleep 100000 +fi + +# TODO: run ezhikov's keyshell here? +exec /bin/sh + diff --git a/packages/linux/linux-hackndev-2.6/palmtx/initramfs_list b/packages/linux/linux-hackndev-2.6/palmtx/initramfs_list new file mode 100644 index 0000000000..821a7cc7cc --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtx/initramfs_list @@ -0,0 +1,243 @@ + +##################### +# ../initramfs/root +# Last modified: 1156149630 + +dir /bin 755 0 0 +file /bin/busybox ../busybox-1.1.0/busybox 4755 0 0 +slink /bin/awk busybox 777 0 0 +slink /bin/ash busybox 777 0 0 +slink /bin/cat busybox 777 0 0 +slink /bin/chgrp busybox 777 0 0 +slink /bin/chmod busybox 777 0 0 +slink /bin/chown busybox 777 0 0 +slink /bin/cp busybox 777 0 0 +slink /bin/df busybox 777 0 0 +slink /bin/dmesg busybox 777 0 0 +slink /bin/echo busybox 777 0 0 +slink /bin/false busybox 777 0 0 +slink /bin/getopt busybox 777 0 0 +slink /bin/grep busybox 777 0 0 +slink /bin/hostname busybox 777 0 0 +slink /bin/kill busybox 777 0 0 +slink /bin/ln busybox 777 0 0 +slink /bin/ls busybox 777 0 0 +slink /bin/mkdir busybox 777 0 0 +slink /bin/mknod busybox 777 0 0 +slink /bin/mktemp busybox 777 0 0 +slink /bin/more busybox 777 0 0 +slink /bin/mount busybox 777 0 0 +slink /bin/mt busybox 777 0 0 +slink /bin/mv busybox 777 0 0 +slink /bin/pidof busybox 777 0 0 +slink /bin/ping busybox 777 0 0 +slink /bin/ps busybox 777 0 0 +slink /bin/pwd busybox 777 0 0 +slink /bin/rm busybox 777 0 0 +slink /bin/rmdir busybox 777 0 0 +slink /bin/sed busybox 777 0 0 +slink /bin/sh busybox 777 0 0 +slink /bin/sleep busybox 777 0 0 +slink /bin/stty busybox 777 0 0 +slink /bin/su busybox 777 0 0 +slink /bin/sync busybox 777 0 0 +slink /bin/touch busybox 777 0 0 +slink /bin/true busybox 777 0 0 +slink /bin/umount busybox 777 0 0 +slink /bin/uname busybox 777 0 0 +slink /bin/stat busybox 777 0 0 +dir /dev 755 0 0 +slink /dev/log /tmp/log 777 0 0 +dir /dev/pts 755 0 0 +dir /dev/shm 755 0 0 +nod /dev/mem 640 0 0 c 1 1 +nod /dev/kmem 640 0 0 c 1 2 +nod /dev/null 666 0 0 c 1 3 +nod /dev/zero 666 0 0 c 1 5 +nod /dev/random 666 0 0 c 1 8 +nod /dev/urandom 666 0 0 c 1 9 +nod /dev/ram 640 0 0 b 1 1 +nod /dev/ram0 640 0 0 b 1 0 +nod /dev/ram1 640 0 0 b 1 1 +nod /dev/ram2 640 0 0 b 1 2 +nod /dev/ram3 640 0 0 b 1 3 +slink /dev/loop0 loop/0 777 0 0 +slink /dev/loop1 loop/1 777 0 0 +nod /dev/rtc 640 0 0 c 10 135 +nod /dev/console 666 0 0 c 5 1 +nod /dev/tty 666 0 0 c 5 0 +nod /dev/tty0 666 0 0 c 4 0 +nod /dev/tty1 666 0 0 c 4 1 +nod /dev/tty2 666 0 0 c 4 2 +nod /dev/tty3 666 0 0 c 4 3 +nod /dev/tty4 666 0 0 c 4 4 +nod /dev/tty5 666 0 0 c 4 5 +nod /dev/tty6 666 0 0 c 4 6 +nod /dev/tty7 666 0 0 c 4 7 +nod /dev/ttyp0 666 0 0 c 3 0 +nod /dev/ttyp1 666 0 0 c 3 1 +nod /dev/ttyp2 666 0 0 c 3 2 +nod /dev/ttyp3 666 0 0 c 3 3 +nod /dev/ttyp4 666 0 0 c 3 4 +nod /dev/ttyp5 666 0 0 c 3 5 +nod /dev/ttyp6 666 0 0 c 3 6 +nod /dev/ttyp7 666 0 0 c 3 7 +nod /dev/ttyp8 666 0 0 c 3 8 +nod /dev/ttyp9 666 0 0 c 3 9 +nod /dev/ptyp0 666 0 0 c 2 0 +nod /dev/ptyp1 666 0 0 c 2 1 +nod /dev/ptyp2 666 0 0 c 2 2 +nod /dev/ptyp3 666 0 0 c 2 3 +nod /dev/ptyp4 666 0 0 c 2 4 +nod /dev/ptyp5 666 0 0 c 2 5 +nod /dev/ptyp6 666 0 0 c 2 6 +nod /dev/ptyp7 666 0 0 c 2 7 +nod /dev/ptyp8 666 0 0 c 2 8 +nod /dev/ptyp9 666 0 0 c 2 9 +nod /dev/ptmx 666 0 0 c 5 2 +nod /dev/ttyP0 666 0 0 c 57 0 +nod /dev/ttyP1 666 0 0 c 57 1 +nod /dev/ttyP2 666 0 0 c 57 2 +nod /dev/ttyP3 666 0 0 c 57 3 +nod /dev/ttyS0 666 0 0 c 4 64 +nod /dev/ttyS1 666 0 0 c 4 65 +nod /dev/ttyS2 666 0 0 c 4 66 +nod /dev/ttyS3 666 0 0 c 4 67 +nod /dev/fb0 640 0 0 c 29 0 +nod /dev/fb1 640 0 0 c 29 32 +nod /dev/fb2 640 0 0 c 29 64 +nod /dev/fb3 640 0 0 c 29 96 +nod /dev/psaux 666 0 0 c 10 1 +dir /dev/input 755 0 0 +nod /dev/input/mice 640 0 0 c 13 63 +nod /dev/input/mouse0 660 0 0 c 13 32 +nod /dev/input/mouse1 660 0 0 c 13 33 +nod /dev/input/mouse2 660 0 0 c 13 34 +nod /dev/input/mouse3 660 0 0 c 13 35 +nod /dev/input/event0 660 0 0 c 13 64 +nod /dev/input/event1 660 0 0 c 13 65 +nod /dev/input/event2 660 0 0 c 13 66 +nod /dev/input/event3 660 0 0 c 13 67 +nod /dev/mtd0 640 0 0 c 90 0 +nod /dev/mtd1 640 0 0 c 90 2 +nod /dev/mtd2 640 0 0 c 90 4 +nod /dev/mtd3 640 0 0 c 90 6 +nod /dev/mtdblock0 640 0 0 b 31 0 +nod /dev/mtdblock1 640 0 0 b 31 1 +nod /dev/mtdblock2 640 0 0 b 31 2 +nod /dev/mtdblock3 640 0 0 b 31 3 +dir /dev/net 755 0 0 +nod /dev/net/tun 660 0 0 c 10 200 +nod /dev/hda 640 0 0 b 3 0 +nod /dev/hda1 640 0 0 b 3 1 +nod /dev/hda2 640 0 0 b 3 2 +nod /dev/hda3 640 0 0 b 3 3 +nod /dev/hda4 640 0 0 b 3 4 +nod /dev/hda5 640 0 0 b 3 5 +nod /dev/hda6 640 0 0 b 3 6 +nod /dev/hda7 640 0 0 b 3 7 +nod /dev/hda8 640 0 0 b 3 8 +nod /dev/hda9 640 0 0 b 3 9 +nod /dev/hda10 640 0 0 b 3 10 +nod /dev/hda11 640 0 0 b 3 11 +nod /dev/hda12 640 0 0 b 3 12 +nod /dev/hda13 640 0 0 b 3 13 +nod /dev/hda14 640 0 0 b 3 14 +nod /dev/hdb 640 0 0 b 3 64 +nod /dev/hdb1 640 0 0 b 3 65 +nod /dev/hdb2 640 0 0 b 3 66 +nod /dev/hdb3 640 0 0 b 3 67 +nod /dev/hdb4 640 0 0 b 3 68 +nod /dev/hdb5 640 0 0 b 3 69 +nod /dev/hdb6 640 0 0 b 3 70 +nod /dev/hdb7 640 0 0 b 3 71 +nod /dev/hdb8 640 0 0 b 3 72 +nod /dev/hdb9 640 0 0 b 3 73 +nod /dev/hdb10 640 0 0 b 3 74 +nod /dev/hdb11 640 0 0 b 3 75 +nod /dev/hdb12 640 0 0 b 3 76 +nod /dev/hdb13 640 0 0 b 3 77 +nod /dev/hdb14 640 0 0 b 3 78 +nod /dev/mmcblk0 666 0 0 b 254 0 +nod /dev/mmcblk0p1 666 0 0 b 254 1 +nod /dev/mmcblk0p2 666 0 0 b 254 2 +nod /dev/mmcblk0p3 666 0 0 b 254 3 +nod /dev/mmcblk0p4 666 0 0 b 254 4 +nod /dev/mmcblk0p5 666 0 0 b 254 5 +nod /dev/mmcblk0p6 666 0 0 b 254 6 +nod /dev/mmcblk0p7 666 0 0 b 254 7 +nod /dev/mmcblk0p8 666 0 0 b 254 8 +nod /dev/mmcblk0p9 666 0 0 b 254 9 +dir /dev/loop 755 0 0 +nod /dev/loop/0 644 0 0 b 7 0 +nod /dev/loop/1 644 0 0 b 7 1 +nod /dev/loop/2 644 0 0 b 7 2 +nod /dev/loop/3 644 0 0 b 7 3 +nod /dev/loop/4 644 0 0 b 7 4 +nod /dev/loop/5 644 0 0 b 7 5 +slink /dev/loop2 loop/2 777 0 0 +slink /dev/loop3 loop/3 777 0 0 +slink /dev/loop4 loop/4 777 0 0 +slink /dev/loop5 loop/5 777 0 0 +dir /etc 755 0 0 +slink /etc/mtab ../proc/mounts 777 0 0 +dir /lib 755 0 0 +dir /lib/modules 755 0 0 +dir /media 755 0 0 +dir /media/mmc1 755 0 0 +dir /mnt 755 0 0 +dir /mnt/mmc 755 0 0 +dir /newroot 755 0 0 +dir /proc 755 0 0 +dir /root 755 0 0 +dir /sbin 755 0 0 +slink /sbin/getty ../bin/busybox 777 0 0 +slink /sbin/halt ../bin/busybox 777 0 0 +slink /sbin/init ../bin/busybox 777 0 0 +slink /sbin/insmod ../bin/busybox 777 0 0 +slink /sbin/klogd ../bin/busybox 777 0 0 +slink /sbin/lsmod ../bin/busybox 777 0 0 +slink /sbin/rmmod ../bin/busybox 777 0 0 +slink /sbin/route ../bin/busybox 777 0 0 +slink /sbin/sulogin ../bin/busybox 777 0 0 +slink /sbin/swapoff ../bin/busybox 777 0 0 +slink /sbin/swapon ../bin/busybox 777 0 0 +slink /sbin/syslogd ../bin/busybox 777 0 0 +slink /sbin/switch_root ../bin/busybox 777 0 0 +slink /sbin/e2fsck ../bin/busybox 777 0 0 +slink /sbin/fsck.ext2 ../bin/busybox 777 0 0 +slink /sbin/fsck.ext3 ../bin/busybox 777 0 0 +dir /sys 755 0 0 +dir /tmp 755 0 0 +dir /usr 755 0 0 +dir /usr/bin 755 0 0 +slink /usr/bin/[ ../../bin/busybox 777 0 0 +slink /usr/bin/[[ ../../bin/busybox 777 0 0 +slink /usr/bin/chvt ../../bin/busybox 777 0 0 +slink /usr/bin/clear ../../bin/busybox 777 0 0 +slink /usr/bin/du ../../bin/busybox 777 0 0 +slink /usr/bin/env ../../bin/busybox 777 0 0 +slink /usr/bin/expr ../../bin/busybox 777 0 0 +slink /usr/bin/find ../../bin/busybox 777 0 0 +slink /usr/bin/free ../../bin/busybox 777 0 0 +slink /usr/bin/hostid ../../bin/busybox 777 0 0 +slink /usr/bin/id ../../bin/busybox 777 0 0 +slink /usr/bin/logger ../../bin/busybox 777 0 0 +slink /usr/bin/logname ../../bin/busybox 777 0 0 +slink /usr/bin/tail ../../bin/busybox 777 0 0 +slink /usr/bin/test ../../bin/busybox 777 0 0 +slink /usr/bin/tty ../../bin/busybox 777 0 0 +slink /usr/bin/uptime ../../bin/busybox 777 0 0 +slink /usr/bin/xargs ../../bin/busybox 777 0 0 +slink /usr/bin/yes ../../bin/busybox 777 0 0 +slink /usr/bin/basename ../../bin/busybox 777 0 0 +slink /usr/bin/cmp ../../bin/busybox 777 0 0 +slink /usr/bin/dc ../../bin/busybox 777 0 0 +slink /usr/bin/dirname ../../bin/busybox 777 0 0 +slink /usr/bin/head ../../bin/busybox 777 0 0 +slink /usr/bin/sort ../../bin/busybox 777 0 0 +slink /usr/bin/strings ../../bin/busybox 777 0 0 +slink /usr/bin/tee ../../bin/busybox 777 0 0 +slink /usr/bin/uniq ../../bin/busybox 777 0 0 +dir /usr/sbin 755 0 0 +file /init ../init 755 0 0 diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb new file mode 100644 index 0000000000..32868b5570 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -0,0 +1,78 @@ +DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." +HOMEPAGE = "http://www.hackndev.com/" +SECTION = "kernel" +LICENSE = "GPL" + +COMPATIBLE_MACHINE = "(palmtx|palmld)" + +SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \ + file://defconfig" + +SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ + file://init \ + file://initramfs_list \ + file://busybox-config" + +S = "${WORKDIR}/trunk" + +K_MAJOR = "2" +K_MINOR = "6" +K_MICRO = "17" +HHV="hnd0" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" + +inherit kernel + +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +do_configure() { + + if [ -f ${WORKDIR}/defconfig ]; then + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available." + else + install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config \ + || die "No default configuration for ${MACHINE} available." + fi + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + if [ -f ${WORKDIR}/initramfs_list ]; then + install -m 0644 ${WORKDIR}/busybox-config ${WORKDIR}/busybox-1.1.0/.config \ + || die "No busybox configuration available." + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" >> ${WORKDIR}/busybox-1.1.0/.config + echo "USING_CROSS_COMPILER=y" >> ${WORKDIR}/busybox-1.1.0/.config + + MY_UID=`id -u` + MY_GID=`id -g` + + echo "CONFIG_INITRAMFS_SOURCE=\"../initramfs_list\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=${MY_UID}" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=${MY_GID}" >> ${S}/.config + else + echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=0" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=0" >> ${S}/.config + + fi + + yes '' | oe_runmake oldconfig + +} + + +do_compile_prepend() { + if [ -f ${WORKDIR}/initramfs_list ]; then + cd ${WORKDIR}/busybox-1.1.0 + oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' + cd - + fi +} diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig index 7fadc7ae3a..ea1a929163 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig @@ -1405,7 +1405,7 @@ CONFIG_CLASS_LEDS=y # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set diff --git a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.18/htcblueangel/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty +++ b/packages/linux/linux-handhelds-2.6-2.6.18/htcblueangel/.mtn2git_empty diff --git a/packages/linux/linux-handhelds-2.6-2.6.18/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.18/htcblueangel/defconfig new file mode 100644 index 0000000000..3744f8f815 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6-2.6.18/htcblueangel/defconfig @@ -0,0 +1,1395 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-hh4 +# Fri Jul 14 19:20:29 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_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 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 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=y +CONFIG_MACH_BLUEANGEL_LCD=y +# CONFIG_MACH_BLUEANGEL_PCMCIA is not set +CONFIG_MACH_BLUEANGEL_SUSPEND=m +# CONFIG_MACH_BLUEANGEL_LEDS is not set +CONFIG_MACH_BLUEANGEL_KEYPAD=m +# CONFIG_MACH_BLUEANGEL_AUDIO is not set +CONFIG_MACH_BLUEANGEL_BATTERY=m +CONFIG_MACH_BLUEANGEL_ROM=m +CONFIG_MACH_BLUEANGEL_DPRAM=m +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_MACH_X30 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 is not set + +# +# Compaq/iPAQ Platforms +# + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_HAMCOP is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +# 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="mem=64M" +# 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 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 is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +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=y + +# +# 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=y + +# +# 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=y +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 is not set +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# 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=y +# 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=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 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_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# 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=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_DISKONCHIP=y +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +# 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 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_ATMEL is not set +# CONFIG_HOSTAP is not set +CONFIG_ACX=m +# CONFIG_ACX_USB is not set +# CONFIG_ACX_MEM 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=m +# 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_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 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 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 is not set +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_CORE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS 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_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 +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# 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=y +# 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 is not set + +# +# 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_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 is not set +CONFIG_FB_W100=y +# 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 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=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +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 + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# 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 is not set +# CONFIG_SND_HTCUNIVERSAL is not set +# CONFIG_SND_H5XXX_AK4535 is not set +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_USB=y +# 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 is not set + +# +# USB Device Class drivers +# +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +CONFIG_USB_ACM=m +# 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 + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# 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 is not set + +# +# 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=m +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# 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=y +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +# 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 is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +CONFIG_MMC_ASIC3=y + +# +# LED devices +# +# CONFIG_CLASS_LEDS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG 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 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 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_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=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +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=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=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y + +# +# 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_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 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=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_DEC16=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig index c09283ff03..e34bdb7916 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig @@ -1,15 +1,19 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-hh2 -# Fri Oct 27 01:20:19 2006 +# Linux kernel version: 2.6.18-hh2 +# Sat Dec 2 19:05:03 2006 # CONFIG_ARM=y CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options @@ -28,16 +32,17 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -52,10 +57,11 @@ CONFIG_SHMEM=y # CONFIG_USELIB is not set CONFIG_CORE_DUMP=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set -CONFIG_OBSOLETE_INTERMODULE=y # # Loadable module support @@ -88,18 +94,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX 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_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -107,12 +121,6 @@ CONFIG_ARCH_PXA=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 # # Intel PXA2xx Implementations @@ -124,6 +132,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set # CONFIG_MACH_H3900 is not set @@ -146,20 +155,20 @@ CONFIG_HX4700_LEDS=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set -# CONFIG_ARCH_AXIMX5 is not set # CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 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_MACH_TRIZEPS4 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 -CONFIG_GPIO_KEYS=y # # Linux As Bootloader @@ -201,8 +210,6 @@ CONFIG_IPAQ_HANDHELD=y # Compaq/HP iPAQ Drivers # # CONFIG_IPAQ_SLEEVE is not set -# CONFIG_IPAQ_SAMCOP is not set -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -239,6 +246,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -324,6 +332,8 @@ CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set @@ -341,7 +351,10 @@ CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_IPV6_TUNNEL=m +# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -367,6 +380,7 @@ CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_AMANDA is not set # CONFIG_IP_NF_PPTP is not set # CONFIG_IP_NF_H323 is not set +# CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set # @@ -403,7 +417,6 @@ CONFIG_LLC=m # 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 @@ -464,6 +477,7 @@ CONFIG_IRPORT_SIR=m # CONFIG_USB_IRDA is not set # CONFIG_SIGMATEL_FIR is not set # CONFIG_PXA_FICP is not set +# CONFIG_MCS_FIR is not set CONFIG_BT=y CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -508,6 +522,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -622,6 +637,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_BLK_DEV_INITRD is not set CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -784,6 +800,7 @@ CONFIG_PCMCIA_HERMES=m # CONFIG_PCMCIA_SPECTRUM is not set # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set +CONFIG_USB_ZD1201=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -857,6 +874,9 @@ CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +CONFIG_GPIO_KEYS=y +# CONFIG_KEYBOARD_ASIC3 is not set +# CONFIG_KEYBOARD_PXA27x is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SERIAL is not set @@ -882,6 +902,7 @@ CONFIG_SERIO_RAW=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -905,55 +926,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # -# I2C support -# -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m - -# -# 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=m -# 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_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 - -# -# L3 serial bus support -# -CONFIG_L3=m - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - -# # IPMI # # CONFIG_IPMI_HANDLER is not set @@ -974,6 +946,7 @@ CONFIG_SA1100_WATCHDOG=m # USB-based Watchdog Cards # # CONFIG_USBPCWATCHDOG is not set +CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set CONFIG_SA1100_RTC=y # CONFIG_DTLK is not set @@ -998,36 +971,61 @@ CONFIG_SA1100_RTC=y # CONFIG_TELCLOCK is not set # -# SPI support +# I2C support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m # -# Dallas's 1-wire bus +# I2C Algorithms # -CONFIG_W1=y +# 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=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES 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_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 # -# 1-wire Bus Masters +# SPI support # -# CONFIG_W1_MASTER_DS9490 is not set -# CONFIG_W1_MASTER_DS2482 is not set -# CONFIG_W1_DS1WM is not set +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # -# 1-wire Slaves +# Dallas's 1-wire bus # -# CONFIG_W1_SLAVE_THERM is not set -# CONFIG_W1_SLAVE_SMEM is not set -# CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=y # # Hardware Monitoring support # CONFIG_HWMON=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set @@ -1055,13 +1053,21 @@ CONFIG_HWMON=y # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D 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 +CONFIG_BATTERY_MONITOR=y + +# +# L3 serial bus support +# +CONFIG_L3=m # # SoC drivers @@ -1070,6 +1076,8 @@ CONFIG_HWMON=y # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y # CONFIG_SOC_TSC2101 is not set @@ -1077,7 +1085,6 @@ CONFIG_HTC_ASIC3=y # # Misc devices # -CONFIG_BATTERY_MONITOR=y # # Multimedia Capabilities Port drivers @@ -1087,15 +1094,23 @@ CONFIG_BATTERY_MONITOR=y # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers # +CONFIG_LEDS_ASIC3=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y +# CONFIG_LEDS_TRIGGER_IDE_DISK is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y # # Multimedia devices @@ -1119,15 +1134,16 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set # # Encoders and Decoders # # CONFIG_VIDEO_MSP3400 is not set # CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_TLV320AIC23B is not set # CONFIG_VIDEO_WM8775 is not set # CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_CX2341X is not set # CONFIG_VIDEO_CX25840 is not set # CONFIG_VIDEO_SAA711X is not set # CONFIG_VIDEO_SAA7127 is not set @@ -1137,17 +1153,19 @@ CONFIG_VIDEO_V4L2=y # # V4L USB devices # +# CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set -# CONFIG_USB_DSBR is not set # CONFIG_USB_VICAM is not set # CONFIG_USB_IBMCAM is not set # CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set CONFIG_USB_SN9C102=m # CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC is not set @@ -1155,6 +1173,7 @@ CONFIG_USB_SN9C102=m # Radio Adapters # # CONFIG_RADIO_MAESTRO is not set +# CONFIG_USB_DSBR is not set # # Digital Video Broadcasting Devices @@ -1165,19 +1184,22 @@ CONFIG_USB_SN9C102=m # # Graphics support # +CONFIG_FIRMWARE_EDID=y 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=y +# CONFIG_FB_BACKLIGHT 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 is not set +# CONFIG_FB_MBX is not set CONFIG_FB_W100=y # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -1245,14 +1267,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # # ALSA ARM devices # -# CONFIG_SND_A716 is not set -# CONFIG_SND_H1910 is not set -# CONFIG_SND_H2200 is not set -# CONFIG_SND_H4000 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 @@ -1380,7 +1395,6 @@ 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 # @@ -1402,10 +1416,12 @@ CONFIG_USB_MON=y # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 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_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # @@ -1480,7 +1496,6 @@ CONFIG_REISERFS_FS_XATTR=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y @@ -1489,6 +1504,7 @@ CONFIG_XFS_RT=y # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y @@ -1543,6 +1559,7 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y @@ -1585,8 +1602,10 @@ CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="cp437" CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1668,15 +1687,19 @@ CONFIG_NLS_UTF8=y # # CONFIG_PRINTK_TIME is not set # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS 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 is not set -CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set @@ -1739,3 +1762,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 7f2dc4c77d..01026cbb79 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|magician|simpad)' +COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty +++ b/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig new file mode 100644 index 0000000000..b9ce6faf0c --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig @@ -0,0 +1,1501 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19-hh6 +# Wed Dec 20 17:26:40 2006 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +# CONFIG_MINIMAL_OOPS is not set +CONFIG_IKCONFIG_PROC=y +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=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_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# 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 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_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X 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_PNX4008 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 + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_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 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=y +CONFIG_MACH_BLUEANGEL_LCD=y +CONFIG_MACH_BLUEANGEL_BACKLIGHT=y +CONFIG_MACH_BLUEANGEL_DS1WM=m +# CONFIG_MACH_BLUEANGEL_PCMCIA is not set +CONFIG_MACH_BLUEANGEL_SUSPEND=m +# CONFIG_MACH_BLUEANGEL_LEDS is not set +CONFIG_MACH_BLUEANGEL_KEYPAD=m +# CONFIG_MACH_BLUEANGEL_AUDIO is not set +CONFIG_MACH_BLUEANGEL_BATTERY=m +CONFIG_MACH_BLUEANGEL_ROM=m +CONFIG_MACH_BLUEANGEL_DPRAM=m +CONFIG_MACH_BLUEANGEL_UDC=y +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X30 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_MACH_TRIZEPS4 is not set +CONFIG_PXA25x=y +CONFIG_PXA_SSP=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 +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_XSCALE_PMU=y +# CONFIG_KEXEC is not set + +# +# Compaq/iPAQ Platforms +# + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# 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_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# 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 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_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +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_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +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_H323 is not set +# CONFIG_IP_NF_SIP 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_LLC=m +# 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_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=y + +# +# 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=y + +# +# 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=y +# CONFIG_MCS_FIR 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 is not set +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR 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=y +CONFIG_NFTL_RW=y +CONFIG_INFTL=y +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC 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_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# 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_ECC_SMC is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_DISKONCHIP=y +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# 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 +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA 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 +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set +# CONFIG_ACX 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_SLHC=m +# 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 +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# 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=m +# 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_KEYBOARD_STOWAWAY is not set +# CONFIG_GPIO_KEYS is not set +# CONFIG_KEYBOARD_ASIC3 is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 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_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# 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 is not set +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_CORE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS 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_HW_RANDOM=y +# 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 +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM 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_ELV is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES 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_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=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_PXA2XX is not set + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=y + +# +# L3 serial bus support +# +CONFIG_L3=m + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_HTC_ASIC2 is not set +CONFIG_HTC_ASIC3=y +# CONFIG_SOC_TSC2101 is not set +CONFIG_SOC_TSC2200=y + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +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_BACKLIGHT 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 is not set +# CONFIG_FB_MBX is not set +CONFIG_FB_W100=y +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB 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 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=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +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_CORGI=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# 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 is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +# 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_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_TOUCHSCREEN 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 + +# +# 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_MII is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_MON is not set + +# +# 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_ADUTUX 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_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# 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_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +CONFIG_USB_GADGET_DUMMY_HCD=y +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +# 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_MIDI_GADGET 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 is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +CONFIG_MMC_ASIC3=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG 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_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=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 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_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# 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=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR 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=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +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=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=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS 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_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS 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_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_HEADERS_CHECK is not set +# 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_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=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_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=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=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_PLIST=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb index 5e07a08733..bdfc876a94 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" # Override where to look for defconfigs and patches, # we have per-kernel-release sets. @@ -10,6 +10,7 @@ FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAM SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ + http://www.handhelds.org/hypermail/kernel-discuss/att-2217/h5400-udc-mod-from-milan.patch;patch=1;pnum=0 \ file://defconfig" require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb index b34d4630a0..b34d4630a0 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh4.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index 5ebce81b2a..e004199865 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "19" -HHV = "0" +HHV = "7" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb index bbdb696a48..1c22e230e1 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://unexpected-int-fix.patch;patch=0 \ file://keymap-fix.patch;patch=0 \ file://io.h-fix.patch;patch=0" - + S = "${WORKDIR}/linux-${PV}" inherit kernel diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb index 900191ae2b..eea3ceab7e 100644 --- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb @@ -21,7 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://Newfile-Epson1356fb.patch;patch=0 \ file://Newfile-Jornada720_kbd.patch;patch=0 \ file://Newfile-Jornada720_ts.patch;patch=0" - + S = "${WORKDIR}/linux-${PV}" inherit kernel diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb index 4f0349e326..80b1e51a50 100644 --- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb +++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "jornada7xx" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ file://defconf_jlime \ file://linux-2.6.18-jornada7xx.patch;patch=0" - + S = "${WORKDIR}/linux-${PV}" inherit kernel diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb index b2375950e8..034f6d93d1 100644 --- a/packages/linux/linux-mtx-3_2.6.15.4.bb +++ b/packages/linux/linux-mtx-3_2.6.15.4.bb @@ -47,14 +47,14 @@ do_configure_prepend() { } do_compile() { - + kernel_do_compile # set CONFIG_XIP_KERNEL=y and CONFIG_XIP_PHYS_ADDR=xxxx if commented out, else append it # sed -i -e "s/^[# ]*CONFIG_XIP_KERNEL.*/CONFIG_XIP_KERNEL=y/" \ # -e "s/^[# ]*CONFIG_XIP_PHYS_ADDR.*/CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}/" .config # grep -q "^CONFIG_XIP_PHYS_ADDR=" .config || echo "CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}" >>.config - + # oe_runmake xipImage CC="arm-linux-gcc " LD="arm-linux-ld " ARCH="arm" } diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb index 47042bfec7..7cdb0b76a9 100644 --- a/packages/linux/linux-navman_2.6.18.bb +++ b/packages/linux/linux-navman_2.6.18.bb @@ -21,24 +21,24 @@ KERNEL_IMAGETYPE = "zImage" do_configure() { rm -f ${S}/.config - + if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." fi - + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else + else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - + sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ '${WORKDIR}/defconfig' >>'${S}/.config' - + yes '' | oe_runmake oldconfig } diff --git a/packages/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty +++ b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.19-omap1/another-ide-cs-ids.patch b/packages/linux/linux-omap1-2.6.19-omap1/another-ide-cs-ids.patch new file mode 100644 index 0000000000..7861b3c274 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.19-omap1/another-ide-cs-ids.patch @@ -0,0 +1,18 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Add another CompactFlash card into ide-cs driver. + +Signed-Off-By: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-10-16 19:16:39.041503288 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-10-16 19:18:40.929973424 +0200 +@@ -405,6 +405,7 @@ + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), ++ PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918), + PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), + PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), + PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), diff --git a/packages/linux/linux-omap1-2.6.19-omap1/defconfig b/packages/linux/linux-omap1-2.6.19-omap1/defconfig new file mode 100644 index 0000000000..93e8bea7d5 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.19-omap1/defconfig @@ -0,0 +1,1301 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19-omap1 +# Fri Dec 29 08:12:35 2006 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# 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_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# 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=y + +# +# Block layer +# +CONFIG_BLOCK=y +# 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 is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X 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_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# 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=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_STI is not set +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y +CONFIG_OMAP_DSP=y +# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set +# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set +# CONFIG_OMAP_DSP_FBEXPORT is not set + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=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 +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=128 +# 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_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# 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 +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE 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_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK 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_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 is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR 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 is not set +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=y +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 +# CONFIG_SSFDC 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 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=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 + +# +# 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_OMAP_NOR=y +# 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 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# 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_RAM_BLOCKSIZE=1024 +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 is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# 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 is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA 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 is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +# 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 +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +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=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_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_OMAP=y +# 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_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_OMAP=y +# CONFIG_OMAP_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_OMAP_RTC is not set +# 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 + +# +# TPM devices +# +# CONFIG_TCG_TPM 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_OCORES is not set +CONFIG_I2C_OMAP=y +# 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_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TPS65010=y +CONFIG_SENSORS_TLV320AIC23=y +# CONFIG_GPIOEXPANDER_OMAP 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_ABITUGURU 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_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D 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 +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_LCD_MIPID is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE 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 is not set +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_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 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_OMAP_AIC23=y +# CONFIG_SND_OMAP_TSC2101 is not set +# CONFIG_SND_SX1 is not set +# CONFIG_SND_OMAP_TSC2102 is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME 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=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_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# Enable Host or Gadget support to see Inventra options +# +# CONFIG_USB_MUSB_HDRC is not set + +# +# 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_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_TOUCHSCREEN 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 + +# +# 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_MII is not set +# CONFIG_USB_USBNET 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_ADUTUX 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_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# Synchronous Serial Interfaces (SSI) +# +CONFIG_OMAP_UWIRE=y +CONFIG_OMAP_TSC2101=y + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# 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_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# 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=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_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# 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=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR 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 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 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# 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=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# 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=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_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/linux-omap1-2.6.19-omap1/defconfig.eabi b/packages/linux/linux-omap1-2.6.19-omap1/defconfig.eabi new file mode 100644 index 0000000000..6e90b9f574 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.19-omap1/defconfig.eabi @@ -0,0 +1,1302 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19-omap1 +# Fri Dec 29 08:12:35 2006 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# 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_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# 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=y + +# +# Block layer +# +CONFIG_BLOCK=y +# 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 is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X 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_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# 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=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_STI is not set +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y +CONFIG_OMAP_DSP=y +# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set +# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set +# CONFIG_OMAP_DSP_FBEXPORT is not set + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=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 +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=128 +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_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# 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 +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE 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_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK 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_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 is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR 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 is not set +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=y +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 +# CONFIG_SSFDC 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 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=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 + +# +# 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_OMAP_NOR=y +# 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 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# 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_RAM_BLOCKSIZE=1024 +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 is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# 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 is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA 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 is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +# 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 +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +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=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_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_OMAP=y +# 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_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_OMAP=y +# CONFIG_OMAP_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_OMAP_RTC is not set +# 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 + +# +# TPM devices +# +# CONFIG_TCG_TPM 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_OCORES is not set +CONFIG_I2C_OMAP=y +# 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_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TPS65010=y +CONFIG_SENSORS_TLV320AIC23=y +# CONFIG_GPIOEXPANDER_OMAP 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_ABITUGURU 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_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D 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 +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_LCD_MIPID is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE 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 is not set +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_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 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_OMAP_AIC23=y +# CONFIG_SND_OMAP_TSC2101 is not set +# CONFIG_SND_SX1 is not set +# CONFIG_SND_OMAP_TSC2102 is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME 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=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_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# Enable Host or Gadget support to see Inventra options +# +# CONFIG_USB_MUSB_HDRC is not set + +# +# 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_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_TOUCHSCREEN 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 + +# +# 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_MII is not set +# CONFIG_USB_USBNET 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_ADUTUX 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_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# Synchronous Serial Interfaces (SSI) +# +CONFIG_OMAP_UWIRE=y +CONFIG_OMAP_TSC2101=y + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# 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_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# 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=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_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# 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=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR 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 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 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# 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=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# 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=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_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/linux-omap1-2.6.19-omap1/i2c-fix.patch b/packages/linux/linux-omap1-2.6.19-omap1/i2c-fix.patch new file mode 100644 index 0000000000..3b35ce23a2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.19-omap1/i2c-fix.patch @@ -0,0 +1,56 @@ +Hack to add I2C zero length transfers and SMBus quick mode +necessary for AIC23 sound again. + +Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com> + + +-------------- next part -------------- +Index: linux-osk/drivers/i2c/busses/i2c-omap.c +=================================================================== +--- linux-osk.orig/drivers/i2c/busses/i2c-omap.c ++++ linux-osk/drivers/i2c/busses/i2c-omap.c +@@ -285,20 +285,29 @@ static int omap_i2c_xfer_msg(struct i2c_ + struct i2c_msg *msg, int stop) + { + struct omap_i2c_dev *dev = i2c_get_adapdata(adap); ++ u8 zero_byte = 0; + int r; + u16 w; + + dev_dbg(dev->dev, "addr: 0x%04x, len: %d, flags: 0x%x, stop: %d\n", + msg->addr, msg->len, msg->flags, stop); + +- if (msg->len == 0) +- return -EINVAL; +- + omap_i2c_write_reg(dev, OMAP_I2C_SA_REG, msg->addr); + +- /* REVISIT: Could the STB bit of I2C_CON be used with probing? */ +- dev->buf = msg->buf; +- dev->buf_len = msg->len; ++ /* Sigh, seems we can't do zero length transactions. Thus, we ++ * can't probe for devices w/o actually sending/receiving at least ++ * a single byte. So we'll set count to 1 for the zero length ++ * transaction case and hope we don't cause grief for some ++ * arbitrary device due to random byte write/read during ++ * probes. ++ */ ++ if (msg->len == 0) { ++ dev->buf = &zero_byte; ++ dev->buf_len = 1; ++ } else { ++ dev->buf = msg->buf; ++ dev->buf_len = msg->len; ++ } + + omap_i2c_write_reg(dev, OMAP_I2C_CNT_REG, dev->buf_len); + +@@ -383,7 +392,7 @@ out: + static u32 + omap_i2c_func(struct i2c_adapter *adap) + { +- return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK); ++ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; + } + + static inline void diff --git a/packages/linux/linux-omap1_2.6.19-omap1.bb b/packages/linux/linux-omap1_2.6.19-omap1.bb new file mode 100644 index 0000000000..cfe0723770 --- /dev/null +++ b/packages/linux/linux-omap1_2.6.19-omap1.bb @@ -0,0 +1,12 @@ +require linux-omap1.inc + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ + http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2;patch=1 \ + file://another-ide-cs-ids.patch;patch=1 \ + file://i2c-fix.patch;patch=1 \ + file://defconfig \ + file://defconfig.eabi" + +S = "${WORKDIR}/linux-2.6.19" + +KERNEL_RELEASE = "${PV}" diff --git a/packages/liblockfile/liblockfile-1.05/.mtn2git_empty b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/liblockfile/liblockfile-1.05/.mtn2git_empty +++ b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty diff --git a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch index a80a1d5528..a80a1d5528 100644 --- a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch +++ b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch diff --git a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch index 4414b21191..4414b21191 100644 --- a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch +++ b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-akita b/packages/linux/linux-rp-2.6.19+git/defconfig-akita index 249466ac87..249466ac87 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-akita +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-akita diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0 b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0 index 1d702f60c0..1d702f60c0 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0 diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-collie b/packages/linux/linux-rp-2.6.19+git/defconfig-collie index f488d42d93..f488d42d93 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-collie +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-collie diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000 index ea56989b75..296c462641 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000 @@ -1,20 +1,28 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.15-rc1-git7 -# Sat Nov 19 23:13:51 2005 +# Linux kernel version: 2.6.20-rc2 +# Mon Jan 1 01:49:04 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y -CONFIG_UID16=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options # CONFIG_EXPERIMENTAL=y -# CONFIG_CLEAN_COMPILE is not set -CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -25,32 +33,39 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y # CONFIG_SWAP is not set -# CONFIG_SYSVIPC is not set +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set -CONFIG_HOTPLUG=y -CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=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_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SHMEM=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_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set # # Loadable module support @@ -58,7 +73,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_KMOD is not set @@ -66,6 +80,10 @@ CONFIG_OBSOLETE_MODPARM=y # # Block layer # +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -83,17 +101,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # 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_CAMELOT 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_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX 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_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -101,23 +130,20 @@ CONFIG_ARCH_PXA=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 # # Intel PXA2xx Implementations # # CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_MACH_HX2750=y CONFIG_PXA27x=y -CONFIG_PXA_KEYS=y CONFIG_PXA_SSP=y +CONFIG_PXA_KEYS=y # # Processor Type @@ -128,17 +154,20 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y CONFIG_XSCALE_PMU=y # # Bus support # -CONFIG_ISA_DMA_API=y # # PCCARD (PCMCIA/CardBus) support @@ -159,6 +188,9 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT=y CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -168,6 +200,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -175,7 +208,9 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # CPU Frequency scaling @@ -199,14 +234,15 @@ 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 # CONFIG_PM=y # CONFIG_PM_LEGACY is not set -# CONFIG_PM_DEBUG is not set +CONFIG_PM_DEBUG=y +# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y # @@ -217,9 +253,13 @@ 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 is not set +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -233,12 +273,21 @@ CONFIG_SYN_COOKIES=y # 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_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # @@ -250,6 +299,11 @@ CONFIG_TCP_CONG_BIC=y # 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 @@ -259,7 +313,6 @@ CONFIG_TCP_CONG_BIC=y # 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 @@ -280,6 +333,8 @@ CONFIG_IEEE80211=m CONFIG_IEEE80211_CRYPT_WEP=m # CONFIG_IEEE80211_CRYPT_CCMP is not set # CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -292,6 +347,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -318,6 +374,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_NFTL is not set # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set # # RAM/ROM/Flash chip drivers @@ -366,7 +423,6 @@ CONFIG_MTD_CFI_UTIL=y # 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 # @@ -405,6 +461,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -413,6 +470,7 @@ CONFIG_BLK_DEV_INITRD=y # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=y # @@ -441,18 +499,17 @@ CONFIG_IDE_GENERIC=y # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set # # Multi-device support (RAID and LVM) # -CONFIG_MD=y -CONFIG_BLK_DEV_DM=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m +# CONFIG_MD is not set # # Fusion MPT device support @@ -462,7 +519,6 @@ CONFIG_DM_MULTIPATH_EMC=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set # # I2O device support @@ -489,6 +545,7 @@ CONFIG_NET_ETHERNET=y CONFIG_MII=m # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) @@ -506,6 +563,7 @@ CONFIG_MII=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set # # Obsolete Wireless cards support (pre-802.11) @@ -522,7 +580,6 @@ CONFIG_NET_RADIO=y # # Wireless 802.11b ISA/PCI cards support # -# CONFIG_AIRO is not set CONFIG_HERMES=m # CONFIG_ATMEL is not set @@ -535,6 +592,7 @@ CONFIG_PCMCIA_SPECTRUM=m # CONFIG_PCMCIA_WL3501 is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y @@ -565,6 +623,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -579,11 +638,12 @@ CONFIG_PPP_BSDCOMP=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 @@ -591,7 +651,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set -# CONFIG_INPUT_POWER is not set +CONFIG_INPUT_POWER=y # # Input Device Drivers @@ -604,6 +664,10 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_TSC2101=y # CONFIG_INPUT_MISC is not set @@ -619,6 +683,7 @@ CONFIG_TOUCHSCREEN_TSC2101=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -645,16 +710,12 @@ CONFIG_UNIX98_PTYS=y # Watchdog Cards # # CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set -# CONFIG_SA1100_RTC is not set # 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 @@ -666,7 +727,6 @@ CONFIG_UNIX98_PTYS=y # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support @@ -674,22 +734,44 @@ CONFIG_UNIX98_PTYS=y # CONFIG_I2C 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 is not set +# CONFIG_HWMON_VID is not set # # Misc devices # +# CONFIG_TIFM_CORE is not set # -# Multimedia Capabilities Port drivers +# Multi-Function Devices # +CONFIG_MFD_TSC2101=y # -# Multi-Function Devices +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers # -CONFIG_MFD_TSC2101=y # # Multimedia devices @@ -704,16 +786,22 @@ CONFIG_MFD_TSC2101=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y 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_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y +CONFIG_FB_PXA_LCD_QVGA=y +# CONFIG_FB_PXA_LCD_VGA is not set +# CONFIG_FB_PXA_OVERLAY is not set # CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set # @@ -730,7 +818,14 @@ CONFIG_FONT_8x16=y # # Logo configuration # -# CONFIG_LOGO is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_LOGO_OHAND_CLUT224=y +# CONFIG_LOGO_OZ240_CLUT224 is not set +# CONFIG_LOGO_OZ480_CLUT224 is not set +# CONFIG_LOGO_OZ640_CLUT224 is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y @@ -744,10 +839,16 @@ CONFIG_BACKLIGHT_HX2750=y # CONFIG_SOUND is not set # +# HID Devices +# +CONFIG_HID=y + +# # 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 # @@ -766,14 +867,16 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y -# CONFIG_MMC_WBSD is not set +# CONFIG_MMC_TIFM_SD is not set # # Real Time Clock # +CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -781,15 +884,17 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # 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_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -798,14 +903,17 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set -# CONFIG_JBD is not set +# CONFIG_EXT4DEV_FS is not set # 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_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set @@ -832,12 +940,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set -# CONFIG_HUGETLBFS is not set +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set # # Miscellaneous filesystems @@ -849,15 +958,14 @@ CONFIG_RAMFS=y # 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_FS_XATTR is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y -CONFIG_JFFS2_SUMMARY=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=y CONFIG_SQUASHFS=m @@ -900,6 +1008,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # @@ -947,6 +1056,11 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y # +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# # Profiling support # # CONFIG_PROFILING is not set @@ -955,24 +1069,33 @@ CONFIG_NLS_UTF8=y # Kernel hacking # # CONFIG_PRINTK_TIME is not set -CONFIG_DEBUG_KERNEL=y +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK 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_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS 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_DEBUG_LIST 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=y # CONFIG_DEBUG_ICEDCC is not set @@ -987,7 +1110,11 @@ CONFIG_DEBUG_LL=y # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m # CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set @@ -996,6 +1123,10 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1019,10 +1150,12 @@ CONFIG_CRYPTO_CRC32C=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m # CONFIG_CRC16 is not set CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y - +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle index deacd170f2..deacd170f2 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm index abb6726556..abb6726556 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86 b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86 index fb66874b90..fb66874b90 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86 diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz index 824fd57aaa..824fd57aaa 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa index 4144e5cf38..4144e5cf38 100644 --- a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa diff --git a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch index b09acacadd..b09acacadd 100644 --- a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch +++ b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch diff --git a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch index 9ece71331a..9ece71331a 100644 --- a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch +++ b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch diff --git a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch index 18bf4268fc..18bf4268fc 100644 --- a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch +++ b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch diff --git a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch index 409daf03e6..409daf03e6 100644 --- a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch +++ b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch diff --git a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch index 097659abad..405d4ec124 100644 --- a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch +++ b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch @@ -2182,7 +2182,7 @@ Index: git/fs/squashfs/inode.c +static struct inode *squashfs_alloc_inode(struct super_block *sb) +{ + struct squashfs_inode_info *ei; -+ ei = kmem_cache_alloc(squashfs_inode_cachep, SLAB_KERNEL); ++ ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL); + if (!ei) + return NULL; + return &ei->vfs_inode; diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch index b6ce56eea4..b6ce56eea4 100644 --- a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch +++ b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch index 9fdd2962c9..9fdd2962c9 100644 --- a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch +++ b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch index 2f1b47d783..2f1b47d783 100644 --- a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch +++ b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch index 00bac40db5..00bac40db5 100644 --- a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch +++ b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch index 624098bc64..624098bc64 100644 --- a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch +++ b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch index aef3a047c1..aef3a047c1 100644 --- a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch +++ b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch index 78e81ea83a..78e81ea83a 100644 --- a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch +++ b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch index 5179b47cc4..5179b47cc4 100644 --- a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch +++ b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch diff --git a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch index 191de3af22..191de3af22 100644 --- a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch +++ b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 95c5af6d1a..a9d7fcb07f 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux8 KERNEL_IMAGETYPE_qemux86 = "bzImage" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" +CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" CMDLINE_OTHER = "dyntick=enable" diff --git a/packages/linux/linux-rp_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb index 6ce8ba1ab6..f1de99d452 100644 --- a/packages/linux/linux-rp_2.6.16.bb +++ b/packages/linux/linux-rp_2.6.16.bb @@ -8,9 +8,9 @@ PR = "r47" # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \ # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \ # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ -# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ +# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ -# Patches submitted upstream are towards top of this list +# Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://rmk-mmc1.patch;patch=1;status=merged \ @@ -119,12 +119,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ # Disabled until I find the reason this gives issues with cdc_subset # ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ -# These patches would really help collie/poodle but we +# These patches would really help collie/poodle but we # need someone to maintain them -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 # (Pavel Machek's git tree has updated versions of this?) # Also parts were recently committed to mainline by rmk (drivers/mfd/) -# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 # (This is mostly in mainline now?) # ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index eba9f5ef01..fceb547e16 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r31" +PR = "r32" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -8,9 +8,9 @@ PR = "r31" # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \ # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \ # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ -# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ +# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ -# Patches submitted upstream are towards top of this list +# Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ @@ -48,6 +48,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/poodle_audio-r7.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r5.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ @@ -84,7 +85,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) # (Pavel Machek's git tree has updated versions of this?) -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb index 097eaf8470..a4d7813f53 100644 --- a/packages/linux/linux-rp_2.6.18.bb +++ b/packages/linux/linux-rp_2.6.18.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -10,7 +10,7 @@ PR = "r6" # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 -# Patches submitted upstream are towards top of this list +# Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ @@ -34,6 +34,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ ${RPSRC}/pxafb_changeres-r2.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r5.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ @@ -66,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) # (Pavel Machek's git tree has updated versions of this?) -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) diff --git a/packages/linux/linux-rp_2.6.18+git.bb b/packages/linux/linux-rp_2.6.19+git.bb index c25307cdec..c0d742fffd 100644 --- a/packages/linux/linux-rp_2.6.18+git.bb +++ b/packages/linux/linux-rp_2.6.19+git.bb @@ -1,8 +1,10 @@ require linux-rp.inc -PR = "r1" +PR = "r4" DEFAULT_PREFERENCE = "-1" +#up the default pref for the hx2000 machine, since this is the only working kernel for it present in .dev +DEFAULT_PREFERENCE_hx2000 = "1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -14,31 +16,33 @@ DEFAULT_PREFERENCE = "-1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ae99a78af33f00565a05dbbc6ca9b247fed002c5 \ - http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ - ${RPSRC}/hx2750_base-r27.patch;patch=1 \ - ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc2 \ + http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \ + ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \ + ${RPSRC}/backlight_parameter_fix-r1.patch;patch=1;status=pending \ + ${RPSRC}/hx2750_base-r28.patch;patch=1 \ + ${RPSRC}/hx2750_bl-r8.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ - ${RPSRC}/pxa_keys-r5.patch;patch=1 \ - ${RPSRC}/tsc2101-r14.patch;patch=1 \ - ${RPSRC}/hx2750_test1-r4.patch;patch=1 \ + ${RPSRC}/pxa_keys-r7.patch;patch=1 \ + ${RPSRC}/tsc2101-r16.patch;patch=1 \ + ${RPSRC}/hx2750_test1-r6.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r6.patch;patch=1 \ - ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \ + ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \ - ${DOSRC}/kexec-arm-r3.patch;patch=1 \ + ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \ + ${RPSRC}/kexec-arm-r4.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ - ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.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 \ - file://add-oz-release-string.patch;patch=1;status=unmergable \ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \ @@ -64,7 +68,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git; # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) # (Pavel Machek's git tree has updated versions of this?) -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb index b13b127722..41212f3c92 100644 --- a/packages/linux/linux-rp_2.6.19.bb +++ b/packages/linux/linux-rp_2.6.19.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r1" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -12,10 +12,12 @@ DEFAULT_PREFERENCE = "-1" # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 -# Patches submitted upstream are towards top of this list +# Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ + ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \ + ${RPSRC}/pxa_irda_susres_fix-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ @@ -27,13 +29,14 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \ + ${RPSRC}/usb_pxa27x_udc-r2.patch;patch=1 \ ${DOSRC}/kexec-arm-r3.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ - ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ @@ -64,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) # (Pavel Machek's git tree has updated versions of this?) -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) diff --git a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty b/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty +++ b/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty diff --git a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch new file mode 100644 index 0000000000..d785cb885f --- /dev/null +++ b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch @@ -0,0 +1,532 @@ +Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c +=================================================================== +--- /dev/null ++++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c +@@ -0,0 +1,351 @@ ++/* ++ * 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. ++ * ++ * This program 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 General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> ++ * iPAQ H1940 touchscreen support ++ * ++ * ChangeLog ++ * ++ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> ++ * - added clock (de-)allocation code ++ * ++ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org> ++ * - h1940_ -> s3c2410 (this driver is now also used on the n30 ++ * machines :P) ++ * - Debug messages are now enabled with the config option ++ * TOUCHSCREEN_S3C2410_DEBUG ++ * - Changed the way the value are read ++ * - Input subsystem should now work ++ * - Use ioremap and readl/writel ++ * ++ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org> ++ * - Make use of some undocumented features of the touchscreen ++ * controller ++ * ++ */ ++ ++#include <linux/errno.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/slab.h> ++#include <linux/input.h> ++#include <linux/init.h> ++#include <linux/serio.h> ++#include <linux/delay.h> ++#include <linux/platform_device.h> ++#include <linux/clk.h> ++#include <asm/io.h> ++#include <asm/irq.h> ++ ++#include <asm/arch/regs-adc.h> ++#include <asm/arch/regs-gpio.h> ++#include <asm/arch/ts.h> ++ ++/* For ts.dev.id.version */ ++#define S3C2410TSVERSION 0x0101 ++ ++#define WAIT4INT(x) (((x)<<8) | \ ++ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ ++ S3C2410_ADCTSC_XY_PST(3)) ++ ++#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ ++ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) ++ ++#define DEBUG_LVL KERN_DEBUG ++ ++MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>"); ++MODULE_DESCRIPTION("s3c2410 touchscreen driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * Definitions & global arrays. ++ */ ++ ++ ++static char *s3c2410ts_name = "s3c2410 TouchScreen"; ++ ++/* ++ * Per-touchscreen data. ++ */ ++ ++struct s3c2410ts { ++ struct input_dev *dev; ++ long xp; ++ long yp; ++ int count; ++ int shift; ++}; ++ ++static struct s3c2410ts ts; ++static void __iomem *base_addr; ++ ++static inline void s3c2410_ts_connect(void) ++{ ++ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); ++} ++ ++static void touch_timer_fire(unsigned long data) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ int updown; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); ++ ++ if (updown) { ++ if (ts.count != 0) { ++ ts.xp >>= ts.shift; ++ ts.yp >>= ts.shift; ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ { ++ struct timeval tv; ++ do_gettimeofday(&tv); ++ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); ++ } ++#endif ++ ++ input_report_abs(ts.dev, ABS_Y, ts.xp); ++ input_report_abs(ts.dev, ABS_X, ts.yp); ++ ++ input_report_key(ts.dev, BTN_TOUCH, 1); ++ input_report_abs(ts.dev, ABS_PRESSURE, 1); ++ input_sync(ts.dev); ++ } ++ ++ ts.count = 0; ++ ++ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); ++ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); ++ } else { ++ ts.count = 0; ++ ++ input_report_abs(ts.dev, ABS_Y, ts.xp); ++ input_report_abs(ts.dev, ABS_X, ts.yp); ++ ++ input_report_key(ts.dev, BTN_TOUCH, 0); ++ input_report_abs(ts.dev, ABS_PRESSURE, 0); ++ input_sync(ts.dev); ++ ++ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); ++ } ++} ++ ++static struct timer_list touch_timer = ++ TIMER_INITIALIZER(touch_timer_fire, 0, 0); ++ ++static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ int updown; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); ++ ++ /* TODO we should never get an interrupt with updown set while ++ * the timer is running, but maybe we ought to verify that the ++ * timer isn't running anyways. */ ++ ++ if (updown) ++ touch_timer_fire(0); ++ ++ return IRQ_HANDLED; ++} ++ ++ ++static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; ++ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; ++ ts.count++; ++ ++ if (ts.count < (1<<ts.shift)) { ++ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); ++ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); ++ } else { ++ mod_timer(&touch_timer, jiffies+1); ++ writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static struct clk *adc_clock; ++ ++/* ++ * The functions for inserting/removing us as a module. ++ */ ++ ++static int __init s3c2410ts_probe(struct platform_device *pdev) ++{ ++ struct s3c2410_ts_mach_info *info; ++ struct input_dev *input_dev; ++ ++ info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data; ++ ++ if (!info) ++ { ++ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); ++ return -EINVAL; ++ } ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); ++#endif ++ ++ adc_clock = clk_get(NULL, "adc"); ++ if (!adc_clock) { ++ printk(KERN_ERR "failed to get adc clock source\n"); ++ return -ENOENT; ++ } ++ clk_enable(adc_clock); ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ printk(DEBUG_LVL "got and enabled clock\n"); ++#endif ++ ++ base_addr=ioremap(S3C2410_PA_ADC,0x20); ++ if (base_addr == NULL) { ++ printk(KERN_ERR "Failed to remap register block\n"); ++ return -ENOMEM; ++ } ++ ++ ++ /* Configure GPIOs */ ++ s3c2410_ts_connect(); ++ ++ if ((info->presc&0xff) > 0) ++ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ ++ base_addr+S3C2410_ADCCON); ++ else ++ writel(0,base_addr+S3C2410_ADCCON); ++ ++ ++ /* Initialise registers */ ++ if ((info->delay&0xffff) > 0) ++ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); ++ ++ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); ++ ++ /* Initialise input stuff */ ++ memset(&ts, 0, sizeof(struct s3c2410ts)); ++ input_dev = input_allocate_device(); ++ ++ if (!input_dev) { ++ printk(KERN_ERR "Unable to allocate the input device !!\n"); ++ return -ENOMEM; ++ } ++ ++ ts.dev = input_dev; ++ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); ++ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); ++ input_set_abs_params(ts.dev, ABS_X, 0x10, 0x3FF, 0, 0); ++ input_set_abs_params(ts.dev, ABS_Y, 0x10, 0x3FF, 0, 0); ++ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); ++ ++ ts.dev->private = &ts; ++ ts.dev->name = s3c2410ts_name; ++ ts.dev->id.bustype = BUS_RS232; ++ ts.dev->id.vendor = 0xDEAD; ++ ts.dev->id.product = 0xBEEF; ++ ts.dev->id.version = S3C2410TSVERSION; ++ ++ ts.shift = info->oversampling_shift; ++ ++ /* Get irqs */ ++ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, ++ "s3c2410_action", ts.dev)) { ++ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); ++ iounmap(base_addr); ++ return -EIO; ++ } ++ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, ++ "s3c2410_action", ts.dev)) { ++ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); ++ iounmap(base_addr); ++ return -EIO; ++ } ++ ++ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); ++ ++ /* All went ok, so register to the input system */ ++ input_register_device(ts.dev); ++ ++ return 0; ++} ++ ++static int s3c2410ts_remove(struct platform_device *pdev) ++{ ++ disable_irq(IRQ_ADC); ++ disable_irq(IRQ_TC); ++ free_irq(IRQ_TC,ts.dev); ++ free_irq(IRQ_ADC,ts.dev); ++ ++ if (adc_clock) { ++ clk_disable(adc_clock); ++ clk_put(adc_clock); ++ adc_clock = NULL; ++ } ++ ++ input_unregister_device(ts.dev); ++ iounmap(base_addr); ++ ++ return 0; ++} ++ ++static struct platform_driver s3c2410ts_driver = { ++ .driver = { ++ .name = "s3c2410-ts", ++ .owner = THIS_MODULE, ++ }, ++ .probe = s3c2410ts_probe, ++ .remove = s3c2410ts_remove, ++}; ++ ++ ++static int __init s3c2410ts_init(void) ++{ ++ return platform_driver_register(&s3c2410ts_driver); ++} ++ ++static void __exit s3c2410ts_exit(void) ++{ ++ platform_driver_unregister(&s3c2410ts_driver); ++} ++ ++module_init(s3c2410ts_init); ++module_exit(s3c2410ts_exit); ++ ++/* ++ Local variables: ++ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." ++ c-basic-offset: 8 ++ End: ++*/ +Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c ++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c +@@ -28,6 +28,7 @@ + #include <asm/irq.h> + + #include <asm/arch/regs-serial.h> ++#include <asm/arch/ts.h> + + #include "devs.h" + #include "cpu.h" +@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = + + EXPORT_SYMBOL(s3c_device_nand); + ++/* Touchscreen */ ++struct platform_device s3c_device_ts = { ++ .name = "s3c2410-ts", ++ .id = -1, ++}; ++ ++EXPORT_SYMBOL(s3c_device_ts); ++ ++static struct s3c2410_ts_mach_info s3c2410ts_info; ++ ++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) ++{ ++ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); ++ s3c_device_ts.dev.platform_data = &s3c2410ts_info; ++} ++EXPORT_SYMBOL(set_s3c2410ts_info); ++ + /* USB Device (Gadget)*/ + + static struct resource s3c_usbgadget_resource[] = { +Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h ++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h +@@ -41,6 +41,8 @@ extern struct platform_device s3c_device + extern struct platform_device s3c_device_timer3; + + extern struct platform_device s3c_device_usbgadget; ++extern struct platform_device s3c_device_ts; ++ + + /* s3c2440 specific devices */ + +Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c ++++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c +@@ -38,6 +38,7 @@ + + #include <asm/arch/idle.h> + #include <asm/arch/fb.h> ++#include <asm/arch/ts.h> + + #include "s3c2410.h" + #include "s3c2440.h" +@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ + &s3c_device_wdt, + &s3c_device_i2c, + &s3c_device_iis, ++ &s3c_device_ts, + }; + + static struct s3c24xx_board smdk2440_board __initdata = { +@@ -184,6 +186,13 @@ static struct s3c24xx_board smdk2440_boa + .devices_count = ARRAY_SIZE(smdk2440_devices) + }; + ++static struct s3c2410_ts_mach_info smdk2440_ts_cfg __initdata = { ++ .delay = 10000, ++ .presc = 49, ++ .oversampling_shift = 2, ++}; ++ ++ + static void __init smdk2440_map_io(void) + { + s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); +@@ -195,6 +204,7 @@ static void __init smdk2440_map_io(void) + static void __init smdk2440_machine_init(void) + { + s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); ++ set_s3c2410ts_info(&smdk2440_ts_cfg); + + smdk_machine_init(); + } +Index: linux-2.6.19/drivers/input/touchscreen/Kconfig +=================================================================== +--- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig ++++ linux-2.6.19/drivers/input/touchscreen/Kconfig +@@ -49,6 +49,25 @@ config TOUCHSCREEN_CORGI + To compile this driver as a module, choose M here: the + module will be called corgi_ts. + ++config TOUCHSCREEN_S3C2410 ++ tristate "Samsung S3C2410 touchscreen input driver" ++ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN ++ select SERIO ++ help ++ Say Y here if you have the s3c2410 touchscreen. ++ ++ If unsure, say N. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called s3c2410_ts. ++ ++config TOUCHSCREEN_S3C2410_DEBUG ++ boolean "Samsung S3C2410 touchscreen debug messages" ++ depends on TOUCHSCREEN_S3C2410 ++ help ++ Select this if you want debug messages ++ ++ + config TOUCHSCREEN_GUNZE + tristate "Gunze AHL-51S touchscreen" + select SERIO +Index: linux-2.6.19/drivers/input/touchscreen/Makefile +=================================================================== +--- linux-2.6.19.orig/drivers/input/touchscreen/Makefile ++++ linux-2.6.19/drivers/input/touchscreen/Makefile +@@ -15,3 +15,4 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 + obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o ++obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o +Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h +=================================================================== +--- /dev/null ++++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h +@@ -0,0 +1,28 @@ ++/* linux/include/asm/arch-s3c2410/ts.h ++ * ++ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * ++ * Changelog: ++ * 24-Mar-2005 RTP Created file ++ * 03-Aug-2005 RTP Renamed to ts.h ++ */ ++ ++#ifndef __ASM_ARM_TS_H ++#define __ASM_ARM_TS_H ++ ++struct s3c2410_ts_mach_info { ++ int delay; ++ int presc; ++ int oversampling_shift; ++}; ++ ++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); ++ ++#endif /* __ASM_ARM_TS_H */ ++ +Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h +=================================================================== +--- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h ++++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h +@@ -41,7 +41,7 @@ + #define S3C2410_ADCTSC_XP_SEN (1<<4) + #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) + #define S3C2410_ADCTSC_AUTO_PST (1<<2) +-#define S3C2410_ADCTSC_XY_PST (0x3<<0) ++#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) + + /* ADCDAT0 Bits */ + #define S3C2410_ADCDAT0_UPDOWN (1<<15) diff --git a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch new file mode 100644 index 0000000000..d03fd94017 --- /dev/null +++ b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch @@ -0,0 +1,529 @@ +Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c ++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c +@@ -26,6 +26,7 @@ + #include <asm/hardware.h> + #include <asm/io.h> + #include <asm/irq.h> ++#include <asm/arch/ts.h> + + #include <asm/arch/regs-serial.h> + +@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = + + EXPORT_SYMBOL(s3c_device_nand); + ++/* Touchscreen */ ++struct platform_device s3c_device_ts = { ++ .name = "s3c2410-ts", ++ .id = -1, ++}; ++ ++EXPORT_SYMBOL(s3c_device_ts); ++ ++static struct s3c2410_ts_mach_info s3c2410ts_info; ++ ++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) ++{ ++ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); ++ s3c_device_ts.dev.platform_data = &s3c2410ts_info; ++} ++EXPORT_SYMBOL(set_s3c2410ts_info); ++ + /* USB Device (Gadget)*/ + + static struct resource s3c_usbgadget_resource[] = { +Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h ++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h +@@ -41,6 +41,7 @@ extern struct platform_device s3c_device + extern struct platform_device s3c_device_timer3; + + extern struct platform_device s3c_device_usbgadget; ++extern struct platform_device s3c_device_ts; + + /* s3c2440 specific devices */ + +Index: linux-2.6.19/drivers/input/touchscreen/Kconfig +=================================================================== +--- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig ++++ linux-2.6.19/drivers/input/touchscreen/Kconfig +@@ -49,6 +49,24 @@ config TOUCHSCREEN_CORGI + To compile this driver as a module, choose M here: the + module will be called corgi_ts. + ++config TOUCHSCREEN_S3C2410 ++ tristate "Samsung S3C2410 touchscreen input driver" ++ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN ++ select SERIO ++ help ++ Say Y here if you have the s3c2410 touchscreen. ++ ++ If unsure, say N. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called s3c2410_ts. ++ ++config TOUCHSCREEN_S3C2410_DEBUG ++ boolean "Samsung S3C2410 touchscreen debug messages" ++ depends on TOUCHSCREEN_S3C2410 ++ help ++ Select this if you want debug messages ++ + config TOUCHSCREEN_GUNZE + tristate "Gunze AHL-51S touchscreen" + select SERIO +Index: linux-2.6.19/drivers/input/touchscreen/Makefile +=================================================================== +--- linux-2.6.19.orig/drivers/input/touchscreen/Makefile ++++ linux-2.6.19/drivers/input/touchscreen/Makefile +@@ -15,3 +15,5 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 + obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o ++obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o ++ +Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c +=================================================================== +--- /dev/null ++++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c +@@ -0,0 +1,350 @@ ++/* ++ * 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. ++ * ++ * This program 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 General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> ++ * iPAQ H1940 touchscreen support ++ * ++ * ChangeLog ++ * ++ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> ++ * - added clock (de-)allocation code ++ * ++ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org> ++ * - h1940_ -> s3c2410 (this driver is now also used on the n30 ++ * machines :P) ++ * - Debug messages are now enabled with the config option ++ * TOUCHSCREEN_S3C2410_DEBUG ++ * - Changed the way the value are read ++ * - Input subsystem should now work ++ * - Use ioremap and readl/writel ++ * ++ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org> ++ * - Make use of some undocumented features of the touchscreen ++ * controller ++ * ++ */ ++ ++#include <linux/errno.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/slab.h> ++#include <linux/input.h> ++#include <linux/init.h> ++#include <linux/serio.h> ++#include <linux/delay.h> ++#include <linux/platform_device.h> ++#include <linux/clk.h> ++#include <asm/io.h> ++#include <asm/irq.h> ++ ++#include <asm/arch/regs-adc.h> ++#include <asm/arch/regs-gpio.h> ++#include <asm/arch/ts.h> ++ ++/* For ts.dev.id.version */ ++#define S3C2410TSVERSION 0x0101 ++ ++#define WAIT4INT(x) (((x)<<8) | \ ++ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ ++ S3C2410_ADCTSC_XY_PST(3)) ++ ++#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ ++ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) ++ ++#define DEBUG_LVL KERN_DEBUG ++ ++MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>"); ++MODULE_DESCRIPTION("s3c2410 touchscreen driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * Definitions & global arrays. ++ */ ++ ++ ++static char *s3c2410ts_name = "s3c2410 TouchScreen"; ++ ++/* ++ * Per-touchscreen data. ++ */ ++ ++struct s3c2410ts { ++ struct input_dev *dev; ++ long xp; ++ long yp; ++ int count; ++ int shift; ++}; ++ ++static struct s3c2410ts ts; ++static void __iomem *base_addr; ++ ++static inline void s3c2410_ts_connect(void) ++{ ++ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); ++ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); ++} ++ ++static void touch_timer_fire(unsigned long data) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ int updown; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); ++ ++ if (updown) { ++ if (ts.count != 0) { ++ ts.xp >>= ts.shift; ++ ts.yp >>= ts.shift; ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ { ++ struct timeval tv; ++ do_gettimeofday(&tv); ++ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); ++ } ++#endif ++ ++ input_report_abs(ts.dev, ABS_X, ts.xp); ++ input_report_abs(ts.dev, ABS_Y, ts.yp); ++ ++ input_report_key(ts.dev, BTN_TOUCH, 1); ++ input_report_abs(ts.dev, ABS_PRESSURE, 1); ++ input_sync(ts.dev); ++ } ++ ++ ts.xp = 0; ++ ts.yp = 0; ++ ts.count = 0; ++ ++ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); ++ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); ++ } else { ++ ts.count = 0; ++ ++ input_report_key(ts.dev, BTN_TOUCH, 0); ++ input_report_abs(ts.dev, ABS_PRESSURE, 0); ++ input_sync(ts.dev); ++ ++ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); ++ } ++} ++ ++static struct timer_list touch_timer = ++ TIMER_INITIALIZER(touch_timer_fire, 0, 0); ++ ++static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ int updown; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); ++ ++ /* TODO we should never get an interrupt with updown set while ++ * the timer is running, but maybe we ought to verify that the ++ * timer isn't running anyways. */ ++ ++ if (updown) ++ touch_timer_fire(0); ++ ++ return IRQ_HANDLED; ++} ++ ++ ++static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ unsigned long data0; ++ unsigned long data1; ++ ++ data0 = readl(base_addr+S3C2410_ADCDAT0); ++ data1 = readl(base_addr+S3C2410_ADCDAT1); ++ ++ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; ++ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; ++ ts.count++; ++ ++ if (ts.count < (1<<ts.shift)) { ++ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); ++ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); ++ } else { ++ mod_timer(&touch_timer, jiffies+1); ++ writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static struct clk *adc_clock; ++ ++/* ++ * The functions for inserting/removing us as a module. ++ */ ++ ++static int __init s3c2410ts_probe(struct platform_device *pdev) ++{ ++ struct s3c2410_ts_mach_info *info; ++ struct input_dev *input_dev; ++ ++ info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data; ++ ++ if (!info) ++ { ++ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); ++ return -EINVAL; ++ } ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); ++#endif ++ ++ adc_clock = clk_get(NULL, "adc"); ++ if (!adc_clock) { ++ printk(KERN_ERR "failed to get adc clock source\n"); ++ return -ENOENT; ++ } ++ clk_enable(adc_clock); ++ ++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG ++ printk(DEBUG_LVL "got and enabled clock\n"); ++#endif ++ ++ base_addr=ioremap(S3C2410_PA_ADC,0x20); ++ if (base_addr == NULL) { ++ printk(KERN_ERR "Failed to remap register block\n"); ++ return -ENOMEM; ++ } ++ ++ ++ /* Configure GPIOs */ ++ s3c2410_ts_connect(); ++ ++ if ((info->presc&0xff) > 0) ++ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ ++ base_addr+S3C2410_ADCCON); ++ else ++ writel(0,base_addr+S3C2410_ADCCON); ++ ++ ++ /* Initialise registers */ ++ if ((info->delay&0xffff) > 0) ++ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); ++ ++ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); ++ ++ /* Initialise input stuff */ ++ memset(&ts, 0, sizeof(struct s3c2410ts)); ++ input_dev = input_allocate_device(); ++ ++ if (!input_dev) { ++ printk(KERN_ERR "Unable to allocate the input device !!\n"); ++ return -ENOMEM; ++ } ++ ++ ts.dev = input_dev; ++ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); ++ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); ++ input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0); ++ input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0); ++ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); ++ ++ ts.dev->private = &ts; ++ ts.dev->name = s3c2410ts_name; ++ ts.dev->id.bustype = BUS_RS232; ++ ts.dev->id.vendor = 0xDEAD; ++ ts.dev->id.product = 0xBEEF; ++ ts.dev->id.version = S3C2410TSVERSION; ++ ++ ts.shift = info->oversampling_shift; ++ ++ /* Get irqs */ ++ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, ++ "s3c2410_action", ts.dev)) { ++ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); ++ iounmap(base_addr); ++ return -EIO; ++ } ++ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, ++ "s3c2410_action", ts.dev)) { ++ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); ++ iounmap(base_addr); ++ return -EIO; ++ } ++ ++ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); ++ ++ /* All went ok, so register to the input system */ ++ input_register_device(ts.dev); ++ ++ return 0; ++} ++ ++static int s3c2410ts_remove(struct platform_device *pdev) ++{ ++ disable_irq(IRQ_ADC); ++ disable_irq(IRQ_TC); ++ free_irq(IRQ_TC,ts.dev); ++ free_irq(IRQ_ADC,ts.dev); ++ ++ if (adc_clock) { ++ clk_disable(adc_clock); ++ clk_put(adc_clock); ++ adc_clock = NULL; ++ } ++ ++ input_unregister_device(ts.dev); ++ iounmap(base_addr); ++ ++ return 0; ++} ++ ++static struct platform_driver s3c2410ts_driver = { ++ .driver = { ++ .name = "s3c2410-ts", ++ .owner = THIS_MODULE, ++ }, ++ .probe = s3c2410ts_probe, ++ .remove = s3c2410ts_remove, ++}; ++ ++ ++static int __init s3c2410ts_init(void) ++{ ++ return platform_driver_register(&s3c2410ts_driver); ++} ++ ++static void __exit s3c2410ts_exit(void) ++{ ++ platform_driver_unregister(&s3c2410ts_driver); ++} ++ ++module_init(s3c2410ts_init); ++module_exit(s3c2410ts_exit); ++ ++/* ++ Local variables: ++ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." ++ c-basic-offset: 8 ++ End: ++*/ +Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h +=================================================================== +--- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h ++++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h +@@ -41,7 +41,7 @@ + #define S3C2410_ADCTSC_XP_SEN (1<<4) + #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) + #define S3C2410_ADCTSC_AUTO_PST (1<<2) +-#define S3C2410_ADCTSC_XY_PST (0x3<<0) ++#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) + + /* ADCDAT0 Bits */ + #define S3C2410_ADCDAT0_UPDOWN (1<<15) +Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h +=================================================================== +--- /dev/null ++++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h +@@ -0,0 +1,28 @@ ++/* linux/include/asm/arch-s3c2410/ts.h ++ * ++ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * ++ * Changelog: ++ * 24-Mar-2005 RTP Created file ++ * 03-Aug-2005 RTP Renamed to ts.h ++ */ ++ ++#ifndef __ASM_ARM_TS_H ++#define __ASM_ARM_TS_H ++ ++struct s3c2410_ts_mach_info { ++ int delay; ++ int presc; ++ int oversampling_shift; ++}; ++ ++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); ++ ++#endif /* __ASM_ARM_TS_H */ ++ +Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c +=================================================================== +--- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c ++++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c +@@ -35,6 +35,7 @@ + #include <asm/arch/regs-serial.h> + #include <asm/arch/regs-gpio.h> + #include <asm/arch/regs-lcd.h> ++#include <asm/arch/ts.h> + + #include <asm/arch/idle.h> + #include <asm/arch/fb.h> +@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ + &s3c_device_wdt, + &s3c_device_i2c, + &s3c_device_iis, ++ &s3c_device_ts, + }; + + static struct s3c24xx_board smdk2440_board __initdata = { +@@ -184,6 +186,12 @@ static struct s3c24xx_board smdk2440_boa + .devices_count = ARRAY_SIZE(smdk2440_devices) + }; + ++static struct s3c2410_ts_mach_info qt2410_ts_cfg = { ++ .delay = 10000, ++ .presc = 49, ++ .oversampling_shift = 2, ++}; ++ + static void __init smdk2440_map_io(void) + { + s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); +@@ -195,6 +203,7 @@ static void __init smdk2440_map_io(void) + static void __init smdk2440_machine_init(void) + { + s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); ++ set_s3c2410ts_info(&qt2410_ts_cfg); + + smdk_machine_init(); + } diff --git a/packages/linux/linux-smdk2440_2.6.18.bb b/packages/linux/linux-smdk2440_2.6.19.bb index 701e08a7c4..039e412919 100644 --- a/packages/linux/linux-smdk2440_2.6.18.bb +++ b/packages/linux/linux-smdk2440_2.6.19.bb @@ -5,9 +5,10 @@ PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ ${GGSRC}smdk2440-cs89x0-r1.patch;patch=1 \ - ${GGSRC}smdk2440-touchscreen-r1.patch;patch=1 \ + file://smdk2440-touchscreen-r3.patch;patch=1 \ + http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.6.patch;patch=1 \ file://defconfig-smdk2440" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb index d949e13324..efbef7e937 100644 --- a/packages/linux/linux-storcenter_2.6.12.6.bb +++ b/packages/linux/linux-storcenter_2.6.12.6.bb @@ -13,7 +13,7 @@ PR = "r0" # QFMT_V2 # DNOTIFY? # MSDOS_FS, VFAT_FS, NTFS_FS? -# +# # USB_GADGET? - USB_GADGET_NET2280, USB_ETH, USB_ETH_RNDIS # # diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index cf67784af4..4bcdf9d81d 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -97,8 +97,8 @@ addtask unpack_extra after do_unpack before do_patch do_configure_prepend() { install -m 0644 ${WORKDIR}/linux.config ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - - sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile + + sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile sed -i -e "s,\-mcpu=,\-mtune=,g;" ${S}/arch/mips/Makefile } diff --git a/packages/linux/linux-x86-2.6.17.9/guinness/defconfig b/packages/linux/linux-x86-2.6.17.9/guinness/defconfig index 33d32d13be..b6213a557c 100644 --- a/packages/linux/linux-x86-2.6.17.9/guinness/defconfig +++ b/packages/linux/linux-x86-2.6.17.9/guinness/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17.9 -# Fri Oct 13 12:24:47 2006 +# Fri Oct 13 13:18:54 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1274,6 +1274,7 @@ CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set @@ -1294,6 +1295,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # Generic devices # CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_BUS=m CONFIG_SND_DUMMY=m @@ -1349,7 +1351,7 @@ CONFIG_SND_DUMMY=m CONFIG_SND_VIA82XX=m # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set +CONFIG_SND_YMFPCI=m # # USB devices diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index 381900e038..b001763710 100644 --- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -9,7 +9,7 @@ PXAV = "1" PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ - http://lorien.handhelds.org/ftp.arm.linux.org.uk/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \ + http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \ file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \ file://mnci-combined.patch;patch=1" diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb index 9852af6eca..09dc45f3bd 100644 --- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb @@ -3,6 +3,8 @@ DESCRIPTION = "Linux kernel for the MX21ADS" LICENSE = "GPL" PR = "r2" +PV = "2.6.18+2.6.19-rc6" + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb index 6d6ba6934a..c6f76fee6f 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb @@ -3,6 +3,8 @@ DESCRIPTION = "Linux kernel for the MX31ADS" LICENSE = "GPL" PR = "r3" +PV = "2.6.18+2.6.19-rc6" + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb index 126485b10f..8c04f75779 100644 --- a/packages/linux/netbook-pro-kernel_2.6.17.bb +++ b/packages/linux/netbook-pro-kernel_2.6.17.bb @@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage" do_configure() { rm -f ${S}/.config - + if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." fi - + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else + else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - + sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ '${WORKDIR}/defconfig' >>'${S}/.config' - + yes '' | oe_runmake oldconfig diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index cb33b2d172..547010996d 100644 --- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -53,7 +53,7 @@ module_conf_sa1100_ir = "alias irda0 sa1100_ir" do_configure() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." - + mem=${SIMPAD_MEM} rd=${SIMPAD_RD} mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index 24fc3bf149..d9324e9883 100644 --- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -60,9 +60,9 @@ export CMDLINE = '${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or "mtdparts=sa1100:5 module_conf_sa1100_ir = "alias irda0 sa1100_ir" -do_configure() { +do_configure() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." - + mem=${SIMPAD_MEM} rd=${SIMPAD_RD} mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index 85f65b519b..d4c93b7b6c 100644 --- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -39,7 +39,7 @@ SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.b # that patch allow to use buzzer as sound device but it removes alarms, # touchclicks etc so it is removed until be fixed -# file://sound-2.4.18r2.patch;patch=1 +# file://sound-2.4.18r2.patch;patch=1 # apply this when we have a patch that allows building with gcc 3.x: # SRC_URI_append = file://gcc-3.3.patch;patch=1 @@ -93,7 +93,7 @@ do_configure_prepend() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} + install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \ ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin } diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb index 81c24eda13..09c9c3cbad 100644 --- a/packages/linux/triton-kernel_2.6.11.bb +++ b/packages/linux/triton-kernel_2.6.11.bb @@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \ file://patch-2.6.11-mm2-karo9.bz2;patch=1 \ file://defconfig" - + S = "${WORKDIR}/linux-${PV}" COMPATIBLE_HOST = 'arm.*-linux' diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index afecd24561..a5ad6094ae 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -1155,7 +1155,7 @@ CONFIG_USB_SCANNER=m # CONFIG_USB_IBMCAM is not set # CONFIG_USB_KONICAWC is not set CONFIG_USB_OV511=m -# CONFIG_USB_PWC is not set +CONFIG_USB_PWC=m # CONFIG_USB_SE401 is not set # CONFIG_USB_STV680 is not set # CONFIG_USB_W9968CF is not set 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 e35ceb884b..6a22591795 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ COMPATIBLE_MACHINE = "nslu2" require nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" -PR = "r16" +PR = "r17" KERNEL_SUFFIX = "unslung" diff --git a/packages/lisa/lisa_0.2.2.bb b/packages/lisa/lisa_0.2.2.bb index 7758744161..a238b7e726 100644 --- a/packages/lisa/lisa_0.2.2.bb +++ b/packages/lisa/lisa_0.2.2.bb @@ -7,7 +7,7 @@ SRC_URI = "http://lisa-home.sourceforge.net/src/lisa-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://head-n.patch;patch=1" LICENSE = "GPL" -inherit autotools +inherit autotools do_configure_prepend () { set -e diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb index 9f5d8cd2b0..ada7c364e7 100644 --- a/packages/login-manager/login-manager.bb +++ b/packages/login-manager/login-manager.bb @@ -14,5 +14,5 @@ SRC_URI = "file://login-manager" do_install() { install -d ${D}/etc/init.d install -m 0755 ${WORKDIR}/login-manager ${D}/etc/init.d/ -} +} diff --git a/packages/lttng/lttng-control_0.12.bb b/packages/lttng/lttng-control_0.12.bb index 937aa4f309..0cfdc03ab5 100644 --- a/packages/lttng/lttng-control_0.12.bb +++ b/packages/lttng/lttng-control_0.12.bb @@ -12,4 +12,4 @@ inherit autotools export KERNELDIR="${STAGING_KERNEL_DIR}" -FILES_${PN} += "${datadir}/ltt-control/facilities/*"
\ No newline at end of file +FILES_${PN} += "${datadir}/ltt-control/facilities/*" diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb index c9a8a1384e..a01912da0f 100644 --- a/packages/lzo/lzo_1.08.bb +++ b/packages/lzo/lzo_1.08.bb @@ -7,7 +7,7 @@ PR = "r14" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz" -inherit autotools +inherit autotools EXTRA_OECONF = "--enable-shared" diff --git a/packages/madwifi/files/slugos-VFP-wackelf.patch b/packages/madwifi/files/slugos-VFP-wackelf.patch new file mode 100644 index 0000000000..a47eed79e7 --- /dev/null +++ b/packages/madwifi/files/slugos-VFP-wackelf.patch @@ -0,0 +1,20 @@ +--- madwifi.orig/ath_hal/Makefile 2007-01-03 23:44:10.000000000 -0600 ++++ madwifi/ath_hal/Makefile 2007-01-03 23:47:55.000000000 -0600 +@@ -81,12 +81,16 @@ + quiet_cmd_uudecode = UUDECODE $@ + cmd_uudecode = $(obj)/uudecode -o $@ $< + +-$(obj)/$(TARGET).hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode ++$(obj)/wackelf: $(HAL)/public/wackelf.c ++ $(HOSTCC) $(HOSTCFLAGS) -o $@ $< ++ ++$(obj)/$(TARGET).hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode $(obj)/wackelf + ifdef LINUX24 + $(Q)$(obj)/uudecode -o $@ $< + else + $(call if_changed,uudecode) + endif ++ $(Q)$(obj)/wackelf -fpa $@ + + install: + test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH) diff --git a/packages/madwifi/files/slugos-xscale-be-elf-copts.patch b/packages/madwifi/files/slugos-xscale-be-elf-copts.patch new file mode 100644 index 0000000000..1a08f3756e --- /dev/null +++ b/packages/madwifi/files/slugos-xscale-be-elf-copts.patch @@ -0,0 +1,10 @@ +--- madwifi.orig/hal/public/xscale-be-elf.inc 2007-01-03 23:42:09.000000000 -0600 ++++ madwifi/hal/public/xscale-be-elf.inc 2007-01-03 23:48:50.000000000 -0600 +@@ -77,5 +77,5 @@ + + LDOPTS= -EB + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ +- -mtune=xscale -mshort-load-bytes ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale diff --git a/packages/madwifi/files/slugos-xscale-le-elf-copts.patch b/packages/madwifi/files/slugos-xscale-le-elf-copts.patch new file mode 100644 index 0000000000..c4d9937220 --- /dev/null +++ b/packages/madwifi/files/slugos-xscale-le-elf-copts.patch @@ -0,0 +1,8 @@ +--- madwifi.orig/hal/public/xscale-le-elf.inc 2007-01-03 23:42:06.000000000 -0600 ++++ madwifi/hal/public/xscale-le-elf.inc 2007-01-03 23:48:50.000000000 -0600 +@@ -79,4 +79,4 @@ + LDOPTS= -EL + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN + COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ +- -mapcs-32 -mtune=xscale -mshort-load-bytes ++ -mtune=xscale diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index 74e976c34c..033fe7edd4 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -27,7 +27,7 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -d ${D}${sbindir} - cd tools; + cd tools; oe_runmake DESTDIR=${D} BINDIR=${sbindir} install install -m 755 athchans athctrl athkey ${D}${sbindir} } diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index f2e9a94299..6df39671db 100644 --- a/packages/madwifi/madwifi-modules_cvs.bb +++ b/packages/madwifi/madwifi-modules_cvs.bb @@ -28,7 +28,7 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -d ${D}/${sbindir} - cd tools; + cd tools; oe_runmake DESTDIR=${D} BINDIR=${sbindir} install install -m 755 athchans athctrl athkey ${D}/${sbindir} } diff --git a/packages/mono/.mtn2git_empty b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mono/.mtn2git_empty +++ b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch new file mode 100644 index 0000000000..f285540d06 --- /dev/null +++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch @@ -0,0 +1,12 @@ +Index: madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc +=================================================================== +--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-be-elf.inc ++++ madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc +@@ -77,5 +77,5 @@ AH_REGOPS_FUNC=1 + + LDOPTS= -EB + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ +- -mtune=xscale -mshort-load-bytes ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch new file mode 100644 index 0000000000..3224324699 --- /dev/null +++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch @@ -0,0 +1,10 @@ +Index: madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc +=================================================================== +--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-le-elf.inc ++++ madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc +@@ -79,4 +79,4 @@ AH_REGOPS_FUNC=1 + LDOPTS= -EL + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN + COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ +- -mapcs-32 -mtune=xscale -mshort-load-bytes ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 215d8c2885..c82b785eb1 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -11,6 +11,11 @@ SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ file://10-xscale-le-elf-copts.patch;patch=1 \ file://10-sh4-le-elf-copts.patch;patch=1" +SRC_URI_slugos = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ + file://slugos-xscale-be-elf-copts.patch;patch=1 \ + file://slugos-xscale-le-elf-copts.patch;patch=1 \ + file://slugos-VFP-wackelf.patch;patch=1" + S = "${WORKDIR}/${PN}-${PV}" inherit module-base diff --git a/packages/madwifi/madwifi-ng_r1844-20061208.bb b/packages/madwifi/madwifi-ng_r1844-20061208.bb new file mode 100644 index 0000000000..42d8ccafe4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r1844-20061208.bb @@ -0,0 +1,3 @@ +PR = "r0" + +require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r1871-20061229.bb b/packages/madwifi/madwifi-ng_r1871-20061229.bb new file mode 100644 index 0000000000..42d8ccafe4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r1871-20061229.bb @@ -0,0 +1,3 @@ +PR = "r0" + +require madwifi-ng_r.inc diff --git a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb index b06df25359..ceda4ff811 100644 --- a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb +++ b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GPS navigation/map display software" LICENSE = "GPL" -DEPENDS = "sqlite3 gtk+ gnome-vfs-dbus dbus bluez-libs" +DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs" RDEPENDS = "bluez-utils" PV = "1.2.4+svn${SRCDATE}" PR = "r1" diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb index 63d29b7ea1..c4ec3a50cf 100644 --- a/packages/maemo/hildon-lgpl_0.9.14-2.bb +++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb @@ -10,7 +10,7 @@ EXTRA_OECONF = "--enable-shared --disable-gtk-doc" inherit pkgconfig autotools -FILES_${PN} += " ${libdir}/outo/*.so" +FILES_${PN} += " ${libdir}/outo/*.so" do_install_prepend() { install -d ${D}/${libdir} diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/maemo/hildon-navigator_0.9.6-2.bb index 569733831b..6772dbd118 100644 --- a/packages/maemo/hildon-navigator_0.9.6-2.bb +++ b/packages/maemo/hildon-navigator_0.9.6-2.bb @@ -10,4 +10,4 @@ S = "${WORKDIR}/hildon-navigator-0.9.6" inherit autotools pkgconfig -#FILES_${PN} += " ${libdir}/outo/*.so" +#FILES_${PN} += " ${libdir}/outo/*.so" diff --git a/packages/maemo/lessertunjo_0.0.10.bb b/packages/maemo/lessertunjo_0.0.10.bb index c15ff958ac..e084d1e050 100644 --- a/packages/maemo/lessertunjo_0.0.10.bb +++ b/packages/maemo/lessertunjo_0.0.10.bb @@ -10,7 +10,7 @@ LDFLAGS += " -losso -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_LIBDIR} do_install() { - install -d ${D}${libdir} + install -d ${D}${libdir} install -m 755 *so.0.0.10 ${D}${libdir} } diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb index 7759e99e9c..9d5626d375 100644 --- a/packages/maemo/osso-gwconnect_0.70.1.bb +++ b/packages/maemo/osso-gwconnect_0.70.1.bb @@ -15,4 +15,4 @@ do_stage() { install -d ${STAGING_INCDIR} install -m 644 src/*.h ${STAGING_INCDIR} } - + diff --git a/packages/maemo/osso-gwobex_0.26.1.bb b/packages/maemo/osso-gwobex_0.26.1.bb index 374f589457..38011800c9 100644 --- a/packages/maemo/osso-gwobex_0.26.1.bb +++ b/packages/maemo/osso-gwobex_0.26.1.bb @@ -12,6 +12,6 @@ do_stage() { install -d ${STAGING_LIBDIR} install -m 644 src/*.h ${STAGING_INCDIR} install -m 755 src/.libs/*.so* ${STAGING_LIBDIR} -} +} diff --git a/packages/maemo/outo_0.1.1.bb b/packages/maemo/outo_0.1.1.bb index 79789f5105..7fe0343691 100644 --- a/packages/maemo/outo_0.1.1.bb +++ b/packages/maemo/outo_0.1.1.bb @@ -10,5 +10,5 @@ inherit pkgconfig autotools do_stage() { install -d ${STAGING_INCDIR} - install -m 644 include/outo.h ${STAGING_INCDIR} + install -m 644 include/outo.h ${STAGING_INCDIR} } diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index d56581dcde..5deee48af1 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/packages/maemo/xpext_1.0-5.bb @@ -9,7 +9,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV file://auxdir.patch;patch=1;pnum=0" S = "${WORKDIR}/xpext-1.0" -inherit autotools pkgconfig +inherit autotools pkgconfig do_configure_prepend () { cd ${S} diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index 7c54931b03..cb368f83cc 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/packages/maemo/xsp_1.0.0-8.bb @@ -8,7 +8,7 @@ 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" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { oe_runmake install prefix=${STAGING_DIR} \ diff --git a/packages/mailutils/mailutils_0.3.1.bb b/packages/mailutils/mailutils_0.3.1.bb index b863b03f62..97101913ff 100644 --- a/packages/mailutils/mailutils_0.3.1.bb +++ b/packages/mailutils/mailutils_0.3.1.bb @@ -5,6 +5,6 @@ LICENSE = "GPL LGPL" SRC_URI = "${GNU_MIRROR}/mailutils/mailutils-${PV}.tar.bz2 \ file://configure.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--disable-pam --without-guile" diff --git a/packages/mailx/mailx_8.1.2-0.20031014cvs.bb b/packages/mailx/mailx_8.1.2-0.20031014cvs.bb deleted file mode 100644 index 973f7ed121..0000000000 --- a/packages/mailx/mailx_8.1.2-0.20031014cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "console/network" -DEPENDS = "liblockfile" -DESCRIPTION = "mailx is the traditional command-line-mode \ -mail user agent." -LICENSE = "GPL" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1 \ - file://install.patch;patch=1" -S = "${WORKDIR}/mailx-${PV}.orig" - -CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/packages/makedevs/makedevs-native_1.0.0.bb b/packages/makedevs/makedevs-native_1.0.0.bb index 28544e12f2..004a71374d 100644 --- a/packages/makedevs/makedevs-native_1.0.0.bb +++ b/packages/makedevs/makedevs-native_1.0.0.bb @@ -1,6 +1,6 @@ SECTION = "base" require makedevs_${PV}.bb -inherit native +inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/makedevs-${PV}" diff --git a/packages/man/man_1.5m2.bb b/packages/man/man_1.5m2.bb deleted file mode 100644 index 10e0576b3c..0000000000 --- a/packages/man/man_1.5m2.bb +++ /dev/null @@ -1,31 +0,0 @@ -LICENSE = "GPL" -SECTION = "base" -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." -RDEPENDS_${PN} = "less groff" -PR = "r1" - -SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2" - -EXTRA_OEMAKE = "" -GS = "-DGREPSILENT=\"q\"" -DEFS = "-DUSG -DDO_COMPRESS ${GS}" - -do_configure() { - ./configure -d -confdir ${sysconfdir} -} - -do_compile() { - (cd src; ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ - makemsg.c -o makemsg) - oe_runmake 'DEFS=${DEFS}' -} - -do_install() { - oe_runmake 'PREFIX=${D}' install -} - -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*/ /lib/*.so*" diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb index b05c935513..e46b5b03cc 100644 --- a/packages/man/man_1.5p.bb +++ b/packages/man/man_1.5p.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "less groff" # Note: The default man.conf uses wrong names for GNU eqn and troff, # so we install our own -SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/man/man-${PV}.tar.bz2 \ file://man.conf" # Disable parallel make or it tries to link objects before they are built diff --git a/packages/maradns/maradns_1.0.39.bb b/packages/maradns/maradns_1.0.39.bb index d89bcf849d..a8bed6f05e 100644 --- a/packages/maradns/maradns_1.0.39.bb +++ b/packages/maradns/maradns_1.0.39.bb @@ -20,7 +20,7 @@ do_install() { sed -i -e "s:PREFIX/man:PREFIX/share/man:" \ -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \ build/install.locations - + oe_runmake \ TOPLEVEL=${S} \ BUILDDIR=${S}/build \ @@ -30,7 +30,7 @@ do_install() { MAN5=${D}${mandir}/man5 \ MAN8=${D}${mandir}/man8 \ install - + mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc rm -r ${D}${sysconfdir}/mararc/ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb index 080c97c18e..e758350dad 100644 --- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb +++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb @@ -3,10 +3,10 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm libmatchbox" SECTION = "x11/wm" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.bz2" S = "${WORKDIR}/mb-applet-input-manager-${PV}" inherit autotools pkgconfig FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" - + diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb index 69fe062178..4afdd426db 100644 --- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb +++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb @@ -16,4 +16,4 @@ S = "${WORKDIR}/mb-applet-input-manager-${PV}" inherit autotools pkgconfig FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" - + diff --git a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb index 11eb87636a..e95665041e 100644 --- a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb +++ b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/mb-applet-startup-monitor-${PV}" inherit autotools pkgconfig FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" - + diff --git a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb index 61b4756059..1f09c3e7dc 100644 --- a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb +++ b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb @@ -9,4 +9,4 @@ S = "${WORKDIR}/mb-applet-volume-${PV}" inherit autotools pkgconfig FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" - + diff --git a/packages/matchbox-common/matchbox-common_0.8.bb b/packages/matchbox-common/matchbox-common_0.8.bb index 74843a8873..d9cb3e3b87 100644 --- a/packages/matchbox-common/matchbox-common_0.8.bb +++ b/packages/matchbox-common/matchbox-common_0.8.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager common files" LICENSE = "GPL" DEPENDS = "libmatchbox" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-common/${PV}/matchbox-common-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-common/${PV}/matchbox-common-${PV}.tar.bz2" S = "${WORKDIR}/matchbox-common-${PV}" inherit autotools pkgconfig diff --git a/packages/matchbox-common/matchbox_0.9.1.bb b/packages/matchbox-common/matchbox_0.9.1.bb index 701c2bc302..203c705267 100644 --- a/packages/matchbox-common/matchbox_0.9.1.bb +++ b/packages/matchbox-common/matchbox_0.9.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Metapackage for Matchbox suite" LICENSE = "GPL" -DEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop" RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop" SECTION = "x11/wm" -PACKAGES= "${PN}" +PACKAGES = "${PN}" + ALLOW_EMPTY = "1" diff --git a/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb index 4337a139d2..be402f9e68 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2 \ file://enable-file-manager.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" diff --git a/packages/matchbox-desktop/matchbox-desktop_0.8.bb b/packages/matchbox-desktop/matchbox-desktop_0.8.bb index a0e5ab21fa..853f2cb4e9 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.8.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.8.bb @@ -3,7 +3,8 @@ PR = "r1" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/${PV}/matchbox-desktop-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2" + EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb index 9475edd55e..f6600bdbcd 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Matchbox panel" LICENSE = "GPL" 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 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ file://automake-lossage.patch;patch=1 \ file://more-automake-lossage.patch;patch=1 \ file://make-batteryapp-less-strict.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 f6bc0166fc..f15d16f39a 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb @@ -4,7 +4,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification v SECTION = "x11/wm" PR = "r1" -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ file://make-batteryapp-less-strict.patch;patch=1 \ file://wifi-location.patch;patch=1" S = "${WORKDIR}/matchbox-panel-${PV}" diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb index a65c017f9e..a02dff7c41 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" 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" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2" S = "${WORKDIR}/matchbox-panel-${PV}" inherit autotools pkgconfig gettext diff --git a/packages/matchbox-wm/matchbox-wm.inc b/packages/matchbox-wm/matchbox-wm.inc new file mode 100644 index 0000000000..55ed9f7131 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm.inc @@ -0,0 +1,3 @@ +DESCRIPTION = "Matchbox window manager" +SECTION = "x11/wm" +LICENSE = "GPL" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index 947f14e867..524dc1af36 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,10 +1,9 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + 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 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" S = "${WORKDIR}/matchbox-window-manager-${PV}" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index 947f14e867..524dc1af36 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,10 +1,9 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + 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 \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" S = "${WORKDIR}/matchbox-window-manager-${PV}" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index 304efc3c44..a46073b924 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,9 +1,8 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" -PR = "r1" +PR = "r1" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index 3a46009a4c..2363801cb2 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,9 +1,8 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" -PR = "r2" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 4fa9a6bd74..5ce26cbab2 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,10 +1,8 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + 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/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index 8c87711950..f135ffd426 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,11 +1,9 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" - SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index 4a9fa639f2..8387d957a1 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + 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_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index a933668692..e55f7a5c4e 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + 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_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb index 275a556d3c..c3e8186481 100644 --- a/packages/matchbox-wm/matchbox-wm_1.1.bb +++ b/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -1,12 +1,10 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" - SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 381be22652..91c66dae90 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "1.1+svn${SRCDATE}" diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb index b67d4deccf..9391263d00 100644 --- a/packages/mdev/mdev_1.2.1.bb +++ b/packages/mdev/mdev_1.2.1.bb @@ -27,7 +27,7 @@ INITSCRIPT_NAME_${PN} = "mdev.sh" INITSCRIPT_PARAMS_${PN} = "start 04 S ." CONFFILES_${PN} = "${sysconfdir}/mdev.conf" -inherit cml1 update-rc.d +inherit cml1 update-rc.d do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe @@ -48,14 +48,14 @@ do_compile () { do_install () { mv ${S}/busybox ${S}/mdev - + install -d ${D}${base_sbindir} install -m 0755 ${S}/mdev ${D}${base_sbindir}/ - + install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ install -m 0755 ${WORKDIR}/mdev.sh ${D}${sysconfdir}/init.d/ - + install -d ${D}${base_libdir}/mdev install -m 0755 ${WORKDIR}/firmware ${D}${base_libdir}/mdev/firmware } diff --git a/packages/mono/files/.mtn2git_empty b/packages/mediatomb/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mono/files/.mtn2git_empty +++ b/packages/mediatomb/.mtn2git_empty diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb new file mode 100644 index 0000000000..2515356b39 --- /dev/null +++ b/packages/mediatomb/mediatomb_svn.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" +HOMEPAGE = "http://mediatomb.org/" +LICENSE = "GPLv2" +DEPENDS = "sqlite3 libexif js zlib file taglib" +PV = "0.8+0.9pre1+svn${SRCDATE}-sqlite" +PR = "r1" + +SRC_URI = "svn://mediatomb.svn.sourceforge.net/svnroot/mediatomb/trunk;proto=https;module=mediatomb" + +S = "${WORKDIR}/mediatomb" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-mysql \ + --disable-rpl-malloc \ + --enable-sqlite3 \ + --enable-libjs \ + --enable-libmagic \ + --enable-taglib \ + --enable-libexif \ + --disable-largefile \ + --with-sqlite3-h=${STAGING_DIR}/${TARGET_SYS}/include \ + --with-sqlite3-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ + --with-magic-h=${STAGING_DIR}/${TARGET_SYS}/include \ + --with-magic-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ + --with-exif-h=${STAGING_DIR}/${TARGET_SYS}/include \ + --with-exif-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ + --with-zlib-h=${STAGING_DIR}/${TARGET_SYS}/include \ + --with-zlib-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ + --with-js-h=${STAGING_DIR}/${TARGET_SYS}/include/js \ + --with-js-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ + --with-taglib-cfg=${STAGING_DIR}/${BUILD_SYS}/bin/taglib-config" diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index 6e9a99144b..0e9f99684f 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/Mesa" LICENSE = "LGPL" -RDEPENDS = "expat" +RDEPENDS = "expat" 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 diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 4894e6659c..7bf8606418 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -51,7 +51,7 @@ EOF rm -r ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - + ${IPKG_HOST} update ${IPKG_HOST} -nodeps install ${HOST_INSTALL} diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 3f51644c68..7995ac3cb8 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -48,7 +48,7 @@ EOF rm -r ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - + ${IPKG_HOST} update ${IPKG_HOST} -nodeps install ${HOST_INSTALL} diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb index a84b3da580..9a1d928a77 100644 --- a/packages/meta/openprotium-packages.bb +++ b/packages/meta/openprotium-packages.bb @@ -5,13 +5,13 @@ DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter" HOMEPAGE = "http://www.openprotium.org" LICENSE = "MIT" -PR = "r1" +PR = "r2" CONFLICTS = "db3" PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages" EXCLUDE_FROM_WORLD = "1" INHIBIT_DEFAULT_DEPS = "1" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" # The list of packages to build for the slugos DISTRO. # KEEP IN ALPHABETICAL ORDER @@ -34,15 +34,29 @@ ALLOW_EMPTY = 1 # wakelan \ # wireless-tools \ # wpa-supplicant \ +# bluez-utils-nodbus \ +# libxml2 \ +# libdvb \ # madwifi-ng \ # motion \ +# ftpd-topfield \ +# eciadsl \ # netpbm \ # reiserfsprogs reiser4progs \ +# libgphoto2 \ +# python \ # mpd \ +# memtester \ +# puppy \ +# samba \ +# sane-backends \ +# vsftpd \ +# zd1211 \ -OPENIOM_PACKAGES = "\ +OPENPROTIUM_PACKAGES = "\ alsa-lib \ alsa-utils \ + apache2 \ audiofile \ aumix \ autoconf \ @@ -51,7 +65,6 @@ OPENIOM_PACKAGES = "\ bind \ binutils \ bison \ - bluez-utils-nodbus \ bridge-utils \ bzip2 \ ccxstream \ @@ -68,7 +81,6 @@ OPENIOM_PACKAGES = "\ dnsmasq \ e2fsprogs \ e2fsprogs-libs \ - eciadsl \ expat \ ez-ipupdate \ fetchmail \ @@ -76,7 +88,7 @@ OPENIOM_PACKAGES = "\ findutils \ flex \ flite \ - ftpd-topfield \ + gallery \ gawk \ gcc \ gdbm \ @@ -94,8 +106,6 @@ OPENIOM_PACKAGES = "\ lcdproc \ less \ libao \ - libdvb \ - libgphoto2 \ libid3tag \ liblockfile \ libmad \ @@ -107,7 +117,6 @@ OPENIOM_PACKAGES = "\ libupnp \ libusb \ libvorbis \ - libxml2 \ litestream \ lrzsz \ lsof \ @@ -117,11 +126,11 @@ OPENIOM_PACKAGES = "\ mailx \ make \ mdadm \ - memtester \ mgetty \ - miau \ + miau \ microcom \ minicom \ + modphp \ mt-daapd \ mtd-utils \ mutt \ @@ -145,15 +154,11 @@ OPENIOM_PACKAGES = "\ pkgconfig \ ppp \ procps \ - puppy \ pvrusb2-mci \ pwc \ - python \ quilt \ rng-tools \ rsync \ - samba \ - sane-backends \ sed \ setpwc \ setserial \ @@ -171,10 +176,8 @@ OPENIOM_PACKAGES = "\ util-linux \ vim \ vlan \ - vsftpd \ watchdog \ wget \ - zd1211 \ zip \ zlib \ " @@ -249,14 +252,14 @@ SLUGOS_OPTIONAL_PACKAGES = "\ # you can place these in the top level openembedded/conf/distro/openprotium.conf # file to fine-tune what's happening # -OPENIOM_EXTRA_PACKAGES ?= "" +OPENPROTIUM_EXTRA_PACKAGES ?= "" # The package-index at the end causes regeneration of the Packages.gz and # other control files. # openprotium-native \ DEPENDS = "\ openprotium-image \ - ${OPENIOM_PACKAGES} \ - ${OPENIOM_EXTRA_PACKAGES} \ + ${OPENPROTIUM_PACKAGES} \ + ${OPENPROTIUM_EXTRA_PACKAGES} \ package-index \ " diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb index e021f6776f..d9d4595c2e 100644 --- a/packages/mikmod/mikmod_3.2.2-beta1.bb +++ b/packages/mikmod/mikmod_3.2.2-beta1.bb @@ -7,6 +7,6 @@ LICENSE = "GPL" SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \ file://m4.patch;patch=1" -inherit autotools +inherit autotools LDFLAGS_append = " -lm" diff --git a/packages/miniinit/miniinit.bb b/packages/miniinit/miniinit.bb index ede7432c19..054c1bdae9 100644 --- a/packages/miniinit/miniinit.bb +++ b/packages/miniinit/miniinit.bb @@ -13,10 +13,10 @@ do_install() { ${D}${sysconfdir}/rcS.d \ ${D}${sysconfdir}/rc2.d \ ${D}${sysconfdir}/init.d - + install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d - + if [ ! -z "${SERIAL_CONSOLE}" ]; then echo "${SERIAL_CONSOLE}::askfirst:/bin/sh --login" >> ${D}${sysconfdir}/inittab fi diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb index be5b58e772..41b24400ac 100644 --- a/packages/minipredict/minipredict.bb +++ b/packages/minipredict/minipredict.bb @@ -13,7 +13,7 @@ SRC_URI = "http://handhelds.org/~paxanima/files/${PN}.tar.gz \ S = "${WORKDIR}/${PN}" -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} = "${bindir}/* ${datadir}/pixmaps ${datadir}/applications" do_install() { install -d ${D}/${bindir} diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb index c26a714ee7..e37cfd6562 100644 --- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb +++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb @@ -19,7 +19,7 @@ if test "x$D" != "x"; then exit 1 else FW_VERSION="v${PV}"; - + fw_upgrade() { IF=$1; echo "firmware upgrade on $IF" @@ -29,13 +29,13 @@ else if [[ `hostap_diag $IF | grep STAID | awk '{print $3}'` < $FW_VERSION ]]; then echo " - upgrading to version $FW_VERSION" prism2_srec -f $IF /tmp/sf010704.hex /tmp/pk010101.hex - else + else echo " - upgrade not necessary" fi fi echo "done". } - + for i in `ls /proc/net/hostap`; do fw_upgrade $i; done; diff --git a/packages/misc-binary-only/tda1004x-firmware.bb b/packages/misc-binary-only/tda1004x-firmware.bb index 317a980852..1e4d68532f 100644 --- a/packages/misc-binary-only/tda1004x-firmware.bb +++ b/packages/misc-binary-only/tda1004x-firmware.bb @@ -12,7 +12,7 @@ python do_unpack() { if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') bb.data.setVar('OVERRIDES', overrides+':'+bb.data.getVar('PN', localdata, 1), localdata) - + bb.data.update_data(localdata) src_uri = bb.data.getVar('SRC_URI', localdata) diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb index 8e6fc8c544..4ea93282de 100644 --- a/packages/modutils/modutils_2.4.27.bb +++ b/packages/modutils/modutils_2.4.27.bb @@ -66,7 +66,7 @@ pkg_postinst_modutils-depmod() { update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10 } -pkg_postinst_modutils-modinfo() { +pkg_postinst_modutils-modinfo() { #!/bin/sh update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10 } diff --git a/packages/mono/files/install-lossage.patch b/packages/mono/files/install-lossage.patch deleted file mode 100644 index 51fcdbbe85..0000000000 --- a/packages/mono/files/install-lossage.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mono-1.0/runtime/net_1_1/Makefile.am.old 2004-07-21 20:30:21.101405400 +0100 -+++ mono-1.0/runtime/net_1_1/Makefile.am 2004-07-21 20:31:05.209699920 +0100 -@@ -91,8 +91,8 @@ - @if test -n '$(gac_assemblies)'; then \ - for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ -- MONO_PATH=$(srcdir) \ -- $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ -+ cd $(srcdir); MONO_PATH=$(srcdir) \ -+ $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ - done; fi - - uninstall-local: diff --git a/packages/mono/files/libtool-lossage.patch b/packages/mono/files/libtool-lossage.patch deleted file mode 100644 index ac6f0f801f..0000000000 --- a/packages/mono/files/libtool-lossage.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- mono-1.0/libgc/acinclude.m4.old 2004-07-21 19:10:53.059455128 +0100 -+++ mono-1.0/libgc/acinclude.m4 2004-07-21 19:10:56.881874032 +0100 -@@ -46,4 +46,3 @@ - ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION) - ]) - --sinclude(libtool.m4) diff --git a/packages/mono/mono-native_1.0.bb b/packages/mono/mono-native_1.0.bb deleted file mode 100644 index c0e649faee..0000000000 --- a/packages/mono/mono-native_1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "unknown" -require mono_${PV}.bb -S = "${WORKDIR}/mono-${PV}" -DEPENDS = "glib-2.0-native" - -inherit native diff --git a/packages/mono/mono_1.0.bb b/packages/mono/mono_1.0.bb deleted file mode 100644 index 4aa543b3ef..0000000000 --- a/packages/mono/mono_1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "unknown" -DEPENDS = "mono-native glib-2.0" -LICENSE = "GPL LGPL X11" -SRC_URI = "http://mono2.ximian.com/archive/1.0/mono-1.0.tar.gz \ - file://libtool-lossage.patch;patch=1 \ - file://install-lossage.patch;patch=1" - -EXTRA_OECONF_arm = "--without-nptl" - -inherit autotools - -do_configure_prepend() { - rm -f libgc/libtool.m4 -} - -do_install() { - oe_runmake 'DESTDIR=${D}' mono_runtime='mint' install -} diff --git a/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch b/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch new file mode 100644 index 0000000000..60759fb727 --- /dev/null +++ b/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.ac 2006-12-18 12:14:47.000000000 +0100 ++++ monotone-0.31/configure.ac 2006-12-18 12:15:58.022227000 +0100 +@@ -73,7 +73,6 @@ + AC_CXX_STLPORT_HASHMAP + AC_CXX_TR1_UNORDERED_MAP + AC_CXX_TR1_UNORDERED_MAP_CONST_CORRECT +-AC_CXX_SYNC_WITH_STDIO_WORKS + AC_CXX_TEMPLATE_STATIC_CONST_BUG + + # Checks for typedefs and structures. diff --git a/packages/monotone/monotone-6_0.26.bb b/packages/monotone/monotone-6_0.26.bb index f879336c2a..2cb59c608f 100644 --- a/packages/monotone/monotone-6_0.26.bb +++ b/packages/monotone/monotone-6_0.26.bb @@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ --with-bundled-lua --with-bundled-sqlite" -inherit autotools +inherit autotools # Release 0.22 reveals bugs in g++ for thumb (g++ generates # relocations which the linker cannot represent) diff --git a/packages/monotone/monotone-6_0.27.bb b/packages/monotone/monotone-6_0.27.bb index f879336c2a..2cb59c608f 100644 --- a/packages/monotone/monotone-6_0.27.bb +++ b/packages/monotone/monotone-6_0.27.bb @@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ --with-bundled-lua --with-bundled-sqlite" -inherit autotools +inherit autotools # Release 0.22 reveals bugs in g++ for thumb (g++ generates # relocations which the linker cannot represent) diff --git a/packages/monotone/monotone-6_0.31.bb b/packages/monotone/monotone-6_0.31.bb new file mode 100644 index 0000000000..103c10d2e4 --- /dev/null +++ b/packages/monotone/monotone-6_0.31.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Monotone is a distributed Source Control System" +HOMEPAGE = "http://www.venge.net/monotone" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "boost" + +S = "${WORKDIR}/monotone-${PV}" +# no cross compile support - it tries to run the test program even with +# --enable_ipv6=yes +EXTRA_OECONF = "--disable-ipv6 \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-nls \ + --with-gnu-ld \ + --with-bundled-lua --with-bundled-sqlite" + +inherit autotools + +# Release 0.22 reveals bugs in g++ for thumb (g++ generates +# relocations which the linker cannot represent) +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +PR = "r0" + +SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ + file://txt2c-cross-post-0.22.patch;patch=1 \ + file://uclibc.database.hh.stdarg.patch;patch=1 \ + file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \ + " +do_compile_append() { + touch testsuite +} + +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. +do_install_append() { + install -d ${D}${tsd} + install -c -m 755 testsuite ${D}${tsd}/testsuite + cp -pPR tests ${D}${tsd}/tests +} + +PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" +tsd = "/home/monotone/${PN}" +FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules" + diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb index dcd22b3dd9..a5f8c73094 100644 --- a/packages/mozilla/minimo_0.016+cvs.bb +++ b/packages/mozilla/minimo_0.016+cvs.bb @@ -19,7 +19,7 @@ SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${ file://mozconfig file://minimo \ file://minimo.desktop file://minimo.png" -inherit autotools +inherit autotools S = "${WORKDIR}/mozilla" diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb index 59b9965aa4..10383b1caa 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -15,5 +15,5 @@ do_stage() { includedir=${STAGING_INCDIR} \ libdir=${STAGING_LIBDIR} \ datadir=${STAGING_DATADIR} \ - infodir=${STAGING_DIR}/${HOST_SYS}/info + infodir=${STAGING_DIR}/${HOST_SYS}/info } diff --git a/packages/mplayer/files/disable-executable-stack-test.patch b/packages/mplayer/files/disable-executable-stack-test.patch new file mode 100644 index 0000000000..dc8871b6ae --- /dev/null +++ b/packages/mplayer/files/disable-executable-stack-test.patch @@ -0,0 +1,30 @@ +Removes the "noexecstack" check from configure so we don't end up with: + + mplayer: error while loading shared libraries: libmad.so.0: cannot + enable executable stack as shared object requires: Error 14 + +at runtime. + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- MPlayer-1.0pre8/configure~disable-executable-stack-test ++++ MPlayer-1.0pre8/configure +@@ -7193,15 +7193,7 @@ + fi + + echocheck "compiler support for noexecstack" +-cat > $TMPC <<EOF +-int main(void) { return 0; } +-EOF +-if cc_check -Wl,-z,noexecstack ; then +- _ld_extra="-Wl,-z,noexecstack $_ld_extra" +- echores "yes" +-else +- echores "no" +-fi ++echores "no" + + echocheck "ftello()" + # if we don't have ftello use the osdep/ compatibility module diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb index 3506b1c7a7..4b9570abbf 100644 --- a/packages/mplayer/mplayer-common.bb +++ b/packages/mplayer/mplayer-common.bb @@ -25,6 +25,6 @@ FILES_${PN} = "/usr/etc/mplayer" do_install() { install -d "${D}/usr/etc/mplayer" - + install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer" } diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 41b50bd656..3a63413d7a 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -19,6 +19,14 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1" +# This is required for the collie machine only as all stacks in that +# machine seem to be set to executable by the toolchain. If someone +# discovers this is more general than please make this more general +# ie. for all armv4 machines. +SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1" +PACKAGE_ARCH_mplayer_collie = "collie" +PACKAGE_ARCH_mencoder_collie = "collie" + RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PR = "r4" diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb index 527629d413..17fa33ac1c 100644 --- a/packages/mysql/mysql_4.1.18.bb +++ b/packages/mysql/mysql_4.1.18.bb @@ -53,9 +53,9 @@ pkg_postinst_mysql-server () { test -d /usr/bin || mkdir -p /usr/bin test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname chmod go+rw /var/run - + mysql_install_db - + } pkg_postrm_mysql-server () { diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb index 8c19adfd0d..9fa59ada55 100644 --- a/packages/nail/nail_11.21.bb +++ b/packages/nail/nail_11.21.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \ file://nail.spec.diff;patch=1" - + S = "${WORKDIR}/nail-11.21/" inherit autotools diff --git a/packages/nautilus/nautilus_2.6.1.bb b/packages/nautilus/nautilus_2.6.1.bb index 0e40c86675..66139eeb2f 100644 --- a/packages/nautilus/nautilus_2.6.1.bb +++ b/packages/nautilus/nautilus_2.6.1.bb @@ -32,14 +32,14 @@ nextdir="${STAGING_INCDIR}/nautilus/libnautilus-extension" do_stage() { install -d ${libndir} ${nextdir} - for file in ${libnheaders}; do + for file in ${libnheaders}; do install -m 0644 libnautilus/$file ${libndir}/$file - done + done for file in ${nextheaders}; do install -m 0644 libnautilus-extension/$file ${nextdir}/$file done - + oe_libinstall -C libnautilus-adapter libnautilus-adapter ${STAGING_LIBDIR} oe_libinstall -C libnautilus-extension libnautilus-extension ${STAGING_LIBDIR} oe_libinstall -C libnautilus-private libnautilus-private ${STAGING_LIBDIR} diff --git a/packages/ncftp/ncftp/fixes.patch b/packages/ncftp/ncftp/fixes.patch new file mode 100644 index 0000000000..557ff5c54f --- /dev/null +++ b/packages/ncftp/ncftp/fixes.patch @@ -0,0 +1,22 @@ +Index: ncftp-3.2.0/ncftp/cmds.c +=================================================================== +--- ncftp-3.2.0.orig/ncftp/cmds.c 2006-12-18 22:21:34.000000000 +0100 ++++ ncftp-3.2.0/ncftp/cmds.c 2006-12-18 22:23:55.000000000 +0100 +@@ -945,7 +945,7 @@ + --n; + memset(&st, 0, sizeof(st)); + } +- (void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size); ++ (void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size); + if (AddLine(&modstrs, modstr) == NULL) { + DisposeLineListContents(&modstrs); + DisposeLineListContents(&rfiles); +@@ -1006,7 +1006,7 @@ + (void) fprintf(stdout, "\n"); + continue; + } +- (void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size); ++ (void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size); + if (strcmp(modstr, mlp->line) == 0) { + Trace(-1, "No changes made to \"%s\".\n", rpath); + continue; diff --git a/packages/ncftp/ncftp/make.patch b/packages/ncftp/ncftp/make.patch new file mode 100644 index 0000000000..78bc523ee7 --- /dev/null +++ b/packages/ncftp/ncftp/make.patch @@ -0,0 +1,39 @@ +Index: ncftp-3.2.0/Strn/Makefile.in +=================================================================== +--- ncftp-3.2.0.orig/Strn/Makefile.in 2006-12-18 22:11:48.000000000 +0100 ++++ ncftp-3.2.0/Strn/Makefile.in 2006-12-18 22:12:48.000000000 +0100 +@@ -42,7 +42,7 @@ + static: $(LIB) + + $(LIB): $(OBJS) +- @CCDV@@AR@ r $(LIB) $(OBJS) ++ @CCDV@$(AR) r $(LIB) $(OBJS) + -@chmod 644 "$(LIB)" + -@RANLIB@ "$(LIB)" + -@echo "$(VER)" > Strn.version +Index: ncftp-3.2.0/sio/Makefile.in +=================================================================== +--- ncftp-3.2.0.orig/sio/Makefile.in 2006-12-18 22:15:39.000000000 +0100 ++++ ncftp-3.2.0/sio/Makefile.in 2006-12-18 22:15:56.000000000 +0100 +@@ -51,7 +51,7 @@ + + $(LIB): $(OBJS) + -@/bin/rm -f $(LIB) +- @CCDV@@AR@ r $(LIB) $(OBJS) ++ @CCDV@$(AR) r $(LIB) $(OBJS) + -@RANLIB@ $(LIB) + -@echo $(VER) > sio.version + -@chmod a+r $(LIB) sio.h usio.h +Index: ncftp-3.2.0/libncftp/Makefile.in +=================================================================== +--- ncftp-3.2.0.orig/libncftp/Makefile.in 2006-12-18 22:16:42.000000000 +0100 ++++ ncftp-3.2.0/libncftp/Makefile.in 2006-12-18 22:16:56.000000000 +0100 +@@ -49,7 +49,7 @@ + + $(LIB): $(OBJS) + -@/bin/rm -f $(LIB) +- @CCDV@@AR@ r $(LIB) $(OBJS) ++ @CCDV@$(AR) r $(LIB) $(OBJS) + -@chmod 644 $(LIB) + -@@RANLIB@ $(LIB) + @/bin/ls -l $(LIB) diff --git a/packages/ncftp/ncftp_3.1.7.bb b/packages/ncftp/ncftp_3.1.7.bb deleted file mode 100644 index 99673d8a97..0000000000 --- a/packages/ncftp/ncftp_3.1.7.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A sophisticated console ftp client" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "ClarifiedArtistic" -SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \ - file://acinclude.m4" - -inherit autotools - -do_configure_prepend () { - install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4 -} - -do_install () { - install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} - oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ - 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ - install -} diff --git a/packages/ncftp/ncftp_3.1.9.bb b/packages/ncftp/ncftp_3.1.9.bb deleted file mode 100644 index 690c7eb613..0000000000 --- a/packages/ncftp/ncftp_3.1.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A sophisticated console ftp client" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "ClarifiedArtistic" -PR = "r1" - -SRC_URI = "ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-${PV}-src.tar.gz \ - file://acinclude.m4" - -inherit autotools - -do_configure_prepend () { - install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4 -} - -INHIBIT_AUTO_STAGE = "1" - -do_install () { - install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} - oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ - 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ - install -} diff --git a/packages/ncftp/ncftp_3.1.8.bb b/packages/ncftp/ncftp_3.2.0.bb index 99673d8a97..ce87846ba0 100644 --- a/packages/ncftp/ncftp_3.1.8.bb +++ b/packages/ncftp/ncftp_3.2.0.bb @@ -2,8 +2,11 @@ DESCRIPTION = "A sophisticated console ftp client" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ClarifiedArtistic" + SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \ - file://acinclude.m4" + file://acinclude.m4 \ + file://make.patch;patch=1 \ + file://fixes.patch;patch=1" inherit autotools @@ -11,6 +14,8 @@ do_configure_prepend () { install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4 } +INHIBIT_AUTO_STAGE = "1" + do_install () { install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb index f0330ed149..302e7eed52 100644 --- a/packages/net-snmp/net-snmp_5.1.2.bb +++ b/packages/net-snmp/net-snmp_5.1.2.bb @@ -9,11 +9,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://init \ file://snmpd.conf \ file://snmptrapd.conf" - + inherit autotools PARALLEL_MAKE = "" -EXTRA_OECONF = "--enable-shared --disable-manuals" +EXTRA_OECONF = "--enable-shared --disable-manuals" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" do_configure() { diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb index 2d986666f1..dde0d17d57 100644 --- a/packages/netpbm/netpbm_10.28.bb +++ b/packages/netpbm/netpbm_10.28.bb @@ -2,14 +2,14 @@ # data) processing package derived from PBMPlus # # For documentation see: http://netpbm.sourceforge.net/doc/ -LICENSE = "GPL MIT Artistic" +LICENSE = "GPL MIT Artistic" # NOTE: individual command line utilities are covered by different # licenses. The compiled and linked command line utilties are # subject to the licenses of the libraries they use too - including # libpng libz, IJG, and libtiff licenses -SECTION = "console/utils" -DEPENDS = "jpeg zlib libpng tiff install-native flex-native" +SECTION = "console/utils" +DEPENDS = "jpeg zlib libpng tiff install-native flex-native" RDEPENDS = "perl\ perl-module-cwd\ perl-module-english\ @@ -25,7 +25,7 @@ RDEPENDS = "perl\ RDEPENDS += "perl-module-exporter-heavy" RDEPENDS += "perl-module-file-spec-unix" -HOMEPAGE = "http://netpbm.sourceforge.net" +HOMEPAGE = "http://netpbm.sourceforge.net" DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ conversion of images between a variety of different formats. There\ are over 220 separate tools in the package including converters for\ @@ -35,11 +35,11 @@ PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ file://ppmtojpeg.patch;patch=42 \ file://Makefile.config \ - file://oeendiangen" + file://oeendiangen" EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}" -do_configure() { +do_configure() { install -c -m 644 ../Makefile.config . # The following stops the host endiangen program being run and uses # the target endian.h header instead. @@ -50,8 +50,8 @@ do_compile() { # need all to get the static library too oe_runmake all default } - -do_install() { + +do_install() { # netpbm makes its own installation package, which must then be # installed to form the dummy installation for ipkg rm -rf ${WORKDIR}/netpbm-package @@ -90,4 +90,4 @@ do_install() { exit 1;; esac done -} +} diff --git a/packages/netperf/netperf_2.4.2.bb b/packages/netperf/netperf_2.4.2.bb index e10d1c0094..8a6dbdba0f 100644 --- a/packages/netperf/netperf_2.4.2.bb +++ b/packages/netperf/netperf_2.4.2.bb @@ -22,7 +22,7 @@ do_install() { install -m 4755 src/netperf ${D}${bindir} install -m 4755 src/netserver ${D}${sbindir} install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf - + # man install -d ${D}${mandir}/man1/ install -m 0644 doc/netserver.man ${D}${mandir}/man1/netserver.1 @@ -31,7 +31,7 @@ do_install() { # move scripts to examples directory install -d ${D}${docdir}/netperf/examples install -m 0644 doc/examples/*_script ${D}${docdir}/netperf/examples/ - + # docs .. install -m 0644 COPYING ${D}${docdir}/netperf install -m 0644 Release_Notes ${D}${docdir}/netperf diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb index 1161f641ee..2e3c0c3fbe 100644 --- a/packages/network-suspend-scripts/network-suspend-scripts.bb +++ b/packages/network-suspend-scripts/network-suspend-scripts.bb @@ -5,7 +5,7 @@ PV = "1.1" PR = "r2" SRC_URI = "file://ifupdown \ - file://usbnet" + file://usbnet" do_install() { install -d ${D}${sysconfdir}/apm/scripts.d diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 08b630737a..2072bd3157 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -58,7 +58,7 @@ do_install() { install -m 0755 ${S}/utils/rquotad/rquotad ${D}${sbindir}/rquotad install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd - + install -d ${D}${mandir}/man8 install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8 install -m 0644 ${S}/utils/lockd/lockd.man ${D}${mandir}/man8/lockd.8 diff --git a/packages/ngrep/ngrep_1.42.bb b/packages/ngrep/ngrep_1.42.bb index 7ff9aa1e6b..6f90965860 100644 --- a/packages/ngrep/ngrep_1.42.bb +++ b/packages/ngrep/ngrep_1.42.bb @@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ngrep/ngrep-${PV}.tar.bz2 \ EXTRA_OECONF = "--with-restart --enable-pcre --with-pcap-includes=${STAGING_INCDIR}" EXTRA_OEMAKE = "INCLUDES=${S}" -inherit autotools +inherit autotools CFLAGS += '-DDROPPRIVS_ONLY_ROOT=0 -DDROPPRIVS_USER=\""nobody\"" -DUSE_DROPPRIVS=1' diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index 1cdf1f207e..be37fb9c28 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -16,7 +16,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" require nis.inc -SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" # 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 1ab9aa8ea4..07d8aee5bb 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -7,7 +7,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" require nis.inc -SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" # ypserv needs a database package, gdbm is currently the # only candidate diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb index 62bb86e7ba..478474645b 100644 --- a/packages/nmap/nmap_3.81.bb +++ b/packages/nmap/nmap_3.81.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--with-pcap=linux \ EXTRA_OEMAKE = "STRIPPROG=${STRIP}" CXXFLAGS_append = " -fpermissive" -# Ugly hack follows -- their configure.ac doesnt match their configure .. +# Ugly hack follows -- their configure.ac doesnt match their configure .. # doesnt include a check for the length type in recvfrom, so we hack it here CPPFLAGS_append = " -Drecvfrom6_t=socklen_t" diff --git a/packages/nmixer/nmixer_2.0.bb b/packages/nmixer/nmixer_2.0.bb index f6fe47fc8f..88b38e06e5 100644 --- a/packages/nmixer/nmixer_2.0.bb +++ b/packages/nmixer/nmixer_2.0.bb @@ -5,7 +5,7 @@ DEPENDS = "ncurses" LICENSE = "GPL" SRC_URI = "http://www.stack.nl/~brama/projects/nmixer/src/nmixer-${PV}.tar.gz" -inherit autotools +inherit autotools do_compile() { oe_runmake nmixer INCLUDES=-I${STAGING_INCDIR}/ diff --git a/packages/nonworking/freenx/nxproxy_1.5.0-9.bb b/packages/nonworking/freenx/nxproxy_1.5.0-9.bb index 59585d15b2..08b189d142 100644 --- a/packages/nonworking/freenx/nxproxy_1.5.0-9.bb +++ b/packages/nonworking/freenx/nxproxy_1.5.0-9.bb @@ -1,4 +1,4 @@ -LICENSE = "" +LICENSE = "" DEPENDS = "nxcomp" diff --git a/packages/nonworking/greader/greader_0.61.bb b/packages/nonworking/greader/greader_0.61.bb index d43609de26..2df07f5361 100644 --- a/packages/nonworking/greader/greader_0.61.bb +++ b/packages/nonworking/greader/greader_0.61.bb @@ -7,4 +7,4 @@ SECTION = "gpe/applications" SRC_URI = "http://handhelds.org/~gberenfield/${PN}_${PV}_src.tgz \ file://greader.patch;patch=1;pnum=1" -S = "${WORKDIR}/greader/" +S = "${WORKDIR}/greader/" diff --git a/packages/nonworking/libconfig++/libconfig++_0.7a.bb b/packages/nonworking/libconfig++/libconfig++_0.7a.bb index 5666c8d8ef..05e977d12b 100644 --- a/packages/nonworking/libconfig++/libconfig++_0.7a.bb +++ b/packages/nonworking/libconfig++/libconfig++_0.7a.bb @@ -6,7 +6,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/config-plus/config-plus-${PV}.tar.gz" S = "${WORKDIR}/config-plus-${PV}" - + inherit autotools diff --git a/packages/nonworking/pixdev/pixdev-stable_0.1.bb b/packages/nonworking/pixdev/pixdev-stable_0.1.bb index f182036cb8..4c7eccf659 100644 --- a/packages/nonworking/pixdev/pixdev-stable_0.1.bb +++ b/packages/nonworking/pixdev/pixdev-stable_0.1.bb @@ -16,13 +16,13 @@ do_compile() { if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi - oe_runmake $CONFIG + oe_runmake $CONFIG oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all } do_install() { install -d ${D}/${prefix}/pixil - + oe_runmake "TARGET_CROSS=${TARGET_PREFIX}" INSTALL_DIR=${D}/${prefix}/pixil \ DEST_DIR=/${prefix}/pixil install } diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb index c4971a24ea..8fc7a0868b 100644 --- a/packages/nonworking/xfree86/xfree86_4.3.0.bb +++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb @@ -13,24 +13,24 @@ S=${WORKDIR}/xc do_configure() { - rm -fr ${WORKDIR}/XXcompiler; - mkdir -p ${WORKDIR}/XXcompiler - pushd ./ - cd ${CROSS_DIR}/bin/; + rm -fr ${WORKDIR}/XXcompiler; + mkdir -p ${WORKDIR}/XXcompiler + pushd ./ + cd ${CROSS_DIR}/bin/; echo ${CC} - for i in *; do - echo " linking ${WORKDIR}/XXcompiler/$i to $i"; - ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ; + for i in *; do + echo " linking ${WORKDIR}/XXcompiler/$i to $i"; + ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ; toolname=`echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//` echo `echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//` - echo " linking ${WORKDIR}/XXcompiler/$i to $toolname"; - ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname; - done + echo " linking ${WORKDIR}/XXcompiler/$i to $toolname"; + ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname; + done echo "#!/bin/sh" > ${WORKDIR}/XXcompiler/cc echo "${CC} \$*" >> ${WORKDIR}/XXcompiler/cc chmod 755 ${WORKDIR}/XXcompiler/cc popd ; - + } @@ -40,7 +40,7 @@ EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \ EXTRA_LDOPTIONS='${LDFLAGS}' \ EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' " do_compile() { - sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; + sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; oe_runmake World diff --git a/packages/nonworking/zaurss/zaurss_0.4.2.bb b/packages/nonworking/zaurss/zaurss_0.4.2.bb index 4ed8897050..7898eb437c 100644 --- a/packages/nonworking/zaurss/zaurss_0.4.2.bb +++ b/packages/nonworking/zaurss/zaurss_0.4.2.bb @@ -26,5 +26,5 @@ do_configure_prepend() { do_install () { install -d ${D}/${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/*.png ${D}/${palmtopdir}/pics/ - + } diff --git a/packages/nsqld/nsqld_0.5.3.bb b/packages/nsqld/nsqld_0.5.3.bb deleted file mode 100644 index 3bf0aa4169..0000000000 --- a/packages/nsqld/nsqld_0.5.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Server process for syncing" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "${GPE_MIRROR}/nsqld-${PV}.tar.gz" - -S = "${WORKDIR}/nsqld-${PV}" - -inherit autotools pkgconfig - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/nsqld-${PV}/nsqld ${D}${bindir} -} diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb index 4af70599f0..dc2d203690 100644 --- a/packages/ntp/ntp_4.1.2.bb +++ b/packages/ntp/ntp_4.1.2.bb @@ -39,10 +39,10 @@ else test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs echo "30 * * * * ${bindir}/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root fi - + # Dunno why this is here, ask the "nylon" guys :) test -x /etc/init.d/busybox-cron && update-rc.d -s busybox-cron defaults - + update-rc.d -s ntpdate defaults 30 fi } diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index 26d3664518..0ce7e10ac9 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -38,7 +38,7 @@ FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate" #perl scripts, and installing perl is an enormous overhead for a user who only #needs ntpq #RDEPENDS_ntp-bin = perl -# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms +# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) RDEPENDS_${PN} = "${PN}-tickadj" FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace" diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb index 679f666b46..de755824c9 100644 --- a/packages/ntp/ntp_4.2.2p3.bb +++ b/packages/ntp/ntp_4.2.2p3.bb @@ -31,7 +31,7 @@ PACKAGES += "ntpdate ntp-bin ntp-tickadj ntp-utils" # This should use rc.update FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate" -# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms +# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) RDEPENDS_${PN} = "${PN}-tickadj" FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace" diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb index d3af648813..373f30f571 100644 --- a/packages/nunome/nunome_1.0.1.bb +++ b/packages/nunome/nunome_1.0.1.bb @@ -13,6 +13,7 @@ S = "${WORKDIR}/nunome" inherit opie EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}" +OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" PARALLEL_MAKE = "" do_configure_prepend() { diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb index dd83eec800..a255025e0c 100644 --- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb +++ b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb @@ -32,13 +32,13 @@ do_install() { for dir in bin include lib share ; do 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 -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 - + } do_stage() { diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb index 42b928f38a..0005b24d39 100644 --- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb +++ b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb @@ -24,7 +24,7 @@ do_compile() { KERNEL_VERSION=${KERNEL_VERSION} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ ${MAKE_TARGETS} - + cd ../nvsound/main oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ KERNEL_SRC=${STAGING_KERNEL_DIR} \ @@ -37,7 +37,7 @@ do_compile() { do_configure() { rm -f ${S}/nvnet/makefile rm -f ${S}/nvsound/main/makefile - + if [ "${KERNEL_PATCHLEVEL}" != "4" ] ; then ln -sf Makefile.kbuild ${S}/nvnet/Makefile ln -sf Makefile.kbuild ${S}/nvsound/main/Makefile @@ -61,7 +61,7 @@ do_install() { for dir in usr/bin nvsound/lib ; do cp -pPR ${S}/$dir ${D}/usr/ done - + } do_stage() { diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index 2840bc8adb..650bd1a8e8 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -28,13 +28,13 @@ else update-rc.d -s emergency-ip defaults 98 update-rc.d -s flash-backup start 38 S . stop 38 0 6 . update-rc.d -s dummydate start 50 S . stop 50 0 6 . - + if ! grep -q flash-backup /etc/cron/crontabs/root; then echo "adding flash-backup crontab" test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs echo "0 * * * * /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root fi - + if ! grep -q reset-wlan /etc/cron/crontabs/root; then echo "adding reset-wlan crontab" test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index 883a5961f1..ef79bc6d31 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -33,9 +33,9 @@ else /etc/init.d/busybox-cron reload if [ ! -e /etc/httpd.conf ]; then echo "A:*" > /etc/httpd.conf - fi + fi update-rc.d -s busybox-httpd defaults - + if ! grep -q "/var/lib/rrd/" /etc/nylon/backup.list; then echo "adding to backup list" echo "/var/lib/rrd/" >> /etc/nylon/backup.list diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb index aa100bab36..23e360bbae 100644 --- a/packages/obexftp/obexftp_0.20.bb +++ b/packages/obexftp/obexftp_0.20.bb @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ file://i-hate-libtool.patch;patch=1 \ file://m4.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs" @@ -18,4 +18,4 @@ PARALLEL_MAKE = "" do_stage() { autotools_stage_all } - + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb index 4ce6871947..4ed4c6dd0c 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb @@ -14,7 +14,7 @@ SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libX11-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig do_compile() { ( diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb index 00fbc92db6..c1b47cb77a 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb @@ -10,7 +10,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libXau-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb index 8ed426fec3..2571939b54 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb @@ -10,7 +10,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ S = "${WORKDIR}/libXcursor-${PV}" FILES_${PN} += "${libdir}/libXcursor.so" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb index f7ea15ea0c..d5f01f4e36 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/libXdmcp-${PV}" SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb index 3e1ff1ab05..d5343fd798 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb @@ -11,7 +11,7 @@ PROVIDES = "xext" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" S = "${WORKDIR}/Xext" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all } diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb index 14174bf9a1..58643ed470 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb @@ -8,7 +8,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libXfixes-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb index d6b51ca55d..f0116aca4b 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb @@ -14,7 +14,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ ${datadir}/aclocal ${bindir} ${sbindir} -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb index 58d2ab33f6..9da41bfe75 100644 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb @@ -8,7 +8,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libXrender-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/python/python-2.4.3/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.3/.mtn2git_empty +++ b/packages/obsolete/tasks/.mtn2git_empty diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb index e737e31608..e737e31608 100644 --- a/packages/tasks/task-bootstrap-unionroot.bb +++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb diff --git a/packages/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb index d84f331102..d84f331102 100644 --- a/packages/tasks/task-bootstrap.bb +++ b/packages/obsolete/tasks/task-bootstrap.bb diff --git a/packages/tasks/task-bootstrap.inc b/packages/obsolete/tasks/task-bootstrap.inc index 073da7055f..073da7055f 100644 --- a/packages/tasks/task-bootstrap.inc +++ b/packages/obsolete/tasks/task-bootstrap.inc diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave_2.1.71.bb index 462eccbf65..22c4d69393 100644 --- a/packages/octave/octave_2.1.71.bb +++ b/packages/octave/octave_2.1.71.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ It provides a convenient command line interface for solving linear and nonlinear problems numerically, \ and for performing other numerical experiments using a language that is mostly compatible with Matlab. \ -It may also be used as a batch-oriented language." +It may also be used as a batch-oriented language." SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "readline ncurses" diff --git a/packages/openjade/openjade_1.3.2.bb b/packages/openjade/openjade_1.3.2.bb index b99a6dee10..7b1272ba4f 100644 --- a/packages/openjade/openjade_1.3.2.bb +++ b/packages/openjade/openjade_1.3.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ file://configure.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ --enable-splibdir=${STAGING_LIBDIR}" diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 26ab365b0e..3523cfce33 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -9,6 +9,6 @@ inherit autotools SRC_URI = "svn://svn.berlios.de/;module=${PN}" S = "${WORKDIR}/${PN}/trunk" -EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" +EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty b/packages/openprotium-init/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty +++ b/packages/openprotium-init/.mtn2git_empty diff --git a/packages/stunnel/stunnel-4.05/.mtn2git_empty b/packages/openprotium-init/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/stunnel/stunnel-4.05/.mtn2git_empty +++ b/packages/openprotium-init/files/.mtn2git_empty diff --git a/packages/tslib/tslib-maemo/.mtn2git_empty b/packages/openprotium-init/files/boot/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib-maemo/.mtn2git_empty +++ b/packages/openprotium-init/files/boot/.mtn2git_empty diff --git a/packages/openprotium-init/files/boot/disk b/packages/openprotium-init/files/boot/disk new file mode 100644 index 0000000000..b4bbaf1f3c --- /dev/null +++ b/packages/openprotium-init/files/boot/disk @@ -0,0 +1,67 @@ +#!/bin/sh +# boot from the hard disk partition "$1" (which +# must be given) using options from the rest of +# the command line. +# +# Use the standard init path (see /etc/init.d/rcS) +export PATH=/sbin:/bin:/usr/sbin:/usr/bin +# +# Load the helper functions +. /etc/default/functions +. /etc/default/modulefunctions +# +# +if test -n "$1" +then + device="$1" + shift + # proc is needed for UUID mount and module load + mount -t proc proc /proc + # load USB & SCSI storage modules (/proc required!) + if [ "$(machine)" != "storcenter" ]; then + echo "boot: loading modules required for disk boot" + loaddiskmods + # waiting for disk (FIXME) + sleep=6 + test "$sleep" -gt 0 && sleep "$sleep" + else + # make the device links so turnup can use short disk names. + # probably only necessary on devfs based systems. + /etc/init.d/devices start + scc -l redflash -f auto + fi + # + # fire the boot + echo "boot: rootfs: mount $* $device [$UUID]" + # + # Mount read-write because before exec'ing init + # If a UUID is given (in the environment) this + # is used in preference to the device, but if + # the UUID mount fails a standard device mount + # is attempted. + if test -n "$UUID" && + mount "$@" -U "$UUID" /mnt || + mount "$@" "$device" /mnt + then + # checkmount checks for sh, chroot, init + # and /mnt (i.e. /mnt/mnt in this case) + if checkmount /mnt + then + # if mounted, then move /dev to the new root + mount --bind /dev /mnt/dev + # pivot to /initrd if available, else /mnt + cd / + if test -d /mnt/initrd + then + swivel mnt initrd + else + swivel mnt mnt + fi + # swivel failed + fi + # Failure: unmount the partition + umount /mnt + fi +fi +# fallback - use the flash boot +exec /boot/flash diff --git a/packages/openprotium-init/files/boot/flash b/packages/openprotium-init/files/boot/flash new file mode 100644 index 0000000000..40f64c9701 --- /dev/null +++ b/packages/openprotium-init/files/boot/flash @@ -0,0 +1,13 @@ +#!/bin/sh +# boot from the current (flash) root partition +# nothing need be done apart from setting the +# system LED status correctly +. /etc/default/functions +scc -l redflash -f auto +test -x /sbin/init && exec /sbin/init +# fallback if /sbin/init has been deleted (bad!) +scc -l red +exec <>/dev/console >&0 2>&0 +test -x /sbin/sulogin && exec /sbin/sulogin +test -x /bin/sh && exec /bin/sh +exit 1 diff --git a/packages/openprotium-init/files/boot/network b/packages/openprotium-init/files/boot/network new file mode 100644 index 0000000000..599250e744 --- /dev/null +++ b/packages/openprotium-init/files/boot/network @@ -0,0 +1,16 @@ +#!/bin/sh +# bring up the network before boot, used to allow +# netconsole logging and NFS boot. This runs out +# of flash, but that's ok because the script doesn't +# leave any process running. +# +# NOTE: /etc/default/functions defines ifup as a shell +# function! +. /etc/default/functions +# +# Now all the information for booting should be in the configuration +# file. Config the loopback and network interfaces. +ifconfig lo 127.0.0.1 up +iface="$(config iface)" +test -n "$iface" && ifup "$iface" +# exit code is true only if the interface config has succeeded diff --git a/packages/openprotium-init/files/boot/nfs b/packages/openprotium-init/files/boot/nfs new file mode 100644 index 0000000000..7cfce66cbb --- /dev/null +++ b/packages/openprotium-init/files/boot/nfs @@ -0,0 +1,19 @@ +#!/bin/sh +# boot from the nfs partition "$1" (which +# must be given) using options from the rest of +# the command line. +# +# Use the standard init path (see /etc/init.d/rcS) +export PATH=/sbin:/bin:/usr/sbin:/usr/bin +# +. /etc/default/functions +scc -l redflash -f auto +# +if /boot/network +then + # network is up and running, the NFS mount will + # now succeed (possibly), use /boot/disk + exec /boot/disk "$@" +fi +# fallback - use the flash boot +exec /boot/flash diff --git a/packages/openprotium-init/files/boot/udhcpc.script b/packages/openprotium-init/files/boot/udhcpc.script new file mode 100644 index 0000000000..3f437e3143 --- /dev/null +++ b/packages/openprotium-init/files/boot/udhcpc.script @@ -0,0 +1,17 @@ +#!/bin/sh +# executed by udhcpc to do the real work of configuring an interface +# writes the result (if any) to file descriptor 9 +case "$1" in +deconfig) # ignored + :;; +renew|bound) # this gives the real information + test -n "$ip" && { + echo "ip='$ip'" + echo "subnet='$subnet'" + echo "broadcast='$broadcast'" + echo "router='$router'" + } >&9;; +leasefail) # ignore - probably no dhcp server + :;; +*) echo "udhcpc: $*: command not recognised" >&2;; +esac diff --git a/packages/openprotium-init/files/conffiles b/packages/openprotium-init/files/conffiles new file mode 100644 index 0000000000..e1408a3227 --- /dev/null +++ b/packages/openprotium-init/files/conffiles @@ -0,0 +1,55 @@ +# conffiles +# Known SlugOS configuration files. These files are preserved on +# a flash upgrade. Other configuration files, found from: +# +# /usr/lib/ipkg/*.conffiles +# /etc/*.conf +# +# are preserved too with an operation of 'diff' if they have been +# changed since /etc/.configured was created. +# +# Lines starting with # are comments, other lines have +# two fields: +# +# operation file +# +# The file must *NOT* have a leading / +# +# operation may be: +# ignore Do not preserve this file +# preserve Preserve this file unconditionally +# diff Compare file with the new version, ask if different +# +preserve linuxrc +preserve etc/.configured +preserve etc/TZ +diff etc/default/conffiles +diff etc/default/devpts +preserve etc/default/rcS +preserve etc/default/sysconf +diff etc/default/usbd +preserve etc/defaultdomain +preserve etc/dropbear/dropbear_dss_host_key +preserve etc/dropbear/dropbear_rsa_host_key +preserve etc/ssh/ssh_host_dsa_key +preserve etc/ssh/ssh_host_dsa_key.pub +preserve etc/ssh/ssh_host_rsa_key +preserve etc/ssh/ssh_host_rsa_key.pub +preserve etc/fstab +preserve etc/group +preserve etc/gshadow +preserve etc/hostname +preserve etc/hosts +preserve etc/localtime +ignore etc/modules +ignore etc/modules.conf +preserve etc/motd +preserve etc/network/interfaces +preserve etc/ntp.drift +preserve etc/passwd +preserve etc/profile +preserve etc/resolv.conf +preserve etc/shadow +preserve etc/syslog.conf +preserve etc/timezone +preserve root/.ssh/authorized_keys diff --git a/packages/openprotium-init/files/functions b/packages/openprotium-init/files/functions new file mode 100644 index 0000000000..25832cf3f9 --- /dev/null +++ b/packages/openprotium-init/files/functions @@ -0,0 +1,413 @@ +#!/bin/sh +# . this file to load the following utility functions +# +# hardware +# the 'Hardware' string from cpuinfo, or, if not found +# try a little harder with 'machine' +hardware(){ + local hdw + hdw=`sed -n 's!^Hardware *: !!p' /proc/cpuinfo` + test -n "$hdw" || { + hdw=`sed -n 's!^machine *: !!p' /proc/cpuinfo` + } + echo $hdw +} +# +# machine +# outputs an identifier of the current machine - i.e. the board +# slugos is running on. +machine(){ + case "$(hardware)" in + *Coyote*) echo coyote;; + *IXDPG425*) echo ixdpg425;; + *WRV54G*) echo wrv54g;; + *IXDP425*) echo ixdp425;; + *IXDP465*) echo ixdp465;; + *IXCDP1100*) echo ixcdp1100*;; + *Avila*) echo avila;; + *Loft*) echo loft;; + *NAS?100d*) echo nas100d;; + *NSLU2*) echo nslu2;; + *StorCenter*) echo storcenter;; + *) echo unknown;; + esac +} +# +# single_user_ok +# if the machine is capable of single user interaction return +# true, else return false. The result of this function is +# preempted by setting SULOGIN to 'yes' or 'ok' in /etc/default/rcS +single_user_ok() { + # list known good machines in the 'case' + test "$SULOGIN" = yes -o "$SULOGIN" = ok || + case "$(machine)" in + ixdp*|avila|loft) + test "$SULOGIN" != never;; + *) return 1;; + esac +} +# +# load_functions "source" +# load the functions in '/sbin/source' - relies on /sbin/source being +# a shell script and having support for this function. +load_functions(){ + test -n "$1" -a -x "/sbin/$1" && . "/sbin/$1" || { + echo "$0: /sbin/$1: script not found" >&2 + return 1 + } +} +# +# mtdev "name" +# return (output) the character device name for flash parition "name" +# /proc/mtd has the general form: +# dev: size erasesize name +# mtd5: 00020000 00020000 "FIS directory" +# use this rather than hard-wiring the device because the partition +# table can change - looking in /proc/mtd is more reliable. +mtdev(){ + if test $(machine) = storcenter ; then + sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtd/\1!p' /proc/mtd + else + sed -n 's!^\(mtd[0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/\1!p' /proc/mtd + fi +} +# +# mtblockdev "name" +# as mtdev but output the name of the block (not character) device +mtblockdev(){ + if test "$(machine)" = storcenter ; then + sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock/\1!p' /proc/mtd + else + sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock\1!p' /proc/mtd + fi +} +# +# mtsize "name" +# the size of the partition as a hexadecimal value (with 0x at the front) +mtsize(){ + sed -n 's!^mtd[0-9][0-9]*: \([^ ]*\)[^"]*"'"$1"'"$!0x\1!p' /proc/mtd +} +# +# sysvalmatch "section" "name" 'pattern' "configuration file" +# sysvalof "section" "name" "configuration file" +# sysval "section" "name" +# outputs the value of the SysConf variable 'name' from section 'section', +# if there are multiple definitions only the last is output +# NOTE: these functions should only be used internally, add entries to 'config' +# below if necessary. This is because 'config' does the defaulting. +sysvalmatch(){ + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^'"$2"'=\('"$3"'\)$/\1/p' "$4" | sed -n '$p' +} +sysvalof(){ + sysvalmatch "$1" "$2" '.*' "$3" +} +sysval(){ + test -r "$config_root/etc/default/sysconf" && + sysvalof "$1" "$2" "$config_root/etc/default/sysconf" +} +# +# syssection "section" +# outputs all the values from the given section changed to the format "name value" +# (i.e. the '=' is dropped). +syssection(){ + test -r "$config_root/etc/default/sysconf" && + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^\([^=]*\)=\(.*\)$/\1 \2/p' "$config_root/etc/default/sysconf" +} +# +# config "value" +# convenience callers for specific values to avoid mis-typing in scripts +# NOTE: this function does the defaulting, 'sysval' does not! +# config_root: if set this will override the root where config/sysval +# looks for /etc/default/sysconf +config(){ + local mac + mac="$(test -r /proc/net/maclist && + sed -n '/^[0-9A-Za-z][0-9A-Za-z]:[0-9A-Za-z][0-9A-Za-z]:[0-9A-Za-z][0-9A-Za-z]:[0-9A-Za-z][0-9A-Za-z]:[0-9A-Za-z][0-9A-Za-z]:[0-9A-Za-z][0-9A-Za-z]$/p' /proc/net/maclist | + sed -n 1p)" + # + case "$1" in + mac) test -n "$mac" && echo "$mac";; + host) if test -n "$(sysval network disk_server_name)" + then + sysval network disk_server_name + elif test -n "$(sysval network default_server_name)" + then + sysval network default_server_name + elif test -n "$mac" + then + echo "$mac" | sed -n 's/^\(..\):\(..\):\(..\):\(..\):\(..\):\(..\)$/slug\1\2\3\4\5\6/p' + else + # because we want the name to remain constant: + echo "openprotium" + fi;; + domain) sysval network w_d_name;; + iface) if test -n "$(sysval network lan_interface)" + then + sysval network lan_interface + else + echo eth0 + fi;; + ip) if test -n "$(sysval network ip_addr)" + then + sysval network ip_addr + else + echo 192.168.1.16 + fi;; + netmask)sysval network netmask;; + gateway)sysval network gateway;; + dns) sysval network dns_server1;; + dns2) sysval network dns_server2;; + dns3) sysval network dns_server3;; + boot) if test -n "$(sysval network bootproto)" + then + sysval network bootproto + else + echo dhcp + fi;; + valid) test -r "$config_root/etc/default/sysconf" -a -n "$mac";; + *) return 1;; + esac +} +# +# checkif "iface" +# Validate an interface name by making sure that it exists +# in /proc/net/dev (and is not lo). The listing outputs the +# interface followed by a :, the check function looks for +# something of the form '$1[a-zA-Z0-9]*:' and outputs the +# part preceding the ':' +checkif(){ + sed -n '/^[ ]*lo:/d;s/^[ ]*\('"$1"'[a-zA-Z0-9]*\):.*$/\1/p;tE;d;:E;q' /proc/net/dev +} +# +# checkmount "mountpoint" +# tests an already mounted mountpoint to see whether to attempt to +# boot with this as root. Returns success if it appears ok. +checkmount(){ + # basic test for init (the kernel will try to load this) + # but require a shell in bin/sh too + test \( -d "$1/mnt" \) -a \ + \( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \ + \( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \ + -x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \ + \( -x "$1/sbin/init" -o -h "$1/sbin/init" -o \ + -x "$1/etc/init" -o -h "$1/etc/init" -o \ + -x "$1/bin/init" -o -h "$1/bin/init" \) +} +# +# swivel "new root" "old root" +# NOTE: the arguments must be paths relative to /, bad things +# will happen if the arguments themselves start with / +# Pivot to a new root. This does all the fancy pivot_root stuff +# including closing streams and does a umount /proc - it doesn't +# matter if this fails (failure codes are ignored), but if /proc +# was mounted it must be restored by the caller on return. +# Normally this function never returns! +# On return 0,1,2 are connected to /dev/console - this may not +# have been true before! +swivel(){ + cd "$1" + exec <&- >&- 2>&- + # This is just-in-case the called mounted /proc and was + # unable to close it because of the streams + umount /proc 2>/dev/null + if pivot_root . "$2" + then + # everything must move out of the old root, this process + # is $2/bin/sh so it must die, IO is redirected + # just in case - typically it will be to a device so it + # won't hold the old root open. + # the exec here is the first point at which the old root + # is unused - before the exec regardless of the close of + # 0,1,2 above ash still has *this* shell script open! + # (it's on fd 10). + # init closes all file descriptors, there's no point + # supplying it with fds. + # NOTE: this used to use $2/usr/sbin/chroot, however on + # linux / is already . when the command is executed + # therefore it is essential to use the local (new root) + # chroot to ensure it gets the correct shared libraries. + if test -x usr/sbin/chroot -o -h usr/sbin/chroot + then + chroot=usr/sbin/chroot + elif test -x sbin/chroot -o -h sbin/chroot + then + chroot=sbin/chroot + else + chroot=chroot + fi + # + exec "$chroot" . bin/sh -c "\ + test -x sbin/init && exec sbin/init + test -x etc/init && exec etc/init + test -x bin/init && exec bin/init + mount -t sysfs sysfs /mnt + umount /mnt + sync;sync;sync + exit 1" + fi + # + # recovery - must restore the old root + cd "$2" + sbin/pivot_root . "$1" + # cd is back to $1 - either pivot_root doesn't change it and the + # chroot above was not executed, or pivot_root does change it and + # has just changed it back! + exec <>/dev/console >&0 2>&0 +} +# +# ifup "interface" +# bring that interface up with the configured ip and other +# information +ifup(){ + local ip hostname router subnet iface HOSTNAME NETMASK BROADCAST + + iface="$1" + ip="$(config ip)" + hostname="$(config host)" + router="$(config gateway)" + broadcast= + + if test -n "$ip" + then + # only if an ip was specified + subnet="$(config netmask)" + else + ip=192.168.1.77 + fi + + # First try udhcpc - note that the /boot/udhcpc.script + # simply records the values returned and the udhcpc + # is not left running so this will only work for + # the lease length time! + ifconfig "$iface" up + if test "$(config boot)" != static + then + test -n "$hostname" && HOSTNAME="-H $hostname" + # The script writes the required shell variable assignments + # to file descriptor 9 + eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + fi + + test -n "$broadcast" && BROADCAST="broadcast $broadcast" + test -n "$subnet" && NETMASK="netmask $subnet" + + if ifconfig "$iface" "$ip" $NETMASK $BROADCAST + then + for route in $router + do + route add default gw "$route" dev "$iface" + done + return 0 + else + ifconfig "$iface" down + return 1 + fi +} +# +# ifdown "interface" +# take the interface down +ifdown(){ + ifconfig "$1" down +} +# +# mountflash "flash device" "flash root directory" {mount options} +# Finds and mounts the flash file system on the given directory +mountflash(){ + local ffsdev ffsdir + + ffsdev="$1" + test -n "$ffsdev" -a -b "$ffsdev" || { + echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 + return 1 + } + shift + + ffsdir="$1" + test -n "$ffsdir" -a -d "$ffsdir" || { + echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2 + return 1 + } + shift + + mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || { + echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2 + return 1 + } + return 0 +} +# +# umountflash [-r] "flash device" +# unmount any instance of the given flash device, if -r is specified a mount on +# root is an error, otherwise a mount on root is ignored (and remains). +umountflash(){ + local rootok ffsno ffsdev + rootok=1 + case "$1" in + -r) rootok= + shift;; + esac + # + # The argument is ffsdev + ffsdev="$1" + ffsno="$(devio "<<$ffsdev" prd)" + test -n "$ffsno" -a "$ffsno" -ge 0 || { + echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 + return 1 + } + # + # Make sure that Flashdisk isn't mounted on / + if test -z "$rootok" -a "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno" + then + echo "$0: $ffsdev is mounted on /, use turnup ram" >&2 + return 1 + fi + # + # The function is currently always used interactively, so output + echo "$0: umounting any existing mount of $ffsdev" >&2 + # + # check each mount point, do this last first because otherwise nested + # mounts of ffsdev cannot be umounted. + ffs_umount() { + local device mp type options stuff + + read device mp type options stuff + test -z "$device" && return 0 + + # handle following entries first + ffs_umount || return 1 + + # handle this entry, since this is currently only used for unmounting + # the flash root partition we know a file which must exist... + case "$mp/$type" in + //jffs2);; # skip / + */jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || + umount "$mp" || { + echo "$0: $mp: unable to umount $ffsdev" >&2 + return 1 + };; + esac + + return 0 + } + # + ffs_umount </proc/mounts || { + echo "$0: umount $ffsdev from all mount points then re-run $0" >&2 + return 1 + } + + return 0 +} + +# +# uuid_by_partition +# output a list of partitions and their UUIDs +uuid_by_partition() { + blkid -c /dev/null -s UUID | sed -n 's/^\([^:]*\): .*UUID="\([^"]*\)".*$/\1 \2/p' +} + +# +# partition_of uuid +# return the partition corresponding to the UUID +partition_of() { + sed -n 's/^\([^ ]*\) '"$1"'$/\1/p' +} diff --git a/packages/tslib/tslib-maemo/nokia770/.mtn2git_empty b/packages/openprotium-init/files/initscripts/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib-maemo/nokia770/.mtn2git_empty +++ b/packages/openprotium-init/files/initscripts/.mtn2git_empty diff --git a/packages/openprotium-init/files/initscripts/fixfstab b/packages/openprotium-init/files/initscripts/fixfstab new file mode 100644 index 0000000000..67116a12fd --- /dev/null +++ b/packages/openprotium-init/files/initscripts/fixfstab @@ -0,0 +1,91 @@ +#!/bin/sh +# validate /etc/fstab against the current UUID list in +# /etc/uuid_by_partition +# +. /etc/default/functions +pfile=/etc/uuid_by_partition + +# +# use debug to find out what is going on +test "$1" = start -o "$1" = debug || exit 0 + +# +# obtain the current list of parititions with UUIDs +newlist="$(uuid_by_partition)" + +if test -r "$pfile" +then + # read the old list + oldlist="$(cat "$pfile")" + # + # if it hasn't changed nothing need be done + test "$newlist" = "$oldlist" && exit 0 + # + # it has changed, but this only matters if + # a previously existing uuid has moved, build + # a list of old device vs new device for every + # uuid which has moved + changedlist="$( + { echo "$oldlist" + echo "$newlist" + } | awk 'device[$2] == ""{device[$2] = $1} + device[$2] != $1{print device[$2], $1}')" + + if test -n "$changedlist" + then + # at least one partition has moved, scan the + # current fstab to see if it has a reference + # to this partition + changedfstab="$( + { echo "$changedlist" + echo '#fstab' + cat /etc/fstab + } | awk 'BEGIN{list=1} + list==1 && $0=="#fstab"{list=0; continue} + list==1{new[$1] = $2; continue} + new[$1] != ""{print $1, new[$1]}')" + + # if this list is not empty edit the fstab + if test -n "$changedfstab" + then + rm -f /tmp/fstab.$$ + # if the edit fails then do not overwrite the old + # partition list - just exit with an error + { echo "$changedlist" + echo '#fstab' + cat /etc/fstab + } | awk 'BEGIN{list=1} + list==1 && $0=="#fstab"{list=0; continue} + list==1{new[$1] = $2; continue} + new[$1] != ""{$1 = new[$1]} + {print}' >/tmp/fstab.$$ || { + if test "$1" = start + then + logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: awk failed" + else + echo "debug: awk script failed with:" >&2 + echo "$changedlist" >&2 + echo "output in /tmp/fstab.$$" >&2 + fi + exit 1 + } + + if test "$1" = start + then + mv /tmp/fstab.$$ /etc/fstab || { + logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: update failed" + exit 1 + } + else + echo "debug: fstab changed:" + diff -u /etc/fstab /tmp/fstab.$$ + fi + fi + fi +fi + +# write the new list to the file, only if we +# are doing something... +test "$1" = start && echo "$newlist" >"$pfile" + +exit 0 diff --git a/packages/openprotium-init/files/initscripts/loadmodules.sh b/packages/openprotium-init/files/initscripts/loadmodules.sh new file mode 100644 index 0000000000..c5d44d1067 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/loadmodules.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +. /etc/default/modulefunctions # Load module loading logic + +loadnetmods + +loaddiskmods + +loadmiscmods + +exit 0 diff --git a/packages/openprotium-init/files/initscripts/rmrecovery b/packages/openprotium-init/files/initscripts/rmrecovery new file mode 100644 index 0000000000..eec822b154 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/rmrecovery @@ -0,0 +1,4 @@ +#!/bin/sh +# Run to remove /.recovery if the boot seems to have succeeded +test -e /.recovery && rm -f /.recovery +exit 0 diff --git a/packages/openprotium-init/files/initscripts/sysconfsetup b/packages/openprotium-init/files/initscripts/sysconfsetup new file mode 100644 index 0000000000..a4f9074d9c --- /dev/null +++ b/packages/openprotium-init/files/initscripts/sysconfsetup @@ -0,0 +1,46 @@ +#!/bin/sh +# This script is run once when the system first boots. Its sole +# purpose is to create /etc/default/sysconf (the overall system +# configuration file) and other files derived from this. +# +# The script runs immediately after S10checkroot.sh - this is the +# point at which the rootfs will be mounted rw even if the kernel +# booted with it ro. +# +# rm or mv the file (/etc/default/sysconf) to recreate it, run this +# script with the reload option to overwrite the system files. The +# configuration files described in sysconf_reload (in +# /sbin/sysconf) will be overwritten on reload. +# +# start: standard startup, do a complete (auto) restore if necessary +# reinit: always do a complete auto restore +# reload: just reload sysconf (no config files!) +# +# /etc/default/functions contains useful utility functions - it's +# in a separate file so that it can be loaded by any script +. /etc/default/functions +load_functions sysconf || exit 1 +# +case "$1" in +start) test -s /etc/default/sysconf || { + if sysconf_read + then + if sysconf_valid + then + sysconf_restore auto + else + sysconf_reload + fi + else + sysconf_default + sysconf_reload + fi + };; + +reload) test -s /etc/default/sysconf || sysconf_read || sysconf_default + sysconf_reload;; + +reinit) sysconf_restore auto;; + +*) ;; +esac diff --git a/packages/openprotium-init/files/initscripts/syslog.buffer b/packages/openprotium-init/files/initscripts/syslog.buffer new file mode 100644 index 0000000000..9285c02946 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/syslog.buffer @@ -0,0 +1,23 @@ +#!/bin/sh +# +# Invoke the syslog startup if the configuration +# uses (only) 'buffer' as the DESTINATION +DESTINATION= +test -f /etc/syslog.conf && . /etc/syslog.conf +doit= + +for d in $DESTINATION +do + case "$d" in + buffer) doit=1;; + file) exit 0;; + remote) exit 0;; + *) echo "/etc/syslog.conf: $d: unknown destination" >&2 + exit 1;; + esac +done + +test -n "$doit" -a -x /etc/init.d/syslog && + exec /etc/init.d/syslog "$@" + +exit 0 diff --git a/packages/openprotium-init/files/initscripts/syslog.file b/packages/openprotium-init/files/initscripts/syslog.file new file mode 100644 index 0000000000..80ee5f0174 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/syslog.file @@ -0,0 +1,23 @@ +#!/bin/sh +# +# Invoke the syslog startup if the configuration +# uses 'file' (and, optionally, buffer) as the DESTINATION +DESTINATION= +test -f /etc/syslog.conf && . /etc/syslog.conf +doit= + +for d in $DESTINATION +do + case "$d" in + buffer) :;; + file) doit=1;; + remote) exit 0;; + *) echo "/etc/syslog.conf: $d: unknown destination" >&2 + exit 1;; + esac +done + +test -n "$doit" -a -x /etc/init.d/syslog && + exec /etc/init.d/syslog "$@" + +exit 0 diff --git a/packages/openprotium-init/files/initscripts/syslog.network b/packages/openprotium-init/files/initscripts/syslog.network new file mode 100644 index 0000000000..3d7f4ab8e6 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/syslog.network @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Invoke the syslog startup if the configuration +# uses 'remote', or doesn't use 'buffer' or 'file' +DESTINATION= +test -f /etc/syslog.conf && . /etc/syslog.conf +doit= +doneit= + +for d in $DESTINATION +do + case "$d" in + buffer) doneit=1;; + file) doneit=1;; + remote) doit=1;; + *) doit=1 + echo "/etc/syslog.conf: $d: unknown destination" >&2 + exit 1;; + esac +done + +# One of doneit or doit is set unless the DESTINATION value +# is empty (which is probably an error), let syslog handle +# the error. +test \( -n "$doit" -o -z "$doneit" \) -a -x /etc/init.d/syslog && + exec /etc/init.d/syslog "$@" + +exit 0 diff --git a/packages/openprotium-init/files/initscripts/umountinitrd.sh b/packages/openprotium-init/files/initscripts/umountinitrd.sh new file mode 100644 index 0000000000..b590ae68b5 --- /dev/null +++ b/packages/openprotium-init/files/initscripts/umountinitrd.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# umount /mnt, which is where the initrd ends up mounted +# if the directory /initrd is not present, if this fails +# then the /initrd is mounted and we want to remount that +# ro - this works round the shutdown -r hang problem +. /etc/default/functions +# +# if we are turnup'ed to disk, then just unmount the initrd all together +# +if [ -e /initrd/dev/.devfsd ]; then + [ "$VERBOSE" = "very" ] && echo "Unmounting initrd..." + umount /initrd/dev + umount /initrd + exit 0 +fi + +while read device directory remainder +do + case "$directory" in + /mnt) echo "InitRD: unmount initrd on /mnt" >&2 + umount /mnt;; + /initrd)# need the device for a remount + ffspart=Flashdisk + ffsdev="$(mtblockdev $ffspart)" + echo "InitRD: remount $ffdev read-only on /initrd" >&2 + if test -n "$ffsdev" -a -b "$ffsdev" + then + mount -o remount,ro "$ffsdev" /initrd + else + echo "Flashdisk: $ffsdev: flash device not found" >&2 + fi;; + esac +done </proc/mounts diff --git a/packages/openprotium-init/files/links.conf b/packages/openprotium-init/files/links.conf new file mode 100644 index 0000000000..fdd1f3ce23 --- /dev/null +++ b/packages/openprotium-init/files/links.conf @@ -0,0 +1,6 @@ +# This file does not exist. Please do not ask the debian maintainer about it. +# You may use it to do strange and wonderful things, at your risk. + +# The new RTC class does not create the /dev/rtc symlink, and udev rules don't get run for built-in modules. +# So it looks like we have to do this here for the moment, until someone comes up with a better idea ... +L rtc rtc0 diff --git a/packages/openprotium-init/files/modulefunctions b/packages/openprotium-init/files/modulefunctions new file mode 100644 index 0000000000..430e376ad8 --- /dev/null +++ b/packages/openprotium-init/files/modulefunctions @@ -0,0 +1,39 @@ +#!/bin/sh +# "." this file, then call the appropriate routines to load modules +# you might need. This is run from /etc/rcS.d/S21loadmodules.sh +# at boot time. Possible examples are commented out, none of which +# are needed on openprotium since they are already in the kernel. + +. /etc/default/functions + + +loaddiskmods(){ + : +# modprobe scsi_mod +# modprobe sd_mod +# modprobe usbcore +# case "$(machine)" in +# nslu2) +# modprobe ehci-hcd +# modprobe ohci-hcd +# ;; +# esac +# modprobe usb-storage +} + +loadnetmods(){ + : +# modprobe af_packet +# case "$(machine)" in +# ixdp425|nslu2|nas100d) +# modprobe ixp4xx_mac +# ;; +# esac +} + +loadmiscmods(){ + : +# modprobe ixp4xx_rng +# modprobe i2c_dev +} + diff --git a/packages/openprotium-init/files/reflash b/packages/openprotium-init/files/reflash new file mode 100644 index 0000000000..f2947822f6 --- /dev/null +++ b/packages/openprotium-init/files/reflash @@ -0,0 +1,163 @@ +#!/bin/sh +# +# Open Protium Reflash. This script will take a firmware image consisting +# of a compressed linux kernel image, concatentated with a jffs2 root +# filesystem image. The kernel MTD device is discovered by locating +# the MTD partition with the tag "kernel" and the filesystem MTD device +# is dicovered by locating the MTD partition with the tag "filesystem." +# There is no TOC inside the firmware images so there is no direct way +# to validate that the sizes of the parts in the firmware match the +# existing MTD partitions. So there could be a mismatch. However, a +# a mismatch size will be detect as this script mounts the newly laid +# done filesystem, a mismatch guarantees this to fail. That being said +# the script does validate the total size to prevent overwriting +# uboot. Furthermore the script makes sure the fsdev is not in use and +# that the various images are block aligned. + +flimg=$1 +if [ -z "$flimg" ]; then + echo "Usage: reflash <image file>" + exit 1 +fi + +if [ \! -f $flimg -o \! -r $flimg ]; then + # + # not a file or not readable + # + echo "error: Image file [$flimg] not available" + exit 1 +fi + +dmesg | grep StorCenter >/dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +blksize=512 +mtd=/proc/mtd +mtab=/proc/mounts +mntdir=/tmp/fs.$$ + +ktag=kernel +fstag=filesystem + +kdev=` grep $ktag $mtd | awk -F: '{print $1}' | sed -e 's?mtd?/dev/mtdblock/?g'` +fsdev=`grep $fstag $mtd | awk -F: '{print $1}' | sed -e 's?mtd?/dev/mtdblock/?g'` + +flsize=`ls -l $flimg | awk '{print $5}'` +ksize=`grep $ktag $mtd | awk '{print "0x" $2}'` +fssize=`grep $fstag $mtd | awk '{print "0x" $2}'` + +# +# Size comes out of dc in exp notation and test wont accept a hex number +# so dumo it in hex then use awk to convert to decimal +# +size=0x`dc 16 o $ksize $fssize + p` +size=`echo $size | awk '{printf ("%d",$1)}'` + +# +# Make sure we are block aligned +# +kblks=`dc $ksize $blksize / p` +r=`dc $ksize $blksize % p` +if [ $r -ne 0 ]; then + echo "error: Kernel partition is not block aligned." + exit 1 +fi + +# +# Make sure we are block aligned +# +fsblks=`dc $fssize $blksize / p` +r=`dc $fssize $blksize % p` +if [ $r -ne 0 ]; then + echo "error: Filesystem partition is not block aligned." + exit 1 +fi + +# +# Check to see that we have enough room +# +if [ $flsize -gt $size ]; then + echo "error: Image size is bigger then available space." + exit 1 +fi + +# +# Is fsdev mounted? +# +grep $fsdev $mtab > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "error: $fsdev mounted" + exit 1 +fi + +# +# If root is a jffs2 then close enough, im out +# +grep jffs2 $mtab > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "error: $fsdev may be mounted" + exit 1 +fi + + +# +# Mount fsdev and save fsdev/linuxrc +# +mkdir $mntdir /tmp/$$ +mount -t jffs2 $fsdev $mntdir +if [ $? -ne 0 ]; then + echo "error: Unable to mount $fsdev" + exit 1 +fi +echo "Preserving /linuxrc in /tmp/$$" +cp $mntdir/linuxrc* /tmp/$$ +umount $mntdir + +echo "Image:" +echo " Name : $flimg" +echo " Length: $flsize" +echo +echo "Kernel:" +echo " Device: $kdev" +echo " Length: $ksize" +echo " Blocks: $kblks" +echo +echo "Filesystem:" +echo " Device: $fsdev" +echo " Length: $fssize" +echo " Blocks: $fsblks" +echo +echo 'Ready to flash, Continue? (yes/no)' +read continue +if [ "z$continue" != "zyes" ]; then + rm -rf $mntdir /tmp/$$ + exit 0 +fi + +# +# Lets do the flash +# +echo Preserving existing flash in: $flimg.sav.$$ +dd of=$flimg.sav.$$ if=$kdev bs=$blksize count=$kblks +dd of=$flimg.sav.$$ if=$fsdev bs=$blksize count=$fsblks seek=$kblks + +echo Flashing new firmware.... +dd if=$flimg of=$kdev bs=$blksize count=$kblks +dd if=$flimg of=$fsdev bs=$blksize count=$fsblks skip=$kblks +sync +sleep 5 + +# +# Mount fsdev and restore fsdev/linuxrc +# +mount -t jffs2 $fsdev $mntdir +if [ $? -ne 0 ]; then + echo "error: Unable to re-mount $fsdev" + exit 1 +fi +echo "Restoring /linuxrc" +cp /tmp/$$/linuxrc* $mntdir +umount $mntdir +rm -rf $mntdir /tmp/$$ diff --git a/packages/openprotium-init/files/sysconf b/packages/openprotium-init/files/sysconf new file mode 100644 index 0000000000..8866c076b8 --- /dev/null +++ b/packages/openprotium-init/files/sysconf @@ -0,0 +1,793 @@ +#!/bin/sh +# sysconf +# +# utility to manipulate system configuration information help +# in a RedBoot SysConf partition +# +# load the utility functions (unless this is being called just +# to load these functions!) +test "$1" != sysconf && . /etc/default/functions + +# NSLU2 flash layout is non-standard. +case "$(machine)" in +nslu2) + kpart="Kernel" + syspart="SysConf" + ffspart="Flashdisk";; +*) + kpart="kernel" + syspart="sysconfig" + ffspart="filesystem";; +esac +# +# sysconf_valid +# return true if the SysConf partition exists and seems to be +# potentially valid (it starts with a reasonable length). +sysconf_valid(){ + local sysdev + sysdev="$(mtblockdev $syspart)" + test -n "$sysdev" -a -b "$sysdev" && + devio "<<$sysdev" '!! b.10>s32768<&!' +} + +# +# sysconf_read [prefix] +# read the $syspart partition (if present) writing the result into +# /etc/default/sysconf, if the result is empty it will be removed. +sysconf_read(){ + local sysdev sedcmd mac config_root + config_root="$1" + rm -f /tmp/sysconf.new + sysdev="$(mtblockdev $syspart)" + if sysconf_valid + then + # Read the defined part of $syspart into /etc/default/sysconf. + # $syspart has lines of two forms: + # + # [section] + # name=value + # + # In practice $syspart also contains other stuff, use the command: + # + # devio '<</dev/mtd1;cpb' + # + # to examine the current settings. The badly formatted stuff + # is removed (to be exact, the sed script selects only lines + # which match one of the two above). The lan interface, which + # on NSLU2 defaults to ixp0, is changed to the correct value for + # slugos, eth0. The bootproto, which LinkSys sets to static in + # manufacturing, is reset to dhcp if the IP is still the + # original (192.168.1.77) + sedcmd='/^\[[^][]*\]$/p;' + # only do the ip_addr and lan_interface fixups on NSLU2 + if test "$(machine)" = nslu2 + then + sedcmd="$sedcmd"' + s/^lan_interface=ixp0$/lan_interface=eth0/; + /^ip_addr=192\.168\.1\.77$/,/^bootproto/s/^bootproto=static$/bootproto=dhcp/;' + fi + # always fix up the hardware addr if it is present + mac="$(config mac)" + if test -n "$mac" + then + sedcmd="$sedcmd"' + s/^hw_addr=.*$/hw_addr='"$mac"'/;' + fi + # and only print lines of the correct form + sedcmd="$sedcmd"' + /^[-a-zA-Z0-9_][-a-zA-Z0-9_]*=/p' + + devio "<<$sysdev" cpb fb1,10 | sed -n "$sedcmd" >/tmp/sysconf.new + fi + # + # test the result - sysconf must be non-empty + if test -s /tmp/sysconf.new + then + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" + else + rm -f /tmp/sysconf.new + return 1 + fi +} + +# +# sysconf_default [prefix] +# Provde a default /etc/default/sysconf when there is no $syspart partition, +# or when it is invalid, this function will read from an existing sysconf, +# copying the values into the new one. +# sysconf_line tag config-tag +# write an appropriate line if the config value is non-empty +sysconf_line(){ + config "$2" | { + local value + read value + test -n "$value" && echo "$1"="$value" + } +} +# +sysconf_default(){ + local config_root + config_root="$1" + { echo '[network]' + sysconf_line hw_addr mac + sysconf_line disk_server_name host + sysconf_line w_d_name domain + sysconf_line lan_interface iface + sysconf_line ip_addr ip + sysconf_line netmask netmask + sysconf_line gateway gateway + sysconf_line dns_server1 dns + sysconf_line dns_server2 dns2 + sysconf_line dns_server3 dns3 + sysconf_line bootproto boot + } >/tmp/sysconf.new + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" +} + +# +# sysconf_reload [prefix] +# read the values from /etc/default/sysconf and use these values to set +# up the following system files: +# +# /etc/hostname +# /etc/defaultdomain +# /etc/resolv.conf +# /etc/network/interfaces +# /etc/motd +# +sysconf_reload(){ + local config_root host domain iface boot ip netmask gateway ifname iftype + config_root="$1" + host="$(config host)" + test -n "$host" && echo "$host" >"$config_root/etc/hostname" + domain="$(config domain)" + test -n "$domain" && echo "$domain" >"$config_root/etc/defaultdomain" + # + # The DNS server information gives up to three nameservers, + # but this currently only binds in the first. + { + test -n "$domain" && echo "search $domain" + test -n "$(config dns)" && echo "nameserver $(config dns)" + test -n "$(config dns2)" && echo "nameserver $(config dns2)" + test -n "$(config dns3)" && echo "nameserver $(config dns3)" + } >"$config_root/etc/resolv.conf" + # + # Ethernet information. This goes into /etc/network/interfaces, + # however this is only used for static setup (and this is not + # the default). With dhcp the slugos udhcp script, + # /etc/udhcpc.d/50default, loads the values from sysconf. + iface="$(config iface)" + boot="$(config boot)" + # Only dhcp and static are supported at present - bootp + # support requires installation of appropriate packages + # dhcp is the fail-safe + case "$boot" in + dhcp|static) ;; + *) boot=dhcp;; + esac + # + ip="$(config ip)" + netmask="$(config netmask)" + gateway="$(config gateway)" + { + echo "# /etc/network/interfaces" + echo "# configuration file for ifup(8), ifdown(8)" + echo "#" + echo "# The loopback interface" + echo "auto lo" + echo "iface lo inet loopback" + echo "#" + echo "# The interface used by default during boot" + echo "auto $iface" + echo "# Automatically generated from /etc/default/sysconf" + echo "# address, netmask and gateway are ignored for 'dhcp'" + echo "# but required for 'static'" + echo "iface $iface inet $boot" + # The following are ignored for DHCP but are harmless + test -n "$ip" && echo " address $ip" + test -n "$netmask" && echo " netmask $netmask" + test -n "$gateway" && echo " gateway $gateway" + # + # Now read all the other ARPHRD_ETHER (type=1) interfaces + # and add an entry for each. + for ifname in $(test -d /sys/class/net && ls /sys/class/net) + do + if test -r "/sys/class/net/$ifname/type" -a "$ifname" != "$iface" + then + read iftype <"/sys/class/net/$ifname/type" + case "$iftype" in + 1) echo "#" + echo "# /sys/class/net/$ifname:" + echo "auto $ifname" + echo "iface $ifname inet dhcp";; + esac + fi + done + } >"$config_root/etc/network/interfaces" + # + # Finally rewrite /etc/motd + { echo "Host name: $host" + echo "Domain name: $domain" + echo "Host MAC: $(config mac)" + echo "Network boot method: $boot" + case "$boot" in + static) echo "Host IP address: $ip";; + esac + echo "Use 'turnup init' to reset the configuration" + echo "Use 'turnup preserve' to save the configuration permanently" + echo "Use 'turnup restore' to restore a previously saved configuration" + echo "Use 'turnup disk|nfs -i <device> options to initialise a non-flash root" + echo "Use 'turnup help' for more information" + } >"$config_root/etc/motd" +} + +# +# sysconf_save_conffiles <flash-directory> <dest> <list> +# preserve the configuration files in a directory or in a CPIO archive +# (which is *not* compressed). If <dest> is a directory the files are +# copied, otherwise a CPIO archive is made with that name. <list> is +# the listing file giving the preserved files and the processing option. +sysconf_save_conffiles(){ + local ffsdir dest list file + ffsdir="$1" + saved="$2" + list="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -n "$saved" -a -n "$list" || { + echo "sysconf_save_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_save_conffiles <flash-directory> <dest> <list>" >&2 + return 1 + } + # + ( cd "$ffsdir" + find etc/*.conf $(sed 's!^/!!' usr/lib/ipkg/info/*.conffiles) ! -type d -newer etc/.configured -print | + sed 's/^/diff /' + exec sed 's/#.*$//;/^[ ]*$/d' etc/default/conffiles + ) | sed 's!^/*!!' | + awk '{ op=$1; $1=""; file[$0]=op } + END{ for (f in file) if (file[f] != "ignore") print file[f] f }' | + while read op file + do + if test -e "$ffsdir/$file" + then + echo "$op $file" >&3 + echo "$file" + fi + done 3>"$list" | ( + cd "$ffsdir" + if test -d "$saved" + then + exec cpio -p -d -m -u "$saved" + else + exec cpio -o -H crc >"$saved" + fi + ) +} + +# +# sysconf_verify file +# this is called with the name of a 'diff' file which is, indeed, +# different and with all the std streams connected to the tty. It +# returns a status code to say whether (0) or not (1) to copy the +# file over. +# +# globals: the following must be defined in the calling context! +# saved: the directory containing the unpacked saved files +# ffsdir: the flash directory to which the files are being restored (/) +# +sysconf_verify_help() { + echo "Please specify how to handle this file or link, the options are as follows," + echo "two character abbreviations may be used:" + echo + echo " keep: retain the old file, overwrite the new flash image file" + echo " upgrade: retain the new file, the old (saved) file is not used" + echo " diff: display the differences between the old and the new using diff -u" + echo " shell: temporarily start an interactive shell (sh -i), exit to continue" + echo " skip: ignore this file for the moment. The file is left in the directory" + echo " $saved and many be handled after this script has completed" +} +# +sysconf_verify() { + local command file + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed file cannot be handled non-interactively" >&2 + return 1 + } + + file="$1" + echo "$0: $file: configuration file changed." + sysconf_verify_help "$file" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$file" + return 1;; + di*) echo "DIFF OLD($saved) NEW($ffsdir)" + diff -u "$saved/$file" "$ffsdir/$file";; + sh*) PS1="$file: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$file";; + esac + done +} +# the same, but for a link +sysconf_verify_link() { + local command link + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed link cannot be handled non-interactively" >&2 + return 1 + } + + link="$1" + echo "reflash: $link: configuration link changed." + sysconf_verify_help "$link" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$link" + return 1;; + di*) echo "DIFF:" + echo "OLD($saved): $link -> $(readlink "$saved/$link")" + echo "NEW($ffsdir): $link -> $(readlink "$ffsdir/$link")";; + sh*) PS1="$link: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$link";; + esac + done +} + +# +# sysconf_restore_conffiles <flash-directory> <source-dir> <restore> +# restore the configuration files from a directory. 'source-dir' +# If <source> is a directory of files from sysconf_save_conffiles. The +# list of files restored is written to the third argument (restore), +# but is not required (/dev/null would be ok). +# +# the list of files to restore is read from stdin, along with the +# processing option for each file (the format is as produced by +# sysconf_save_conffiles in the 'list' output). +sysconf_restore_conffiles(){ + local ffsdir saved restore + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + restore="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" -a -n "$restore" || { + echo "restore_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_restore_conffiles <flash-directory> <source-dir> <list>" >&2 + return 1 + } + # + # read the list and process each given file + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$file" = "etc/.configured" + then + # this should definately not fail because of the test above! + if cp -a "$saved/$file" "$ffsdir/$file" + then + echo "$file" >&3 + else + echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2 + fi + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + # no change + echo "$file" >&3 + else + # assume a change regardless + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # need user input + if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + # do not overwrite + echo "$file" >&3 + elif test ! -e "$ffsdir/$file" + then + # always preserve + echo "$file" + echo "$file" >&3 + else + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # the files are different, get user input + if sysconf_verify "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + fi + done 3>"$restore" | (cd "$saved"; exec cpio -p -d -u "$ffsdir") +} + +# +# sysconf_test_restore <flash-directory> <source-dir> +# return true only if the restore does not need to do an interactive +# compare +sysconf_test_restore(){ + local ffsdir saved + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + # this is an error case, but return 0 so that the error is + # detected later + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" || + return 0 + # + # read the list and check each diff file (this is just a copy of the + # logic above with all the work removed!) + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$op" != diff + then + : # no diff required + elif test "$file" = "etc/.configured" + then + : # special handling + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + : # no change + else + # assume a change regardless + return 1 + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + : # do not overwrite + elif test ! -e "$ffsdir/$file" + then + : # always preserve + else + # a change + return 1 + fi + fi + done + + return 0 +} + +# +# sysconf_save +# save the system configuration to $syspart - $syspart must exist and +# there must be a writeable device for it. +sysconf_save(){ + local sysdev ffsdev ffsdir saved list size status + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" -o ro || { + rmdir "$ffsdir" + exit 1 + } + # need temporary files for the cpio output and the listing + saved=/tmp/cpio.$$ + list=/tmp/preserve.$$ + rm -rf "$saved" "$list" + sysconf_save_conffiles "$ffsdir" "$saved" "$list" || { + echo "$0: $saved: archive of saved configuration files failed" >&2 + rm -rf "$saved" + rm "$list" + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + return 1 + } + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + # + # we now have: + # /etc/default/sysconf the basic config + # /tmp/preserve.$$ the list of saved files + # /tmp/cpio.$$ the CPIO archive of those files + # + # make one big file with the sysconf data followed by the + # compressed archive in /tmp/sysconf.$$ + { { cat /etc/default/sysconf + echo '[preserve]' + } | sed -n '1,/^\[preserve\]^/p' + while read op file + do + echo "$op"="$file" + done <"$list" + } >/tmp/sysconf.$$ + size="$(devio "<</tmp/sysconf.$$" 'pr$')" + gzip -9 <"$saved" >>/tmp/sysconf.$$ + # + # more cleanup, then try to write the new sysconf to $syspart + # the format is a 4 byte big-endian length then the text data + # if the data won't fit exit with error code 7 + rm "$saved" "$list" + devio -p "<</tmp/sysconf.$$" ">>$sysdev" ' + $( $4+ # > + !! 7 + $) 0 + wb '"$size"',4 + cp $' + case $? in + 0) echo " done" >&2 + status=0;; + 1) echo " failed" >&2 + echo " $syspart could not be written (no changes made)" >&2;; + 3) echo " failed" >&2 + echo " $syspart partially written, you may want to reset it" >&2;; + 7) echo " failed" >&2 + echo " $syspart is too small: $size bytes required" >&2 + echo " No change made" >&2;; + *) echo " failed" >&2 + echo " Internal error writing $syspart" >&2;; + esac + # + rm -f /tmp/sysconf.$$ + else + echo "sysconf save: $syspart or $ffspart partition not found" >&2 + echo " A RedBoot partition named '$syspart' must exist in the system" >&2 + echo " flash memory for this command to work, and there must be a" >&2 + echo " block device to access this partition (udev will normally" >&2 + echo " create this automatically. The flash partition contents must" >&2 + echo " also be accessible in a partition called '$ffspart'" >&2 + echo + echo " To create the $syspart partition use the 'fis create' command" >&2 + echo " in the RedBoot boot loader, it is sufficient to make the" >&2 + echo " partition one erase block in size unless you have substantially" >&2 + echo " increased the size of the files listed in /etc/default/conffiles" >&2 + fi + + return $status +} + +# +# sysconf_restore [auto] +# restore previously saved configuration information from $syspart +sysconf_restore_error(){ + local root + root="$1" + shift + # ------------------------------------------------------------------------------- + { echo " WARNING: saved configuration files not restored" + test -n "$1" && echo "$*" + echo + echo "The configuration of this machine has been reinitialised using the values" + echo "from /etc/default/sysconf, however configuration files saved in the $syspart" + echo "partition have not been restored." + echo + echo "You can restore these files by correcting any reported errors then running" + echo + echo " sysconf restore" + echo + echo "from the command line. This will completely reinitialise the configuration" + echo "using the information in the $syspart partition." + } >"$root/etc/motd" + cat "$root/etc/motd" >&2 +} +# +sysconf_restore(){ + local sysdev ffsdev ffsdir saved restore size status sysconf_noninteractive config_root + + # if set this means 'do no diff' - this avoids the code above which + # would open /dev/tty and therefore allows this stuff to be done from + # an init script + sysconf_noninteractive= + test "$1" = auto && sysconf_noninteractive=1 + + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" && + sysconf_valid + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + config_root="$ffsdir" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" || { + rmdir "$ffsdir" + exit 1 + } + # + # first restore the $syspart section + sysconf_read "$ffsdir" || sysconf_default "$ffsdir" + # + # now use this to regenerate the system files + sysconf_reload "$ffsdir" + # + # now examine the [preserve] section, if it is there restore + # it if possible. + if test -n "$(syssection preserve)" + then + # 'saved' is a directory, 'restore' is a file (which is + # used to detect unrestored files). The directory needs + # to be populated with files. + saved=/tmp/cpio.$$ + restore=/tmp/restore.$$ + rm -rf "$saved" "$restore" + # + mkdir "$saved" || { + sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory" + return 1 + } + # + # the CPIO archive is gzip compressed after the text part + # of sysconf, gzip will handle the LZ stream termination + # correctly (and break the pipe) so we don't need to know + # the real length of the data + devio "<<$sysdev" '<=b4+.' 'cp $s-' | gunzip | ( + cd "$saved" + exec cpio -i -d -m -u + ) || { + rm -rf "$saved" + sysconf_restore_error "$ffsdir" "$saved: cpio -i failed" + return 1 + } + # either there must be no 'diff' files or it must + # be possible to interact with a real user. + if test -z "$sysconf_noninteractive" || + syssection preserve | sysconf_test_restore "$ffsdir" "$saved" + then + # + # remove the 'init' motd from sysconf_reload + rm "$ffsdir/etc/motd" + # + # now restore from the directory, using the information in + # the preserve section, if this fails in a non-interactive + # setting the system might not reboot + syssection preserve | + sysconf_restore_conffiles "$ffsdir" "$saved" "$restore" || { + # there is a chance of the user cleaning this up +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: $saved: restore of saved configuration files failed. + The flash file system is mounted on $ffsdir. + The saved files are in $saved and the list of files selected for + restore is in $restore. + You should restore any required configuration from $saved, then umount + $ffsdir and reboot." + # this prevents cleanup/umount + return 1 + } + # + # remove the copied files (i.e. the ones which were preserved) + ( cd "$saved" + exec rm $(cat "$restore") + ) + rm "$restore" + # + # clean up, files left in $saved need to be handled by the user + files="$(find "$saved" ! -type d -print)" + if test -n "$files" + then +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: some saved configuration files have not been handled: + +$files + +These files can be examined in $saved and restored to +$ffsdir if required. The saved files are in a temporary +directory and will not be retained across a reboot - copy then elsewhere if +you are unsure whether they are needed." + return 1 + fi + # + # so this is safe now (no files, links etc) + rm -rf "$saved" + else + rm -rf "$saved" + # non-interactive and some changed diff files + sysconf_restore_error "$ffsdir" \ +"$0: some of the saved configuration files must be +examined before restoration" + # but continue to the umount + fi + fi + # + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + status=0 + else + echo "sysconf restore: $syspart or $ffspart partition not found" >&2 + echo " You must have used 'sysconf save' to save configuration data" >&2 + echo " into the $syspart partition before using this command. The command" >&2 + echo " will restore the configuration data to the flash root partition" >&2 + echo " named '$ffspart' - this must also be accessible." >&2 + fi + + return $status +} + +# +# sysconf_help +# help text +sysconf_help(){ + # ------------------------------------------------------------------------------- + echo "sysconf: usage: sysconf read|default|reload|save|restore" >&2 + echo " read: the current $syspart partition is read into /etc/default/sysconf" >&2 + echo " default: a default /etc/default/sysconf is created" >&2 + echo " reload: system configuration files are recreated from /etc/default/sysconf" >&2 + echo " save: /etc/default/sysconf and the files listed in /etc/default/conffiles" >&2 + echo " are written to the $syspart partition" >&2 + echo " restore: the configuration information in the $syspart partition saved by" >&2 + echo " 'sysconf save' is restored" >&2 +} + +# +# the real commands +#if [ "$(machine)" = "storcenter" ]; then +# echo "sysconf not (yet) supported on storcenter" +# exit 0 +#fi +sysconf_command="$1" +test $# -gt 0 && shift +case "$sysconf_command" in +read) sysconf_read "$@";; +default)sysconf_default "$@";; +reload) sysconf_reload "$@";; +save) sysconf_save "$@";; +restore)sysconf_restore "$@";; +valid) sysconf_valid "$@";; + +sysconf)# just load the functions + ;; + +*) # help text + sysconf_help "$@";; +esac diff --git a/packages/openprotium-init/files/turnup b/packages/openprotium-init/files/turnup new file mode 100644 index 0000000000..73befd26c9 --- /dev/null +++ b/packages/openprotium-init/files/turnup @@ -0,0 +1,861 @@ +#!/bin/sh +# turnup +# See the help block at the end for documentation. +# +. /etc/default/functions + +# +# configuration +# The following variables control which directories in /var end +# up on the rootfs and which end up in a temporary file system. +INRAM_MEMSTICK="/var/cache /var/lock /var/log /var/run /var/tmp /var/lib/ipkg" +INRAM_NFS="/var/cache /var/lock /var/run /var/tmp" +INRAM_DISK="" + +# +# force: override certain checks +force= + +# +# pfile: the uuid/partition file +pfile=/etc/uuid_by_partition + +# +# fstype new +# The type of the file system mounted on "new" Outputs the last +# piece of information found, which should be the one for the +# currently visible mount! +fstype() { + local cwd dev mp type options pass freq result + cwd="$(cd "$1"; /bin/pwd)" + result= + while read dev mp type options pass freq + do + case "$mp" in + "$cwd") result="$type";; + esac + done </proc/mounts + echo "$result" +} + +# +# fsoptions arguments +# Collapses the mount (-o) options into a single list which is +# printed on stdout. Accepts an arbitrary list of options and +# just joins them together. +fsoptions() { + local options + options= + while test $# -gt 1 + do + case "$1" in + -t) shift;; + -o) if test -n "$2" + then + if test -n "$options" + then + options="$options,$2" + else + options="$2" + fi + fi + shift;; + esac + shift + done + if test -n "$options" + then + echo "$options" + else + echo defaults + fi +} + +# +# get_flash <directory> {mount options} +# mount the flash device, writeable, on the given directory +get_flash() { + local ffsdir ffsdev + + ffsdir="$1" + shift + test -n "$ffsdir" -a -d "$ffsdir" || { + echo "$0: $ffsdir: internal error, flash mount point not a directory" >&2 + return 1 + } + + case "$(machine)" in + nslu2) ffsdev="$(mtblockdev Flashdisk)";; + *) ffsdev="$(mtblockdev filesystem)";; + esac + umountflash "$ffsdev" && + mountflash "$ffsdev" "$ffsdir" "$@" +} + +# +# check_rootfs [-i] <root fs directory> +# Make sure the candidate rootfs is empty +# Environment: rootdev=device or NFS root path +check_rootfs() { + local fcount + + case "$1" in + -i) shift + case "$force" in + -f) return 0;; + esac + + fcount="$(find "$1" ! -type d -print | wc -l)" + test "$fcount" -eq 0 && return 0 + + echo "turnup: $rootdev: partition contains existing files, specify -f to overwrite" >&2 + return 1;; + *) checkmount "$1" && return 0 + + echo "turnup: $rootdev: partition does not seem to be a valid root partition" >&2 + echo " The partition must contain a full operating system. To ensure that" >&2 + echo " this is the case it is checked for the following, all of which must" >&2 + echo " exist for the bootstrap to work:" >&2 + echo + echo " 1) A directory /mnt." >&2 + echo " 2) A command line interpreter program in /bin/sh." >&2 + echo " 3) The program chroot in /sbin or /usr/sbin." >&2 + echo " 4) The program init in /sbin, /etc or /bin." >&2 + echo + echo " One or more of these items is missing. Mount $rootdev on /mnt" >&2 + echo " and examine its contents. You can use turnup disk|nfs -i -f" >&2 + echo " to copy this operating system onto the disk, but it may overwrite" >&2 + echo " files on the disk." >&2 + return 1;; + esac +} + +# +# copy_rootfs old new +# Make a copy of the given root file system, copying only the +# directories needed. The root must be the flash file system +copy_rootfs() { + local old new + old="$1" + new="$2" + test -d "$old" -a -d "$new" || { + echo "turnup: rootfs: copy $old $new: not a directory" >&2 + return 1 + } + # + # There are no problem file names in the flash file system, so + # it is possible to use -print, not -print0. The following + # files and directories are not copied: + # + # /dev/* + # /boot, /boot/* + # /linuxrc* + # /var/* + echo "turnup: copying root file system" >&2 + ( cd "$1" + find . -mount -print | + sed '\@^./dev/@d;\@^./boot/@d;\@^./boot$@d;\@^./linuxrc@d;\@^./var/@d' | + cpio -p -d -m -u "$2" + ) || { + echo "turnup: rootfs: cpio $old $new failed" >&2 + return 1 + } + echo "done" >&2 +} + +# +# setup_dev new device_table +# In flash file systems /dev is in ramfs, in disk systems /dev +# can be populated permanently. This is done by creating a +# single entry '.noram' in /dev - the devices init script will +# then populate the directory without overmounting it. The +# devices in the passed in device table are also created, but +# note that this is insufficient, /etc/init.d/devices must +# also run. +setup_dev() { + test -n "$1" -a -d "$1"/dev -a -r "$2" || { + echo "turnup: setup_dev($1,$2): expected a directory and a file" >&2 + return 1 + } + echo "turnup: initialising dev file system" >&2 + # init tries to open the following devices: + # /dev/console + # /dev/tty0 + # /dev/null + # syslog, and maybe other things, only work if fd 1 is valid, therefore + # we must create these devices here... + makedevs --root="$1" --devtable="$2" + :>"$1"/dev/.noram + return 0 +} + +# +# setup_bootdev new device_table +# As above but actually uses the supplied device table - this is possible if +# the table is just used for boot because the extra setup is not required. +setup_bootdev() { + test -n "$1" -a -d "$1"/dev -a -r "$2" || { + echo "turnup: setup_bootdev($1,$2): expected a directory and a file" >&2 + return 1 + } + # NOTE: this fails silently with 0 return code(!) when a directory + # does not exist yet things are created within it. + makedevs -r "$1" -D "$2" +} + +# +# setup_var new type +# Populates /var. +# Removes the /var tmpfs entry from /etc/fstab. +# Creates links from /var into /media/ram for NFS and Memstick. +setup_var() { + local ram_targets directory + + test -n "$1" -a -d "$1"/var || { + echo "turnup: setup_var($1,$2): expected a directory" >&2 + return 1 + } + case "$2" in + disk|nfs|memstick);; + *) echo "turnup: setup_var($1,$2): expected 'disk', 'nfs' or 'memstick'" >&2 + return 1;; + esac + # + # populate /var, there is a shell script to do this, but it uses + # absolute path names + chroot "$1" /bin/busybox sh /etc/init.d/populate-volatile.sh || { + echo "turnup: /var: could not populate directory" >&2 + return 1 + } + + case "$2" in + disk) ram_targets="$INRAM_DISK";; + nfs) ram_targets="$INRAM_NFS";; + memstick) + ram_targets="$INRAM_MEMSTICK";; + esac + + for directory in $ram_targets + do + rm -rf "$1/$directory" + ln -s "/media/ram/$directory" "$1/$directory" + done + # the startup link is left for the moment, this seems safer + #rm "$1"/etc/rc?.d/[KS]??populate-var.sh + # remove the /var tmpfs entry from the new /etc/fstab + sed -i '\@[ ]/var[ ][ ]*tmpfs[ ]@d' "$1"/etc/fstab + echo "turnup: tmpfs will no longer be mounted on /var" >&2 + # + # Previous versions of turnup removed populate-var.sh from the + # startup links, this one doesn't, so /var can be made back into + # a tmpfs just by a change to /etc/fstab. + return 0 +} + +# +# setup_syslog new +# Moves the syslog to a file - appropriate for disk and nfs types, not +# otherwise. +setup_syslog() { + test -n "$1" -a -d "$1"/etc || { + echo "turnup: setup_syslog($1): expected a directory" >&2 + return 1 + } + # + # if the syslog is to the buffer redirect it to a file + if egrep -q '^DESTINATION="buffer"' "$1"/etc/syslog.conf + then + if cp "$1"/etc/syslog.conf "$1"/etc/syslog.conf.sav + then + # the busybox syslog will fail with ROTATESIZE and ROTATEGENS + sed -i 's!DESTINATION="buffer"!DESTINATION="file"! + /^ROTATESIZE=/d + /^ROTATEGENS=/d' "$1"/etc/syslog.conf + echo "turnup: /etc/syslog.conf: changed to file buffering" >&2 + echo " Old (buffer) version in /etc/syslog.conf.sav" >&2 + echo " Log messages will be in /var/log/messages" >&2 + else + echo "turnup: /etc/syslog.conf: failed to make a copy" >&2 + echo " syslog will log to a buffer" >&2 + fi + fi + return 0 +} + +# +# setup_rootfs type new device_table +# Populates the /dev and /var directories, alters the startup to +# not mount or populate them further. Does the right thing according +# to the given $type +setup_rootfs() { + local type new table + type="$1" + new="$2" + table="$3" + + test -n "$new" -a -d "$new" -a -f "$table" || { + echo "turnup: setup_rootfs($type,$new,$table): expected a directory and a file" >&2 + return 1 + } + + case "$type" in + flash) return 0;; + disk) setup_dev "$new" "$table" && + setup_var "$new" "$type" && + setup_syslog "$new";; + memstick) + setup_bootdev "$new" "$table" && + setup_var "$new" "$type" ;; + nfs) setup_dev "$new" "$table" && + setup_var "$new" "$type" && + setup_syslog "$new";; + *) echo "turnup: setup_rootfs: $type: unknown rootfs type" >&2 + return 1;; + esac + # return code of last setup function +} + +# +# setup_fstab new fsdev fstype fsoptions +# Alters the /etc/fstab entry for / to refer to the correct device and +# have the correct type and options. Essential for checkroot to remount +# / with the correct options. Writes the initial uuid file. +# bad, since sed won't fail even if it changes nothing. +setup_fstab() { + sed -i '\@^[^ ]*[ ][ ]*/[ ]@s@^.*$@'"$2 / $3 $4 1 1"'@' "$1"/etc/fstab + egrep -q "^$2 / $3 $4 1 1\$" "$1"/etc/fstab || { + echo "turnup: /etc/fstab: root(/) entry not changed" >&2 + echo " you probably need to check the options in /etc/fstab" >&2 + echo " to ensure that the root partition is mounted correctly" >&2 + return 1 + } + # + # build $pfile + uuid_by_partition >"$1""$pfile" || + echo "turnup: $pfile: blkid failed (ignored)" >&2 + return 0 +} + +# +# boot_rootfs <boot type> <flash file system> <sleep time> (<device> <uuid>|<nfsroot>) [options] +# Change the flash partition (not the current root!) to boot off +# the new root file system +boot_rootfs() { + local type ffs sleep device uuid opt + + type="$1" + ffs="$2" + sleep="$3" + device="$4" + uuid= + + # test this first as the test does not depend on the correctness + # of the other arguments + test -n "$ffs" -a -d "$ffs" || { + echo "turnup: boot_rootfs($type, $ffs, $device): expected directory" >&2 + return 1 + } + test -x "$ffs"/boot/"$type" || { + echo "turnup: boot_rootfs($type, $ffs, $device): invalid boot type $type" >&2 + return 1 + } + shift + shift + + case "$type" in + disk) test -n "$device" -a -b "$device" || { + echo "turnup: boot_rootfs($ffs, $type, $device): expected block device" >&2 + return 1 + } + uuid="$3" + shift 3;; + nfs) shift 2;; + flash) ;; + ram) ;; + *) echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2 + return 1;; + esac + + # + # The /linuxrc records the correct options to mount the device, + # since we have already mounted if correctly with these options + # we can be sure (maybe) that the boot will work. If not /boot/disk + # falls back to flash. + # + # This modifies the boot process, until this point no harm has been + # done to the system, but at this point the boot rootfs will change + rm -f "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to remove $ffs/linuxrc.new" >&2 + return 1 + } + case "$type" in + flash) ln -s "boot/flash" "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2 + return 1 + };; + ram) { echo '#!/bin/sh' + echo 'rm -f /linuxrc.new' + echo 'ln -s boot/flash /linuxrc.new' + echo 'mv /linuxrc.new /linuxrc' + echo 'exec /boot/ram /dev/ram0' + echo 'exec /boot/flash' + } >"$ffs"/linuxrc.new && + chmod 744 "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 + return 1 + };; + *) { echo '#!/bin/sh' + test "$sleep" -gt 0 && echo -n "sleep='$sleep' " + test -n "$uuid" && echo -n "UUID='$uuid' " + echo -n "exec '/boot/$type' '$device'" + for opt in "$@" + do + echo -n " '$opt'" + done + echo + echo 'exec /boot/flash' + } >"$ffs"/linuxrc.new && + chmod 744 "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 + return 1 + };; + esac + rm -f "$ffs"/linuxrc.sav || { + echo "turnup: boot_rootfs: failed to remove $ffs/linuxrc.sav" >&2 + return 1 + } + ln "$ffs"/linuxrc "$ffs"/linuxrc.sav || { + echo "turnup: boot_rootfs: failed to save /linuxrc.sav" >&2 + return 1 + } + mv -f "$ffs"/linuxrc.new "$ffs"/linuxrc || { + echo "turnup: boot_rootfs: failed to install new /linuxrc" >&2 + return 1 + } + return 0 +} + +# +# disk [-m] [-i] [-s<time>] <device> {options} +# Carefully copy the flash file system to the named device. +disk() { + local setup_type sleep init device uuid new ffs fst fso + + setup_type=disk + sleep=0 + init= + while test $# -gt 0 + do + case "$1" in + -f) force="$1" + shift;; + -m) setup_type=memstick + shift;; + -i) init="$1" + shift;; + -s*) sleep="${1#-s}" + sleep="${sleep:-10}" + shift;; + *) break;; + esac + done + + device="$1" + test -n "$device" -a -b "$device" || { + echo "turnup disk: $device: block device required" >&2 + return 1 + } + shift + + # find the uuid if available + uuid="$(blkid -c /dev/null -s UUID -o value "$device")" + # XXX nasty hack - using the UUID fails on storcenter, for now, + # probably due to various devfs problems. fix later. + if [ $(machine) = storcenter ]; then + uuid= + fi + + # make temporary directories for the mount points + new="/tmp/rootfs.$$" + ffs="/tmp/flashdisk.$$" + mkdir "$new" "$ffs" || { + echo "turnup: disk: failed to create temporary directories" >&2 + return 1 + } + + # make sure we can get to the flash file system first + get_flash "$ffs" || { + rmdir "$new" "$ffs" + return 1 + } + + # Now mount the device with the given options, note that specifying + # read only is *not* an option, this is important because the boot/disk + # script needs a rw file system + status=1 + fst= + fso="$(fsoptions "$@")" + if if test -n "$uuid" + then + mount "$@" -U "$uuid" "$new" + else + mount "$@" "$device" "$new" + fi + then + fst="$(fstype "$new")" + umount "$new" || + echo "turnup disk: $device($new): umount does not seem to work" >&2 + fi + + if test -n "$fst" && + if test -n "$uuid" + then + mount -t "$fst" -o "$fso" -U "$uuid" "$new" + else + mount -t "$fst" -o "$fso" "$device" "$new" + fi + then + if rootdev="$device" check_rootfs $init "$new" && { + test -z "$init" || { + copy_rootfs "$ffs" "$new" && + setup_rootfs "$setup_type" "$new" "$ffs"/etc/device_table + } + } + then + setup_fstab "$new" "$device" "$fst" "$fso" + status=0 + fi + + # clean up the disk. It is worrying if this umount fails! + umount "$new" || test "$force" = "-f" || { + echo "turnup disk: $device: umount failed" >&2 + echo " you must unmount this device cleanly yourself, then use" >&2 + if test -z "$init" + then + echo " turnup with the -f option to boot from the device" >&2 + else + echo " turnup without the -i option to boot from the device" >&2 + fi + status=1 + } + + # if everything went ok boot from this disk + if test $status -eq 0 + then + # memsticks boot like disks, so ignore the -m + boot_rootfs disk "$ffs" "$sleep" "$device" "$uuid" -t "$fst" -o "$fso" + fi + else + echo "turnup disk: $device($*): unable to mount device on $new" >&2 + # If it worked first time + if test -n "$fst" + then + echo " options used: -t $fst -o $fso [error in this script]" >&2 + test -n "$uuid" && + echo " uuid: $uuid (passed with -U)" >&2 + fi + fi + + # clean up the flash file system + umount "$ffs" + rmdir "$new" "$ffs" + return $status +} + +# +# boot_reset <type> +# Resets the boot type to flash or ram, as appropriate +boot_reset() { + local ffs typ status + + case "$1" in + flash|ram)type="$1" + shift;; + *) echo "turnup: boot_reset($1): invalid type" >&2 + return 1;; + esac + + ffs="/tmp/flashdisk.$$" + mkdir "$ffs" || { + echo "turnup: $1: failed to create temporary directory" >&2 + return 1 + } + + get_flash "$ffs" || { + rmdir "$ffs" + return 1 + } + + # now try to set the /linuxrc appropriately + boot_rootfs "$type" "$ffs" + status=$? + + # clean up + umount "$ffs" + rmdir "$ffs" + return $status +} + +# +# nfs [-i] <root partition> {options} +# Copy the flash file system to the given NFS root partition. +nfs() { + local init nfsroot new ffs + + init= + while test $# -gt 0 + do + case "$1" in + -i) init="$1" + shift;; + -f) force="$1" + shift;; + *) break;; + esac + done + + nfsroot="$1" + test -n "$nfsroot" || { + echo "turnup nfs: $nfsroot: NFS root file system required" >&2 + return 1 + } + shift + + # make temporary directories for the mount points + new="/tmp/rootfs.$$" + ffs="/tmp/flashdisk.$$" + mkdir "$new" "$ffs" || { + echo "turnup nfs: failed to create temporary directories" >&2 + return 1 + } + + # make sure we can get to the flash file system first + get_flash "$ffs" || { + rmdir "$new" "$ffs" + return 1 + } + + # Now mount the device with the given options, note that specifying + # read only is *not* an option, this is important because the boot/disk + # script needs a rw file system + status=1 + fst= + # These settings for for NFS, something better will probably have to + # be done to support other network file systems. + nfsopt="nolock,noatime,hard,intr,rsize=1024,wsize=1024" + fso="$(fsoptions -o "$nfsopt" "$@")" + if mount -o "$nfsopt" "$@" "$nfsroot" "$new" + then + fst="$(fstype "$new")" + umount "$new" || + echo "turnup nfs: $nfsroot($new): umount does not seem to work" >&2 + fi + + if test -n "$fst" && mount -t "$fst" -o "$fso" "$nfsroot" "$new" + then + if :>"$new"/ttt && test -O "$new"/ttt && rm "$new"/ttt + then + if rootdev="$nfsroot" check_rootfs $init "$new" && { + test -z "$init" || { + copy_rootfs "$ffs" "$new" && + setup_rootfs nfs "$new" "$ffs"/etc/device_table + } + } + then + setup_fstab "$new" "$nfsroot" "$fst" "$fso" + status=0 + fi + else + echo "turnup nfs: $nfsroot: partition must be exported no_root_squash" >&2 + fi + + # clean up the disk. It is worrying if this umount fails! + umount "$new" || test "$force" = "-f" || { + echo "turnup nfs: $nfsroot: umount failed" >&2 + if test $status -eq 0 + then + echo " you must unmount this partition cleanly yourself, then use" >&2 + if test -z "$init" + then + echo " turnup with the -f option to boot from the NFS root" >&2 + else + echo " turnup without the -i option to boot from the NFS root" >&2 + fi + status=1 + fi + } + + # if everything went ok boot from this disk + if test $status -eq 0 + then + # the options used are exactly those which worked before. + boot_rootfs nfs "$ffs" 0 "$nfsroot" -t nfs -o "$fso" + fi + else + echo "turnup nfs: $nfsroot($*): unable to mount device on $new" >&2 + # If it worked first time + if test -n "$fst" + then + echo " options obtained: -t $fst -o $fso" >&2 + fi + fi + + # clean up the flash file system + umount "$ffs" + rmdir "$new" "$ffs" + return $status +} + +# +# read_one 'prompt' 'group' 'name' +# read a single value +read_one() { + local n o + o="$(sysval "$2" "$3")" + echo -n "$1 [$o]: " >/dev/tty + read n </dev/tty + test -z "$n" && n="$o" + eval "$3='$n'" +} + +# +# init_network +# Change the network initialisation +init_network() { + # fix the root password + echo "Please enter a new password for 'root'." >/dev/tty + echo "The password must be non-empty for ssh login to succeed!" >/dev/tty + passwd + # now the network configuration + read_one "Host name" network disk_server_name + read_one "Domain name" network w_d_name + read_one "Boot protocol (dhcp|static)" network bootproto + case "$bootproto" in + static) read_one "IP address" network ip_addr + read_one "IP netmask" network netmask + read_one "IP gateway" network gateway + read_one "First DNS server" network dns_server1 + read_one "Second DNS server" network dns_server2 + read_one "Third DNS server" network dns_server3 + echo "$ip_addr $disk_server_name" >> /etc/hosts + ;; + dhcp) sed -i -e "s/localhost\$/localhost $disk_server_name/" /etc/hosts + ;; + *) bootproto=dhcp;; + esac + # + # The other stuff which cannot be changed + hw_addr="$(config mac)" + lan_interface="$(config iface)" + # + # Write this out to a new sysconf + { echo "[network]" + echo "hw_addr=$hw_addr" + echo "lan_interface=$lan_interface" + test -n "$disk_server_name" && echo "disk_server_name=$disk_server_name" + test -n "$w_d_name" && echo "w_d_name=$w_d_name" + echo "bootproto=$bootproto" + case "$bootproto" in + static) echo "ip_addr=$ip_addr" + test -n "$netmask" && echo "netmask=$netmask" + test -n "$gateway" && echo "gateway=$gateway" + test -n "$dns_server1" && echo "dns_server1=$dns_server1" + test -n "$dns_server2" && echo "dns_server2=$dns_server2" + test -n "$dns_server3" && echo "dns_server3=$dns_server3" + ;; + esac + } >/etc/default/sysconf + # + # And reload the result + sysconf reload + # + # The remove the spurious 'init' motd + rm /etc/motd +} + +# +# Basic command switch (this should be the only thing in this +# script which actually does anything!) +case "$1" in +init) shift + if init_network "$@" + then + echo "turnup init: you must reboot for the changes to take effect" >&2 + echo " You may want to run 'turnup preserve' to save these settings," >&2 + echo " after making any additional configuration changes which you" >&2 + echo " require." >&2 + else + exit 1 + fi;; +disk) shift + disk "$@";; +memstick) + shift + disk -m "$@" -o noatime;; +nfs) shift + nfs "$@";; +flash) boot_reset flash;; +ram) boot_reset ram;; +preserve) + shift + sysconf save "$@";; +restore) + shift + sysconf restore "$@";; +*) echo "\ +usage: turnup command [options] + commands: + help + output this help + init + correct errors in network information + initialise network information when DHCP is not available + change network information + disk [-i] [-s<seconds>] <device>|<uuid> [mount options] + With -i make <device> a bootable file system then (with or + without -i) arrange for the next reboot to use that device. + The device must already be formatted as a file system, with + -i it must be completely empty, without it must contain an + apparently bootable file system. -s (for example -s5) + specifies a delay in seconds to wait at boot time before + mounting the device. + memstick [-i] <device>|<uuid> [mount options] + Behaves as disk however options appropriate to a flash memory + stick are automatically added + nfs [-i] <nfs mount path> [mount options] + <nfs mount path> must be a mountable NFS file system. With + -i the partition must be empty and is initialised with a + bootable file system. Without -i the partition must already + contain a bootable file system. In either case the NFS + partition must be available to be mounted without root id + sqashing (i.e. root must be root) and it will be selected + as the root file system for subsequent reboots. + A default set of -o options are provided, additional options + may be given on the command line (multiple -o options will + be combined into a single -o). + flash + Revert to booting from the flash disk on next reboot. + ram + Boot (once) into a ramdisk, subsequent boots will be to + the flash file system. + preserve + Save the system configuration to the SysConf partition, you + will need to create the SysConf partition from the boot loader + before using this if SysConf does not already exist. This + just runs 'sysconf save'. + restore + Restore a previously saved system configuration. This just + runs 'sysconf restore'. + disk formatting: + The argument to 'nfs' or 'disk' must be an empty partition + of sufficient size to hold the root file system (at least + 16MByte but more is recommended to allow package installation). + An appropriate ext3 partition can be made using the command: + + mke2fs -j <device> # for example: /dev/sda1 + + An appropriate NFS partition can be emptied using 'rm', but + must be set up (exported) on the NFS server." >&2 + exit 0;; +esac +# Exit with return code from command. diff --git a/packages/openprotium-init/openprotium-init_0.10.bb b/packages/openprotium-init/openprotium-init_0.10.bb new file mode 100644 index 0000000000..92c9d789cb --- /dev/null +++ b/packages/openprotium-init/openprotium-init_0.10.bb @@ -0,0 +1,148 @@ +DESCRIPTION = "OpenProtium initial boot and config" +SECTION = "base" +PRIORITY = "required" +LICENSE = "GPL" +DEPENDS = "base-files devio" +RDEPENDS = "busybox devio" +PR = "r71" + +SRC_URI = "file://boot/flash \ + file://boot/disk \ + file://boot/nfs \ + file://boot/network \ + file://boot/udhcpc.script \ + file://initscripts/fixfstab \ + file://initscripts/syslog.buffer \ + file://initscripts/syslog.file \ + file://initscripts/syslog.network \ + file://initscripts/rmrecovery \ + file://initscripts/sysconfsetup \ + file://initscripts/umountinitrd.sh \ + file://initscripts/loadmodules.sh \ + file://functions \ + file://modulefunctions \ + file://conffiles \ + file://sysconf \ + file://turnup \ + file://reflash \ + file://links.conf \ + " + +SBINPROGS = "" +USRSBINPROGS = "" +CPROGS = "${USRSBINPROGS} ${SBINPROGS}" +SCRIPTS = "turnup reflash sysconf" +BOOTSCRIPTS = "flash disk nfs network udhcpc.script" +INITSCRIPTS = "syslog.buffer syslog.file syslog.network \ + rmrecovery sysconfsetup umountinitrd.sh \ + fixfstab loadmodules.sh" + +# This just makes things easier... + +S="${WORKDIR}" + +do_compile() { + set -ex + for p in ${CPROGS} + do + ${CC} ${CFLAGS} -o $p $p.c + done + set +ex +} + +do_install() { + set -ex + + # Directories + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/modutils \ + ${D}${sysconfdir}/udev \ + ${D}${sbindir} \ + ${D}${base_sbindir} \ + ${D}/initrd \ + ${D}/boot + + # linuxrc + rm -f ${D}/linuxrc + ln -s boot/flash ${D}/linuxrc + + # C programs + for p in ${USRSBINPROGS} + do + install -m 0755 $p ${D}${sbindir}/$p + done + for p in ${SBINPROGS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # Shell scripts + for p in ${SCRIPTS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # + # Init scripts + install -m 0644 functions ${D}${sysconfdir}/default + install -m 0644 modulefunctions ${D}${sysconfdir}/default + for s in ${INITSCRIPTS} + do + install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/ + done + + # + # Udev configuration files + install -m 0644 links.conf ${D}${sysconfdir}/udev + + # + # Boot scripts + for p in ${BOOTSCRIPTS} + do + install -m 0755 boot/$p ${D}/boot + done + + # Configuration files + install -m 0644 conffiles ${D}${sysconfdir}/default + + set +ex +} + +# If the package is installed on an NSLU2 $D will be empty, in that +# case it is normal to run 'start' and 'stop', but because the conf +# files installed don't actually start or stop anything this is +# unnecessary, so the package postfoo handling is simplified here. +#NB: do not use '08' (etc) for the first argument after start/stop, +# the value is interpreted as an octal number if there is a leading +# zero. +pkg_postinst_openprotium-init() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt hwclock.sh start 8 S . start 45 0 6 . + update-rc.d $opt umountinitrd.sh start 9 S . + update-rc.d $opt fixfstab start 10 S . + update-rc.d $opt syslog.buffer start 11 S . start 49 0 6 . + update-rc.d $opt sysconfsetup start 12 S . + update-rc.d $opt loadmodules.sh start 21 S . + update-rc.d $opt syslog.file start 39 S . start 47 0 6 . + update-rc.d $opt syslog.network start 44 S . start 39 0 6 . + update-rc.d $opt rmrecovery start 99 1 2 3 4 5 . +} + +pkg_postrm_openprotium-init() { + opt= + test -n "$D" && opt="-r $D" + for s in ${INITSCRIPTS} + do + update-rc.d $opt "$s" remove + done +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" + +# It is bad to overwrite /linuxrc as it puts the system back to +# a flash boot (and the flash has potentially not been upgraded!) +CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles" diff --git a/packages/opensp/opensp_1.5.bb b/packages/opensp/opensp_1.5.bb index 7cb164a770..5d6ad639af 100644 --- a/packages/opensp/opensp_1.5.bb +++ b/packages/opensp/opensp_1.5.bb @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \ file://attributevalue.patch;patch=1" S = "${WORKDIR}/OpenSP-${PV}" -inherit autotools +inherit autotools do_stage () { oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR} diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb index 2c830982ee..dc365f5eac 100644 --- a/packages/openssh/openssh_3.8p1.bb +++ b/packages/openssh/openssh_3.8p1.bb @@ -31,7 +31,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ --without-zlib-version-check \ --with-privsep-path=/var/run/sshd \ --sysconfdir=${sysconfdir}/ssh" - + EXTRA_OEMAKE = "'STRIP_OPT='" do_configure_prepend () { diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index 86763a9275..ae3092ff10 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -35,7 +35,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ --with-privsep-path=/var/run/sshd \ --sysconfdir=${sysconfdir}/ssh \ --with-xauth=/usr/bin/xauth" - + EXTRA_OEMAKE = "'STRIP_OPT='" do_configure_prepend () { diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb index 810810acb6..114657536a 100644 --- a/packages/openssh/openssh_4.3p2.bb +++ b/packages/openssh/openssh_4.3p2.bb @@ -34,7 +34,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ --with-privsep-path=/var/run/sshd \ --sysconfdir=${sysconfdir}/ssh \ --with-xauth=/usr/bin/xauth" - + EXTRA_OEMAKE = "'STRIP_OPT='" do_configure_prepend () { diff --git a/packages/tslib/tslib/akita/.mtn2git_empty b/packages/openswan/openswan-2.4.7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/akita/.mtn2git_empty +++ b/packages/openswan/openswan-2.4.7/.mtn2git_empty diff --git a/packages/openswan/openswan-2.4.7/installflags.patch b/packages/openswan/openswan-2.4.7/installflags.patch new file mode 100644 index 0000000000..e6da2eaa5f --- /dev/null +++ b/packages/openswan/openswan-2.4.7/installflags.patch @@ -0,0 +1,13 @@ +Index: openswan-2.4.7/Makefile.inc +=================================================================== +--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100 ++++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100 +@@ -158,7 +158,7 @@ + # how backup names are composed. + # Note that the install procedures will never overwrite an existing config + # file, which is why -b is not specified for them. +-INSTBINFLAGS=-b --suffix=.old ++INSTBINFLAGS= + INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old + INSTMANFLAGS= + INSTCONFFLAGS= diff --git a/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch new file mode 100644 index 0000000000..e3cc8762cc --- /dev/null +++ b/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch @@ -0,0 +1,26 @@ +--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200 ++++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100 +@@ -30,10 +30,6 @@ + + CFLAGS+= ${WERROR} + +-ifneq ($(LD_LIBRARY_PATH),) +-LDFLAGS=-L$(LD_LIBRARY_PATH) +-endif +- + MANDIR8=$(MANTREE)/man8 + MANDIR5=$(MANTREE)/man5 + +--- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100 ++++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100 +@@ -234,10 +234,6 @@ + LIBSPLUTO+=${CURL_LIBS} + LIBSPLUTO+= -lgmp -lresolv # -lefence + +-ifneq ($(LD_LIBRARY_PATH),) +-LDFLAGS=-L$(LD_LIBRARY_PATH) +-endif +- + LIBSADNS = $(OPENSWANLIB) + LIBSADNS += -lresolv # -lefence + diff --git a/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch new file mode 100644 index 0000000000..b3863a584b --- /dev/null +++ b/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch @@ -0,0 +1,377 @@ +diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile +--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200 ++++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200 +@@ -1,6 +1,6 @@ + # Makefile to generate various formats from HTML source + # +-# Assumes the htmldoc utility is available. ++# No longer cares if the htmldoc utility is available. + # This can be downloaded from www.easysw.com + # + # Also needs lynx(1) for HTML-to-text conversion +diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl +--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300 ++++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> +diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl +--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300 ++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) + # des_cblock (*input); +diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl +--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300 ++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # require 'x86asm.pl'; + # &asm_init("cpp","des-586.pl"); +diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl +--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300 ++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86ms; + +diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl +--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300 ++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86unix; + +diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile +--- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200 ++++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200 +@@ -20,7 +20,7 @@ + CDEFINES = -g + CWARNINGS = -Werror + +-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} ++CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) + + VERSION="@(\#) openswan-hacking-9.3-for-osw2" + LIBINTERFACE=2 +diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl +--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> +diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl +--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $prog="des686.pl"; + +diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl +--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $L="edi"; + $R="esi"; +diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc +--- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200 ++++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200 +@@ -46,7 +46,7 @@ + DESTDIR?= + + # "local" part of tree, used in building other pathnames +-INC_USRLOCAL=/usr/local ++INC_USRLOCAL?=/usr + + # PUBDIR is where the "ipsec" command goes; beware, many things define PATH + # settings which are assumed to include it (or at least, to include *some* +@@ -80,7 +80,7 @@ + MANPLACES=man3 man5 man8 + + # where configuration files go +-FINALCONFFILE?=/etc/ipsec.conf ++FINALCONFFILE?=/etc/ipsec/ipsec.conf + CONFFILE=$(DESTDIR)$(FINALCONFFILE) + + FINALCONFDIR?=/etc +@@ -91,7 +91,7 @@ + + # sample configuration files go into + INC_DOCDIR?=share/doc +-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan ++FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan + EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} + + FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan +@@ -239,7 +239,7 @@ + # installed one in RH 7.2, won't work - you wind up depending upon + # openssl. + +-BIND9STATICLIBDIR?=/usr/local/lib ++BIND9STATICLIBDIR?=/usr/lib + + # if you install elsewere, you may need to point the include files to it. + #BIND9STATICLIBDIR?=/sandel/lib +diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in +--- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200 ++++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200 +@@ -16,7 +16,7 @@ + + LOGS=${LOGS-/var/log} + CONFS=${IPSEC_CONFS-/etc} +-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} ++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} + me="ipsec barf" + # Max lines to use for things like 'route -n' + maxlines=100 +@@ -238,13 +238,13 @@ + done + fi + _________________________ ipsec/ls-libdir +-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} ++ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} + _________________________ ipsec/ls-execdir +-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} ++ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} + _________________________ ipsec/updowns +-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` ++for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` + do +- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f ++ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f + done + _________________________ /proc/net/dev + cat /proc/net/dev +diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5 +--- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300 ++++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200 +@@ -168,7 +168,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8 +--- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200 ++++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200 +@@ -308,7 +308,7 @@ + .br + .LP + .SH FILES +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) +diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in +--- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200 ++++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200 +@@ -47,10 +47,10 @@ + do + if test ! -r "$f" + then +- if test ! "$f" = "/etc/ipsec.conf" ++ if test ! "$f" = "/etc/ipsec/ipsec.conf" + then + echo "#:cannot open configuration file \'$f\'" +- if test "$f" = "/etc/ipsec.secrets" ++ if test "$f" = "/etc/ipsec/ipsec.secrets" + then + echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." + fi +diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8 +--- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200 ++++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200 +@@ -81,7 +81,7 @@ + .I ipsec + thinks the IPsec configuration files are stored. + .SH FILES +-/usr/local/lib/ipsec usual utilities directory ++/usr/lib/ipsec usual utilities directory + .SH ENVIRONMENT + .PP + The following environment variables control where FreeS/WAN finds its +diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5 +--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300 ++++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200 +@@ -114,7 +114,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8 +--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300 ++++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200 +@@ -111,7 +111,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in +--- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300 ++++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200 +@@ -60,7 +60,7 @@ + + "$test1st" + +-Common concerns: This account must be able to read /etc/ipsec.secrets. ++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. + If you haven't generated your key yet, please run 'ipsec newhostkey'." + exit 0 + } +diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile +--- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200 ++++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200 +@@ -256,7 +256,7 @@ + -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ + -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" + +-ALLFLAGS = $(CPPFLAGS) $(CFLAGS) ++ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) + + # libefence is a free memory allocation debugger + # Solaris 2 needs -lsocket -lnsl +diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile +--- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200 ++++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200 +@@ -33,25 +33,10 @@ + @rm -f $(BINDIR)/setup + @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec + @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup +- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done +- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec +- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec +- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec +- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec +- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec +- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec +- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec + + install_file_list:: + @echo $(RCDIR)/ipsec + @echo $(BINDIR)/setup +- @echo $(RCDIR)/../rc0.d/K76ipsec +- @echo $(RCDIR)/../rc1.d/K76ipsec +- @echo $(RCDIR)/../rc2.d/S47ipsec +- @echo $(RCDIR)/../rc3.d/S47ipsec +- @echo $(RCDIR)/../rc4.d/S47ipsec +- @echo $(RCDIR)/../rc5.d/S47ipsec +- @echo $(RCDIR)/../rc6.d/K76ipsec + + clean:: + @rm -f setup +diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in +--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200 ++++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200 +@@ -18,7 +18,7 @@ + usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] + [--dhclient] [--ipseckey]" + +-file=/etc/ipsec.secrets ++file=/etc/ipsec/ipsec.secrets + fmt="" + gw= + id= +diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5 +--- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300 ++++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200 +@@ -157,7 +157,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8 +--- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200 ++++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200 +@@ -215,7 +215,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5 +--- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300 ++++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200 +@@ -67,7 +67,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8 +--- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300 ++++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200 +@@ -87,7 +87,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5 +--- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300 ++++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200 +@@ -101,7 +101,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8 +--- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300 ++++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200 +@@ -63,7 +63,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + + .SH "SEE ALSO" + diff --git a/packages/openswan/openswan_2.4.7.bb b/packages/openswan/openswan_2.4.7.bb new file mode 100644 index 0000000000..353e0eacdd --- /dev/null +++ b/packages/openswan/openswan_2.4.7.bb @@ -0,0 +1,36 @@ +SECTION = "console/network" +DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \ +Linux operating system." +HOMEPAGE = "http://www.openswan.org" +LICENSE = "GPLv2" +DEPENDS = "gmp flex-native" +RRECOMMENDS = "kernel-module-ipsec" +RDEPENDS_nylon = "perl" +PR = "r0" + +SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ + file://openswan-2.4.7-gentoo.patch;patch=1 \ + file://installflags.patch;patch=1 \ + file://ld-library-path-breakage.patch;patch=1" +S = "${WORKDIR}/openswan-${PV}" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=${sysconfdir}/ipsec \ + INC_RCDEFAULT=${sysconfdir}/init.d \ + INC_USRLOCAL=${prefix} \ + INC_MANDIR=share/man WERROR=''" + +do_compile () { + oe_runmake programs +} + +do_install () { + oe_runmake install +} + +FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*" +FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" + +CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf" diff --git a/packages/opensync/libsyncml_0.4.0.bb b/packages/opensync/libsyncml_0.4.0.bb index 19bc91c382..dbc7404f50 100644 --- a/packages/opensync/libsyncml_0.4.0.bb +++ b/packages/opensync/libsyncml_0.4.0.bb @@ -12,7 +12,7 @@ EXTRA_OECONF = " --enable-http \ --enable-obex \ --enable-bluetooth \ --enable-tools \ - --with-wbxml" + --with-wbxml" CFLAGS += "-I${STAGING_INCDIR}/libsoup-2.2" diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb index 7a99236d90..729ac9a559 100644 --- a/packages/opensync/syncml-client_0.1.bb +++ b/packages/opensync/syncml-client_0.1.bb @@ -3,6 +3,6 @@ SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz" LICENSE = "GPL" DEPENDS = "gtk+ curl gconf" HOMEPAGE = "http://hem.bredband.net/miko22/" -DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." +DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." inherit autotools pkgconfig diff --git a/packages/openvpn/openvpn_2.0.9.bb b/packages/openvpn/openvpn_2.0.9.bb new file mode 100644 index 0000000000..badac9b551 --- /dev/null +++ b/packages/openvpn/openvpn_2.0.9.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A full-featured SSL VPN solution via tun device." +HOMEPAGE = "http://openvpn.sourceforge.net" +SECTION = "console/network" +LICENSE = "GPLv2" +PRIORITY = "optional" +DEPENDS = "lzo openssl" +RDEPENDS = "kernel-module-tun" +PR = "r0" + +SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ + file://openvpn" +S = "${WORKDIR}/openvpn-${PV}" + +CFLAGS += "-fno-inline" + +inherit autotools + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/openvpn + install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d +} diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb index 668697dd6b..a1172a5cc0 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet" diff --git a/packages/opie-addressbook/opie-addressbook_1.2.2.bb b/packages/opie-addressbook/opie-addressbook_1.2.2.bb index e32ef1b348..5667f05ba2 100644 --- a/packages/opie-addressbook/opie-addressbook_1.2.2.bb +++ b/packages/opie-addressbook/opie-addressbook_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb index f0db7f32fc..e66a3b2faa 100644 --- a/packages/opie-addressbook/opie-addressbook_cvs.bb +++ b/packages/opie-addressbook/opie-addressbook_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \ diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb index eb2011e5f3..1df77dc9be 100644 --- a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb +++ b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb index 2d365c68a6..ca2955fb0b 100644 --- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb +++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ diff --git a/packages/opie-alarm/opie-alarm_1.2.2.bb b/packages/opie-alarm/opie-alarm_1.2.2.bb index 7ae0b195a9..c656e87e98 100644 --- a/packages/opie-alarm/opie-alarm_1.2.2.bb +++ b/packages/opie-alarm/opie-alarm_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \ file://01opiealarm " diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb index 22b8f92bbd..0dd6254dbe 100644 --- a/packages/opie-alarm/opie-alarm_cvs.bb +++ b/packages/opie-alarm/opie-alarm_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \ diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb index db634523f8..ecb74d91df 100644 --- a/packages/opie-appearance/opie-appearance_cvs.bb +++ b/packages/opie-appearance/opie-appearance_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \ diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb index 7eff025ffc..4de0ec4958 100644 --- a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb +++ b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb index cbbdc6d306..3a372b698a 100644 --- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb +++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \ diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb index cc37c5e1bd..c2a43d1108 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb index d8a3b4a0a8..6c1e0a212f 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \ diff --git a/packages/opie-backgammon/opie-backgammon_1.2.2.bb b/packages/opie-backgammon/opie-backgammon_1.2.2.bb index 892ed19759..1dffa307bb 100644 --- a/packages/opie-backgammon/opie-backgammon_1.2.2.bb +++ b/packages/opie-backgammon/opie-backgammon_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb index d532ac1478..42559202a0 100644 --- a/packages/opie-backgammon/opie-backgammon_cvs.bb +++ b/packages/opie-backgammon/opie-backgammon_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \ diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb index 59d32bf8cd..a0ed96cc64 100644 --- a/packages/opie-backup/opie-backup_cvs.bb +++ b/packages/opie-backup/opie-backup_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \ diff --git a/packages/opie-bartender/opie-bartender_1.2.2.bb b/packages/opie-bartender/opie-bartender_1.2.2.bb index d91e2179bd..67e07df39a 100644 --- a/packages/opie-bartender/opie-bartender_1.2.2.bb +++ b/packages/opie-bartender/opie-bartender_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb index c7ab8583fa..0ba1b88e70 100644 --- a/packages/opie-bartender/opie-bartender_cvs.bb +++ b/packages/opie-bartender/opie-bartender_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \ diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb index c4083ec846..0548fa8b6b 100644 --- a/packages/opie-bluepin/opie-bluepin_cvs.bb +++ b/packages/opie-bluepin/opie-bluepin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb index c75a50a9e5..6db4ec5af6 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index 9387c04409..bf9cc5689b 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ diff --git a/packages/opie-bounce/opie-bounce_1.2.2.bb b/packages/opie-bounce/opie-bounce_1.2.2.bb index f3e587b59a..990c40296e 100644 --- a/packages/opie-bounce/opie-bounce_1.2.2.bb +++ b/packages/opie-bounce/opie-bounce_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb index c50e1adba6..8215c5baed 100644 --- a/packages/opie-bounce/opie-bounce_cvs.bb +++ b/packages/opie-bounce/opie-bounce_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \ diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb index 2d573375ec..ed74ebd446 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb index 511df2f502..a364980c1a 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \ diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb index cd77a862fb..d340e98bd1 100644 --- a/packages/opie-button-settings/opie-button-settings_cvs.bb +++ b/packages/opie-button-settings/opie-button-settings_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \ diff --git a/packages/opie-buzzword/opie-buzzword_1.2.2.bb b/packages/opie-buzzword/opie-buzzword_1.2.2.bb index d1560d811e..64b24d8a65 100644 --- a/packages/opie-buzzword/opie-buzzword_1.2.2.bb +++ b/packages/opie-buzzword/opie-buzzword_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb index e35f855098..3ac46958a8 100644 --- a/packages/opie-buzzword/opie-buzzword_cvs.bb +++ b/packages/opie-buzzword/opie-buzzword_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \ diff --git a/packages/opie-camera/opie-camera_1.2.2.bb b/packages/opie-camera/opie-camera_1.2.2.bb index d6906dd80a..f1e7a230f1 100644 --- a/packages/opie-camera/opie-camera_1.2.2.bb +++ b/packages/opie-camera/opie-camera_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb index 571689673f..9c6b059ca9 100644 --- a/packages/opie-camera/opie-camera_cvs.bb +++ b/packages/opie-camera/opie-camera_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \ diff --git a/packages/opie-cardmon/opie-cardmon_1.2.2.bb b/packages/opie-cardmon/opie-cardmon_1.2.2.bb index c5da07532f..607f2ff497 100644 --- a/packages/opie-cardmon/opie-cardmon_1.2.2.bb +++ b/packages/opie-cardmon/opie-cardmon_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb index 2168baffda..b1e69fb619 100644 --- a/packages/opie-cardmon/opie-cardmon_cvs.bb +++ b/packages/opie-cardmon/opie-cardmon_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \ diff --git a/packages/opie-checkbook/opie-checkbook_1.2.2.bb b/packages/opie-checkbook/opie-checkbook_1.2.2.bb index eb2011e5f3..1df77dc9be 100644 --- a/packages/opie-checkbook/opie-checkbook_1.2.2.bb +++ b/packages/opie-checkbook/opie-checkbook_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb index 2d365c68a6..ca2955fb0b 100644 --- a/packages/opie-checkbook/opie-checkbook_cvs.bb +++ b/packages/opie-checkbook/opie-checkbook_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ diff --git a/packages/opie-citytime/opie-citytime_1.2.2.bb b/packages/opie-citytime/opie-citytime_1.2.2.bb index 94fde31e6a..01fb34b795 100644 --- a/packages/opie-citytime/opie-citytime_1.2.2.bb +++ b/packages/opie-citytime/opie-citytime_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb index 457b9e2bb8..e4d9c1729e 100644 --- a/packages/opie-citytime/opie-citytime_cvs.bb +++ b/packages/opie-citytime/opie-citytime_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \ diff --git a/packages/opie-clock/opie-clock_1.2.2.bb b/packages/opie-clock/opie-clock_1.2.2.bb index da30def9ca..a83184a46f 100644 --- a/packages/opie-clock/opie-clock_1.2.2.bb +++ b/packages/opie-clock/opie-clock_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb index ef670bb7a8..ec38d84e8b 100644 --- a/packages/opie-clock/opie-clock_cvs.bb +++ b/packages/opie-clock/opie-clock_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \ diff --git a/packages/opie-confeditor/opie-confeditor_1.2.2.bb b/packages/opie-confeditor/opie-confeditor_1.2.2.bb index c6f7ff7612..60141c7ba9 100644 --- a/packages/opie-confeditor/opie-confeditor_1.2.2.bb +++ b/packages/opie-confeditor/opie-confeditor_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb index e945ad6de2..3431c6a1fd 100644 --- a/packages/opie-confeditor/opie-confeditor_cvs.bb +++ b/packages/opie-confeditor/opie-confeditor_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \ diff --git a/packages/opie-dagger/opie-dagger_1.2.2.bb b/packages/opie-dagger/opie-dagger_1.2.2.bb index 36a938634f..74589fbb96 100644 --- a/packages/opie-dagger/opie-dagger_1.2.2.bb +++ b/packages/opie-dagger/opie-dagger_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb index 59f2d5a943..6649fd81a0 100644 --- a/packages/opie-dagger/opie-dagger_cvs.bb +++ b/packages/opie-dagger/opie-dagger_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \ diff --git a/packages/opie-dasher/opie-dasher_1.2.2.bb b/packages/opie-dasher/opie-dasher_1.2.2.bb index 0f19139b0a..3a2e814fe1 100644 --- a/packages/opie-dasher/opie-dasher_1.2.2.bb +++ b/packages/opie-dasher/opie-dasher_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share " diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb index 58a051e2fa..d53cfc9e1b 100644 --- a/packages/opie-dasher/opie-dasher_cvs.bb +++ b/packages/opie-dasher/opie-dasher_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \ 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 c9ba827803..397bb5239d 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday " diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb index a4007d5a2c..2ade3c9e51 100644 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday " 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 f2912d602c..b95ca154fd 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian " diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb index 707c2e94f0..d9d0c07932 100644 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian " 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 56f2112b29..3e663fbe38 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays " diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb index 38927d1564..b396f38a01 100644 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \ diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb index e5e5a0e558..bbde94d59d 100644 --- a/packages/opie-datebook/opie-datebook_cvs.bb +++ b/packages/opie-datebook/opie-datebook_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \ 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 14dc7ce512..f0564654a8 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat " diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb index 7cd4c8bf1a..aeeccfc956 100644 --- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb +++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat " 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 b4f9ff39b7..fbe8119992 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid " diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb index 5a379e0087..d807dc67be 100644 --- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb +++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid " 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 77ca1c864f..583cfb179f 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished " diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb index 506d11f26e..ab6d8bf304 100644 --- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb +++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished " diff --git a/packages/opie-doctab/opie-doctab_1.2.2.bb b/packages/opie-doctab/opie-doctab_1.2.2.bb index 656c10eca3..ec714a00e8 100644 --- a/packages/opie-doctab/opie-doctab_1.2.2.bb +++ b/packages/opie-doctab/opie-doctab_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb index cc2c7819d1..3e7a8519a8 100644 --- a/packages/opie-doctab/opie-doctab_cvs.bb +++ b/packages/opie-doctab/opie-doctab_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \ diff --git a/packages/opie-drawpad/opie-drawpad_1.2.2.bb b/packages/opie-drawpad/opie-drawpad_1.2.2.bb index 7d3084f05f..c6055d1525 100644 --- a/packages/opie-drawpad/opie-drawpad_1.2.2.bb +++ b/packages/opie-drawpad/opie-drawpad_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb index 23e2674f9f..8d2cf708af 100644 --- a/packages/opie-drawpad/opie-drawpad_cvs.bb +++ b/packages/opie-drawpad/opie-drawpad_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \ diff --git a/packages/opie-dvorak/opie-dvorak_1.2.2.bb b/packages/opie-dvorak/opie-dvorak_1.2.2.bb index 39ae44e08e..a958f6cc88 100644 --- a/packages/opie-dvorak/opie-dvorak_1.2.2.bb +++ b/packages/opie-dvorak/opie-dvorak_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \ ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb index 33c9345763..bf38334b0c 100644 --- a/packages/opie-dvorak/opie-dvorak_cvs.bb +++ b/packages/opie-dvorak/opie-dvorak_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \ diff --git a/packages/opie-euroconv/opie-euroconv_1.2.2.bb b/packages/opie-euroconv/opie-euroconv_1.2.2.bb index 9053e62f5f..69999abdcb 100644 --- a/packages/opie-euroconv/opie-euroconv_1.2.2.bb +++ b/packages/opie-euroconv/opie-euroconv_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb index 56af9ca0ee..2578d52026 100644 --- a/packages/opie-euroconv/opie-euroconv_cvs.bb +++ b/packages/opie-euroconv/opie-euroconv_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \ diff --git a/packages/opie-examples/opie-examples_1.2.2.bb b/packages/opie-examples/opie-examples_1.2.2.bb index 7f601d9744..69cf92abe7 100644 --- a/packages/opie-examples/opie-examples_1.2.2.bb +++ b/packages/opie-examples/opie-examples_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb index a468b68ec4..67018bce33 100644 --- a/packages/opie-examples/opie-examples_cvs.bb +++ b/packages/opie-examples/opie-examples_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/examples \ diff --git a/packages/opie-eye/opie-eye_1.2.2.bb b/packages/opie-eye/opie-eye_1.2.2.bb index f67489075a..c7676389ce 100644 --- a/packages/opie-eye/opie-eye_1.2.2.bb +++ b/packages/opie-eye/opie-eye_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index 9997125ac9..6eee0c6d8e 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \ diff --git a/packages/opie-fifteen/opie-fifteen_1.2.2.bb b/packages/opie-fifteen/opie-fifteen_1.2.2.bb index 1463d942ee..817415710a 100644 --- a/packages/opie-fifteen/opie-fifteen_1.2.2.bb +++ b/packages/opie-fifteen/opie-fifteen_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb index 0a2b7e078e..56644933b9 100644 --- a/packages/opie-fifteen/opie-fifteen_cvs.bb +++ b/packages/opie-fifteen/opie-fifteen_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \ diff --git a/packages/opie-formatter/opie-formatter_1.2.2.bb b/packages/opie-formatter/opie-formatter_1.2.2.bb index 9665187811..3fe511399d 100644 --- a/packages/opie-formatter/opie-formatter_1.2.2.bb +++ b/packages/opie-formatter/opie-formatter_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb index 8b83f84df1..03c83a1542 100644 --- a/packages/opie-formatter/opie-formatter_cvs.bb +++ b/packages/opie-formatter/opie-formatter_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \ diff --git a/packages/opie-ftp/opie-ftp_1.2.2.bb b/packages/opie-ftp/opie-ftp_1.2.2.bb index f74b9eefcf..b0dd7aed5d 100644 --- a/packages/opie-ftp/opie-ftp_1.2.2.bb +++ b/packages/opie-ftp/opie-ftp_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb index 0217273ef6..2d0b8d9199 100644 --- a/packages/opie-ftp/opie-ftp_cvs.bb +++ b/packages/opie-ftp/opie-ftp_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \ diff --git a/packages/opie-ftplib/opie-ftplib_1.2.2.bb b/packages/opie-ftplib/opie-ftplib_1.2.2.bb index d614b14595..27b6d9b535 100644 --- a/packages/opie-ftplib/opie-ftplib_1.2.2.bb +++ b/packages/opie-ftplib/opie-ftplib_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib" diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb index 29d9a5e8fe..1275355f92 100644 --- a/packages/opie-ftplib/opie-ftplib_cvs.bb +++ b/packages/opie-ftplib/opie-ftplib_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib" diff --git a/packages/opie-go/opie-go_1.2.2.bb b/packages/opie-go/opie-go_1.2.2.bb index fa01fa9b04..049bc2feb6 100644 --- a/packages/opie-go/opie-go_1.2.2.bb +++ b/packages/opie-go/opie-go_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb index 62609e923c..a23d2ee45c 100644 --- a/packages/opie-go/opie-go_cvs.bb +++ b/packages/opie-go/opie-go_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \ diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb index a322ae5301..a6fe8ae305 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb index 72349585ad..6e64fef216 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \ diff --git a/packages/opie-handwriting/opie-handwriting_1.2.2.bb b/packages/opie-handwriting/opie-handwriting_1.2.2.bb index 46f832bc8d..01e2c3fc4e 100644 --- a/packages/opie-handwriting/opie-handwriting_1.2.2.bb +++ b/packages/opie-handwriting/opie-handwriting_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen" diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb index aaeaf94489..a607b32c69 100644 --- a/packages/opie-handwriting/opie-handwriting_cvs.bb +++ b/packages/opie-handwriting/opie-handwriting_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \ diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index 445963634c..787b40833f 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,5 @@ 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 bc31fcdf72..b69c2837d7 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb index a9089f0ffc..8e0e398a30 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb index 91c462268b..3870da10b2 100644 --- a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb +++ b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb index 22447dd621..b0c092c719 100644 --- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb +++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \ diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb index a398b21c44..9d87f74817 100644 --- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb +++ b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb @@ -11,13 +11,13 @@ SRC_URI = "file://icon-reload.desktop \ FILES_${PN} += "/opt" -do_install() { +do_install() { install -d ${D}${palmtopdir}/apps/Settings install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/pics - + install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin - install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics + install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics } 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 52118fe625..07196d1827 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 @@ 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 b61a4df306..7c49fdd77b 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc -#Remove the dash below when 1.2.1 changes +#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 374c388ecf..f8e1e7818b 100644 --- a/packages/opie-irc/opie-irc_1.2.2.bb +++ b/packages/opie-irc/opie-irc_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \ ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb index 4a8aa181f4..f1ad3901c2 100644 --- a/packages/opie-irc/opie-irc_cvs.bb +++ b/packages/opie-irc/opie-irc_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \ diff --git a/packages/opie-jumpx/opie-jumpx_1.2.2.bb b/packages/opie-jumpx/opie-jumpx_1.2.2.bb index 0e8284c672..cd335aea01 100644 --- a/packages/opie-jumpx/opie-jumpx_1.2.2.bb +++ b/packages/opie-jumpx/opie-jumpx_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb index 61ef6a73e2..6da41fef17 100644 --- a/packages/opie-jumpx/opie-jumpx_cvs.bb +++ b/packages/opie-jumpx/opie-jumpx_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \ diff --git a/packages/opie-kbill/opie-kbill_1.2.2.bb b/packages/opie-kbill/opie-kbill_1.2.2.bb index 38c9276ce1..e5c6161aea 100644 --- a/packages/opie-kbill/opie-kbill_1.2.2.bb +++ b/packages/opie-kbill/opie-kbill_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb index d0856b9648..208220cc00 100644 --- a/packages/opie-kbill/opie-kbill_cvs.bb +++ b/packages/opie-kbill/opie-kbill_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \ diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb index f1b74f25a1..33f01a4b03 100644 --- a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb +++ b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb index e5329f28cc..a1c47e7c54 100644 --- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb +++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \ diff --git a/packages/opie-keyboard/opie-keyboard_1.2.2.bb b/packages/opie-keyboard/opie-keyboard_1.2.2.bb index c2b29cd64a..5fe068c320 100644 --- a/packages/opie-keyboard/opie-keyboard_1.2.2.bb +++ b/packages/opie-keyboard/opie-keyboard_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb index b3ed6e71eb..0e6f66710e 100644 --- a/packages/opie-keyboard/opie-keyboard_cvs.bb +++ b/packages/opie-keyboard/opie-keyboard_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keypebble/opie-keypebble_1.2.2.bb b/packages/opie-keypebble/opie-keypebble_1.2.2.bb index 5a8e3c5508..782bc5f797 100644 --- a/packages/opie-keypebble/opie-keypebble_1.2.2.bb +++ b/packages/opie-keypebble/opie-keypebble_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb index 92faa6c52c..56d0408c60 100644 --- a/packages/opie-keypebble/opie-keypebble_cvs.bb +++ b/packages/opie-keypebble/opie-keypebble_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \ diff --git a/packages/opie-keytabs/opie-keytabs_1.2.2.bb b/packages/opie-keytabs/opie-keytabs_1.2.2.bb index b07033a4ce..2244f0153a 100644 --- a/packages/opie-keytabs/opie-keytabs_1.2.2.bb +++ b/packages/opie-keytabs/opie-keytabs_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-keyview/opie-keyview_1.2.2.bb b/packages/opie-keyview/opie-keyview_1.2.2.bb index 0f8c1c7cd4..172ad700a0 100644 --- a/packages/opie-keyview/opie-keyview_1.2.2.bb +++ b/packages/opie-keyview/opie-keyview_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview " diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb index f59904d193..f8bfff4b4b 100644 --- a/packages/opie-keyview/opie-keyview_cvs.bb +++ b/packages/opie-keyview/opie-keyview_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview " diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb index ddba3e4cfe..b558970ce5 100644 --- a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb +++ b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb index 2e8bb23ab7..70520aed36 100644 --- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb +++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \ diff --git a/packages/opie-kpacman/opie-kpacman_1.2.2.bb b/packages/opie-kpacman/opie-kpacman_1.2.2.bb index 7ae8b103c7..6508932193 100644 --- a/packages/opie-kpacman/opie-kpacman_1.2.2.bb +++ b/packages/opie-kpacman/opie-kpacman_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb index d86df42d17..8461547fa6 100644 --- a/packages/opie-kpacman/opie-kpacman_cvs.bb +++ b/packages/opie-kpacman/opie-kpacman_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \ diff --git a/packages/opie-language/opie-language_1.2.2.bb b/packages/opie-language/opie-language_1.2.2.bb index 77a4908293..dc46d457f0 100644 --- a/packages/opie-language/opie-language_1.2.2.bb +++ b/packages/opie-language/opie-language_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb index 8af7b7ea3f..f2b6619fdc 100644 --- a/packages/opie-language/opie-language_cvs.bb +++ b/packages/opie-language/opie-language_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \ diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb index 1a13c13720..291818ffc1 100644 --- a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb +++ b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync" diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb index d529b6e7c5..6befafb953 100644 --- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb +++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/rsync" 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 1f0f54d7eb..d7041aa4a9 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ 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 92c78e5c2e..bc94b4806e 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,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \ diff --git a/packages/opie-login/opie-login_1.2.2.bb b/packages/opie-login/opie-login_1.2.2.bb index 29be64cc81..c9c6c5f5e0 100644 --- a/packages/opie-login/opie-login_1.2.2.bb +++ b/packages/opie-login/opie-login_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb index d5c65b70ac..f009d24b4f 100644 --- a/packages/opie-login/opie-login_cvs.bb +++ b/packages/opie-login/opie-login_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \ diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb index b2fe4f905b..e8bf673c99 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb index 8a51c37040..9b30c7dfe5 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \ diff --git a/packages/opie-mail/opie-mail_1.2.2.bb b/packages/opie-mail/opie-mail_1.2.2.bb index 058e949a56..e7da9190f4 100644 --- a/packages/opie-mail/opie-mail_1.2.2.bb +++ b/packages/opie-mail/opie-mail_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb index 3da24143c3..5c8a18acc3 100644 --- a/packages/opie-mail/opie-mail_cvs.bb +++ b/packages/opie-mail/opie-mail_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \ diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb index ac7c6d311b..06f572a7fe 100644 --- a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb +++ b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb index ad7bcfc5c1..75785868ef 100644 --- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb +++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \ 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 be7dd3f433..8c8ea5f9fb 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index 97ca074890..c30822ab46 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ 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 d145c140d7..d5702318c9 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index cfccd3db0e..4cf1ac926d 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " 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 c929d7c0a5..e49bc44f41 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index 46f8851741..f1a3d8a92e 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ 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 d145c140d7..d5702318c9 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index cfccd3db0e..4cf1ac926d 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb index a78f5679b4..27f2b4d618 100644 --- a/packages/opie-mediummount/opie-mediummount_cvs.bb +++ b/packages/opie-mediummount/opie-mediummount_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb index 82c879a392..9246b06e01 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb index 25cc6d4523..e72a5ab7b6 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \ diff --git a/packages/opie-minesweep/opie-minesweep_1.2.2.bb b/packages/opie-minesweep/opie-minesweep_1.2.2.bb index f67fb457f1..c150529904 100644 --- a/packages/opie-minesweep/opie-minesweep_1.2.2.bb +++ b/packages/opie-minesweep/opie-minesweep_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb index 6292c661e8..6201cee393 100644 --- a/packages/opie-minesweep/opie-minesweep_cvs.bb +++ b/packages/opie-minesweep/opie-minesweep_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \ diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb index 41f2c79cf7..7cd1ac6914 100644 --- a/packages/opie-multikey/opie-multikey_1.2.2.bb +++ b/packages/opie-multikey/opie-multikey_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share" diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index 38eccd4a33..93d37edfac 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb index 786efe8d21..e05bf122c9 100644 --- a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb +++ b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb index 72975f88f2..d81ff2c915 100644 --- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb +++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \ diff --git a/packages/opie-networksettings/opie-networksettings_1.2.2.bb b/packages/opie-networksettings/opie-networksettings_1.2.2.bb index c1d5ecfcf9..bc25163d03 100644 --- a/packages/opie-networksettings/opie-networksettings_1.2.2.bb +++ b/packages/opie-networksettings/opie-networksettings_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb index accde9871b..47eecac791 100644 --- a/packages/opie-networksettings/opie-networksettings_cvs.bb +++ b/packages/opie-networksettings/opie-networksettings_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \ diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb index 49b176d432..a9a2a57203 100644 --- a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb +++ b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb index 0a11f79919..5a81637d56 100644 --- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb +++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-odict/opie-odict_1.2.2.bb b/packages/opie-odict/opie-odict_1.2.2.bb index d7f85ef55c..0e31a758d8 100644 --- a/packages/opie-odict/opie-odict_1.2.2.bb +++ b/packages/opie-odict/opie-odict_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb index 907ef18c9e..922c8313f1 100644 --- a/packages/opie-odict/opie-odict_cvs.bb +++ b/packages/opie-odict/opie-odict_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \ diff --git a/packages/opie-oxygen/opie-oxygen_1.2.2.bb b/packages/opie-oxygen/opie-oxygen_1.2.2.bb index d94985dc6f..329b1ae9a6 100644 --- a/packages/opie-oxygen/opie-oxygen_1.2.2.bb +++ b/packages/opie-oxygen/opie-oxygen_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb index 99dae6e239..3b40f47c42 100644 --- a/packages/opie-oxygen/opie-oxygen_cvs.bb +++ b/packages/opie-oxygen/opie-oxygen_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb index bc6264d383..48ee0a135c 100644 --- a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb +++ b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb index 51269ca473..c0a0c19789 100644 --- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb +++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \ diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb index 8f162caa09..5be7333846 100644 --- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb +++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ diff --git a/packages/opie-parashoot/opie-parashoot_1.2.2.bb b/packages/opie-parashoot/opie-parashoot_1.2.2.bb index 655282ca67..f7099c895c 100644 --- a/packages/opie-parashoot/opie-parashoot_1.2.2.bb +++ b/packages/opie-parashoot/opie-parashoot_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb index 85fc6cff9a..2a29dfa2d6 100644 --- a/packages/opie-parashoot/opie-parashoot_cvs.bb +++ b/packages/opie-parashoot/opie-parashoot_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \ diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb index bf73361ebf..c058534f61 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 @@ -require ${PN}.inc +require ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ diff --git a/packages/opie-pickboard/opie-pickboard_1.2.2.bb b/packages/opie-pickboard/opie-pickboard_1.2.2.bb index 227e179f0a..c220323d81 100644 --- a/packages/opie-pickboard/opie-pickboard_1.2.2.bb +++ b/packages/opie-pickboard/opie-pickboard_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb index ec86d1c169..4f778f135d 100644 --- a/packages/opie-pickboard/opie-pickboard_cvs.bb +++ b/packages/opie-pickboard/opie-pickboard_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pics/opie-pics_1.2.2.bb b/packages/opie-pics/opie-pics_1.2.2.bb index 7638dc9ce2..5ca408ea5e 100644 --- a/packages/opie-pics/opie-pics_1.2.2.bb +++ b/packages/opie-pics/opie-pics_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-powerchord/opie-powerchord_1.2.2.bb b/packages/opie-powerchord/opie-powerchord_1.2.2.bb index 756d2cf170..4e458943e0 100644 --- a/packages/opie-powerchord/opie-powerchord_1.2.2.bb +++ b/packages/opie-powerchord/opie-powerchord_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb index 2825308e51..1ee8132651 100644 --- a/packages/opie-powerchord/opie-powerchord_cvs.bb +++ b/packages/opie-powerchord/opie-powerchord_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \ diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb index 91c09fa8e9..6ab6bae411 100644 --- a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb +++ b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb index f4a52e68c6..3449dd850c 100644 --- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb +++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \ diff --git a/packages/opie-qcop/opie-qcop_1.2.2.bb b/packages/opie-qcop/opie-qcop_1.2.2.bb index 945811abd1..f2ba1e4701 100644 --- a/packages/opie-qcop/opie-qcop_1.2.2.bb +++ b/packages/opie-qcop/opie-qcop_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop" diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb index 9f97581b8c..13f2a817d0 100644 --- a/packages/opie-qcop/opie-qcop_cvs.bb +++ b/packages/opie-qcop/opie-qcop_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop" diff --git a/packages/opie-qss/opie-qss_1.2.2.bb b/packages/opie-qss/opie-qss_1.2.2.bb index 3db0f278be..ccf7704683 100644 --- a/packages/opie-qss/opie-qss_1.2.2.bb +++ b/packages/opie-qss/opie-qss_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss" diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb index 19b7b8da7c..765849976e 100644 --- a/packages/opie-qss/opie-qss_cvs.bb +++ b/packages/opie-qss/opie-qss_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb index 9d54ec91ed..f7826ee71f 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb index e3a7155a6a..992279d24a 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb index 75c6686ce2..29d159b541 100644 --- a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb +++ b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb index d2a73bcfbf..d615dfedd7 100644 --- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb +++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \ diff --git a/packages/opie-recorder/opie-recorder_1.2.2.bb b/packages/opie-recorder/opie-recorder_1.2.2.bb index a71079f7c9..2c0a378001 100644 --- a/packages/opie-recorder/opie-recorder_1.2.2.bb +++ b/packages/opie-recorder/opie-recorder_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb index 7e09748f10..7e5697574d 100644 --- a/packages/opie-recorder/opie-recorder_cvs.bb +++ b/packages/opie-recorder/opie-recorder_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \ diff --git a/packages/opie-remote/opie-remote_1.2.2.bb b/packages/opie-remote/opie-remote_1.2.2.bb index f988f29125..52284d9c59 100644 --- a/packages/opie-remote/opie-remote_1.2.2.bb +++ b/packages/opie-remote/opie-remote_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb index cf9afb6bf0..7c4ec466b2 100644 --- a/packages/opie-remote/opie-remote_cvs.bb +++ b/packages/opie-remote/opie-remote_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \ diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb index 97520564a1..341f6d3637 100644 --- a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb +++ b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb index f8d5b7d564..65ca2e23bd 100644 --- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \ diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb index 450eab5b24..797eb0eaf4 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb index 107d2fc348..f0c970c5ab 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \ diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb index c8c986d687..0e1239b33b 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb index 5b7377f4ec..98b1175f9d 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \ diff --git a/packages/opie-search/opie-search_1.2.2.bb b/packages/opie-search/opie-search_1.2.2.bb index 202e925aaa..d8d6a1b659 100644 --- a/packages/opie-search/opie-search_1.2.2.bb +++ b/packages/opie-search/opie-search_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb index 5141028b54..1bfe154839 100644 --- a/packages/opie-search/opie-search_cvs.bb +++ b/packages/opie-search/opie-search_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \ diff --git a/packages/opie-sfcave/opie-sfcave_1.2.2.bb b/packages/opie-sfcave/opie-sfcave_1.2.2.bb index db57345b94..72f7ba3bd4 100644 --- a/packages/opie-sfcave/opie-sfcave_1.2.2.bb +++ b/packages/opie-sfcave/opie-sfcave_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb index a5f3a6b2da..0698cda1da 100644 --- a/packages/opie-sfcave/opie-sfcave_cvs.bb +++ b/packages/opie-sfcave/opie-sfcave_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \ diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb index 289a1cd01e..4701e1aeeb 100644 --- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb +++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb @@ -13,7 +13,7 @@ FILES_${PN} = "/opt/QtPalmtop" SRC_URI = "file://snes.desktop \ file://snes.png \ file://opie-sh-snes.sh" - + do_install() { @@ -21,8 +21,8 @@ do_install() { do install -d ${D}${palmtopdir}/$dir done - + install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}${palmtopdir}/bin install -m 644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics install -m 644 ${WORKDIR}/*.desktop ${D}${palmtopdir}/apps/Games -} +} 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 52118fe625..07196d1827 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 @@ 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 b61a4df306..7c49fdd77b 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc -#Remove the dash below when 1.2.1 changes +#Remove the dash below when 1.2.1 changes PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-sheet/opie-sheet_1.2.2.bb b/packages/opie-sheet/opie-sheet_1.2.2.bb index bc90e3709d..f71dbb9415 100644 --- a/packages/opie-sheet/opie-sheet_1.2.2.bb +++ b/packages/opie-sheet/opie-sheet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb index c695558c3f..ec5200c17a 100644 --- a/packages/opie-sheet/opie-sheet_cvs.bb +++ b/packages/opie-sheet/opie-sheet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \ diff --git a/packages/opie-snake/opie-snake_1.2.2.bb b/packages/opie-snake/opie-snake_1.2.2.bb index 8d422568f5..26fd77fa53 100644 --- a/packages/opie-snake/opie-snake_1.2.2.bb +++ b/packages/opie-snake/opie-snake_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb index cee76c6c70..8bffd63a1d 100644 --- a/packages/opie-snake/opie-snake_cvs.bb +++ b/packages/opie-snake/opie-snake_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \ diff --git a/packages/opie-solitaire/opie-solitaire_1.2.2.bb b/packages/opie-solitaire/opie-solitaire_1.2.2.bb index 5074934c63..c8c3b8c2f3 100644 --- a/packages/opie-solitaire/opie-solitaire_1.2.2.bb +++ b/packages/opie-solitaire/opie-solitaire_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb index b9428ef04c..b3dd70cd9f 100644 --- a/packages/opie-solitaire/opie-solitaire_cvs.bb +++ b/packages/opie-solitaire/opie-solitaire_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \ diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb index a731009a7c..6a9732fa96 100644 --- a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb +++ b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb index b669870373..4a1c99746b 100644 --- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb +++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \ 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 91641bfd6d..17b022f789 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat " diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb index ac045b599e..f007a4b9b2 100644 --- a/packages/opie-style-flat/opie-style-flat_cvs.bb +++ b/packages/opie-style-flat/opie-style-flat_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat " 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 223e7067f7..80a77e2144 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh " diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb index 6e571ef451..d68f8ef83f 100644 --- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb +++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh " 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 ea307ee9a5..597be07ec5 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid " diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb index 1b76a1fb66..02ba287dee 100644 --- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb +++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid " 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 9fadf8ab7f..f4c582d92b 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal " diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb index b21797e5bd..966c733259 100644 --- a/packages/opie-style-metal/opie-style-metal_cvs.bb +++ b/packages/opie-style-metal/opie-style-metal_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal " 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 47235dd14d..c9654633b4 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase" diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb index cd047a2254..09e90748bd 100644 --- a/packages/opie-style-phase/opie-style-phase_cvs.bb +++ b/packages/opie-style-phase/opie-style-phase_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase" 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 b92edb8804..9c8af9a4df 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web" diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb index a43db5557c..8bf3cb2b57 100644 --- a/packages/opie-style-web/opie-style-web_cvs.bb +++ b/packages/opie-style-web/opie-style-web_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb index 46fe78b358..ed4d6b037a 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb index f517498690..f18b4300e7 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \ diff --git a/packages/opie-symlinker/opie-symlinker_1.2.2.bb b/packages/opie-symlinker/opie-symlinker_1.2.2.bb index ac98fb73f9..1f46355811 100644 --- a/packages/opie-symlinker/opie-symlinker_1.2.2.bb +++ b/packages/opie-symlinker/opie-symlinker_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker " diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb index 31c3954ffa..01cc735823 100644 --- a/packages/opie-symlinker/opie-symlinker_cvs.bb +++ b/packages/opie-symlinker/opie-symlinker_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker " diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 6517203c8e..597f28970d 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb index e75c4e73d9..a553ce6f33 100644 --- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb +++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \ diff --git a/packages/opie-systemtime/opie-systemtime_1.2.2.bb b/packages/opie-systemtime/opie-systemtime_1.2.2.bb index 78e22ae536..11ec29c45f 100644 --- a/packages/opie-systemtime/opie-systemtime_1.2.2.bb +++ b/packages/opie-systemtime/opie-systemtime_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb index c58c5509d1..ca4f7ab00e 100644 --- a/packages/opie-systemtime/opie-systemtime_cvs.bb +++ b/packages/opie-systemtime/opie-systemtime_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \ diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb index 35397627d1..b78bf3388a 100644 --- a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb +++ b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb index b97f7265d7..044d249d7e 100644 --- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb +++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \ diff --git a/packages/opie-tetrix/opie-tetrix_1.2.2.bb b/packages/opie-tetrix/opie-tetrix_1.2.2.bb index c3a36f09de..bb9052066d 100644 --- a/packages/opie-tetrix/opie-tetrix_1.2.2.bb +++ b/packages/opie-tetrix/opie-tetrix_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb index dfb057879c..bf315fd7ce 100644 --- a/packages/opie-tetrix/opie-tetrix_cvs.bb +++ b/packages/opie-tetrix/opie-tetrix_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \ diff --git a/packages/opie-textedit/opie-textedit_1.2.2.bb b/packages/opie-textedit/opie-textedit_1.2.2.bb index bc31fcdf72..b69c2837d7 100644 --- a/packages/opie-textedit/opie-textedit_1.2.2.bb +++ b/packages/opie-textedit/opie-textedit_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb index a9089f0ffc..8e0e398a30 100644 --- a/packages/opie-textedit/opie-textedit_cvs.bb +++ b/packages/opie-textedit/opie-textedit_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ diff --git a/packages/opie-theme/opie-theme_1.2.2.bb b/packages/opie-theme/opie-theme_1.2.2.bb index 5aa0a4315f..d765a9ffc4 100644 --- a/packages/opie-theme/opie-theme_1.2.2.bb +++ b/packages/opie-theme/opie-theme_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \ ${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles " diff --git a/packages/opie-tictac/opie-tictac_1.2.2.bb b/packages/opie-tictac/opie-tictac_1.2.2.bb index 6d018524ee..7ff217e1eb 100644 --- a/packages/opie-tictac/opie-tictac_1.2.2.bb +++ b/packages/opie-tictac/opie-tictac_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb index 2ee752587c..a685ad6ea4 100644 --- a/packages/opie-tictac/opie-tictac_cvs.bb +++ b/packages/opie-tictac/opie-tictac_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \ diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb index 3618a15804..e964a4886e 100644 --- a/packages/opie-tinykate/opie-tinykate_1.2.2.bb +++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb index 1f49465a5a..1a4283ac86 100644 --- a/packages/opie-tinykate/opie-tinykate_cvs.bb +++ b/packages/opie-tinykate/opie-tinykate_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \ 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 2648340536..1ebcab1886 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook " diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb index 10b53b92a6..fad571b599 100644 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook " 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 f05a82c1cd..b9b978586b 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook " diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb index 7abf53e4d7..1f71be5147 100644 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook " 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 558cb028cd..b8dcf1d2a0 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune " diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb index bde03ddfa8..4d54cdc259 100644 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune " 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 7be824499f..ea01493fc2 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail " diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb index ae38b4acf4..00f951f34d 100644 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail " 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 993d247cd3..c34565c4fa 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb index 2fd397e8c8..fb9d16bed0 100644 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \ 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 53ca61146b..002152f7e2 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,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist " diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb index 6ccc6481a4..3c6875404d 100644 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist " 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 878ac811b1..8daa8273d2 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb index 5bda2fa8ae..0c73984428 100644 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \ diff --git a/packages/opie-today/opie-today_1.2.2.bb b/packages/opie-today/opie-today_1.2.2.bb index 8cdd4e4cd6..1039d274b1 100644 --- a/packages/opie-today/opie-today_1.2.2.bb +++ b/packages/opie-today/opie-today_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb index d0730ac974..fc7f2d808e 100644 --- a/packages/opie-today/opie-today_cvs.bb +++ b/packages/opie-today/opie-today_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \ diff --git a/packages/opie-todo/opie-todo_1.2.2.bb b/packages/opie-todo/opie-todo_1.2.2.bb index ea24060b02..5b50255d43 100644 --- a/packages/opie-todo/opie-todo_1.2.2.bb +++ b/packages/opie-todo/opie-todo_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb index 525ab0ee8d..dabbdfd4fb 100644 --- a/packages/opie-todo/opie-todo_cvs.bb +++ b/packages/opie-todo/opie-todo_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \ diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb index f471360ced..9dbbdba2ff 100644 --- a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb +++ b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb index 7536f8db7e..b413c24297 100644 --- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb +++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \ diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb index f012af4a72..139c842c90 100644 --- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb +++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb @@ -6,7 +6,7 @@ SRC_URI = "file://update-qtttffontdir.c" S = "${WORKDIR}" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c + ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c } do_install() { diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb index c505e360de..b9a85ce275 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb index d173bd7de7..c85a6ad7e2 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-usermanager/opie-usermanager_1.2.2.bb b/packages/opie-usermanager/opie-usermanager_1.2.2.bb index ccc9c52cbe..2233f1349f 100644 --- a/packages/opie-usermanager/opie-usermanager_1.2.2.bb +++ b/packages/opie-usermanager/opie-usermanager_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb index 10f1528934..1f481f7461 100644 --- a/packages/opie-usermanager/opie-usermanager_cvs.bb +++ b/packages/opie-usermanager/opie-usermanager_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \ 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 9bcf900b85..f70855361b 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,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb index 2965355f57..834e65c526 100644 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \ diff --git a/packages/opie-vmemo/opie-vmemo_1.2.2.bb b/packages/opie-vmemo/opie-vmemo_1.2.2.bb index fcb988f085..10e11d82d6 100644 --- a/packages/opie-vmemo/opie-vmemo_1.2.2.bb +++ b/packages/opie-vmemo/opie-vmemo_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb index 5d17175393..2ea90ed3e2 100644 --- a/packages/opie-vmemo/opie-vmemo_cvs.bb +++ b/packages/opie-vmemo/opie-vmemo_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \ diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb index 423f676470..6aa925b63a 100644 --- a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb +++ b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb index cf7a023c5c..9e1817220b 100644 --- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb +++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \ diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb index 13e10e9dfa..782f2cbb7d 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \ diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb index 62e07c3a1e..fcd2794595 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb index 1928692898..76a2b2f340 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wordgame/opie-wordgame_1.2.2.bb b/packages/opie-wordgame/opie-wordgame_1.2.2.bb index 694822c3ab..93897ec99f 100644 --- a/packages/opie-wordgame/opie-wordgame_1.2.2.bb +++ b/packages/opie-wordgame/opie-wordgame_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb index e827b5bb05..9d557d6880 100644 --- a/packages/opie-wordgame/opie-wordgame_cvs.bb +++ b/packages/opie-wordgame/opie-wordgame_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \ diff --git a/packages/opie-write/opie-write_1.2.2.bb b/packages/opie-write/opie-write_1.2.2.bb index eb2011e5f3..1df77dc9be 100644 --- a/packages/opie-write/opie-write_1.2.2.bb +++ b/packages/opie-write/opie-write_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb index 2d365c68a6..ca2955fb0b 100644 --- a/packages/opie-write/opie-write_cvs.bb +++ b/packages/opie-write/opie-write_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb index cec152e3fe..db2f29d7d4 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb index f861726632..260552de7a 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \ diff --git a/packages/opie-zlines/opie-zlines_1.2.2.bb b/packages/opie-zlines/opie-zlines_1.2.2.bb index 4f65bb9537..2e7f2dc774 100644 --- a/packages/opie-zlines/opie-zlines_1.2.2.bb +++ b/packages/opie-zlines/opie-zlines_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb index 00956b4a0c..c2810d68fe 100644 --- a/packages/opie-zlines/opie-zlines_cvs.bb +++ b/packages/opie-zlines/opie-zlines_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \ diff --git a/packages/opie-zsafe/opie-zsafe_1.2.2.bb b/packages/opie-zsafe/opie-zsafe_1.2.2.bb index d9c5e75c68..80e53c3882 100644 --- a/packages/opie-zsafe/opie-zsafe_1.2.2.bb +++ b/packages/opie-zsafe/opie-zsafe_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb index 8b7aaacbc0..51c15f7711 100644 --- a/packages/opie-zsafe/opie-zsafe_cvs.bb +++ b/packages/opie-zsafe/opie-zsafe_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \ diff --git a/packages/opie-zsame/opie-zsame_1.2.2.bb b/packages/opie-zsame/opie-zsame_1.2.2.bb index bb18cc23bd..a318d0a1cc 100644 --- a/packages/opie-zsame/opie-zsame_1.2.2.bb +++ b/packages/opie-zsame/opie-zsame_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc - - + + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb index 5dc7427fb5..a25478fabf 100644 --- a/packages/opie-zsame/opie-zsame_cvs.bb +++ b/packages/opie-zsame/opie-zsame_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc - + PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \ diff --git a/packages/orinoco/orinoco-conf_1.0.bb b/packages/orinoco/orinoco-conf_1.0.bb index 6fb90970a7..97b860f2cf 100644 --- a/packages/orinoco/orinoco-conf_1.0.bb +++ b/packages/orinoco/orinoco-conf_1.0.bb @@ -9,9 +9,9 @@ SRC_URI = "file://spectrum.conf \ file://hermes.conf \ file://orinoco_cs.conf" -do_install() { +do_install() { install -d ${D}${sysconfdir}/pcmcia - install -d ${D}${sysconfdir}/modutils + install -d ${D}${sysconfdir}/modutils install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/ install -m 0644 ${WORKDIR}/hermes.conf ${D}${sysconfdir}/pcmcia/ install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb index 102a6f6aa1..9c5cc2f776 100644 --- a/packages/orinoco/orinoco-modules_0.13e.bb +++ b/packages/orinoco/orinoco-modules_0.13e.bb @@ -20,7 +20,7 @@ do_compile_prepend() { cp -f ${WORKDIR}/spectrum* ${S}/ } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -d ${D}${sysconfdir}/pcmcia install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ @@ -31,7 +31,7 @@ do_install() { } PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" -FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}" +FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}" FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index b2abc152f7..ebf0f03bbf 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -17,13 +17,13 @@ S = "${WORKDIR}/orinoco-${PV}" inherit module -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ } PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" -FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" +FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index b31f1bf6c2..4153e8c4fc 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -19,13 +19,13 @@ S = "${WORKDIR}/orinoco-${PV}" inherit module -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ } PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" -FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" +FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc new file mode 100644 index 0000000000..e73fecbfb2 --- /dev/null +++ b/packages/pango/pango.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "The goal of the Pango project is to provide an \ +Open Source framework for the layout and rendering of \ +internationalized text." +LICENSE = "LGPL" + +inherit gnome +EXTRA_AUTORECONF = "" + +SECTION = "x11/libs" + +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" + +PACKAGES_DYNAMIC = "pango-module-*" + +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +SRC_URI += "file://no-tests.patch;patch=1 \ + " + +EXTRA_OECONF = "--disable-glibtest \ + --enable-explicit-deps=no \ + --disable-debug" + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.6.0" + +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +do_stage () { + autotools_stage_all +} + +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.10.2.bb b/packages/pango/pango_1.10.2.bb index d9273e0b78..fa91b2bd28 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.bb @@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \ internationalized text." PR = "r2" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index 6e07832f34..ae8f597bc1 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \ internationalized text." PR = "r2" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb index ba0e606c42..90e4acbf50 100644 --- a/packages/pango/pango_1.13.3.bb +++ b/packages/pango/pango_1.13.3.bb @@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \ internationalized text." PR = "r2" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb index b98e241af5..caa09c610a 100644 --- a/packages/pango/pango_1.14.0.bb +++ b/packages/pango/pango_1.14.0.bb @@ -8,7 +8,7 @@ PR = "r2" PACKAGES_DYNAMIC = "pango-module-*" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.14.8.bb b/packages/pango/pango_1.14.8.bb index dd2afb09d4..aec8219efa 100644 --- a/packages/pango/pango_1.14.8.bb +++ b/packages/pango/pango_1.14.8.bb @@ -8,7 +8,7 @@ PR = "r0" PACKAGES_DYNAMIC = "pango-module-*" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.15.1.bb b/packages/pango/pango_1.15.1.bb index 8847b88549..82d1ad2b66 100644 --- a/packages/pango/pango_1.15.1.bb +++ b/packages/pango/pango_1.15.1.bb @@ -10,7 +10,7 @@ PR = "r0" PACKAGES_DYNAMIC = "pango-module-*" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/packages/pango/pango_1.15.2.bb b/packages/pango/pango_1.15.2.bb new file mode 100644 index 0000000000..8e3e8e7d3a --- /dev/null +++ b/packages/pango/pango_1.15.2.bb @@ -0,0 +1 @@ +require pango.inc diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb index 11cfdec40f..c80f7326a3 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" DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +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 \ internationalized text." diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb index c0b5b04b98..66a6a84d22 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" DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +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 \ internationalized text." diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/panoramixext/panoramixext_1.1.bb index c2627c5bc1..2da504779f 100644 --- a/packages/panoramixext/panoramixext_1.1.bb +++ b/packages/panoramixext/panoramixext_1.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "PanoramiX extension headers" SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { oe_runmake install prefix=${STAGING_DIR} \ diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb index e8dbe1e082..08cc0cc51e 100644 --- a/packages/panoramixext/panoramixext_cvs.bb +++ b/packages/panoramixext/panoramixext_cvs.bb @@ -7,7 +7,7 @@ DESCRIPTION = "PanoramiX extension headers" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt" S = "${WORKDIR}/PanoramiXExt" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { oe_runmake install prefix=${STAGING_DIR} \ diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb index 22bf67d03a..59c076280a 100644 --- a/packages/pciutils/pciutils_2.1.11.bb +++ b/packages/pciutils/pciutils_2.1.11.bb @@ -31,4 +31,4 @@ do_install_append () { install -d ${D}/${prefix}/share install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share } - + diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb index 0bf20745d1..3f4472b501 100644 --- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -85,7 +85,7 @@ do_install() { # ensure that config.opts always exists, albeit empty echo >> ${D}${sysconfdir}/pcmcia/config.opts - + install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/ install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/ for i in etc/cis/*; do diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb index f3486307b5..69555e0fac 100644 --- a/packages/perl/perl-native_5.8.4.bb +++ b/packages/perl/perl-native_5.8.4.bb @@ -27,7 +27,7 @@ do_configure () { -Ud_csh \ -Uusesfio \ -Uusenm -des - sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; + sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new mv config.sh.new config.sh } diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index 338d1617cc..eeef2a2bc4 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -31,7 +31,7 @@ do_configure () { -Ud_csh \ -Uusesfio \ -Uusenm -des - sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; + sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new mv config.sh.new config.sh } diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 12450fbe74..2f37e6ccbe 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -43,7 +43,7 @@ do_configure() { cp ${WORKDIR}/config.sh-sh3-linux . cp ${WORKDIR}/config.sh-sh4-linux . #perl insists on an extra config.sh for arm EABI - cp config.sh-arm-linux config.sh-arm-linux-gnueabi + cp config.sh-arm-linux config.sh-arm-linux-gnueabi # nslu2 LE uclibc builds do not work with the default config.sh if test "${MACHINE}" = nslu2 then diff --git a/packages/pine/pine_4.64.bb b/packages/pine/pine_4.64.bb index a69f1c5a96..22a5cae098 100644 --- a/packages/pine/pine_4.64.bb +++ b/packages/pine/pine_4.64.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/pine${PV}" inherit autotools # -# ~lart Pine's build structure... +# ~lart Pine's build structure... # PARALLEL_MAKE = "" EXTRA_OEMAKE = "-e" diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb index 31fc7820fe..68d6a9917d 100644 --- a/packages/pkgconfig/pkgconfig_0.15.0.bb +++ b/packages/pkgconfig/pkgconfig_0.15.0.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV file://pkg.m4 \ file://glibconfig-sysdefs.h" -inherit autotools +inherit autotools acpaths = "-I ." do_configure_prepend () { diff --git a/packages/pme/pme_1.0.3.bb b/packages/pme/pme_1.0.3.bb index 2e1cab6117..75269c3432 100644 --- a/packages/pme/pme_1.0.3.bb +++ b/packages/pme/pme_1.0.3.bb @@ -5,7 +5,7 @@ DESCRIPTION = "PME is a C++ wrapper around the PCRE library." SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz" PR = "r1" -inherit autotools +inherit autotools do_stage () { oe_libinstall -a -so libpme ${STAGING_LIBDIR} diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb index f9cbdf11e8..6278c920be 100644 --- a/packages/poboxserver/poboxserver_1.2.5.bb +++ b/packages/poboxserver/poboxserver_1.2.5.bb @@ -25,7 +25,7 @@ do_compile() { oe_runmake cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt oe_runmake -C ${WORKDIR}/pbserver dic - #patch -p1 + #patch -p1 } do_install() { diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb index 31f15dab59..84fc53fa87 100644 --- a/packages/pocketcellar/pocketcellar_1.1.bb +++ b/packages/pocketcellar/pocketcellar_1.1.bb @@ -21,7 +21,7 @@ do_install() { ${D}${palmtopdir}/apps/Applications \ ${D}${palmtopdir}/pics \ ${D}${palmtopdir}/data/PocketCellar - + install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/ install -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/ install -m 644 pocketcellar.desktop ${D}${palmtopdir}/apps/Applications/ diff --git a/packages/poppler/poppler-fpu.inc b/packages/poppler/poppler-fpu.inc new file mode 100644 index 0000000000..a26273020a --- /dev/null +++ b/packages/poppler/poppler-fpu.inc @@ -0,0 +1,6 @@ + +def get_poppler_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-fixedpoint" + return "" + diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc new file mode 100644 index 0000000000..14ae8220a8 --- /dev/null +++ b/packages/poppler/poppler.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +DEPENDS = "fontconfig jpeg zlib gtk+ cairo" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-xpdf-headers \ + --disable-gtk-test \ + --disable-poppler-qt \ + --enable-zlib \ + " + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require poppler-fpu.inc +EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" + + +do_stage() { + autotools_stage_all +} diff --git a/packages/poppler/poppler_0.5.1.bb b/packages/poppler/poppler_0.5.1.bb deleted file mode 100644 index f39e7fe8d9..0000000000 --- a/packages/poppler/poppler_0.5.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -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_0.5.3.bb b/packages/poppler/poppler_0.5.3.bb deleted file mode 100644 index f39e7fe8d9..0000000000 --- a/packages/poppler/poppler_0.5.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -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_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb index bdd67a8c12..ade41a276a 100644 --- a/packages/poppler/poppler_0.5.4.bb +++ b/packages/poppler/poppler_0.5.4.bb @@ -1,14 +1,2 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -DEPENDS = "fontconfig jpeg gtk+ cairo" -LICENSE = "GPL" -PR = "r0" - -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 -} +require poppler.inc +PR = "r1" diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb index 358e1df842..842536eda3 100644 --- a/packages/poppler/poppler_20060418.bb +++ b/packages/poppler/poppler_20060418.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/poppler" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt" +EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt" do_stage() { autotools_stage_all diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb index 6f4dfd7acf..137b6744dc 100644 --- a/packages/popt/popt_1.7.bb +++ b/packages/popt/popt_1.7.bb @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ file://m4.patch;patch=1 \ file://intl.patch;patch=1" -inherit autotools +inherit autotools do_stage () { oe_libinstall -a -so libpopt ${STAGING_LIBDIR} diff --git a/packages/poptop/poptop_1.3.0.bb b/packages/poptop/poptop_1.3.0.bb index a8bd12a31f..0ad4588ac4 100644 --- a/packages/poptop/poptop_1.3.0.bb +++ b/packages/poptop/poptop_1.3.0.bb @@ -4,12 +4,12 @@ This enables administrators to leverage the considerable benefits of both Micros The current release version supports Windows 95/98/Me/NT/2000/XP PPTP clients and Linux PPTP clients \ For more info visit http://www.poptop.org/" -HOMEPAGE = "http://www.poptop.org/" +HOMEPAGE = "http://www.poptop.org/" LICENSE = "GPL" SECTION = "network" PRIORITY = "optional" DEPENDS = "ppp" -RDEPENDS = "ppp" +RDEPENDS = "ppp" PR = "r0" @@ -20,7 +20,7 @@ S = "${WORKDIR}/pptpd-${PV}" -do_install() { +do_install() { install -d ${D}${sbindir} install -d ${D}/${sysconfdir} install -d ${D}/${sysconfdir}/ppp/ diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb index 734c7acfb3..bd61bad88e 100644 --- a/packages/portabase/beecrypt_3.1.0.bb +++ b/packages/portabase/beecrypt_3.1.0.bb @@ -21,7 +21,7 @@ cp ${WORKDIR}/config.m4 ${S}/gas/ do_stage() { - + # oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR} cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/ install -d ${STAGING_INCDIR}/ diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index c1ead5c0be..51aec57012 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -13,7 +13,7 @@ PR = "r1" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/ - + } do_configure () { @@ -38,7 +38,7 @@ do_configure () { --mandir=${mandir} \ ${EXTRA_OECONF} \ $@; - + } @@ -56,11 +56,11 @@ do_stage() { do_compile () { - cd builds + cd builds oe_runmake } do_install() { - + : } diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb index 4ba5108a31..e6eb9716ff 100644 --- a/packages/portabase/portabase_1.9.bb +++ b/packages/portabase/portabase_1.9.bb @@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/portabase/portabase_${PV}.tar.gz \ S = "${WORKDIR}/portabase" -inherit palmtop +inherit palmtop do_configure_prepend() { find . -name "Makefile"|xargs rm -f @@ -34,15 +34,15 @@ do_install() { ${D}${palmtopdir}/help/en install -D -m 0755 ${APPNAME} ${D}${palmtopdir}/bin/${APPNAME} install -m 0644 package/${APPNAME}.desktop ${D}${palmtopdir}/apps/Applications/${APPNAME}.desktop - + install -D -m 0644 pics/PortaBase.png ${D}${palmtopdir}/pics/PortaBase.png for f in calculator.png checked.png image.png note.png save.png save_disabled.png unchecked.png calendar.xpm QtaDatePickerNext.xpm QtaDatePickerPrev.xpm do install -D -m 0644 pics/$f ${D}${palmtopdir}/pics/${APPNAME}/$f - done + done install -D -m 0644 help/html/${APPNAME}.html ${D}${palmtopdir}/help/en/html/${APPNAME}.html -} +} pkg_postinst() { @@ -124,6 +124,6 @@ grep $EXT $QPEDIR/etc/mime.types | echo >&2 "$EXT already assigned to $TYPE" exit 1 fi -) -} +) +} diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb index 3b4871ba17..e5bb5e850f 100644 --- a/packages/portaudio/portaudio_0.0.19.bb +++ b/packages/portaudio/portaudio_0.0.19.bb @@ -21,7 +21,7 @@ do_configure_prepend() { echo "SUBDIRS = lib tests" >>portaudio.pro mkdir -p lib - cat <<EOF >lib/lib.pro + cat <<EOF >lib/lib.pro TEMPLATE = lib CONFIG = console debug warn_on TARGET = portaudio @@ -51,7 +51,7 @@ EOF mkdir -p tests echo "TEMPLATE = subdirs" >tests/tests.pro echo "SUBDIRS = \\" >>tests/tests.pro - + for test in ${TESTS} do mkdir -p tests/$test diff --git a/packages/tslib/tslib/c7x0/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/c7x0/.mtn2git_empty +++ b/packages/portmap/portmap-5-24/.mtn2git_empty diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch new file mode 100644 index 0000000000..7726846b7c --- /dev/null +++ b/packages/portmap/portmap-5-24/make.patch @@ -0,0 +1,73 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: portmap_5beta/Makefile +=================================================================== +--- portmap_5beta.orig/Makefile 2006-12-19 10:32:58.000000000 +0000 ++++ portmap_5beta/Makefile 2006-12-19 10:35:54.000000000 +0000 +@@ -110,6 +110,13 @@ + # + #CONST = -Dconst= + ++DESTDIR = ++prefix = /usr ++sbindir = /sbin ++datadir = $(prefix)/share ++mandir = $(datadir)/man ++docdir = $(datadir)/doc/portmap ++ + ### End of configurable stuff. + ############################## + +@@ -127,7 +134,7 @@ + COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ + $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \ + $(SA_LEN) $(LOOPBACK) $(SETPGRP) +-CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) ++CFLAGS = -Wall -O2 $(NSARCHS) + OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) + + all: portmap pmap_dump pmap_set +@@ -142,20 +149,23 @@ + $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + from_local: from_local.c +- cc $(CFLAGS) -DTEST -o $@ from_local.c ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c + + get_myaddress: get_myaddress.c +- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) + + install: all +- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin +- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 +- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt +- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt ++ install -d $(DESTDIR)/$(sbindir) \ ++ $(DESTDIR)/$(docdir) \ ++ $(DESTDIR)/$(mandir)/man8 ++ install -m 0755 portmap ${DESTDIR}/sbin ++ install -m 0755 pmap_dump ${DESTDIR}/sbin ++ install -m 0755 pmap_set ${DESTDIR}/sbin ++ install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 ++ cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt ++ gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt + + + lint: +@@ -181,3 +191,6 @@ + portmap.o: portmap.c + portmap.o: pmap_check.h Makefile + strerror.o: strerror.c ++ ++%.o: %.c ++ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb deleted file mode 100644 index ee6c648e9b..0000000000 --- a/packages/portmap/portmap-unslung_5-7.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "RPC program number mapper." -SECTION = "console/network" -LICENSE = "GPL" -PR = "r2" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ - file://no-libwrap.patch;patch=1;pnum=0 \ - file://portmap.init \ - file://make.patch;patch=1" -S = "${WORKDIR}/portmap_5beta" - -sbindir = "/sbin" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake 'docdir=${datadir}/doc/portmap' \ - 'DESTDIR=${D}' install -} diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap.inc index 0e6e2ab6a5..ad477828fb 100644 --- a/packages/portmap/portmap_5-7.bb +++ b/packages/portmap/portmap.inc @@ -1,7 +1,6 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -PR = "r2" SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ @@ -15,7 +14,7 @@ FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" FILES_${PN}-doc += "${docdir}" INITSCRIPT_NAME = "portmap" -INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . start 18 2 3 4 5 . stop 81 1 ." +INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." inherit update-rc.d diff --git a/packages/portmap/portmap_5-24.bb b/packages/portmap/portmap_5-24.bb new file mode 100644 index 0000000000..064679e7f0 --- /dev/null +++ b/packages/portmap/portmap_5-24.bb @@ -0,0 +1 @@ +require portmap.inc diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb index 76d66e9ad9..348a3060e4 100644 --- a/packages/portmap/portmap_5-9.bb +++ b/packages/portmap/portmap_5-9.bb @@ -1,33 +1,3 @@ -DESCRIPTION = "RPC program number mapper." -SECTION = "console/network" -LICENSE = "GPL" -PR = "r5" - -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ - file://no-libwrap.patch;patch=1;pnum=0 \ - file://portmap.init \ - file://make.patch;patch=1" -S = "${WORKDIR}/portmap_5beta" - -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - -INITSCRIPT_NAME = "portmap" -INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." +require portmap.inc -inherit update-rc.d - -sbindir = "/sbin" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' \ - 'DESTDIR=${D}' install -} +PR = "r5" diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index c64afeea03..117fd2fc61 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -71,7 +71,7 @@ pkg_postinst () { } pkg_postrm () { - update-alternatives --remove sendmail ${sbindir}/sendmail + update-alternatives --remove sendmail ${sbindir}/sendmail } # Exclude .debug directories from the main package diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb index df6131161e..5843b2b3df 100644 --- a/packages/postgresql/postgresql_8.1.4.bb +++ b/packages/postgresql/postgresql_8.1.4.bb @@ -10,7 +10,7 @@ SRC_URI = "ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/source/v${PV}/${P}. inherit autotools pkgconfig -FILES_${PN}-doc += "${prefix}/doc/" +FILES_${PN}-doc += "${prefix}/doc/" do_compile_append() { cp /usr/sbin/zic ${S}/src/timezone/ diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index 12e0a043b3..914d2eaad6 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. " HOMEPAGE = "http://www.povray.org" SECTION = "console/graphics" -#Make this a weak assigment to allow branding of the povray binary +#Make this a weak assigment to allow branding of the povray binary LICENSE = "povray" DEPENDS = "virtual/libx11 zlib jpeg libpng tiff" @@ -20,7 +20,7 @@ PARALLEL_MAKE = "" #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect do_configure() { oe_runconf -} +} PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes" diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index 535d7854da..ee41bcc646 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -20,7 +20,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ip-down \ file://08setupdns \ file://92removedns" - + SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1" inherit autotools diff --git a/packages/pptp-linux/pptp-linux_1.5.0.bb b/packages/pptp-linux/pptp-linux_1.5.0.bb index d98478d780..7fdcd4d316 100644 --- a/packages/pptp-linux/pptp-linux_1.5.0.bb +++ b/packages/pptp-linux/pptp-linux_1.5.0.bb @@ -22,7 +22,7 @@ do_compile() { oe_runmake } -do_install() { +do_install() { install -d ${D}${sbindir} install -d ${D}/etc/ install -d ${D}/etc/ppp/ diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb index 602adcd444..063742ce97 100644 --- a/packages/prboom/prboom-devconfig.bb +++ b/packages/prboom/prboom-devconfig.bb @@ -12,6 +12,6 @@ FILES_${PN} = "/usr/share/games/doom/prboom.cfg" do_install() { install -d ${D}/usr/share/games/doom/ - + install -m 644 ${WORKDIR}/prboom.cfg ${D}/usr/share/games/doom/ } diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb index 15a0482d2e..f20aae2b64 100644 --- a/packages/prboom/prboom_2.2.6.bb +++ b/packages/prboom/prboom_2.2.6.bb @@ -9,12 +9,11 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} " do_configure() { - PATH=${STAGING_BINDIR}:$PATH gnu-configize oe_runconf } @@ -22,7 +21,7 @@ do_configure() { do_install() { install -d ${D}${bindir} \ ${D}${datadir}/games/doom - + install -m 0755 src/prboom ${D}${bindir}/prboom install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/ } diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb index c14e733656..88d1f6a183 100644 --- a/packages/prboom/prboom_2.3.1.bb +++ b/packages/prboom/prboom_2.3.1.bb @@ -14,12 +14,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ file://prboom.png \ file://prboom.desktop" -inherit autotools +inherit autotools EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} " do_configure() { - PATH=${STAGING_BINDIR}:$PATH gnu-configize oe_runconf } diff --git a/packages/prelink/prelink_20060712.bb b/packages/prelink/prelink_20060712.bb index a83ff1b61f..fcf990b7a0 100644 --- a/packages/prelink/prelink_20060712.bb +++ b/packages/prelink/prelink_20060712.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/prelink-0.0.${PV}" EXTRA_OECONF = "--disable-64bit" -inherit autotools +inherit autotools do_install_append () { install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb index f7b0c17fa9..41285fb412 100644 --- a/packages/prism54/prism54-module_1.2.bb +++ b/packages/prism54/prism54-module_1.2.bb @@ -27,7 +27,7 @@ do_compile() { do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake install - + } FILES_${PN} = "/lib/modules/" diff --git a/packages/privoxy/privoxy_3.0.3.bb b/packages/privoxy/privoxy_3.0.3.bb index e475182f54..55580b1aa5 100644 --- a/packages/privoxy/privoxy_3.0.3.bb +++ b/packages/privoxy/privoxy_3.0.3.bb @@ -29,14 +29,14 @@ do_install() { mkdir -p ${D}/${sbindir} install -m 0755 ${S}/privoxy ${D}/${sbindir} - # Documentation + # Documentation mkdir -p ${D}/${docdir} install -m 0755 -d ${S}/doc ${D}/${docdir} # Install man page mkdir -p ${D}/${mandir} install -m 0755 ${S}/privoxy.1 ${D}/${mandir} -} +} do_install_append() { diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 0aaf82a92a..5101874a5b 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -15,7 +15,7 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ -inherit autotools +inherit autotools FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ @@ -35,7 +35,7 @@ do_install_append () { mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} mv ${D}${bindir}/free ${D}${bindir}/free.${PN} mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} -} +} pkg_postinst() { update-alternatives --install ${bindir}/top top top.${PN} 90 diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb index 0aaf82a92a..5101874a5b 100644 --- a/packages/procps/procps_3.2.7.bb +++ b/packages/procps/procps_3.2.7.bb @@ -15,7 +15,7 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ -inherit autotools +inherit autotools FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ @@ -35,7 +35,7 @@ do_install_append () { mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} mv ${D}${bindir}/free ${D}${bindir}/free.${PN} mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} -} +} pkg_postinst() { update-alternatives --install ${bindir}/top top top.${PN} 90 diff --git a/packages/proj4/proj-4_4.9.bb b/packages/proj4/proj-4_4.9.bb index cb8dcc5eea..1f7ea8c0b9 100644 --- a/packages/proj4/proj-4_4.9.bb +++ b/packages/proj4/proj-4_4.9.bb @@ -10,5 +10,5 @@ S = "${WORKDIR}/proj-4.${PV}" do_stage() { autotools_stage_all -} +} diff --git a/packages/psplash/files/psplash-hand-img.h b/packages/psplash/files/psplash-hand-img.h index 3e9a933ea8..c54f04c362 100644 --- a/packages/psplash/files/psplash-hand-img.h +++ b/packages/psplash/files/psplash-hand-img.h @@ -1,757 +1,1498 @@ /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ -#define HAND_IMG_ROWSTRIDE (600) -#define HAND_IMG_WIDTH (150) -#define HAND_IMG_HEIGHT (93) +#define HAND_IMG_ROWSTRIDE (880) +#define HAND_IMG_WIDTH (220) +#define HAND_IMG_HEIGHT (137) #define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ #define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \ - "\261\377\377\377\0\1\0\0\0\12\271\377\377\377\0\1\0\0\0\13\333\377\377" \ - "\377\0\1\0\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0" \ - "\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271" \ - "\377\377\377\0\1\0\0\0\16\324\377\377\377\0\17\0\0\0\6\0\0\0!\7\10\11" \ - ">\34\35\"h\"$*\214,.7\23568C\2538:F\2748:F\257/1:\241$&-\221\36\37%r" \ - "\17\20\23I\0\0\0(\0\0\0\14\252\377\377\377\0\20\0\0\0\3\0\0\0\33\3\3" \ - "\4;\31\32\36f\37\40'\220%'/\247.09\26468C\30179E\32278D\305,.7\262!!" \ - "(\234\30\31\36m\0\0\0+\0\0\0\5\0\0\0\2\312\377\377\377\0\10\0\0\0\21" \ - "\33\34!n24>\262KO^\331gl\201\360z\200\230\376\213\221\255\377\231\240" \ - "\276\377\202\234\243\302\377\1\224\232\270\377\202\234\243\302\377\10" \ - "\233\242\301\377\217\226\262\377\177\205\237\377mr\210\364TWh\3419;G" \ - "\275\"#*\210\0\0\0!\244\377\377\377\0\11\0\0\0\7\34\35#d13<\267EHV\340" \ - "Y]o\356nt\212\375\200\206\240\377\222\230\266\377\233\242\301\377\202" \ - "\234\243\302\377\1\223\232\267\377\202\234\243\302\377\10\231\240\276" \ - "\377\203\211\243\377bg{\362<>J\310\"$+\216\0\0\0#\0\0\0\15\0\0\0\5\304" \ - "\377\377\377\0\5\0\0\0\34\40\"(\20479D\273TXi\342\212\221\254\377\210" \ - "\234\243\302\377\1\224\232\270\377\210\234\243\302\377\5\223\232\267" \ - "\377afy\354<>J\307%'.\231\11\11\13""6\236\377\377\377\0\6\0\0\0\5\27" \ - "\30\34Y,.7\263GJY\336|\201\233\375\231\240\276\377\210\234\243\302\377" \ - "\1\223\232\267\377\206\234\243\302\377\4\223\232\267\377]at\350:=H\270" \ - "\33\34!d\202\0\0\0\16\1\0\0\0\7\277\377\377\377\0\4\0\0\0\31(*2\250Y" \ - "]o\347\221\230\265\377\207\234\243\302\377\11\233\242\301\377\231\240" \ - "\276\377\227\236\274\377\225\234\272\377\213\220\255\377\225\234\272" \ - "\377\227\236\274\377\231\240\276\377\233\242\301\377\207\234\243\302" \ - "\377\4\230\237\275\377kp\205\362-/8\300\22\23\27<\232\377\377\377\0\5" \ - "\0\0\0\26)+4\247CFT\331x~\226\374\232\241\300\377\210\234\243\302\377" \ - "\10\232\241\277\377\230\237\275\377\226\235\273\377\214\222\256\377\225" \ - "\233\271\377\227\235\273\377\230\237\276\377\232\241\300\377\205\234" \ - "\243\302\377\6u{\222\366,.7\276\20\21\24(\0\0\0\10\0\0\0\20\0\0\0\10" \ - "\273\377\377\377\0\4\0\0\0\15$&-\225QUe\340\227\235\273\377\205\234\243" \ - "\302\377\1\230\237\275\377\202\224\232\270\377\17\215\222\257\377TXi" \ - "\351ACQ\3228:E\276,.7\251\36\37%\231(*2\24357B\267\77BN\315KM]\341\201" \ - "\210\241\376\224\233\270\377\224\232\270\377\226\235\273\377\233\242" \ - "\301\377\205\234\243\302\377\3fj~\355+,5\264\13\13\15%\226\377\377\377" \ - "\0\5\0\0\0\1\37\40'xEHV\336\217\224\261\377\232\241\300\377\205\234\243" \ - "\302\377\1\230\237\276\377\202\224\232\270\377\202\224\233\270\377\10" \ - "\226\235\273\377\230\237\275\377\232\241\277\377\223\232\267\377\233" \ - "\242\301\377\231\240\276\377\227\235\273\377\225\233\271\377\202\224" \ - "\233\270\377\7\224\232\270\377\226\235\273\377\233\242\301\377\234\243" \ - "\302\377\232\241\277\377W[l\345$&-\225\202\0\0\0\10\2\0\0\0\20\0\0\0" \ - "\5\267\377\377\377\0\4\0\0\0\5!\")\200GJX\327\221\230\265\377\203\234" \ - "\243\302\377\2\233\242\301\377\227\235\273\377\202\224\232\270\377\5" \ - "\227\236\274\377\213\221\255\377GKY\331%'.\231\0\0\0\31\203\377\377\377" \ - "\0\1\0\0\0\15\203\377\377\377\0\11\0\0\0\12\36\37%}:<H\316|\202\233\371" \ - "\231\240\276\377\224\233\270\377\224\232\270\377\225\234\272\377\232" \ - "\241\300\377\203\234\243\302\377\4\231\240\276\377Y]o\346)*3\243\0\0" \ - "\0\24\223\377\377\377\0\4\21\22\25--/8\304y\177\227\371\232\241\277\377" \ - "\204\234\243\302\377\1\227\236\274\377\202\224\232\270\377\1\227\235" \ - "\273\377\205\234\243\302\377\26\233\242\301\377z\200\230\372DGU\335@" \ - "CP\312<>J\27569D\26046@\25069C\2578;F\270;>I\300>AN\321ORb\347qv\215" \ - "\374\215\224\260\377\232\241\300\377\215\224\260\377&(0\270\0\0\0\1\377" \ - "\377\377\0\0\0\0\12\0\0\0\17\0\0\0\3\264\377\377\377\0\3\11\11\13\36" \ - "24\77\310\212\220\253\375\204\234\243\302\377\10\225\234\272\377\224" \ - "\232\270\377\230\237\276\377\234\243\302\377\227\235\273\377CFT\327#" \ - "%,}\0\0\0\11\205\377\377\377\0\1\0\0\0\15\205\377\377\377\0\6\0\0\0\2" \ - "\33\34!`47A\310\212\220\254\375\234\243\302\377\232\241\277\377\202\224" \ - "\233\270\377\1\233\242\301\377\203\234\243\302\377\3\225\233\271\377" \ - "GJX\335\40!(M\220\377\377\377\0\4\0\0\0\7$&-\223UYj\350\227\236\275\377" \ - "\204\234\243\302\377\3\226\235\273\377\224\232\270\377\230\237\275\377" \ - "\205\234\243\302\377\6\227\235\273\377ko\205\362@CP\316*+4\246\22\23" \ - "\27O\0\0\0\24\210\377\377\377\0\7\0\0\0\16\14\15\17A\40!(\206/2<\267" \ - "HKY\337gl\200\372%'/\214\202\377\377\377\0\3\0\0\0\1\0\0\0\15\0\0\0\11" \ - "\262\377\377\377\0\3\32\33\40EDGU\331\232\241\277\377\203\234\243\302" \ - "\377\3\227\235\273\377\223\232\267\377\231\240\276\377\202\234\243\302" \ - "\377\3\212\220\254\375+-6\304\5\5\7\31\207\377\377\377\0\1\0\0\0\15\207" \ - "\377\377\377\0\3\0\0\0\3&(0\234ty\220\361\202\234\243\302\377\4\232\241" \ - "\300\377\224\233\270\377\225\233\271\377\233\242\301\377\203\234\243" \ - "\302\377\2afy\352#%,{\216\377\377\377\0\4\0\0\0\23""02<\310\205\213\246" \ - "\376\233\242\301\377\203\234\243\302\377\3\227\236\274\377\223\232\267" \ - "\377\230\237\276\377\205\234\243\302\377\4ot\212\360<>J\302%'.\222\10" \ - "\10\12.\203\377\377\377\0\1\0\0\0\16\214\377\377\377\0\4\0\0\0\13\25" \ - "\27\33i\26\30\35\277\6\6\10\25\203\377\377\377\0\2\0\0\0\10\0\0\0\15" \ - "\260\377\377\377\0\2\37!'r\\`s\346\203\234\243\302\377\3\230\237\275" \ - "\377\223\232\267\377\230\237\275\377\203\234\243\302\377\3ty\221\362" \ - "%&.\237\0\0\0\4\210\377\377\377\0\1\0\0\0\15\211\377\377\377\0\2\40\"" \ - ")iX\\n\341\203\234\243\302\377\3\232\241\277\377\223\232\267\377\225" \ - "\234\272\377\203\234\243\302\377\3y~\226\366&(0\245\0\0\0\4\213\377\377" \ - "\377\0\3\0\0\0\25""24\77\316\217\226\263\377\203\234\243\302\377\3\231" \ - "\240\276\377\223\232\267\377\227\236\274\377\205\234\243\302\377\3\212" \ - "\221\254\3769<G\315\32\33\40L\206\377\377\377\0\1\0\0\0\16\216\377\377" \ - "\377\0\3\0\0\0\2\0\0\0\15\0\0\0\13\203\377\377\377\0\3\0\0\0\5\0\0\0" \ - "\20\0\0\0\1\254\377\377\377\0\3\0\0\0\3#$+\234uz\221\362\203\234\243" \ - "\302\377\2\225\234\272\377\226\235\273\377\204\234\243\302\377\2ot\212" \ - "\357\40!(p\212\377\377\377\0\1\0\0\0\15\212\377\377\377\0\2\25\26\32" \ - "6LP_\331\204\234\243\302\377\3\230\237\276\377\223\232\267\377\233\242" \ - "\301\377\202\234\243\302\377\3\213\221\255\376-/8\302\0\0\0\23\211\377" \ - "\377\377\0\3\5\6\7\30""13=\320\222\231\266\377\203\234\243\302\377\2" \ - "\227\235\273\377\225\233\271\377\205\234\243\302\377\4\231\240\276\377" \ - "SVg\343$%-\214\0\0\0\5\207\377\377\377\0\1\0\0\0\16\220\377\377\377\0" \ - "\3\0\0\0\4\0\0\0\16\0\0\0\1\202\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0" \ - "\0\3\253\377\377\377\0\2%'.\256\210\216\252\373\203\234\243\302\377\2" \ - "\224\232\270\377\230\237\275\377\204\234\243\302\377\2\203\211\243\372" \ - "$&-\215\213\377\377\377\0\1\0\0\0\15\213\377\377\377\0\2\32\33\40Lcg" \ - "{\346\204\234\243\302\377\3\232\241\300\377\222\231\266\377\232\241\300" \ - "\377\202\234\243\302\377\3\226\235\273\37747A\321\0\0\0\20\207\377\377" \ - "\377\0\3\5\5\6\32""24>\322\225\233\272\377\203\234\243\302\377\2\225" \ - "\233\271\377\227\236\274\377\205\234\243\302\377\3ty\220\365,.7\273\14" \ - "\14\17\"\211\377\377\377\0\1\0\0\0\16\221\377\377\377\0\3\0\0\0\1\0\0" \ - "\0\16\0\0\0\3\203\377\377\377\0\2\0\0\0\20\0\0\0\3\251\377\377\377\0" \ - "\2!#)\214\202\210\241\370\202\234\243\302\377\3\232\241\300\377\223\232" \ - "\267\377\232\241\277\377\204\234\243\302\377\2\222\230\265\377)*3\261" \ - "\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\2!\")ux~\226\363\205" \ - "\234\243\302\377\2\223\232\267\377\230\237\276\377\202\234\243\302\377" \ - "\3\225\233\271\377+-6\277\0\0\0\3\205\377\377\377\0\3\5\5\6\33""36@\322" \ - "\223\232\270\377\202\234\243\302\377\3\233\242\301\377\223\232\267\377" \ - "\231\240\276\377\205\234\243\302\377\2VZk\344\35\36$c\213\377\377\377" \ - "\0\1\0\0\0\16\223\377\377\377\0\2\0\0\0\14\0\0\0\6\203\377\377\377\0" \ - "\2\0\0\0\20\0\0\0\1\247\377\377\377\0\2\35\36$`lq\206\354\202\234\243" \ - "\302\377\3\232\241\277\377\223\232\267\377\233\242\301\377\204\234\243" \ - "\302\377\3\232\241\277\37725\77\310\0\0\0\11\214\377\377\377\0\1\0\0" \ - "\0\15\215\377\377\377\0\2%'.\235\212\220\254\374\205\234\243\302\377" \ - "\2\225\234\272\377\227\236\274\377\202\234\243\302\377\2\212\220\253" \ - "\375%'/\240\205\377\377\377\0\2)+4\277\222\230\266\377\202\234\243\302" \ - "\377\3\232\241\300\377\223\232\267\377\232\241\300\377\205\234\243\302" \ - "\377\2W[l\344\36\37%Q\214\377\377\377\0\1\0\0\0\16\224\377\377\377\0" \ - "\202\0\0\0\11\202\377\377\377\0\2\0\0\0\2\0\0\0\17\246\377\377\377\0" \ - "\2\23\23\27""6TWh\337\202\234\243\302\377\2\233\242\301\377\223\232\267" \ - "\377\206\234\243\302\377\2Y]o\346\16\17\22$\214\377\377\377\0\3\0\0\0" \ - "\1\0\0\0\20\0\0\0\1\214\377\377\377\0\2\0\0\0\3""9;G\311\206\234\243" \ - "\302\377\2\225\233\271\377\231\240\276\377\202\234\243\302\377\2w|\224" \ - "\364\"$+v\203\377\377\377\0\2\36\37%|x~\226\370\203\234\243\302\377\2" \ - "\223\232\267\377\233\242\301\377\205\234\243\302\377\2X\\n\343\36\37" \ - "%Q\215\377\377\377\0\2\0\0\0\21\0\0\0\1\224\377\377\377\0\2\0\0\0\11" \ - "\0\0\0\6\202\377\377\377\0\2\0\0\0\5\0\0\0\15\244\377\377\377\0\2\0\0" \ - "\0\26=@L\322\203\234\243\302\377\2\223\232\267\377\233\242\301\377\205" \ - "\234\243\302\377\2\222\231\266\377')1\233\210\377\377\377\0\3\0\0\0\3" \ - "\0\0\0\14\0\0\0\16\203\0\0\0\15\2\0\0\0\26\0\0\0\14\202\0\0\0\15\3\0" \ - "\0\0\16\0\0\0\15\0\0\0\5\210\377\377\377\0\2\30\31\36Vv{\222\363\206" \ - "\234\243\302\377\2\223\232\267\377\232\241\300\377\202\234\243\302\377" \ - "\5`ex\347\35\36$J\377\377\377\0\12\12\15%JN\\\342\203\234\243\302\377" \ - "\2\224\232\270\377\232\241\277\377\205\234\243\302\377\2Y]o\343\36\37" \ - "%Q\210\377\377\377\0\3\0\0\0\2\0\0\0\13\0\0\0\16\203\0\0\0\15\2\0\0\0" \ - "\27\0\0\0\14\202\0\0\0\15\3\0\0\0\16\0\0\0\15\0\0\0\6\220\377\377\377" \ - "\0\2\0\0\0\14\0\0\0\3\202\377\377\377\0\2\0\0\0\10\0\0\0\11\243\377\377" \ - "\377\0\2,.7\265\230\237\275\377\202\234\243\302\377\2\225\233\271\377" \ - "\231\240\276\377\206\234\243\302\377\2GKY\327\0\0\0\16\205\377\377\377" \ - "\0\5\0\0\0\1\0\0\0\13\0\0\0\16\0\0\0\13\0\0\0\2\204\377\377\377\0\1\0" \ - "\0\0\15\204\377\377\377\0\5\0\0\0\1\0\0\0\11\0\0\0\16\0\0\0\15\0\0\0" \ - "\2\206\377\377\377\0\2.1:\272\233\242\301\377\205\234\243\302\377\2\233" \ - "\242\301\377\223\232\267\377\203\234\243\302\377\4BDR\327\0\0\0\16*," \ - "4\304\230\237\275\377\202\234\243\302\377\2\225\234\272\377\230\237\275" \ - "\377\205\234\243\302\377\2Z^p\343\36\37%Q\207\377\377\377\0\4\0\0\0\12" \ - "\0\0\0\16\0\0\0\14\0\0\0\3\204\377\377\377\0\1\0\0\0\16\204\377\377\377" \ - "\0\2\0\0\0\1\0\0\0\10\202\0\0\0\16\1\0\0\0\3\216\377\377\377\0\2\0\0" \ - "\0\16\0\0\0\1\202\377\377\377\0\2\0\0\0\15\0\0\0\3\241\377\377\377\0" \ - "\2\25\26\32Kqv\215\360\202\234\243\302\377\2\227\235\273\377\227\236" \ - "\274\377\206\234\243\302\377\2\207\215\250\374\37!'z\205\377\377\377" \ - "\0\3\0\0\0\11\0\0\0\16\0\0\0\3\207\377\377\377\0\1\0\0\0\15\207\377\377" \ - "\377\0\4\0\0\0\1\0\0\0\15\0\0\0\14\0\0\0\1\204\377\377\377\0\2\20\20" \ - "\24""0aey\350\206\234\243\302\377\2\232\241\300\377\224\232\270\377\202" \ - "\234\243\302\377\3\221\230\265\377!#(\313}\202\233\372\202\234\243\302" \ - "\377\2\230\237\275\377\226\235\273\377\205\234\243\302\377\2{\200\231" \ - "\366\37\40'h\206\377\377\377\0\3\0\0\0\10\0\0\0\16\0\0\0\4\207\377\377" \ - "\377\0\1\0\0\0\16\207\377\377\377\0\4\0\0\0\1\0\0\0\14\0\0\0\15\0\0\0" \ - "\2\214\377\377\377\0\2\0\0\0\1\0\0\0\16\202\377\377\377\0\2\0\0\0\1\0" \ - "\0\0\17\240\377\377\377\0\2\0\0\0\1""47A\303\202\234\243\302\377\2\232" \ - "\241\300\377\224\233\270\377\207\234\243\302\377\2>AN\312\0\0\0\3\203" \ - "\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0\5\211\377\377\377\0\1\0\0\0\15" \ - "\211\377\377\377\0\3\0\0\0\2\0\0\0\16\0\0\0\10\204\377\377\377\0\2+-" \ - "5\252\232\241\300\377\206\234\243\302\377\5\230\237\275\377\227\236\274" \ - "\377\234\243\302\377\224\232\270\377HLZ\373\202\234\243\302\377\2\233" \ - "\242\301\377\224\232\270\377\205\234\243\302\377\2\231\240\276\377.0" \ - "9\270\205\377\377\377\0\3\0\0\0\2\0\0\0\17\0\0\0\6\211\377\377\377\0" \ - "\1\0\0\0\16\211\377\377\377\0\3\0\0\0\2\0\0\0\15\0\0\0\11\214\377\377" \ - "\377\0\2\0\0\0\4\0\0\0\11\202\377\377\377\0\2\0\0\0\13\0\0\0\5\237\377" \ - "\377\377\0\2\33\34\"f\177\204\235\370\202\234\243\302\377\2\224\232\270" \ - "\377\233\242\301\377\206\234\243\302\377\2\225\233\271\377#$+\216\203" \ - "\377\377\377\0\2\0\0\0\7\0\0\0\16\213\377\377\377\0\1\0\0\0\15\213\377" \ - "\377\377\0\2\0\0\0\12\0\0\0\14\203\377\377\377\0\2\20\21\24;pu\213\364" \ - "\207\234\243\302\377\4\224\232\270\377\234\243\302\377Z^p\377\213\221" \ - "\255\377\202\234\243\302\377\2\224\233\270\377\232\241\300\377\205\234" \ - "\243\302\377\2QUe\340\11\11\13\37\204\377\377\377\0\6\0\0\0\5\24\26\31" \ - "\214),4\261&'.\234\27\32\35W\0\0\0\3\207\377\377\377\0\1\0\0\0\16\213" \ - "\377\377\377\0\2\0\0\0\10\0\0\0\15\214\377\377\377\0\2\0\0\0\14\0\0\0" \ - "\1\202\377\377\377\0\1\0\0\0\20\236\377\377\377\0\2\0\0\0\5=@L\315\202" \ - "\234\243\302\377\2\231\240\276\377\225\234\272\377\207\234\243\302\377" \ - "\2]bt\347\0\0\0\36\202\377\377\377\0\202\0\0\0\12\214\377\377\377\0\1" \ - "\0\0\0\15\214\377\377\377\0\2\0\0\0\6\0\0\0\17\203\377\377\377\0\1=@" \ - "M\312\207\234\243\302\377\3\231\240\276\377\223\232\267\377LP_\377\202" \ - "\234\243\302\377\2\232\241\300\377\224\233\270\377\205\234\243\302\377" \ - "\2\205\213\246\373!#)\177\204\377\377\377\0\11\0\0\0\10\0\0\0\14\0\0" \ - "\0\15(+3\263}\204\235\370{\200\231\371BER\323')0\226\0\0\0\13\205\377" \ - "\377\377\0\1\0\0\0\16\214\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0\1\212" \ - "\377\377\377\0\2\0\0\0\2\0\0\0\13\202\377\377\377\0\2\0\0\0\11\0\0\0" \ - "\7\235\377\377\377\0\2!\")~\211\217\253\375\202\234\243\302\377\1\223" \ - "\232\267\377\210\234\243\302\377\1""57B\273\202\377\377\377\0\2\0\0\0" \ - "\11\0\0\0\10\215\377\377\377\0\1\0\0\0\15\215\377\377\377\0\2\0\0\0\4" \ - "\0\0\0\16\202\377\377\377\0\2$&-\220\224\233\270\377\207\234\243\302" \ - "\377\2_dw\377|\202\234\377\202\234\243\302\377\2\224\232\270\377\233" \ - "\242\301\377\205\234\243\302\377\2""13=\306\0\0\0\2\203\377\377\377\0" \ - "\2\0\0\0\7\0\0\0\12\203\377\377\377\0\6!#+\202ty\220\361\234\243\302" \ - "\377\222\230\265\377\77BN\322\34\37\"R\204\377\377\377\0\1\0\0\0\16\215" \ - "\377\377\377\0\2\0\0\0\2\0\0\0\17\213\377\377\377\0\2\0\0\0\14\0\0\0" \ - "\2\202\377\377\377\0\1\0\0\0\20\235\377\377\377\0\1<\77K\313\202\234" \ - "\243\302\377\2\230\237\275\377\227\235\273\377\207\234\243\302\377\5" \ - "\210\217\252\376\34\35\"o\377\377\377\0\0\0\0\5\0\0\0\14\216\377\377" \ - "\377\0\1\0\0\0\15\216\377\377\377\0\5\0\0\0\7\0\0\0\12\377\377\377\0" \ - "\0\0\0\35]bt\351\207\234\243\302\377\5HKZ\377\225\233\271\377\234\243" \ - "\302\377\231\240\276\377\225\234\272\377\205\234\243\302\377\2aex\351" \ - "\23\24\30""4\203\377\377\377\0\2\0\0\0\4\0\0\0\16\205\377\377\377\0\2" \ - "%'.\221\204\212\244\372\202\234\243\302\377\2lq\206\357!$,z\203\377\377" \ - "\377\0\1\0\0\0\16\216\377\377\377\0\2\0\0\0\4\0\0\0\15\212\377\377\377" \ - "\0\2\0\0\0\1\0\0\0\15\202\377\377\377\0\2\0\0\0\11\0\0\0\6\233\377\377" \ - "\377\0\2\6\6\10)ej~\357\202\234\243\302\377\1\224\232\270\377\210\234" \ - "\243\302\377\4NRa\336\0\0\0\12\0\0\0\2\0\0\0\17\217\377\377\377\0\1\0" \ - "\0\0\15\217\377\377\377\0\4\0\0\0\12\0\0\0\7\377\377\377\0""79D\300\206" \ - "\234\243\302\377\5y~\226\377hm\202\377\224\232\270\377\234\243\302\377" \ - "\224\232\270\377\206\234\243\302\377\1""58B\271\203\377\377\377\0\2\0" \ - "\0\0\1\0\0\0\20\207\377\377\377\0\2*+2\262\226\235\272\377\202\234\243" \ - "\302\377\2rv\215\357\"\"(y\202\377\377\377\0\1\0\0\0\16\217\377\377\377" \ - "\0\2\0\0\0\10\0\0\0\11\212\377\377\377\0\5\0\0\0\14\0\0\0\2\377\377\377" \ - "\0\0\0\0\1\0\0\0\15\233\377\377\377\0\5#%,\217\225\233\271\377\234\243" \ - "\302\377\233\242\301\377\224\233\270\377\210\234\243\302\377\4;>J\300" \ - "\377\377\377\0\0\0\0\16\0\0\0\1\217\377\377\377\0\1\0\0\0\15\220\377" \ - "\377\377\0\4\0\0\0\17\377\377\377\0%'.\236\232\241\277\377\205\234\243" \ - "\302\377\5MQa\377\227\236\273\377\230\237\275\377\227\236\274\377\224" \ - "\232\270\377\205\234\243\302\377\2\206\214\247\376\35\36$j\203\377\377" \ - "\377\0\2\0\0\0\15\0\0\0\2\207\377\377\377\0\2\0\0\0\27SWh\342\203\234" \ - "\243\302\377\4bh{\352\21\21\26;\377\377\377\0\0\0\0\16\220\377\377\377" \ - "\0\2\0\0\0\16\0\0\0\1\211\377\377\377\0\2\0\0\0\3\0\0\0\12\202\377\377" \ - "\377\0\1\0\0\0\16\233\377\377\377\0\1:=H\302\202\234\243\302\377\2\227" \ - "\235\273\377\231\240\276\377\210\234\243\302\377\3+-5\242\0\0\0\4\0\0" \ - "\0\12\220\377\377\377\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\4\0\0\0" \ - "\13\26\27\34X\200\206\237\376\205\234\243\302\377\1KN]\377\202\234\243" \ - "\302\377\2\220\226\263\377\227\236\274\377\205\234\243\302\377\2KO^\333" \ - "\0\0\0\11\202\377\377\377\0\2\0\0\0\3\0\0\0\15\211\377\377\377\0\2)+" \ - "4\242\226\235\273\377\203\234\243\302\377\3.1:\301\377\377\377\0\0\0" \ - "\0\16\220\377\377\377\0\2\0\0\0\2\0\0\0\15\212\377\377\377\0\1\0\0\0" \ - "\15\202\377\377\377\0\2\0\0\0\12\0\0\0\4\231\377\377\377\0\2\0\0\0\31" \ - "\\`r\350\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\3" \ - "\213\221\255\377\33\34!l\0\0\0\17\221\377\377\377\0\1\0\0\0\15\221\377" \ - "\377\377\0\3\0\0\0\16\0\0\0\25Y]o\350\204\234\243\302\377\2\221\230\265" \ - "\377VZk\377\202\234\243\302\377\1\215\223\257\377\206\234\243\302\377" \ - "\1.09\255\203\377\377\377\0\2\0\0\0\17\0\0\0\1\211\377\377\377\0\2\12" \ - "\12\12\32UXi\344\203\234\243\302\377\3|\200\231\365\31\34!f\0\0\0\16" \ - "\221\377\377\377\0\2\0\0\0\15\0\0\0\2\211\377\377\377\0\5\0\0\0\14\0" \ - "\0\0\1\377\377\377\0\0\0\0\2\0\0\0\14\231\377\377\377\0\2\40!'}\217\226" \ - "\262\377\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\3" \ - "gk\200\357\0\0\0&\0\0\0\12\221\377\377\377\0\1\0\0\0\15\221\377\377\377" \ - "\0\3\0\0\0\3\0\0\0\14BER\315\204\234\243\302\377\2hm\201\377\177\205" \ - "\236\377\202\234\243\302\377\2\217\225\262\377\230\237\276\377\204\234" \ - "\243\302\377\2v|\223\370\25\26\33J\202\377\377\377\0\2\0\0\0\2\0\0\0" \ - "\15\213\377\377\377\0\2)+4\246\226\235\273\377\203\234\243\302\377\2" \ - ";>I\317\0\0\0\26\221\377\377\377\0\2\0\0\0\1\0\0\0\16\211\377\377\377" \ - "\0\2\0\0\0\4\0\0\0\10\202\377\377\377\0\1\0\0\0\16\231\377\377\377\0" \ - "\1""36@\262\202\234\243\302\377\2\227\236\274\377\230\237\275\377\210" \ - "\234\243\302\377\3GJX\324\0\0\0\15\0\0\0\1\221\377\377\377\0\1\0\0\0" \ - "\15\222\377\377\377\0\2\0\0\0\17""36@\256\204\234\243\302\377\1OSb\377" \ - "\202\234\243\302\377\3\231\240\276\377\226\235\273\377\224\233\270\377" \ - "\204\234\243\302\377\2BER\321\0\0\0\1\202\377\377\377\0\2\0\0\0\13\0" \ - "\0\0\3\213\377\377\377\0\2\11\11\21\36_cv\353\203\234\243\302\377\2\214" \ - "\222\255\375\35\35#\221\222\377\377\377\0\1\0\0\0\16\212\377\377\377" \ - "\0\1\0\0\0\15\202\377\377\377\0\2\0\0\0\15\0\0\0\1\230\377\377\377\0" \ - "\1;>J\303\202\234\243\302\377\1\224\233\270\377\211\234\243\302\377\2" \ - ":=I\301\0\0\0\16\222\377\377\377\0\1\0\0\0\15\222\377\377\377\0\2\0\0" \ - "\0\14\"#*\233\204\234\243\302\377\1NRb\377\202\234\243\302\377\3\225" \ - "\234\272\377\232\241\300\377\224\233\270\377\204\234\243\302\377\1""7" \ - ":E\261\203\377\377\377\0\1\0\0\0\16\215\377\377\377\0\1EHU\313\204\234" \ - "\243\302\377\2:>I\324\0\0\0\1\221\377\377\377\0\2\0\0\0\11\0\0\0\4\211" \ - "\377\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\12\0\0\0\3\230\377" \ - "\377\377\0\1ADR\320\202\234\243\302\377\1\224\233\270\377\211\234\243" \ - "\302\377\2""46@\267\0\0\0\13\222\377\377\377\0\1\0\0\0\15\222\377\377" \ - "\377\0\3\0\0\0\3\34\35#\216\227\236\274\377\203\234\243\302\377\1MQ`" \ - "\377\202\234\243\302\377\3\224\233\270\377\234\243\302\377\224\233\270" \ - "\377\204\234\243\302\377\1,.7\237\202\377\377\377\0\2\0\0\0\1\0\0\0\15" \ - "\215\377\377\377\0\1""36A\252\204\234\243\302\377\2gk\200\364\12\12\12" \ - "3\221\377\377\377\0\2\0\0\0\1\0\0\0\14\211\377\377\377\0\1\0\0\0\14\202" \ - "\377\377\377\0\2\0\0\0\7\0\0\0\6\230\377\377\377\0\1HKY\335\202\234\243" \ - "\302\377\1\224\233\270\377\211\234\243\302\377\2,.7\260\0\0\0\4\222\377" \ - "\377\377\0\1\0\0\0\15\223\377\377\377\0\2\27\30\36x\215\223\257\377\202" \ - "\234\243\302\377\2\232\241\300\377OSb\377\202\234\243\302\377\3\224\233" \ - "\270\377\234\243\302\377\224\233\270\377\203\234\243\302\377\2\227\235" \ - "\273\377!#)\206\202\377\377\377\0\202\0\0\0\7\215\377\377\377\0\2!#)" \ - "|\222\230\265\377\203\234\243\302\377\2\215\224\260\377$$+\216\222\377" \ - "\377\377\0\1\0\0\0\16\211\377\377\377\0\1\0\0\0\14\202\377\377\377\0" \ - "\2\0\0\0\4\0\0\0\12\227\377\377\377\0\2\0\0\0\23X\\m\351\202\234\243" \ - "\302\377\1\224\233\270\377\211\234\243\302\377\2&&/\247\0\0\0\1\222\377" \ - "\377\377\0\1\0\0\0\15\223\377\377\377\0\2\17\20\23\\\202\210\242\377" \ - "\202\234\243\302\377\2\216\224\261\377Z^q\377\202\234\243\302\377\3\224" \ - "\233\270\377\234\243\302\377\224\233\270\377\203\234\243\302\377\2\204" \ - "\212\244\377\26\27\33U\202\377\377\377\0\2\0\0\0\12\0\0\0\3\215\377\377" \ - "\377\0\2\5\5\5/nt\211\365\203\234\243\302\377\2\223\232\267\37734>\260" \ - "\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\5\0\0\0\11\0\0\0\3\377" \ - "\377\377\0\0\0\0\1\0\0\0\14\227\377\377\377\0\2\0\0\0-lq\207\367\202" \ - "\234\243\302\377\1\224\233\270\377\211\234\243\302\377\1\37\40&\236\223" \ - "\377\377\377\0\1\0\0\0\15\223\377\377\377\0\2\0\0\0Aw|\224\375\202\234" \ - "\243\302\377\2~\203\235\377hm\202\377\202\234\243\302\377\4\224\233\270" \ - "\377\234\243\302\377\226\235\273\377\232\241\277\377\202\234\243\302" \ - "\377\2lp\206\372\0\0\0(\202\377\377\377\0\2\0\0\0\15\0\0\0\1\215\377" \ - "\377\377\0\2\0\0\0\27[^q\346\203\234\243\302\377\2\223\232\267\377<=" \ - "J\273\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\202\0\0\0\6\202" \ - "\377\377\377\0\1\0\0\0\15\221\377\377\377\0\206\0\0\0\2\2\22\23\27Q}" \ - "\201\232\377\202\232\241\300\377\1\222\231\266\377\210\232\241\300\377" \ - "\2\222\231\266\377\32\33\40\214\223\0\0\0\2\1\0\0\0\17\223\0\0\0\2\2" \ - "\0\0\0""2in\202\361\202\232\241\300\377\2mr\210\377w|\223\377\202\232" \ - "\241\300\377\2\222\231\266\377\232\241\300\377\202\226\235\273\377\202" \ - "\232\241\300\377\2QTd\364\0\0\0\12\202\0\0\0\2\1\0\0\0\17\216\0\0\0\2" \ - "\2\0\0\0\6JN\\\336\203\232\241\300\377\2\221\230\265\377BER\307\222\0" \ - "\0\0\2\1\0\0\0\20\211\0\0\0\2\2\0\0\0\5\0\0\0\13\202\0\0\0\2\1\0\0\0" \ - "\17\207\0\0\0\2\1\0\0\0\1\211\377\377\377\0\1\0\0\0\12\205\0\0\0\14\2" \ - "\26\26\33f|\202\233\377\202\224\233\270\377\1\215\223\257\377\210\224" \ - "\233\270\377\2\211\217\253\377\26\30\34\210\223\0\0\0\14\1\0\0\0\30\223" \ - "\0\0\0\14\2\0\0\0""5`dw\356\202\224\233\270\377\2hm\202\377sx\216\377" \ - "\202\224\233\270\377\4\215\223\257\377\224\233\270\377\221\227\264\377" \ - "\220\227\263\377\202\224\233\270\377\2FIW\363\0\0\0\15\202\0\0\0\14\1" \ - "\0\0\0\30\217\0\0\0\14\1DFU\336\203\224\233\270\377\2\213\222\255\377" \ - "@CP\314\222\0\0\0\14\2\0\0\0\30\0\0\0\15\210\0\0\0\14\2\0\0\0\16\0\0" \ - "\0\26\202\0\0\0\14\1\0\0\0\30\207\0\0\0\14\1\0\0\0\12\217\377\377\377" \ - "\0\2\4\4\5""8sx\217\374\202\234\243\302\377\1\224\233\270\377\210\234" \ - "\243\302\377\2\232\241\300\377\35\36#\231\223\377\377\377\0\1\0\0\0\15" \ - "\223\377\377\377\0\2\0\0\0;sx\217\370\202\234\243\302\377\2}\201\233" \ - "\377lp\205\377\202\234\243\302\377\4\224\233\270\377\234\243\302\377" \ - "\227\235\273\377\231\240\276\377\202\234\243\302\377\2_cv\366\0\0\0\31" \ - "\202\377\377\377\0\1\0\0\0\15\216\377\377\377\0\2\0\0\0\12TXg\343\203" \ - "\234\243\302\377\2\223\232\267\377=@L\277\222\377\377\377\0\1\0\0\0\16" \ - "\211\377\377\377\0\2\0\0\0\5\0\0\0\7\202\377\377\377\0\1\0\0\0\15\227" \ - "\377\377\377\0\2\0\0\0\34_cv\355\202\234\243\302\377\1\224\233\270\377" \ - "\211\234\243\302\377\1\"$+\244\223\377\377\377\0\1\0\0\0\15\223\377\377" \ - "\377\0\2\11\11\12R~\204\235\377\202\234\243\302\377\2\213\222\255\377" \ - "^bu\377\202\234\243\302\377\4\224\233\270\377\234\243\302\377\225\233" \ - "\271\377\233\242\301\377\202\234\243\302\377\2z\200\230\376\13\13\16" \ - "@\202\377\377\377\0\2\0\0\0\13\0\0\0\2\215\377\377\377\0\2\0\0\0\35d" \ - "i|\354\203\234\243\302\377\2\223\232\267\37768B\265\222\377\377\377\0" \ - "\1\0\0\0\16\211\377\377\377\0\2\0\0\0\10\0\0\0\4\202\377\377\377\0\1" \ - "\0\0\0\15\227\377\377\377\0\2\0\0\0\4KO^\342\202\234\243\302\377\1\224" \ - "\233\270\377\211\234\243\302\377\2*,4\255\0\0\0\3\222\377\377\377\0\1" \ - "\0\0\0\15\223\377\377\377\0\2\25\26\33n\211\217\253\377\202\234\243\302" \ - "\377\2\231\240\276\377SVg\377\202\234\243\302\377\3\224\233\270\377\234" \ - "\243\302\377\224\233\270\377\203\234\243\302\377\2\217\226\262\377\37" \ - "\40&u\202\377\377\377\0\2\0\0\0\10\0\0\0\5\215\377\377\377\0\2\30\30" \ - "\36^\206\214\247\377\203\234\243\302\377\2\223\232\267\377+,6\241\222" \ - "\377\377\377\0\1\0\0\0\16\211\377\377\377\0\5\0\0\0\13\0\0\0\1\377\377" \ - "\377\0\0\0\0\3\0\0\0\13\230\377\377\377\0\1CFT\325\202\234\243\302\377" \ - "\1\224\233\270\377\211\234\243\302\377\2""13=\265\0\0\0\10\222\377\377" \ - "\377\0\1\0\0\0\15\222\377\377\377\0\3\0\0\0\1\33\34!\207\224\232\270" \ - "\377\203\234\243\302\377\1QUe\377\202\234\243\302\377\3\224\233\270\377" \ - "\234\243\302\377\224\233\270\377\204\234\243\302\377\1')1\231\202\377" \ - "\377\377\0\2\0\0\0\3\0\0\0\12\215\377\377\377\0\1(+3\237\204\234\243" \ - "\302\377\2|\202\232\376\26\31\34[\222\377\377\377\0\1\0\0\0\15\211\377" \ - "\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\6\0\0\0\10\230\377\377" \ - "\377\0\1=@L\310\202\234\243\302\377\1\224\233\270\377\211\234\243\302" \ - "\377\2""8;F\275\0\0\0\16\222\377\377\377\0\1\0\0\0\15\222\377\377\377" \ - "\0\2\0\0\0\11\37\40'\230\204\234\243\302\377\1PTd\377\202\234\243\302" \ - "\377\3\225\233\271\377\233\242\301\377\224\233\270\377\204\234\243\302" \ - "\377\1""36@\254\203\377\377\377\0\1\0\0\0\16\215\377\377\377\0\1:=H\275" \ - "\204\234\243\302\377\2PSd\346\0\0\0\21\221\377\377\377\0\2\0\0\0\6\0" \ - "\0\0\10\211\377\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\11\0\0" \ - "\0\4\230\377\377\377\0\1""69C\272\202\234\243\302\377\2\225\234\272\377" \ - "\232\241\277\377\210\234\243\302\377\2BES\313\0\0\0\15\222\377\377\377" \ - "\0\1\0\0\0\15\222\377\377\377\0\2\0\0\0\16-/8\244\204\234\243\302\377" \ - "\1NRb\377\202\234\243\302\377\3\227\236\274\377\230\237\275\377\224\233" \ - "\270\377\204\234\243\302\377\1<>J\302\203\377\377\377\0\2\0\0\0\15\0" \ - "\0\0\1\213\377\377\377\0\2\0\0\0\12LN^\333\204\234\243\302\377\1""03" \ - "<\303\222\377\377\377\0\1\0\0\0\15\212\377\377\377\0\1\0\0\0\15\202\377" \ - "\377\377\0\2\0\0\0\14\0\0\0\1\230\377\377\377\0\5'(0\230\230\237\276" \ - "\377\234\243\302\377\232\241\300\377\225\233\271\377\210\234\243\302" \ - "\377\3X\\n\345\0\0\0\27\0\0\0\5\221\377\377\377\0\1\0\0\0\15\222\377" \ - "\377\377\0\2\0\0\0\16>@M\302\204\234\243\302\377\2`ex\377\207\215\251" \ - "\377\202\234\243\302\377\2\221\227\264\377\227\235\273\377\204\234\243" \ - "\302\377\2]as\351\0\0\0\37\202\377\377\377\0\2\0\0\0\5\0\0\0\11\213\377" \ - "\377\377\0\2\37\37%\204\215\223\257\376\203\234\243\302\377\2\200\206" \ - "\237\372\27\27\33i\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\2\0" \ - "\0\0\2\0\0\0\13\202\377\377\377\0\1\0\0\0\16\231\377\377\377\0\2\13\13" \ - "\16""7ot\212\364\202\234\243\302\377\1\224\233\270\377\210\234\243\302" \ - "\377\3\177\205\236\375\22\23\27O\0\0\0\17\221\377\377\377\0\1\0\0\0\15" \ - "\221\377\377\377\0\202\0\0\0\13\1NQa\337\204\234\243\302\377\2\213\221" \ - "\255\377\\as\377\202\234\243\302\377\2\214\223\256\377\233\242\301\377" \ - "\204\234\243\302\377\2\224\233\270\377$%,\223\203\377\377\377\0\1\0\0" \ - "\0\20\212\377\377\377\0\2\0\0\0\11ADQ\323\204\234\243\302\377\2\77BN" \ - "\316\0\0\0\20\221\377\377\377\0\2\0\0\0\10\0\0\0\7\211\377\377\377\0" \ - "\2\0\0\0\12\0\0\0\3\202\377\377\377\0\1\0\0\0\16\232\377\377\377\0\1" \ - "ADP\320\202\234\243\302\377\2\225\233\271\377\233\242\301\377\207\234" \ - "\243\302\377\4\232\241\277\377%'/\225\0\0\0\11\0\0\0\6\220\377\377\377" \ - "\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\1\0\0\0\16\12\12\14<ty\220\372" \ - "\205\234\243\302\377\1LP_\377\202\234\243\302\377\2\216\224\261\377\231" \ - "\240\276\377\205\234\243\302\377\1<\77K\315\203\377\377\377\0\2\0\0\0" \ - "\7\0\0\0\11\211\377\377\377\0\2\36\40(\201\212\221\254\376\203\234\243" \ - "\302\377\3sw\216\362\36\36$]\0\0\0\16\221\377\377\377\0\1\0\0\0\17\212" \ - "\377\377\377\0\1\0\0\0\15\202\377\377\377\0\202\0\0\0\7\232\377\377\377" \ - "\0\5)+4\247\233\242\301\377\234\243\302\377\232\241\277\377\225\234\272" \ - "\377\210\234\243\302\377\3""79D\265\377\377\377\0\0\0\0\17\220\377\377" \ - "\377\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\15\0\0\0\3!#*\213\224\233" \ - "\270\377\205\234\243\302\377\5MQ`\377\233\242\301\377\232\241\277\377" \ - "\224\233\271\377\224\233\270\377\205\234\243\302\377\2qv\215\365\22\23" \ - "\26B\203\377\377\377\0\1\0\0\0\17\210\377\377\377\0\2\0\0\0\7\77AO\323" \ - "\203\234\243\302\377\4\225\234\272\377*+4\254\377\377\377\0\0\0\0\16" \ - "\220\377\377\377\0\2\0\0\0\13\0\0\0\4\211\377\377\377\0\2\0\0\0\1\0\0" \ - "\0\14\202\377\377\377\0\1\0\0\0\16\233\377\377\377\0\2\23\24\27Ny\177" \ - "\227\372\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\4" \ - "DGU\323\377\377\377\0\0\0\0\6\0\0\0\12\217\377\377\377\0\1\0\0\0\15\217" \ - "\377\377\377\0\4\0\0\0\4\0\0\0\14\377\377\377\0""02<\264\206\234\243" \ - "\302\377\5lq\205\377u{\222\377\225\233\271\377\232\241\300\377\224\232" \ - "\270\377\205\234\243\302\377\2\233\242\301\377+-6\253\203\377\377\377" \ - "\0\2\0\0\0\4\0\0\0\14\207\377\377\377\0\2\40\"'\217\211\217\251\375\202" \ - "\234\243\302\377\5\230\237\275\37758C\312\0\0\0\17\377\377\377\0\0\0" \ - "\0\16\217\377\377\377\0\2\0\0\0\3\0\0\0\16\212\377\377\377\0\2\0\0\0" \ - "\11\0\0\0\4\202\377\377\377\0\1\0\0\0\16\233\377\377\377\0\2\0\0\0\5" \ - "EHV\330\202\234\243\302\377\2\225\234\272\377\231\240\276\377\207\234" \ - "\243\302\377\5ty\220\366\21\22\25D\377\377\377\0\0\0\0\13\0\0\0\6\216" \ - "\377\377\377\0\1\0\0\0\15\216\377\377\377\0\5\0\0\0\2\0\0\0\17\377\377" \ - "\377\0\0\0\0\11KN]\332\206\234\243\302\377\6\232\241\300\377HKY\377\224" \ - "\232\270\377\234\243\302\377\227\235\273\377\230\237\275\377\205\234" \ - "\243\302\377\2ILZ\332\0\0\0\12\203\377\377\377\0\2\0\0\0\11\0\0\0\10" \ - "\205\377\377\377\0\2\36!&fko\204\355\202\234\243\302\377\3\230\237\275" \ - "\37778D\314\0\0\0\23\202\377\377\377\0\1\0\0\0\16\216\377\377\377\0\2" \ - "\0\0\0\1\0\0\0\20\213\377\377\377\0\1\0\0\0\16\202\377\377\377\0\2\0" \ - "\0\0\5\0\0\0\11\234\377\377\377\0\2*,4\247\227\236\274\377\202\234\243" \ - "\302\377\1\223\232\267\377\207\234\243\302\377\2\233\242\301\377,.6\252" \ - "\202\377\377\377\0\2\0\0\0\16\0\0\0\3\215\377\377\377\0\1\0\0\0\15\216" \ - "\377\377\377\0\5\0\0\0\20\0\0\0\1\377\377\377\0\33\34\"k\207\215\250" \ - "\376\207\234\243\302\377\2RVg\377\210\217\251\377\202\234\243\302\377" \ - "\1\223\232\267\377\205\234\243\302\377\2\220\226\263\377')1\233\204\377" \ - "\377\377\0\2\0\0\0\15\0\0\0\4\203\377\377\377\0\2\26\32\40PY]o\343\202" \ - "\234\243\302\377\3x~\226\365-08\265\14\14\14\25\203\377\377\377\0\1\0" \ - "\0\0\16\216\377\377\377\0\2\0\0\0\17\0\0\0\2\212\377\377\377\0\2\0\0" \ - "\0\10\0\0\0\5\202\377\377\377\0\2\0\0\0\17\0\0\0\1\234\377\377\377\0" \ - "\2\5\5\6\33TXi\341\202\234\243\302\377\2\227\235\273\377\230\237\275" \ - "\377\207\234\243\302\377\2JM\\\331\0\0\0\11\202\377\377\377\0\2\0\0\0" \ - "\17\0\0\0\4\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\3\0\0\0\1" \ - "\0\0\0\20\0\0\0\3\202\377\377\377\0\1""57B\272\207\234\243\302\377\3" \ - "\233\242\301\377\212\220\254\377PSc\377\202\234\243\302\377\2\230\237" \ - "\275\377\227\235\273\377\205\234\243\302\377\2ej~\353\30\31\36>\204\377" \ - "\377\377\0\11\0\0\0\16\0\0\0\5\0\0\0\1!#)\212bg{\351\233\242\300\377" \ - "ty\220\366>@L\317\37\37$d\205\377\377\377\0\1\0\0\0\16\215\377\377\377" \ - "\0\2\0\0\0\16\0\0\0\5\213\377\377\377\0\1\0\0\0\15\202\377\377\377\0" \ - "\2\0\0\0\4\0\0\0\14\236\377\377\377\0\2&'/\227\222\231\266\377\202\234" \ - "\243\302\377\1\223\232\267\377\207\234\243\302\377\2\207\215\250\375" \ - "\31\32\37k\203\377\377\377\0\2\0\0\0\16\0\0\0\7\213\377\377\377\0\1\0" \ - "\0\0\15\213\377\377\377\0\3\0\0\0\3\0\0\0\20\0\0\0\2\202\377\377\377" \ - "\0\2\0\0\0\30Z^p\347\207\234\243\302\377\4\224\233\270\377\232\241\300" \ - "\377MQ`\377\224\232\270\377\202\234\243\302\377\1\223\232\267\377\206" \ - "\234\243\302\377\2""8:F\312\0\0\0\5\204\377\377\377\0\7\0\0\0\14\21\21" \ - "\24\233*,4\327;>H\276+,5\250\23\23\27C\0\0\0\1\206\377\377\377\0\1\0" \ - "\0\0\16\213\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0\0\3\213\377\377\377" \ - "\0\2\0\0\0\12\0\0\0\4\202\377\377\377\0\2\0\0\0\17\0\0\0\1\236\377\377" \ - "\377\0\2\0\0\0\17HLZ\330\202\234\243\302\377\2\230\237\275\377\227\235" \ - "\273\377\207\234\243\302\377\1""46A\270\204\377\377\377\0\2\0\0\0\12" \ - "\0\0\0\13\212\377\377\377\0\1\0\0\0\15\212\377\377\377\0\2\0\0\0\7\0" \ - "\0\0\16\204\377\377\377\0\2#$+\212\222\231\266\377\206\234\243\302\377" \ - "\5\232\241\300\377\224\233\270\377\234\243\302\377\207\215\250\377VZ" \ - "l\376\202\234\243\302\377\2\231\240\276\377\225\234\272\377\205\234\243" \ - "\302\377\2\214\222\256\376%'.\217\205\377\377\377\0\2\0\0\0\11\0\0\0" \ - "\15\212\377\377\377\0\1\0\0\0\16\212\377\377\377\0\3\0\0\0\6\0\0\0\17" \ - "\0\0\0\1\213\377\377\377\0\2\0\0\0\1\0\0\0\15\202\377\377\377\0\2\0\0" \ - "\0\6\0\0\0\12\240\377\377\377\0\2!\")\203\213\221\255\375\202\234\243" \ - "\302\377\2\224\232\270\377\232\241\300\377\206\234\243\302\377\2jo\204" \ - "\355\25\26\32@\204\377\377\377\0\3\0\0\0\5\0\0\0\17\0\0\0\10\210\377" \ - "\377\377\0\1\0\0\0\15\210\377\377\377\0\3\0\0\0\5\0\0\0\17\0\0\0\10\204" \ - "\377\377\377\0\2\0\0\0\15FIW\325\207\234\243\302\377\6\222\231\266\377" \ - "\233\242\301\377\234\243\302\377\233\242\301\377&(/\347\214\223\257\377" \ - "\202\234\243\302\377\2\224\233\270\377\231\240\276\377\205\234\243\302" \ - "\377\2]bt\347\25\26\32""1\205\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0" \ - "\12\210\377\377\377\0\1\0\0\0\16\210\377\377\377\0\3\0\0\0\4\0\0\0\17" \ - "\0\0\0\12\215\377\377\377\0\2\0\0\0\16\0\0\0\2\202\377\377\377\0\1\0" \ - "\0\0\17\241\377\377\377\0\2\0\0\0\6>AM\317\202\234\243\302\377\2\233" \ - "\242\301\377\222\231\266\377\207\234\243\302\377\1""36@\303\206\377\377" \ - "\377\0\4\0\0\0\7\0\0\0\17\0\0\0\12\0\0\0\2\205\377\377\377\0\1\0\0\0" \ - "\15\206\377\377\377\0\3\0\0\0\10\0\0\0\17\0\0\0\13\206\377\377\377\0" \ - "\2$&-\227\222\230\265\377\206\234\243\302\377\2\224\233\270\377\231\240" \ - "\276\377\202\234\243\302\377\3aex\353\17\17\22""97:E\324\203\234\243" \ - "\302\377\2\222\231\266\377\233\242\301\377\205\234\243\302\377\2""57" \ - "B\314\0\0\0\17\206\377\377\377\0\4\0\0\0\5\0\0\0\17\0\0\0\13\0\0\0\2" \ - "\205\377\377\377\0\1\0\0\0\16\206\377\377\377\0\4\0\0\0\7\0\0\0\17\0" \ - "\0\0\14\0\0\0\1\215\377\377\377\0\2\0\0\0\13\0\0\0\6\202\377\377\377" \ - "\0\2\0\0\0\10\0\0\0\7\242\377\377\377\0\2\35\37%Rej~\351\202\234\243" \ - "\302\377\2\232\241\300\377\223\232\267\377\206\234\243\302\377\2\177" \ - "\204\236\370\36\40&i\207\377\377\377\0\14\0\0\0\4\0\0\0\15\0\0\0\16\0" \ - "\0\0\14\0\0\0\11\0\0\0\6\0\0\0\2\0\0\0\15\0\0\0\2\0\0\0\5\0\0\0\10\0" \ - "\0\0\13\202\0\0\0\16\1\0\0\0\7\207\377\377\377\0\2\10\10\12!W[l\342\206" \ - "\234\243\302\377\2\226\235\273\377\227\236\274\377\202\234\243\302\377" \ - "\5\205\213\245\374'(0\223\377\377\377\0\30\31\36Odi}\356\202\234\243" \ - "\302\377\2\233\242\301\377\222\231\266\377\205\234\243\302\377\3\225" \ - "\233\271\37702<\312\0\0\0\20\207\377\377\377\0\14\0\0\0\3\0\0\0\14\0" \ - "\0\0\16\0\0\0\15\0\0\0\11\0\0\0\6\0\0\0\3\0\0\0\16\0\0\0\1\0\0\0\4\0" \ - "\0\0\10\0\0\0\13\202\0\0\0\16\1\0\0\0\10\217\377\377\377\0\2\0\0\0\7" \ - "\0\0\0\11\202\377\377\377\0\2\0\0\0\3\0\0\0\16\244\377\377\377\0\2\"" \ - "#*||\202\233\364\202\234\243\302\377\2\230\237\276\377\225\233\271\377" \ - "\206\234\243\302\377\2@CP\322\0\0\0\10\211\377\377\377\0\11\0\0\0\1\0" \ - "\0\0\5\0\0\0\10\0\0\0\13\0\0\0\31\0\0\0\14\0\0\0\10\0\0\0\5\0\0\0\2\212" \ - "\377\377\377\0\2+-5\260\231\240\276\377\205\234\243\302\377\2\230\237" \ - "\275\377\225\233\271\377\202\234\243\302\377\3\222\231\266\377+-5\265" \ - "\0\0\0\1\202\377\377\377\0\2$&.\245\215\223\257\377\202\234\243\302\377" \ - "\2\232\241\277\377\224\232\270\377\205\234\243\302\377\3\225\234\272" \ - "\37724>\313\0\0\0\22\211\377\377\377\0\11\0\0\0\1\0\0\0\4\0\0\0\7\0\0" \ - "\0\12\0\0\0\32\0\0\0\14\0\0\0\11\0\0\0\6\0\0\0\3\221\377\377\377\0\2" \ - "\0\0\0\4\0\0\0\14\202\377\377\377\0\2\0\0\0\1\0\0\0\20\246\377\377\377" \ - "\0\2&'/\243\215\224\260\375\202\234\243\302\377\2\227\235\273\377\226" \ - "\235\273\377\205\234\243\302\377\2\215\224\260\377%'.\235\215\377\377" \ - "\377\0\1\0\0\0\15\215\377\377\377\0\2\35\36$Xnr\210\356\205\234\243\302" \ - "\377\2\231\240\276\377\224\232\270\377\202\234\243\302\377\3\232\241" \ - "\277\37758C\313\0\0\0\12\203\377\377\377\0\3\0\0\0\13:<H\322\231\240" \ - "\276\377\202\234\243\302\377\2\227\236\274\377\225\234\272\377\205\234" \ - "\243\302\377\3\227\235\273\37736@\314\0\0\0\23\214\377\377\377\0\1\0" \ - "\0\0\16\224\377\377\377\0\2\0\0\0\3\0\0\0\16\203\377\377\377\0\2\0\0" \ - "\0\17\0\0\0\2\246\377\377\377\0\3\0\0\0\5-09\276\230\237\275\377\202" \ - "\234\243\302\377\2\227\236\274\377\225\233\271\377\205\234\243\302\377" \ - "\2v{\222\363\"#*s\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\2\23" \ - "\23\27""0PSc\337\205\234\243\302\377\2\227\236\274\377\225\233\271\377" \ - "\203\234\243\302\377\2HKY\332\15\15\20\40\205\377\377\377\0\3\33\35\"" \ - "ETWh\345\232\241\300\377\202\234\243\302\377\2\230\237\275\377\224\233" \ - "\270\377\205\234\243\302\377\3\227\236\274\37758B\314\6\7\10\25\213\377" \ - "\377\377\0\1\0\0\0\16\223\377\377\377\0\2\0\0\0\6\0\0\0\15\203\377\377" \ - "\377\0\2\0\0\0\14\0\0\0\5\250\377\377\377\0\2\0\0\0\24=\77L\317\203\234" \ - "\243\302\377\3\231\240\276\377\223\232\267\377\233\242\301\377\204\234" \ - "\243\302\377\2]bt\347\34\36#G\213\377\377\377\0\1\0\0\0\15\213\377\377" \ - "\377\0\2\0\0\0\23:=H\322\205\234\243\302\377\2\225\234\272\377\227\235" \ - "\273\377\203\234\243\302\377\2_dw\346\33\35\"E\207\377\377\377\0\2\35" \ - "\36$RSWh\345\203\234\243\302\377\3\232\241\277\377\223\232\267\377\233" \ - "\242\301\377\204\234\243\302\377\3\230\237\275\377CFT\323\35\36$c\212" \ - "\377\377\377\0\1\0\0\0\16\222\377\377\377\0\2\0\0\0\11\0\0\0\12\203\377" \ - "\377\377\0\202\0\0\0\11\252\377\377\377\0\3\20\21\24(9;G\314\226\235" \ - "\273\377\202\234\243\302\377\3\232\241\300\377\223\232\267\377\232\241" \ - "\277\377\204\234\243\302\377\2EIV\333\17\20\23#\212\377\377\377\0\1\0" \ - "\0\0\15\212\377\377\377\0\3\0\0\0\6,.6\301\227\235\273\377\204\234\243" \ - "\302\377\2\224\232\270\377\230\237\276\377\203\234\243\302\377\2TWh\337" \ - "\40!'[\211\377\377\377\0\3\34\35#SSWh\345\232\241\300\377\202\234\243" \ - "\302\377\3\233\242\301\377\224\232\270\377\231\240\276\377\205\234\243" \ - "\302\377\3z\200\230\365.0:\274\20\20\24)\210\377\377\377\0\1\0\0\0\16" \ - "\221\377\377\377\0\2\0\0\0\14\0\0\0\6\203\377\377\377\0\202\0\0\0\12" \ - "\254\377\377\377\0\3\0\0\0\20+,5\270\212\220\254\373\203\234\243\302" \ - "\377\2\224\233\270\377\225\234\272\377\203\234\243\302\377\3\232\241" \ - "\277\377BER\332\35\36$F\211\377\377\377\0\1\0\0\0\15\211\377\377\377" \ - "\0\3\5\5\6\32.09\305\216\224\261\376\203\234\243\302\377\3\227\236\274" \ - "\377\223\232\267\377\232\241\300\377\202\234\243\302\377\3\227\236\274" \ - "\377=@L\322\24\25\31""2\213\377\377\377\0\3\35\36$RTWh\345\230\237\276" \ - "\377\203\234\243\302\377\202\225\233\271\377\1\233\242\301\377\204\234" \ - "\243\302\377\4\232\241\300\377Y]o\346%'.\231\0\0\0\12\206\377\377\377" \ - "\0\1\0\0\0\16\217\377\377\377\0\3\0\0\0\5\0\0\0\16\0\0\0\3\203\377\377" \ - "\377\0\2\0\0\0\16\0\0\0\7\256\377\377\377\0\3\0\0\0\3$%,\231w}\224\361" \ - "\203\234\243\302\377\3\231\240\276\377\223\232\267\377\227\235\273\377" \ - "\203\234\243\302\377\2^cv\350#%,{\210\377\377\377\0\1\0\0\0\15\210\377" \ - "\377\377\0\3\34\36#GCFS\331\230\237\276\377\202\234\243\302\377\3\230" \ - "\237\276\377\223\232\267\377\227\236\274\377\203\234\243\302\377\3\215" \ - "\223\257\376.0:\277\0\0\0\23\215\377\377\377\0\3\36\37%QTXh\344\227\235" \ - "\273\377\203\234\243\302\377\3\232\241\277\377\223\232\267\377\225\234" \ - "\272\377\205\234\243\302\377\4\216\224\261\377=@L\325\37\40'|\0\0\0\30" \ - "\204\377\377\377\0\1\0\0\0\16\215\377\377\377\0\3\0\0\0\21\26\26\33x" \ - "\3\3\3$\203\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0\0\4\261\377\377\377" \ - "\0\2\36\40&r_cv\344\204\234\243\302\377\3\230\237\275\377\223\232\267" \ - "\377\230\237\275\377\202\234\243\302\377\3{\200\231\367)*3\256\5\6\7" \ - "\30\206\377\377\377\0\1\0\0\0\15\206\377\377\377\0\3\0\0\0\7#%,\207`" \ - "dw\351\202\234\243\302\377\3\232\241\277\377\224\232\270\377\226\235" \ - "\273\377\204\234\243\302\377\3z\200\230\365&(/\243\0\0\0\4\217\377\377" \ - "\377\0\3\31\33\40>58B\313\204\213\245\375\204\234\243\302\377\3\231\240" \ - "\276\377\223\232\267\377\227\235\273\377\205\234\243\302\377\7\216\224" \ - "\261\377]as\352>@M\304()1\230\16\17\22;\0\0\0\1\0\0\0\16\212\377\377" \ - "\377\0\6\0\0\0\24\32\33!g-/8\272ADR\344\34\35#\307\0\0\0\3\202\377\377" \ - "\377\0\3\0\0\0\4\0\0\0\20\0\0\0\1\263\377\377\377\0\3\27\30\35\77""4" \ - "6A\302|\202\232\367\204\234\243\302\377\10\227\235\273\377\224\232\270" \ - "\377\224\233\270\377\230\237\275\377\225\233\271\377W[l\345-/8\255\21" \ - "\21\25.\204\377\377\377\0\1\0\0\0\15\204\377\377\377\0\10\0\0\0\23()" \ - "1\224HLZ\330\213\221\255\377\232\241\277\377\225\233\271\377\224\232" \ - "\270\377\225\234\272\377\204\234\243\302\377\3\214\223\256\377ADQ\323" \ - "!\")m\222\377\377\377\0\4\0\0\0\5\"#+\216TXi\345\226\235\273\377\204" \ - "\234\243\302\377\1\230\237\275\377\202\224\233\270\377\1\230\237\275" \ - "\377\205\234\243\302\377\27\230\237\276\377rw\216\366EHV\324,.7\261#" \ - "%,\221\37\40'x\27\30\35X\7\7\11\77\24\25\31R\35\36$j\40!(\200%&.\233" \ - "35\77\267>AM\322TXh\351~\204\234\376\230\237\275\37703<\311\0\0\0\14" \ - "\377\377\377\0\0\0\0\2\0\0\0\15\0\0\0\13\267\377\377\377\0\3\35\36$`" \ - "=\77L\314\210\216\251\374\205\234\243\302\377\1\227\236\274\377\202\224" \ - "\232\270\377\21\225\233\271\377afz\35657B\276)+3\242\40\"(|\13\13\16" \ - "@\0\0\0%\4\5\6""3\36\37%m&(/\23313=\264QUf\343\216\225\261\377\224\233" \ - "\270\377\224\232\270\377\226\235\273\377\233\242\301\377\204\234\243" \ - "\302\377\4\224\233\270\377LP_\334$&-\211\0\0\0\7\225\377\377\377\0\4" \ - "\17\20\23*.0:\301z\177\230\371\230\237\276\377\205\234\243\302\377\1" \ - "\230\237\275\377\202\224\232\270\377\3\226\235\273\377\230\237\276\377" \ - "\232\241\300\377\203\234\243\302\377\23\223\232\267\377\232\241\300\377" \ - "\217\226\262\377\202\210\242\377w}\225\377|\201\232\377\203\211\243\377" \ - "\211\216\252\377\222\230\265\377\225\234\272\377\232\241\300\377\234" \ - "\243\302\377{\201\231\366.09\272\5\5\7\31\0\0\0\1\0\0\0\14\0\0\0\15\0" \ - "\0\0\1\271\377\377\377\0\4\0\0\0\3\"$*zHKY\326\221\230\265\377\206\234" \ - "\243\302\377\15\231\240\276\377\227\235\273\377\225\233\271\377\224\233" \ - "\270\377\211\217\253\377tx\217\375W[m\356ms\211\371\203\212\243\377\223" \ - "\232\267\377\224\233\270\377\226\235\273\377\230\237\276\377\206\234" \ - "\243\302\377\4\231\240\276\377Y]n\345(*2\236\0\0\0\21\230\377\377\377" \ - "\0\5\0\0\0\1!\")uCFS\331~\203\235\375\232\241\277\377\206\234\243\302" \ - "\377\3\231\240\276\377\227\236\274\377\225\234\272\377\203\224\233\270" \ - "\377\1\214\222\256\377\204\224\233\270\377\3\226\235\273\377\230\237" \ - "\275\377\233\242\301\377\202\234\243\302\377\7\224\233\270\377EHV\332" \ - "\36\40&k\377\377\377\0\0\0\0\12\0\0\0\16\0\0\0\3\275\377\377\377\0\5" \ - "\0\0\0\13$%-\214:<H\305\\`r\351\217\226\262\377\211\234\243\302\377\1" \ - "\224\232\270\377\211\234\243\302\377\5\227\235\273\377ko\205\362>AM\317" \ - "()1\244\14\14\17\"\234\377\377\377\0\6\0\0\0\11\30\32\37f/1;\266LO^\341" \ - "\204\211\243\377\232\241\300\377\211\234\243\302\377\1\223\232\267\377" \ - "\207\234\243\302\377\4\220\226\263\377UXi\340*+4\252\0\0\0\32\202\0\0" \ - "\0\16\1\0\0\0\5\302\377\377\377\0\5\0\0\0\33\37\40&~57B\270PTd\336\205" \ - "\213\246\375\206\234\243\302\377\1\224\232\270\377\206\234\243\302\377" \ - "\5\217\226\262\377]at\351;=I\303$&-\225\7\10\11""1\242\377\377\377\0" \ - "\6\0\0\0\15\35\37%q35@\274QTd\346\203\211\242\377\230\237\275\377\206" \ - "\234\243\302\377\1\223\232\267\377\204\234\243\302\377\7\232\241\300" \ - "\377mr\207\361;=I\305\37\40'\204\0\0\0\34\0\0\0\15\0\0\0\6\310\377\377" \ - "\377\0\21\0\0\0\14\27\30\34c\"#*\233+-6\25046@\266;>J\304BER\321KN]\336" \ - "VZl\350PSc\340CGT\325=@L\30769D\271.09\254%&.\237\35\36${\0\0\0\32\250" \ - "\377\377\377\0\22\0\0\0\21\35\37%s!#*\236)+4\25624>\272:=H\307ADQ\324" \ - "IKZ\341\\_r\354gl\201\371]bt\354FIW\333<\77L\31014=\265#%,\240\12\13" \ - "\15B\0\0\0\14\0\0\0\4\322\377\377\377\0\3\0\0\0\5\0\0\0%\0\0\0\12\266" \ - "\377\377\377\0\4\0\0\0\3\0\0\0\31\0\0\0=\0\0\0\34\332\377\377\377\0\1" \ - "\0\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271" \ - "\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271\377\377\377" \ - "\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\2\271\377\377\377\0\1\0\0\0\2" \ - "\377\377\377\377\0\377\377\377\377\0\377\377\377\377\0\377\377\377\377" \ - "\0\305\377\377\377\0\2\225\225\225\30\222\222\222\25\222\377\377\377" \ - "\0\2\217\217\217\31\214\214\214\24\206\377\377\377\0\2\223\223\223\32" \ - "\224\224\224\23\215\377\377\377\0\3\231\231\231\5\223\223\223(\377\377" \ - "\377\1\350\377\377\377\0\2\222\222\222\237\222\222\222\210\222\377\377" \ - "\377\0\2\222\222\222\241\223\223\223\206\206\377\377\377\0\2\222\222" \ - "\222\253\222\222\222|\215\377\377\377\0\3\217\217\217\40\222\222\222" \ - "\377\222\222\222\7\350\377\377\377\0\2\222\222\222\237\222\222\222\210" \ - "\222\377\377\377\0\2\222\222\222\241\223\223\223\206\206\377\377\377" \ - "\0\2\222\222\222\253\222\222\222|\215\377\377\377\0\3\217\217\217\40" \ - "\222\222\222\377\222\222\222\7\264\377\377\377\0\4\0\0\0%\0\0\0}\0\0" \ - "\0\217\0\0\0R\203\377\377\377\0\6\0\0\0U\0\0\0-\0\0\0W\0\0\0\221\0\0" \ - "\0s\0\0\0\10\203\377\377\377\0\4\0\0\0;\0\0\0\206\0\0\0\216\0\0\0F\202" \ - "\377\377\377\0\6\0\0\0\33\0\0\0f\0\0\0\30\0\0\0x\0\0\0\203\0\0\0&\205" \ - "\377\377\377\0\21\221\221\221%\222\222\222|\222\222\222\223\221\221\221" \ - "_\377\377\377\1\377\377\377\0\252\252\252\3\222\222\222p\225\225\225" \ - "\30\221\221\221m\221\221\221\220\222\222\222K\377\377\377\0\223\223\223" \ - "B\223\223\223\213\222\222\222^\237\237\237\10\202\377\377\377\0\6\222" \ - "\222\222\237\222\222\222\210\221\221\221H\222\222\222\215\223\223\223" \ - "}\216\216\216\22\203\377\377\377\0\4\221\221\221,\223\223\223\177\223" \ - "\223\223\222\223\223\223W\203\377\377\377\0\6\252\252\252\3\223\223\223" \ - "a\221\221\221\225\222\222\222u\222\222\222\267\223\223\223\206\202\377" \ - "\377\377\0\6\200\200\200\4\222\222\222e\221\221\221\225\221\221\221r" \ - "\222\222\222\276\222\222\222|\202\377\377\377\0\5\200\200\200\4\223\223" \ - "\223a\223\223\223\222\221\221\221\200\225\225\225\35\203\377\377\377" \ - "\0\6\223\223\223(\223\223\223\204\222\222\222\217\223\223\223h\222\222" \ - "\222\377\222\222\222\7\263\377\377\377\0\6\0\0\0""5\0\0\0\362\0\0\0\260" \ - "\0\0\0\205\0\0\0\352\0\0\0\220\202\377\377\377\0\6\0\0\0\304\0\0\0\355" \ - "\0\0\0\256\0\0\0\222\0\0\0\360\0\0\0\261\202\377\377\377\0\16\0\0\0j" \ - "\0\0\0\340\0\0\0\203\0\0\0\207\0\0\0\350\0\0\0_\377\377\377\0\0\0\0>" \ - "\0\0\0\370\0\0\0\327\0\0\0\222\0\0\0\236\0\0\0\375\0\0\0\36\203\377\377" \ - "\377\0\22\220\220\220>\222\222\222\345\222\222\222\226\222\222\222w\223" \ - "\223\223\326\222\222\222\224\377\377\377\0\237\237\237\10\222\222\222" \ - "\377\222\222\222\336\222\222\222\235\223\223\223\222\222\222\222\367" \ - "\222\222\222\267\222\222\222\311\223\223\223\206\222\222\222\315\221" \ - "\221\221\254\202\377\377\377\0\16\222\222\222\237\222\222\222\357\222" \ - "\222\222\303\221\221\221\216\222\222\222\347\222\222\222\323\252\252" \ - "\252\3\377\377\377\0\222\222\222K\222\222\222\345\221\221\221\220\221" \ - "\221\221{\222\222\222\334\222\222\222\203\202\377\377\377\0\36\222\222" \ - "\222\264\222\222\222\357\221\221\221\216\222\222\222\215\222\222\222" \ - "\350\223\223\223\206\377\377\377\0\377\377\377\1\222\222\222\275\222" \ - "\222\222\354\223\223\223\213\222\222\222\217\222\222\222\353\222\222" \ - "\222|\377\377\377\0\200\200\200\2\222\222\222\277\223\223\223\301\222" \ - "\222\222p\223\223\223\247\222\222\222\352\220\220\220\27\377\377\377" \ - "\0\222\222\222=\222\222\222\366\222\222\222\302\221\221\221{\223\223" \ - "\223\265\222\222\222\377\222\222\222\7\263\377\377\377\0\2\0\0\0\270" \ - "\0\0\0\231\202\377\377\377\0\6\0\0\0""0\0\0\0\375\0\0\0\"\377\377\377" \ - "\0\0\0\0\304\0\0\0t\202\377\377\377\0\6\0\0\0""5\0\0\0\377\0\0\0$\0\0" \ - "\0\17\0\0\0\363\0\0\0""2\202\377\377\377\0\6\0\0\0h\0\0\0\324\377\377" \ - "\377\0\0\0\0>\0\0\0\357\0\0\0\16\202\377\377\377\0\2\0\0\0\275\0\0\0" \ - "j\203\377\377\377\0\2\222\222\222\316\223\223\223h\202\377\377\377\0" \ - "\6\224\224\2242\222\222\222\375\225\225\225\14\237\237\237\10\222\222" \ - "\222\377\221\221\2213\202\377\377\377\0\2\222\222\222\246\222\222\222" \ - "\253\202\377\377\377\0\6\220\220\220.\222\222\222\360\252\252\252\3\377" \ - "\377\377\0\222\222\222\237\222\222\222\232\202\377\377\377\0\6\217\217" \ - "\217\20\222\222\222\375\223\223\223I\377\377\377\0\222\222\222\336\223" \ - "\223\223W\202\377\377\377\0\6\221\221\221C\222\222\222\366\200\200\200" \ - "\2\222\222\222K\222\222\222\375\225\225\225\30\202\377\377\377\0\6\222" \ - "\222\222\241\223\223\223\206\377\377\377\0\223\223\223U\222\222\222\372" \ - "\226\226\226\21\202\377\377\377\0\6\222\222\222\253\222\222\222|\377" \ - "\377\377\0\221\221\221]\222\222\222\327\377\377\377\1\202\377\377\377" \ - "\0\5\223\223\223\301\222\222\222z\377\377\377\0\222\222\222\312\221\221" \ - "\221\227\202\377\377\377\0\3\217\217\217\40\222\222\222\377\222\222\222" \ - "\7\263\377\377\377\0\2\0\0\0\354\0\0\0Y\202\377\377\377\0\6\0\0\0\1\0" \ - "\0\0\353\0\0\0S\377\377\377\0\0\0\0\304\0\0\0c\202\377\377\377\0\5\0" \ - "\0\0\4\0\0\0\364\0\0\0H\0\0\0=\0\0\0\372\203\0\0\0\300\5\0\0\0\315\0" \ - "\0\0\366\377\377\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2\0\0\0\241" \ - "\0\0\0\221\202\377\377\377\0\3\216\216\216\11\222\222\222\375\222\222" \ - "\222\307\203\222\222\222\300\5\222\222\222\377\224\224\224+\237\237\237" \ - "\10\222\222\222\377\224\224\224\37\202\377\377\377\0\2\223\223\223\222" \ - "\222\222\222\237\202\377\377\377\0\6\224\224\224\23\222\222\222\377\220" \ - "\220\220\27\377\377\377\0\222\222\222\237\222\222\222\210\203\377\377" \ - "\377\0\5\222\222\222\322\222\222\222l\225\225\225\30\222\222\222\377" \ - "\222\222\222\303\202\222\222\222\300\5\222\222\222\304\222\222\222\377" \ - "\216\216\216\33\222\222\222\201\223\223\223\310\203\377\377\377\0\5\222" \ - "\222\222\241\223\223\223\206\377\377\377\0\222\222\222\214\222\222\222" \ - "\275\203\377\377\377\0\5\222\222\222\253\222\222\222|\377\377\377\0\222" \ - "\222\222\226\223\223\223\344\203\222\222\222\300\5\223\223\223\344\221" \ - "\221\221\234\231\231\231\5\222\222\222\373\223\223\223I\202\377\377\377" \ - "\0\3\217\217\217\40\222\222\222\377\222\222\222\7\263\377\377\377\0\2" \ - "\0\0\0\357\0\0\0W\203\377\377\377\0\5\0\0\0\347\0\0\0V\377\377\377\0" \ - "\0\0\0\304\0\0\0c\202\377\377\377\0\5\0\0\0\12\0\0\0\370\0\0\0\77\0\0" \ - "\0B\0\0\0\360\204\0\0\0(\4\0\0\0'\377\377\377\0\0\0\0>\0\0\0\351\203" \ - "\377\377\377\0\2\0\0\0\236\0\0\0\221\202\377\377\377\0\3\211\211\211" \ - "\15\222\222\222\377\224\224\224E\204\223\223\223(\4\222\222\222\7\237" \ - "\237\237\10\222\222\222\377\224\224\224\37\202\377\377\377\0\2\221\221" \ - "\221\220\222\222\222\237\202\377\377\377\0\6\217\217\217\20\222\222\222" \ - "\377\220\220\220\27\377\377\377\0\222\222\222\237\222\222\222\210\203" \ - "\377\377\377\0\5\222\222\222\333\222\222\222b\225\225\225\35\222\222" \ - "\222\377\220\220\2207\204\223\223\223(\3\231\231\231\5\222\222\222\214" \ - "\222\222\222\270\203\377\377\377\0\5\222\222\222\241\223\223\223\206" \ - "\377\377\377\0\222\222\222\226\223\223\223\256\203\377\377\377\0\5\222" \ - "\222\222\253\222\222\222|\377\377\377\0\222\222\222\233\222\222\222\244" \ - "\204\223\223\223(\4\217\217\217\31\213\213\213\13\222\222\222\377\221" \ - "\221\221:\202\377\377\377\0\3\217\217\217\40\222\222\222\377\222\222" \ - "\222\7\263\377\377\377\0\2\0\0\0\300\0\0\0\235\202\377\377\377\0\6\0" \ - "\0\0,\0\0\0\377\0\0\0(\377\377\377\0\0\0\0\304\0\0\0c\202\377\377\377" \ - "\0\6\0\0\0M\0\0\0\370\0\0\0\25\0\0\0\24\0\0\0\371\0\0\0""8\203\377\377" \ - "\377\0\4\0\0\0\11\377\377\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2" \ - "\0\0\0\236\0\0\0\221\203\377\377\377\0\2\222\222\222\330\222\222\222" \ - "n\203\377\377\377\0\5\237\237\237\10\377\377\377\1\237\237\237\10\222" \ - "\222\222\377\224\224\224\37\202\377\377\377\0\2\221\221\221\220\222\222" \ - "\222\237\202\377\377\377\0\6\217\217\217\20\222\222\222\377\220\220\220" \ - "\27\377\377\377\0\222\222\222\237\222\222\222\210\202\377\377\377\0\6" \ - "\222\222\222#\222\222\222\377\222\222\222/\377\377\377\0\222\222\222" \ - "\350\221\221\221]\203\377\377\377\0\5\216\216\216\11\377\377\377\0\222" \ - "\222\222e\222\222\222\361\252\252\252\3\202\377\377\377\0\6\222\222\222" \ - "\253\223\223\223\206\377\377\377\0\223\223\223o\222\222\222\351\377\377" \ - "\377\1\202\377\377\377\0\6\223\223\223\265\222\222\222|\377\377\377\0" \ - "\223\223\223h\222\222\222\327\222\222\222\7\203\377\377\377\0\4\216\216" \ - "\216\11\377\377\377\0\222\222\222\343\223\223\223v\202\377\377\377\0" \ - "\3\222\222\222*\222\222\222\377\222\222\222\7\263\377\377\377\0\6\0\0" \ - "\0>\0\0\0\365\0\0\0\245\0\0\0u\0\0\0\337\0\0\0\236\202\377\377\377\0" \ - "\6\0\0\0\304\0\0\0\321\0\0\0z\0\0\0\227\0\0\0\365\0\0\0}\202\377\377" \ - "\377\0\11\0\0\0w\0\0\0\356\0\0\0\201\0\0\0e\0\0\0\225\0\0\0\305\377\377" \ - "\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2\0\0\0\236\0\0\0\221\203\377" \ - "\377\377\0\6\221\221\221H\222\222\222\363\222\222\222\224\223\223\223" \ - "c\222\222\222\210\222\222\222\341\202\237\237\237\10\2\222\222\222\377" \ - "\224\224\224\37\202\377\377\377\0\2\221\221\221\220\222\222\222\237\202" \ - "\377\377\377\0\12\217\217\217\20\222\222\222\377\220\220\220\27\377\377" \ - "\377\0\222\222\222\237\222\222\222\327\223\223\223q\222\222\222z\222" \ - "\222\222\342\223\223\223\247\202\377\377\377\0&\221\221\221V\222\222" \ - "\222\363\221\221\221\216\223\223\223c\222\222\222\214\222\222\222\337" \ - "\377\377\377\0\225\225\225\14\222\222\222\347\223\223\223\326\222\222" \ - "\222|\222\222\222\267\222\222\222\366\223\223\223\206\377\377\377\0\226" \ - "\226\226\21\222\222\222\354\222\222\222\322\221\221\221{\222\222\222" \ - "\274\222\222\222\366\222\222\222|\377\377\377\0\231\231\231\5\222\222" \ - "\222\312\222\222\222\313\221\221\221k\221\221\221r\221\221\221\263\221" \ - "\221\221y\377\377\377\0\223\223\223q\222\222\222\372\222\222\222\233" \ - "\221\221\221\211\222\222\222\341\222\222\222\377\222\222\222\7\264\377" \ - "\377\377\0\5\0\0\0""0\0\0\0\215\0\0\0\237\0\0\0b\0\0\0\1\202\377\377" \ - "\377\0\5\0\0\0\304\0\0\0\220\0\0\0\211\0\0\0\220\0\0\0J\204\377\377\377" \ - "\0\10\0\0\0\77\0\0\0\211\0\0\0\237\0\0\0\200\0\0\0-\377\377\377\0\0\0" \ - "\0\37\0\0\0t\203\377\377\377\0\2\0\0\0O\0\0\0H\204\377\377\377\0\11\224" \ - "\224\224&\222\222\222\201\222\222\222\237\222\222\222\212\223\223\223" \ - "B\377\377\377\0\200\200\200\4\221\221\221\200\231\231\231\17\202\377" \ - "\377\377\0\2\221\221\221H\221\221\221O\202\377\377\377\0\12\237\237\237" \ - "\10\221\221\221\200\213\213\213\13\377\377\377\0\221\221\221O\221\221" \ - "\221d\222\222\222\214\222\222\222\244\223\223\223j\252\252\252\3\203" \ - "\377\377\377\0\5\220\220\220.\223\223\223\204\222\222\222\237\221\221" \ - "\221\207\223\223\223;\202\377\377\377\0\6\223\223\223!\222\222\222\221" \ - "\222\222\222\232\224\224\224L\223\223\223P\221\221\221C\202\377\377\377" \ - "\0\6\224\224\224&\222\222\222\223\222\222\222\230\223\223\223G\223\223" \ - "\223U\220\220\220>\202\377\377\377\0\6\231\231\231\5\222\222\222e\221" \ - "\221\221\225\222\222\222\230\222\222\222i\216\216\216\22\202\377\377" \ - "\377\0\6\222\222\222b\222\222\222\242\222\222\222~\221\221\221%\221\221" \ - "\221\200\252\252\252\3\273\377\377\377\0\2\0\0\0\304\0\0\0c\377\377\377" \ - "\377\0\225\377\377\377\0\2\0\0\0\304\0\0\0c\354\377\377\377\0") + "\310\354\354\341\377\2\342\342\330\377\352\352\337\377\323\354\354\341" \ + "\377\2\346\346\333\377\345\345\332\377\377\354\354\341\377\206\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331" \ + "\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342" \ + "\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377\377" \ + "\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350\350\335\377" \ + "\323\354\354\341\377\2\343\343\331\377\342\342\330\377\375\354\354\341" \ + "\377\21\346\346\333\377\305\305\273\377\240\240\230\377xyu\377efd\377" \ + "XYY\377LLM\377FGH\377\77@B\377CDF\377GHI\377QQR\377]^]\377kki\377\210" \ + "\210\204\377\257\257\247\377\323\323\312\377\303\354\354\341\377\6\337" \ + "\337\325\377\272\272\261\377\216\216\210\377ab`\377JJJ\377>\77@\377\202" \ + "<=\77\377\12;<@\37779=\37789=\377\77@B\377YYY\377~~z\377\242\242\232" \ + "\377\306\306\274\377\342\342\330\377\350\350\335\377\362\354\354\341" \ + "\377\32\337\337\324\377\231\231\222\377OPP\377\77@D\377@BH\377TVb\377" \ + "fk~\377}\203\233\377\211\217\253\377\220\227\264\377\230\237\276\377" \ + "\234\243\302\377\222\230\265\377\231\240\276\377\234\243\302\377\225" \ + "\234\272\377\215\224\260\377\205\213\246\377sx\217\377_br\377KNV\377" \ + "=>C\377@AC\377iig\377\271\271\260\377\353\353\340\377\271\354\354\341" \ + "\377\34\347\347\334\377\260\260\250\377fge\377>\77A\3778:=\377=\77F\377" \ + "RTa\377fj\177\377\177\205\237\377\216\225\261\377\230\237\275\377\232" \ + "\241\300\377\233\242\301\377\234\243\302\377\226\235\273\377\225\234" \ + "\272\377\233\242\301\377\211\220\253\377rw\215\377\\`q\377HKT\3778:=" \ + "\377BCD\377\216\216\210\377\322\322\307\377\334\334\322\377\344\344\331" \ + "\377\353\353\340\377\352\354\354\341\377\6\323\323\311\377\206\207\202" \ + "\377EFG\377CEL\377hm\201\377\224\232\270\377\211\234\243\302\377\2\222" \ + "\230\265\377\231\240\276\377\211\234\243\302\377\6\204\212\244\377X[" \ + "i\377<=A\377XXX\377\247\247\237\377\345\345\332\377\263\354\354\341\377" \ + "\10\322\322\310\377\212\213\206\377FFH\37778=\377SVc\377w}\225\377\224" \ + "\233\270\377\232\241\277\377\211\234\243\302\377\2\226\235\273\377\225" \ + "\234\272\377\206\234\243\302\377\11\224\233\270\377dhz\377<=B\377TTT" \ + "\377\247\247\240\377\330\330\316\377\332\332\320\377\342\342\330\377" \ + "\352\352\337\377\344\354\354\341\377\6\303\303\272\377stq\377=>A\377" \ + "HJS\377qv\214\377\230\237\276\377\214\234\243\302\377\2\222\230\265\377" \ + "\231\240\276\377\214\234\243\302\377\6\214\222\256\377^bs\377;<A\377" \ + "JJK\377\225\225\217\377\335\335\322\377\255\354\354\341\377\10\352\352" \ + "\337\377\244\244\235\377BCD\377\77AI\377bgz\377\210\217\252\377\225\234" \ + "\272\377\232\241\300\377\214\234\243\302\377\2\226\235\273\377\225\234" \ + "\272\377\211\234\243\302\377\11\213\221\255\377Y\\j\3779:=\377hhf\377" \ + "\312\312\302\377\332\332\320\377\331\331\317\377\337\337\325\377\351" \ + "\351\336\377\337\354\354\341\377\5\232\232\224\37789;\377PS^\377z\200" \ + "\230\377\233\242\301\377\217\234\243\302\377\2\222\230\265\377\231\240" \ + "\276\377\217\234\243\302\377\5\222\230\265\377ej|\377=\77F\377MNN\377" \ + "\314\314\303\377\251\354\354\341\377\7\332\332\320\377yyv\377569\377" \ + "TWe\377\207\215\250\377\227\235\273\377\233\242\301\377\217\234\243\302" \ + "\377\2\226\235\273\377\225\234\272\377\214\234\243\302\377\10~\203\234" \ + "\377:<A\377}~z\377\347\347\334\377\344\344\331\377\333\333\321\377\331" \ + "\331\317\377\346\346\333\377\333\354\354\341\377\4\261\261\251\377<=" \ + "\77\377]ap\377\230\237\276\377\213\234\243\302\377\20\232\241\277\377" \ + "\230\237\275\377\226\235\273\377\224\233\270\377\222\231\266\377\220" \ + "\227\264\377\207\215\250\377ko\205\377w}\226\377\215\223\260\377\221" \ + "\230\265\377\223\232\267\377\225\233\271\377\227\235\273\377\230\237" \ + "\276\377\232\241\300\377\213\234\243\302\377\4\206\214\247\377@BI\377" \ + "`a_\377\331\331\317\377\245\354\354\341\377\6\340\340\326\377mnk\377" \ + ">>D\377ko\205\377\222\230\265\377\232\241\300\377\213\234\243\302\377" \ + "\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233\270\377\222" \ + "\231\266\377\202\220\227\264\377\2\213\221\255\377\212\220\254\377\202" \ + "\220\227\264\377\5\222\231\266\377\224\233\270\377\226\235\273\377\230" \ + "\237\275\377\232\241\277\377\207\234\243\302\377\10jn\202\37789;\377" \ + "\261\261\251\377\354\354\341\377\352\352\337\377\335\335\322\377\332" \ + "\332\320\377\350\350\335\377\327\354\354\341\377\4\306\306\274\377HI" \ + "J\377QTa\377\224\232\270\377\211\234\243\302\377\2\227\236\274\377\222" \ + "\230\265\377\202\220\227\264\377\20\222\231\266\377nt\212\377TXe\377" \ + "CEL\377@AF\377EFH\377VWX\377rsp\377jki\377KLN\377BDG\377>\77E\377JMV" \ + "\377\\`o\377\203\211\244\377\222\230\265\377\202\220\227\264\377\2\224" \ + "\233\270\377\232\241\277\377\211\234\243\302\377\4|\201\232\377:;@\377" \ + "vvs\377\343\343\331\377\241\354\354\341\377\6\351\351\336\377\211\212" \ + "\205\37789=\377os\211\377\220\227\264\377\231\240\276\377\211\234\243" \ + "\302\377\2\230\237\276\377\223\232\267\377\202\220\227\264\377\5\222" \ + "\231\266\377\224\233\270\377\226\235\273\377\230\237\275\377\232\241" \ + "\277\377\202\234\243\302\377\2\226\235\273\377\225\234\272\377\202\234" \ + "\243\302\377\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233" \ + "\270\377\222\231\266\377\202\220\227\264\377\2\223\232\267\377\230\237" \ + "\276\377\204\234\243\302\377\11\225\233\271\377OQ\\\377RRR\377\325\325" \ + "\313\377\354\354\341\377\351\351\336\377\333\333\321\377\334\334\322" \ + "\377\352\352\337\377\323\354\354\341\377\4\324\324\312\377YYY\377GJS" \ + "\377\215\223\257\377\207\234\243\302\377\14\233\242\301\377\226\235\273" \ + "\377\221\230\265\377\220\227\264\377\225\233\271\377\232\241\300\377" \ + "\231\240\276\377fk}\377:;\77\377}~z\377\277\277\266\377\341\341\327\377" \ + "\203\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341" \ + "\377\13\324\324\312\377\256\256\246\377TUU\377EGO\377\200\206\237\377" \ + "\234\243\302\377\230\237\275\377\222\231\266\377\220\227\264\377\223" \ + "\232\267\377\230\237\276\377\210\234\243\302\377\4pu\213\37789<\377\216" \ + "\216\211\377\352\352\337\377\236\354\354\341\377\5\264\264\255\37789" \ + ";\377afw\377\216\225\261\377\230\237\276\377\210\234\243\302\377\5\227" \ + "\236\274\377\222\230\265\377\220\227\264\377\224\232\270\377\231\240" \ + "\276\377\211\234\243\302\377\20\224\233\271\377\207\215\250\377~\204" \ + "\235\377ot\213\377cfy\377W[h\377RU`\377X[i\377^br\377dh{\377ko\205\377" \ + "qv\214\377\202\207\242\377\220\227\264\377\222\230\265\377\227\236\274" \ + "\377\203\234\243\302\377\3\203\211\243\37767;\377\273\273\262\377\202" \ + "\354\354\341\377\4\347\347\334\377\331\331\317\377\337\337\324\377\353" \ + "\353\340\377\317\354\354\341\377\4\342\342\330\377nnl\377@BH\377\203" \ + "\211\243\377\207\234\243\302\377\13\225\234\272\377\220\227\264\377\221" \ + "\230\265\377\226\235\273\377\233\242\301\377\234\243\302\377\224\232" \ + "\270\377Z^l\377<=@\377\225\225\220\377\350\350\335\377\206\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\206\354\354\341\377\4\323\323" \ + "\311\377efe\377>@E\377sx\217\377\202\234\243\302\377\5\231\240\276\377" \ + "\223\232\267\377\220\226\263\377\222\230\265\377\230\237\276\377\206" \ + "\234\243\302\377\4\232\241\300\377ej{\377;;>\377\250\250\241\377\233" \ + "\354\354\341\377\5\350\350\335\377oom\377CFO\377\210\217\252\377\227" \ + "\235\273\377\207\234\243\302\377\5\227\235\273\377\221\230\265\377\220" \ + "\227\264\377\225\233\271\377\232\241\300\377\210\234\243\302\377\33\222" \ + "\231\266\377ot\213\377RU`\377;<A\377@AC\377YYY\377ttq\377\215\215\207" \ + "\377\244\244\235\377\271\271\260\377\303\303\272\377\271\271\260\377" \ + "\256\256\246\377\243\243\234\377\230\230\220\377\211\211\204\377aba\377" \ + "CDE\377<=B\377GIR\377Z]n\377tz\220\377\226\234\272\377\234\243\302\377" \ + "\225\233\271\3779;@\377\264\264\255\377\203\354\354\341\377\3\345\345" \ + "\332\377\331\331\317\377\340\340\326\377\315\354\354\341\377\3\321\321" \ + "\307\377<=>\377w|\223\377\207\234\243\302\377\3\226\235\273\377\217\226" \ + "\262\377\226\235\273\377\204\234\243\302\377\3_cs\377ABD\377\252\252" \ + "\243\377\211\354\354\341\377\2\335\335\322\377\350\350\335\377\210\354" \ + "\354\341\377\4\337\337\324\377{{x\3779;\77\377\206\214\247\377\203\234" \ + "\243\302\377\4\232\241\277\377\223\232\267\377\221\230\265\377\231\240" \ + "\276\377\206\234\243\302\377\4\227\236\274\377RUa\377mnk\377\353\353" \ + "\340\377\230\354\354\341\377\4\313\313\302\377;<>\377ei|\377\225\233" \ + "\271\377\207\234\243\302\377\4\230\237\275\377\220\226\263\377\224\233" \ + "\270\377\233\242\301\377\210\234\243\302\377\11\222\230\265\377^bs\377" \ + "9:>\377MNN\377\207\207\202\377\302\302\271\377\352\352\337\377\343\343" \ + "\331\377\342\342\330\377\215\354\354\341\377\11\323\323\311\377\245\245" \ + "\236\377nnl\37788;\377BEM\377qw\215\377\225\233\271\3779:\77\377\334" \ + "\334\322\377\204\354\354\341\377\3\341\341\327\377\332\332\320\377\353" \ + "\353\340\377\312\354\354\341\377\3\266\266\256\37789>\377\214\223\256" \ + "\377\206\234\243\302\377\3\227\236\274\377\217\226\262\377\225\233\271" \ + "\377\204\234\243\302\377\3\227\236\274\377DFP\377}~{\377\213\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\212\354\354\341\377\3\330" \ + "\330\316\377ABC\377qv\213\377\204\234\243\302\377\1\232\241\277\377\202" \ + "\222\230\265\377\1\232\241\300\377\206\234\243\302\377\3ko\202\377MM" \ + "M\377\341\341\327\377\226\354\354\341\377\4\234\234\227\3779;A\377\200" \ + "\206\237\377\230\237\275\377\206\234\243\302\377\4\231\240\276\377\220" \ + "\227\264\377\222\231\266\377\233\242\301\377\207\234\243\302\377\6\232" \ + "\241\300\377pu\212\377@BI\377GHI\377\241\241\232\377\347\347\334\377" \ + "\204\354\354\341\377\2\343\343\331\377\342\342\330\377\221\354\354\341" \ + "\377\5\313\313\302\377rrp\37778:\377'(-\377^_^\377\205\354\354\341\377" \ + "\3\346\346\333\377\330\330\316\377\351\351\336\377\310\354\354\341\377" \ + "\3\222\222\215\377BDK\377\227\235\273\377\205\234\243\302\377\4\230\237" \ + "\276\377\220\227\264\377\223\232\267\377\233\242\301\377\204\234\243" \ + "\302\377\3\214\222\256\37778=\377\254\254\246\377\214\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\213\354\354\341\377\3\350\350\335" \ + "\377aaa\377WZh\377\205\234\243\302\377\4\231\240\276\377\220\227\264" \ + "\377\224\232\270\377\233\242\301\377\205\234\243\302\377\3}\203\233\377" \ + ";<>\377\320\320\306\377\224\354\354\341\377\4\205\205\201\377GIS\377" \ + "\215\223\260\377\232\241\277\377\205\234\243\302\377\4\232\241\300\377" \ + "\222\230\265\377\221\230\265\377\232\241\300\377\210\234\243\302\377" \ + "\4mr\207\37789=\377~\177{\377\327\327\315\377\207\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\223\354\354\341\377\4\352\352\337\377\303" \ + "\303\271\377\257\257\246\377\352\352\337\377\205\354\354\341\377\3\351" \ + "\351\336\377\330\330\316\377\345\345\332\377\305\354\354\341\377\3\352" \ + "\352\337\377hig\377UXe\377\205\234\243\302\377\4\232\241\277\377\221" \ + "\230\265\377\222\230\265\377\232\241\300\377\205\234\243\302\377\3y~" \ + "\225\377:;=\377\317\317\305\377\215\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\215\354\354\341\377\3\220\221\214\377@BI\377\224\233" \ + "\270\377\205\234\243\302\377\3\227\236\274\377\220\226\263\377\225\233" \ + "\271\377\205\234\243\302\377\3\214\223\256\37789>\377\265\265\255\377" \ + "\222\354\354\341\377\4llj\377SVb\377\220\226\263\377\233\242\301\377" \ + "\204\234\243\302\377\4\233\242\301\377\223\232\267\377\220\227\264\377" \ + "\231\240\276\377\210\234\243\302\377\4uz\222\3779;\77\377\177\177{\377" \ + "\345\345\332\377\211\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\225\354\354\341\377\4\350\350\335\377\333\333\321\377\337\337\324\377" \ + "\353\353\340\377\204\354\354\341\377\3\353\353\340\377\332\332\320\377" \ + "\341\341\327\377\303\354\354\341\377\3\337\337\325\377IJJ\377lq\204\377" \ + "\205\234\243\302\377\3\230\237\275\377\217\226\262\377\231\240\276\377" \ + "\206\234\243\302\377\3jn\201\377QRQ\377\343\343\331\377\216\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\216\354\354\341\377\3\274\274" \ + "\263\37768<\377\221\230\265\377\206\234\243\302\377\3\225\234\272\377" \ + "\220\227\264\377\233\242\301\377\204\234\243\302\377\3\227\235\273\377" \ + "BDK\377\221\221\214\377\217\354\354\341\377\4\352\352\337\377WXW\377" \ + "^br\377\222\231\266\377\205\234\243\302\377\3\232\241\277\377\217\226" \ + "\262\377\230\237\275\377\210\234\243\302\377\4\215\223\257\377=>E\377" \ + "pqo\377\340\340\326\377\213\354\354\341\377\2\343\343\331\377\342\342" \ + "\330\377\227\354\354\341\377\3\346\346\333\377\331\331\317\377\351\351" \ + "\336\377\205\354\354\341\377\2\337\337\324\377\335\335\322\377\301\354" \ + "\354\341\377\3\315\315\303\3779:<\377~\203\234\377\205\234\243\302\377" \ + "\3\225\234\272\377\221\230\265\377\233\242\301\377\206\234\243\302\377" \ + "\3z\200\230\377GGH\377\352\352\337\377\217\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\217\354\354\341\377\3\304\304\273\377:;A\377" \ + "\231\240\276\377\206\234\243\302\377\3\230\237\276\377\217\226\262\377" \ + "\232\241\277\377\205\234\243\302\377\3UXe\377ghf\377\353\353\340\377" \ + "\215\354\354\341\377\3]]\\\377bgx\377\225\234\272\377\205\234\243\302" \ + "\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234\243\302" \ + "\377\3mr\206\37789;\377\306\306\274\377\215\354\354\341\377\2\343\343" \ + "\331\377\342\342\330\377\230\354\354\341\377\3\352\352\337\377\331\331" \ + "\317\377\346\346\333\377\205\354\354\341\377\3\343\343\331\377\331\331" \ + "\317\377\352\352\337\377\276\354\354\341\377\3\331\331\317\377346\377" \ + "\215\223\257\377\205\234\243\302\377\2\222\231\266\377\224\232\270\377" \ + "\207\234\243\302\377\3\214\222\256\377569\377\337\337\325\377\220\354" \ + "\354\341\377\2\335\335\322\377\350\350\335\377\220\354\354\341\377\2" \ + "\243\243\235\377JLV\377\207\234\243\302\377\3\232\241\300\377\217\226" \ + "\262\377\230\237\275\377\205\234\243\302\377\2fj|\377klj\377\214\354" \ + "\354\341\377\3qro\377W[i\377\230\237\275\377\205\234\243\302\377\3\225" \ + "\234\272\377\221\230\265\377\233\242\301\377\207\234\243\302\377\4\225" \ + "\234\272\377FHR\377jjh\377\347\347\334\377\216\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\231\354\354\341\377\3\353\353\340\377\334" \ + "\334\322\377\341\341\327\377\205\354\354\341\377\2\346\346\333\377\331" \ + "\331\317\377\275\354\354\341\377\3\347\347\334\377>\77\77\377\202\210" \ + "\242\377\204\234\243\302\377\3\233\242\301\377\220\226\263\377\227\235" \ + "\273\377\207\234\243\302\377\3\227\235\273\37756:\377\314\314\303\377" \ + "\221\354\354\341\377\2\335\335\322\377\350\350\335\377\221\354\354\341" \ + "\377\2xyv\377adu\377\207\234\243\302\377\3\233\242\301\377\221\230\265" \ + "\377\225\234\272\377\205\234\243\302\377\2QTa\377\225\226\221\377\212" \ + "\354\354\341\377\3\207\207\203\377KNZ\377\225\234\272\377\205\234\243" \ + "\302\377\2\222\231\266\377\224\232\270\377\210\234\243\302\377\3\211" \ + "\217\252\37778<\377\262\262\253\377\220\354\354\341\377\2\343\343\331" \ + "\377\342\342\330\377\233\354\354\341\377\2\337\337\325\377\336\336\323" \ + "\377\205\354\354\341\377\2\343\343\331\377\335\335\322\377\274\354\354" \ + "\341\377\2Z[Z\377pt\211\377\204\234\243\302\377\3\231\240\276\377\217" \ + "\226\262\377\230\237\276\377\210\234\243\302\377\2BDL\377\256\256\246" \ + "\377\222\354\354\341\377\2\335\335\322\377\350\350\335\377\222\354\354" \ + "\341\377\2RRR\377v{\222\377\210\234\243\302\377\2\224\232\270\377\222" \ + "\231\266\377\204\234\243\302\377\3\233\242\301\377>@G\377\272\272\261" \ + "\377\210\354\354\341\377\3\260\260\250\377@BJ\377\222\231\266\377\204" \ + "\234\243\302\377\3\233\242\301\377\220\227\264\377\227\235\273\377\210" \ + "\234\243\302\377\3\177\205\237\377<=\77\377\327\327\315\377\221\354\354" \ + "\341\377\2\343\343\331\377\342\342\330\377\234\354\354\341\377\3\344" \ + "\344\331\377\332\332\320\377\353\353\340\377\204\354\354\341\377\2\337" \ + "\337\324\377\341\341\327\377\272\354\354\341\377\2\204\204\200\377X[" \ + "i\377\204\234\243\302\377\3\230\237\276\377\217\226\262\377\232\241\300" \ + "\377\210\234\243\302\377\2Y\\j\377\206\206\202\377\223\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\222\354\354\341\377\3\344\344\331" \ + "\377;<>\377\207\215\250\377\210\234\243\302\377\2\227\235\273\377\220" \ + "\227\264\377\204\234\243\302\377\3\225\233\271\37767;\377\323\323\312" \ + "\377\206\354\354\341\377\3\341\341\327\377458\377\212\221\255\377\204" \ + "\234\243\302\377\3\232\241\300\377\217\226\262\377\231\240\276\377\210" \ + "\234\243\302\377\3v{\221\377DDE\377\337\337\325\377\222\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\235\354\354\341\377\3\350\350\335" \ + "\377\331\331\317\377\352\352\337\377\204\354\354\341\377\2\333\333\321" \ + "\377\346\346\333\377\270\354\354\341\377\2\255\255\246\377BDL\377\204" \ + "\234\243\302\377\3\232\241\300\377\217\226\262\377\233\242\301\377\210" \ + "\234\243\302\377\2\205\213\246\377MMM\377\224\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\223\354\354\341\377\2\322\322\310\377;=C\377" \ + "\211\234\243\302\377\2\226\235\273\377\222\231\266\377\204\234\243\302" \ + "\377\3\211\217\252\377<<>\377\344\344\331\377\205\354\354\341\377\3[" \ + "[Z\377os\210\377\233\242\301\377\204\234\243\302\377\2\220\226\263\377" \ + "\231\240\276\377\210\234\243\302\377\3mr\205\377PPP\377\346\346\333\377" \ + "\223\354\354\341\377\2\343\343\331\377\342\342\330\377\236\354\354\341" \ + "\377\2\350\350\335\377\332\332\320\377\204\354\354\341\377\3\353\353" \ + "\340\377\330\330\316\377\351\351\336\377\266\354\354\341\377\3\314\314" \ + "\303\37757;\377\227\236\274\377\204\234\243\302\377\2\217\226\262\377" \ + "\231\240\276\377\211\234\243\302\377\2=\77E\377\317\317\305\377\216\354" \ + "\354\341\377\15\353\353\340\377\350\350\335\377\345\345\332\377\342\342" \ + "\330\377\337\337\325\377\335\335\322\377\314\314\302\377\327\327\315" \ + "\377\336\336\323\377\340\340\326\377\343\343\331\377\346\346\333\377" \ + "\351\351\336\377\217\354\354\341\377\2opn\377rw\215\377\211\234\243\302" \ + "\377\2\223\232\267\377\225\234\272\377\204\234\243\302\377\2w|\223\377" \ + "QRQ\377\204\354\354\341\377\3\253\253\244\377FIS\377\232\241\277\377" \ + "\204\234\243\302\377\2\222\230\265\377\227\235\273\377\210\234\243\302" \ + "\377\3v|\222\377NOO\377\352\352\337\377\217\354\354\341\377\14\351\351" \ + "\336\377\346\346\333\377\343\343\331\377\340\340\326\377\336\336\323" \ + "\377\323\323\311\377\322\322\310\377\336\336\323\377\340\340\326\377" \ + "\343\343\331\377\346\346\333\377\351\351\336\377\232\354\354\341\377" \ + "\2\344\344\331\377\335\335\322\377\204\354\354\341\377\3\351\351\336" \ + "\377\330\330\316\377\353\353\340\377\264\354\354\341\377\3\337\337\325" \ + "\377679\377\214\223\256\377\204\234\243\302\377\2\222\230\265\377\227" \ + "\236\274\377\211\234\243\302\377\2tz\221\377iig\377\214\354\354\341\377" \ + "\23\352\352\337\377\341\341\327\377\332\332\320\377\331\331\317\377\335" \ + "\335\322\377\337\337\325\377\342\342\330\377\345\345\332\377\350\350" \ + "\335\377\334\334\321\377\346\346\333\377\347\347\334\377\344\344\331" \ + "\377\341\341\327\377\337\337\324\377\333\333\321\377\330\330\316\377" \ + "\335\335\322\377\345\345\332\377\214\354\354\341\377\3\342\342\330\377" \ + "67;\377\232\241\300\377\211\234\243\302\377\2\220\227\264\377\230\237" \ + "\275\377\204\234\243\302\377\2afv\377vvt\377\202\354\354\341\377\3\337" \ + "\337\325\377235\377\223\231\266\377\204\234\243\302\377\2\225\233\271" \ + "\377\224\233\270\377\210\234\243\302\377\3\200\206\237\377ABC\377\345" \ + "\345\332\377\214\354\354\341\377\24\353\353\340\377\343\343\331\377\333" \ + "\333\321\377\330\330\316\377\334\334\322\377\337\337\324\377\342\342" \ + "\330\377\345\345\332\377\350\350\335\377\342\342\330\377\341\341\327" \ + "\377\350\350\335\377\345\345\332\377\342\342\330\377\337\337\324\377" \ + "\334\334\322\377\330\330\316\377\333\333\321\377\343\343\331\377\353" \ + "\353\340\377\227\354\354\341\377\2\340\340\326\377\341\341\327\377\204" \ + "\354\354\341\377\2\346\346\333\377\333\333\321\377\264\354\354\341\377" \ + "\2TUU\377|\201\232\377\204\234\243\302\377\202\224\233\270\377\211\234" \ + "\243\302\377\3\232\241\300\37756:\377\337\337\325\377\211\354\354\341" \ + "\377\6\353\353\340\377\337\337\325\377\331\331\317\377\332\332\320\377" \ + "\342\342\330\377\352\352\337\377\206\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\206\354\354\341\377\5\347\347\334\377\337\337\324\377" \ + "\330\330\316\377\333\333\321\377\344\344\331\377\212\354\354\341\377" \ + "\2\221\221\214\377bfw\377\211\234\243\302\377\3\233\242\301\377\217\226" \ + "\262\377\232\241\277\377\204\234\243\302\377\5FIR\377\265\265\255\377" \ + "\354\354\341\377TTS\377tz\221\377\204\234\243\302\377\2\230\237\275\377" \ + "\221\230\265\377\210\234\243\302\377\3\211\217\253\3779:<\377\336\336" \ + "\323\377\213\354\354\341\377\5\342\342\330\377\332\332\320\377\331\331" \ + "\317\377\340\340\326\377\351\351\336\377\206\354\354\341\377\2\343\343" \ + "\331\377\342\342\330\377\206\354\354\341\377\5\351\351\336\377\340\340" \ + "\326\377\331\331\317\377\332\332\320\377\342\342\330\377\226\354\354" \ + "\341\377\2\334\334\322\377\346\346\333\377\204\354\354\341\377\2\341" \ + "\341\327\377\337\337\325\377\262\354\354\341\377\2\300\300\267\377GJ" \ + "S\377\204\234\243\302\377\2\227\236\274\377\221\230\265\377\212\234\243" \ + "\302\377\2chy\377\211\211\205\377\211\354\354\341\377\4\340\340\326\377" \ + "\330\330\316\377\343\343\331\377\353\353\340\377\211\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\211\354\354\341\377\4\351\351\336" \ + "\377\336\336\323\377\331\331\317\377\347\347\334\377\210\354\354\341" \ + "\377\3\353\353\340\377:;>\377\224\233\270\377\211\234\243\302\377\3\232" \ + "\241\277\377\217\226\262\377\233\242\301\377\203\234\243\302\377\4\221" \ + "\230\265\377=>@\377\246\246\237\377ILV\377\204\234\243\302\377\2\232" \ + "\241\277\377\217\226\262\377\210\234\243\302\377\3\227\235\273\37789" \ + "<\377\323\323\312\377\212\354\354\341\377\4\344\344\331\377\330\330\316" \ + "\377\340\340\326\377\352\352\337\377\211\354\354\341\377\2\343\343\331" \ + "\377\342\342\330\377\211\354\354\341\377\4\352\352\337\377\340\340\326" \ + "\377\330\330\316\377\344\344\331\377\225\354\354\341\377\2\331\331\317" \ + "\377\351\351\336\377\204\354\354\341\377\2\330\330\316\377\352\352\337" \ + "\377\261\354\354\341\377\2DEF\377\215\223\257\377\203\234\243\302\377" \ + "\2\232\241\277\377\217\226\262\377\212\234\243\302\377\3\225\233\271" \ + "\377679\377\351\351\336\377\207\354\354\341\377\3\343\343\331\377\330" \ + "\330\316\377\342\342\330\377\214\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\213\354\354\341\377\4\351\351\336\377\334\334\322\377\333" \ + "\333\321\377\351\351\336\377\207\354\354\341\377\2\261\261\251\377QT" \ + "a\377\212\234\243\302\377\2\230\237\275\377\220\227\264\377\204\234\243" \ + "\302\377\3RVd\377)*.\377\223\232\267\377\203\234\243\302\377\3\233\242" \ + "\301\377\217\226\262\377\232\241\300\377\210\234\243\302\377\2KMW\377" \ + "\262\262\252\377\211\354\354\341\377\4\346\346\333\377\331\331\317\377" \ + "\337\337\324\377\353\353\340\377\213\354\354\341\377\2\343\343\331\377" \ + "\342\342\330\377\213\354\354\341\377\4\353\353\340\377\337\337\324\377" \ + "\331\331\317\377\346\346\333\377\223\354\354\341\377\3\352\352\337\377" \ + "\331\331\317\377\353\353\340\377\203\354\354\341\377\2\345\345\332\377" \ + "\335\335\322\377\260\354\354\341\377\2\256\256\246\377RTa\377\204\234" \ + "\243\302\377\2\220\226\263\377\232\241\300\377\212\234\243\302\377\2" \ + "Y\\k\377\247\247\240\377\206\354\354\341\377\4\350\350\335\377\331\331" \ + "\317\377\337\337\325\377\353\353\340\377\215\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\215\354\354\341\377\3\350\350\335\377\332\332" \ + "\320\377\337\337\324\377\207\354\354\341\377\2HIJ\377\220\226\263\377" \ + "\212\234\243\302\377\2\224\233\270\377\226\235\273\377\203\234\243\302" \ + "\377\2GJW\377os\211\377\204\234\243\302\377\2\222\231\266\377\230\237" \ + "\275\377\210\234\243\302\377\2ot\211\377klj\377\210\354\354\341\377\4" \ + "\353\353\340\377\333\333\321\377\334\334\322\377\352\352\337\377\215" \ + "\354\354\341\377\2\343\343\331\377\342\342\330\377\215\354\354\341\377" \ + "\4\352\352\337\377\335\335\322\377\333\333\321\377\353\353\340\377\222" \ + "\354\354\341\377\2\346\346\333\377\336\336\323\377\204\354\354\341\377" \ + "\2\331\331\317\377\351\351\336\377\256\354\354\341\377\3\353\353\340" \ + "\377;<>\377\224\232\270\377\203\234\243\302\377\2\227\235\273\377\224" \ + "\232\270\377\213\234\243\302\377\1:;>\377\206\354\354\341\377\3\345\345" \ + "\332\377\330\330\316\377\351\351\336\377\217\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\217\354\354\341\377\3\342\342\330\377\332\332" \ + "\320\377\353\353\340\377\205\354\354\341\377\2\251\251\242\377]ap\377" \ + "\213\234\243\302\377\1\217\226\262\377\202\234\243\302\377\3\226\235" \ + "\273\377+-7\377\230\237\276\377\203\234\243\302\377\2\232\241\277\377" \ + "\220\227\264\377\210\234\243\302\377\3\215\223\257\377;<>\377\350\350" \ + "\335\377\207\354\354\341\377\3\341\341\326\377\276\276\265\377\342\342" \ + "\327\377\217\354\354\341\377\2\343\343\331\377\342\342\330\377\217\354" \ + "\354\341\377\3\346\346\333\377\330\330\316\377\350\350\335\377\222\354" \ + "\354\341\377\2\333\333\321\377\351\351\336\377\203\354\354\341\377\2" \ + "\347\347\334\377\333\333\321\377\256\354\354\341\377\2\231\231\223\377" \ + "\\`p\377\204\234\243\302\377\2\217\226\262\377\233\242\301\377\212\234" \ + "\243\302\377\2|\202\233\377oom\377\205\354\354\341\377\3\340\340\326" \ + "\377\333\333\321\377\353\353\340\377\220\354\354\341\377\2\335\335\322" \ + "\377\350\350\335\377\220\354\354\341\377\3\346\346\333\377\330\330\316" \ + "\377\350\350\335\377\204\354\354\341\377\2\352\352\337\377:;\77\377\213" \ + "\234\243\302\377\5\226\235\273\377\224\233\270\377\234\243\302\377Z_" \ + "q\377`ex\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377\210" \ + "\234\243\302\377\2>@G\377\311\311\300\377\207\354\354\341\377\10\345" \ + "\345\332\377\266\266\255\377\14\14\15\377./4\377@BF\377ABE\377iig\377" \ + "\307\307\276\377\213\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\220\354\354\341\377\3\351\351\336\377\330\330\316\377\345\345\332\377" \ + "\221\354\354\341\377\2\351\351\336\377\334\334\322\377\204\354\354\341" \ + "\377\2\333\333\321\377\347\347\334\377\254\354\354\341\377\3\347\347" \ + "\334\37767:\377\230\237\276\377\203\234\243\302\377\2\225\234\272\377" \ + "\225\233\271\377\213\234\243\302\377\2JLV\377\313\313\302\377\204\354" \ + "\354\341\377\2\335\335\322\377\337\337\324\377\222\354\354\341\377\2" \ + "\335\335\322\377\350\350\335\377\221\354\354\341\377\3\351\351\336\377" \ + "\330\330\316\377\345\345\332\377\204\354\354\341\377\2ded\377\202\210" \ + "\242\377\213\234\243\302\377\4\217\226\262\377\232\241\300\377')1\377" \ + "\230\237\274\377\203\234\243\302\377\2\231\240\276\377\222\230\265\377" \ + "\210\234\243\302\377\2v|\222\377hig\377\207\354\354\341\377\14\340\340" \ + "\326\377\332\332\320\377\353\353\340\377\315\315\303\37799;\377v{\222" \ + "\377\234\243\302\377~\204\235\377KNW\377>\77A\377\220\220\213\377\353" \ + "\353\340\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377\221" \ + "\354\354\341\377\3\353\353\340\377\332\332\320\377\340\340\326\377\221" \ + "\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341\377" \ + "\2\351\351\336\377\331\331\317\377\254\354\354\341\377\2\205\205\201" \ + "\377hl\177\377\203\234\243\302\377\2\233\242\301\377\217\226\262\377" \ + "\213\234\243\302\377\2\230\237\276\377>\77A\377\204\354\354\341\377\2" \ + "\333\333\321\377\343\343\331\377\223\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\222\354\354\341\377\3\353\353\340\377\332\332\320\377" \ + "\346\346\333\377\203\354\354\341\377\2\303\303\272\377NP\\\377\213\234" \ + "\243\302\377\3\227\236\274\377ei}\377OSc\377\204\234\243\302\377\2\220" \ + "\227\264\377\232\241\300\377\207\234\243\302\377\3\233\242\301\37768" \ + "<\377\337\337\325\377\206\354\354\341\377\2\340\340\326\377\336\336\323" \ + "\377\203\354\354\341\377\3\344\344\331\377VWV\377[^l\377\202\234\243" \ + "\302\377\4\230\237\276\377cgx\377@AC\377\313\313\302\377\207\354\354" \ + "\341\377\2\343\343\331\377\342\342\330\377\223\354\354\341\377\2\336" \ + "\336\323\377\340\340\326\377\220\354\354\341\377\2\352\352\337\377\333" \ + "\333\321\377\204\354\354\341\377\2\335\335\322\377\345\345\332\377\252" \ + "\354\354\341\377\3\341\341\327\37767;\377\233\242\301\377\203\234\243" \ + "\302\377\2\224\232\270\377\227\235\273\377\213\234\243\302\377\2kp\205" \ + "\377\212\212\205\377\203\354\354\341\377\2\337\337\325\377\340\340\326" \ + "\377\224\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354" \ + "\341\377\3\353\353\340\377\330\330\316\377\351\351\336\377\203\354\354" \ + "\341\377\2:;>\377\232\241\277\377\213\234\243\302\377\2)+3\377\216\225" \ + "\262\377\203\234\243\302\377\2\230\237\275\377\223\232\267\377\210\234" \ + "\243\302\377\2ei{\377\210\211\204\377\206\354\354\341\377\2\345\345\332" \ + "\377\333\333\321\377\206\354\354\341\377\2ttq\377]ap\377\203\234\243" \ + "\302\377\4\214\223\256\377@BH\377\202\203\177\377\353\353\340\377\205" \ + "\354\354\341\377\2\343\343\331\377\342\342\330\377\224\354\354\341\377" \ + "\2\333\333\321\377\345\345\332\377\220\354\354\341\377\2\337\337\324" \ + "\377\346\346\333\377\203\354\354\341\377\2\352\352\337\377\330\330\316" \ + "\377\252\354\354\341\377\2\232\232\223\377im\201\377\203\234\243\302" \ + "\377\2\232\241\300\377\220\226\263\377\214\234\243\302\377\2>@F\377\335" \ + "\335\322\377\202\354\354\341\377\2\344\344\331\377\334\334\322\377\225" \ + "\354\354\341\377\2\335\335\322\377\350\350\335\377\224\354\354\341\377" \ + "\3\351\351\336\377\330\330\316\377\353\353\340\377\202\354\354\341\377" \ + "\2\177\200|\377pu\213\377\212\234\243\302\377\3~\203\235\377<\77K\377" \ + "\222\230\265\377\203\234\243\302\377\2\217\226\262\377\233\242\301\377" \ + "\207\234\243\302\377\3\226\235\273\37789;\377\351\351\336\377\205\354" \ + "\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377\207\354" \ + "\354\341\377\2XXX\377ot\211\377\204\234\243\302\377\3chx\377]^\\\377" \ + "\353\353\340\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\224\354\354\341\377\3\353\353\340\377\330\330\316\377\350\350\335\377" \ + "\217\354\354\341\377\2\353\353\340\377\332\332\320\377\204\354\354\341" \ + "\377\2\334\334\322\377\350\350\335\377\251\354\354\341\377\2OPP\377\224" \ + "\232\270\377\203\234\243\302\377\2\222\231\266\377\230\237\275\377\213" \ + "\234\243\302\377\2\217\226\262\377KLL\377\202\354\354\341\377\2\350\350" \ + "\335\377\331\331\317\377\226\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\225\354\354\341\377\2\346\346\333\377\332\332\320\377\202\354" \ + "\354\341\377\2\327\327\315\377ACI\377\212\234\243\302\377\7""9<H\377" \ + "\201\207\241\377\221\230\265\377\232\241\277\377\234\243\302\377\227" \ + "\235\273\377\224\233\270\377\210\234\243\302\377\2afw\377\223\223\215" \ + "\377\205\354\354\341\377\3\353\353\340\377\330\330\316\377\351\351\336" \ + "\377\210\354\354\341\377\3\350\350\335\377BCC\377~\204\235\377\204\234" \ + "\243\302\377\3hl~\377]^\\\377\353\353\340\377\203\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\225\354\354\341\377\3\351\351\336\377\330" \ + "\330\316\377\353\353\340\377\217\354\354\341\377\2\341\341\327\377\344" \ + "\344\331\377\203\354\354\341\377\2\345\345\332\377\337\337\324\377\250" \ + "\354\354\341\377\2\347\347\334\377\77AF\377\204\234\243\302\377\1\220" \ + "\227\264\377\214\234\243\302\377\6in\202\377\225\225\220\377\354\354" \ + "\341\377\353\353\340\377\330\330\316\377\352\352\337\377\226\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\341" \ + "\341\327\377\337\337\324\377\202\354\354\341\377\1@AC\377\211\234\243" \ + "\302\377\10\222\231\266\377.0:\377\234\243\302\377\230\237\276\377\224" \ + "\232\270\377\234\243\302\377\220\227\264\377\233\242\301\377\210\234" \ + "\243\302\377\2""57:\377\346\346\333\377\205\354\354\341\377\2\332\332" \ + "\320\377\346\346\333\377\212\354\354\341\377\3\336\336\323\377569\377" \ + "\230\237\276\377\204\234\243\302\377\2hl~\377_`^\377\203\354\354\341" \ + "\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377\2\346\346" \ + "\333\377\332\332\320\377\217\354\354\341\377\2\353\353\340\377\333\333" \ + "\321\377\204\354\354\341\377\1\330\330\316\377\250\354\354\341\377\2" \ + "\252\252\242\377_dt\377\203\234\243\302\377\2\230\237\276\377\224\232" \ + "\270\377\214\234\243\302\377\5NQ[\377\313\313\302\377\354\354\341\377" \ + "\337\337\324\377\344\344\331\377\227\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\227\354\354\341\377\5\331\331\317\377\351\351\336\377" \ + "\354\354\341\377bba\377\207\215\250\377\210\234\243\302\377\2kp\204\377" \ + "UZj\377\202\234\243\302\377\3\220\227\264\377\233\242\301\377\220\227" \ + "\264\377\210\234\243\302\377\2w|\224\377ppn\377\205\354\354\341\377\2" \ + "\345\345\332\377\336\336\323\377\214\354\354\341\377\2\231\231\223\377" \ + "[^m\377\205\234\243\302\377\2[_m\377\226\226\221\377\202\354\354\341" \ + "\377\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\336\336" \ + "\323\377\344\344\331\377\217\354\354\341\377\2\333\333\321\377\353\353" \ + "\340\377\203\354\354\341\377\2\333\333\321\377\352\352\337\377\247\354" \ + "\354\341\377\2Z[Z\377\214\222\256\377\203\234\243\302\377\2\223\232\267" \ + "\377\231\240\276\377\214\234\243\302\377\4<>B\377\354\354\341\377\352" \ + "\352\337\377\331\331\317\377\230\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\227\354\354\341\377\5\347\347\334\377\333\333\321\377\354" \ + "\354\341\377\232\232\223\377hl\177\377\210\234\243\302\377\2ACQ\377\177" \ + "\205\236\377\202\234\243\302\377\3\222\230\265\377\225\233\271\377\225" \ + "\234\272\377\210\234\243\302\377\2ACI\377\326\326\314\377\205\354\354" \ + "\341\377\2\330\330\316\377\353\353\340\377\215\354\354\341\377\2\77\77" \ + "A\377\217\225\262\377\204\234\243\302\377\6\233\242\301\3779:\77\377" \ + "\323\323\311\377\354\354\341\377\343\343\331\377\342\342\330\377\227" \ + "\354\354\341\377\2\353\353\340\377\330\330\316\377\217\354\354\341\377" \ + "\2\342\342\330\377\344\344\331\377\203\354\354\341\377\2\342\342\330" \ + "\377\340\340\326\377\246\354\354\341\377\2\353\353\340\377<=A\377\204" \ + "\234\243\302\377\1\220\226\263\377\214\234\243\302\377\5\232\241\277" \ + "\377DEG\377\354\354\341\377\335\335\322\377\346\346\333\377\230\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\230\354\354\341\377\4\333" \ + "\333\321\377\350\350\335\377\316\316\304\377MPY\377\210\234\243\302\377" \ + "\2)+4\377\233\242\301\377\202\234\243\302\377\3\227\235\273\377\213\221" \ + "\255\377\232\241\300\377\207\234\243\302\377\2\223\232\267\377KLM\377" \ + "\205\354\354\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341" \ + "\377\2\277\277\266\377HKT\377\205\234\243\302\377\5\207\215\250\377B" \ + "CD\377\353\353\340\377\343\343\331\377\342\342\330\377\230\354\354\341" \ + "\377\2\340\340\326\377\341\341\327\377\216\354\354\341\377\2\352\352" \ + "\337\377\335\335\322\377\203\354\354\341\377\2\353\353\340\377\331\331" \ + "\317\377\246\354\354\341\377\2\272\272\261\377VYf\377\203\234\243\302" \ + "\377\2\232\241\277\377\222\230\265\377\214\234\243\302\377\4\177\204" \ + "\236\377pqo\377\351\351\336\377\333\333\321\377\231\354\354\341\377\2" \ + "\335\335\322\377\350\350\335\377\230\354\354\341\377\4\350\350\335\377" \ + "\332\332\320\377\354\354\341\377=>B\377\207\234\243\302\377\2\216\224" \ + "\261\37769C\377\204\234\243\302\377\1\205\214\247\377\210\234\243\302" \ + "\377\2hm\201\377\227\227\221\377\205\354\354\341\377\1\330\330\316\377" \ + "\220\354\354\341\377\2IJK\377\222\231\266\377\205\234\243\302\377\4^" \ + "br\377\223\223\216\377\343\343\331\377\342\342\330\377\231\354\354\341" \ + "\377\2\327\327\315\377\353\353\340\377\216\354\354\341\377\1\333\333" \ + "\321\377\204\354\354\341\377\2\331\331\317\377\353\353\340\377\245\354" \ + "\354\341\377\2ijh\377\201\206\240\377\203\234\243\302\377\2\224\233\270" \ + "\377\230\237\275\377\214\234\243\302\377\4`du\377\252\252\242\377\333" \ + "\333\321\377\350\350\335\377\231\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\231\354\354\341\377\4\335\335\322\377\346\346\333\377FF" \ + "H\377\232\241\277\377\206\234\243\302\377\2dh|\377^bu\377\203\234\243" \ + "\302\377\3\230\237\275\377\211\217\253\377\233\242\301\377\207\234\243" \ + "\302\377\2DEM\377\336\336\323\377\204\354\354\341\377\2\340\340\326\377" \ + "\342\342\330\377\220\354\354\341\377\2\246\246\236\377^bq\377\205\234" \ + "\243\302\377\2\232\241\277\377<<\77\377\202\342\342\330\377\231\354\354" \ + "\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341\377\2\340" \ + "\340\326\377\346\346\333\377\203\354\354\341\377\2\340\340\326\377\343" \ + "\343\331\377\245\354\354\341\377\1;;>\377\204\234\243\302\377\1\220\226" \ + "\263\377\215\234\243\302\377\3DFN\377\334\334\321\377\331\331\317\377" \ + "\232\354\354\341\377\2\335\335\322\377\350\350\335\377\231\354\354\341" \ + "\377\4\350\350\335\377\334\334\322\377rrp\377\177\204\236\377\206\234" \ + "\243\302\377\2:=I\377\212\220\253\377\203\234\243\302\377\3\222\231\266" \ + "\377\223\232\267\377\226\235\273\377\206\234\243\302\377\2\232\241\277" \ + "\377DEG\377\205\354\354\341\377\1\331\331\317\377\221\354\354\341\377" \ + "\2\351\351\336\37778<\377\206\234\243\302\377\3]ap\377\237\237\230\377" \ + "\342\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341" \ + "\377\2\351\351\336\377\336\336\323\377\203\354\354\341\377\2\351\351" \ + "\336\377\333\333\321\377\244\354\354\341\377\2\331\331\317\377FHP\377" \ + "\203\234\243\302\377\2\232\241\300\377\221\230\265\377\215\234\243\302" \ + "\377\3>\77B\377\344\344\331\377\340\340\326\377\232\354\354\341\377\2" \ + "\335\335\322\377\350\350\335\377\232\354\354\341\377\3\330\330\316\377" \ + "\252\252\242\377aev\377\206\234\243\302\377\1+-6\377\204\234\243\302" \ + "\377\3\220\227\264\377\233\242\301\377\220\227\264\377\206\234\243\302" \ + "\377\2tz\221\377\202\202~\377\204\354\354\341\377\2\352\352\337\377\333" \ + "\333\321\377\222\354\354\341\377\2ggf\377\177\205\237\377\205\234\243" \ + "\302\377\3\225\233\271\377<=>\377\342\342\330\377\232\354\354\341\377" \ + "\2\333\333\321\377\352\352\337\377\216\354\354\341\377\1\333\333\321" \ + "\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2\265" \ + "\265\254\377[^l\377\203\234\243\302\377\2\227\236\274\377\225\233\271" \ + "\377\214\234\243\302\377\4\231\240\276\377DEF\377\334\334\322\377\351" \ + "\351\336\377\232\354\354\341\377\2\335\335\322\377\350\350\335\377\232" \ + "\354\354\341\377\3\335\335\322\377\320\320\307\377KMU\377\205\234\243" \ + "\302\377\2\213\221\255\377:=I\377\203\234\243\302\377\4\232\241\300\377" \ + "\222\230\265\377\234\243\302\377\220\227\264\377\206\234\243\302\377" \ + "\2TWd\377\272\272\261\377\204\354\354\341\377\2\341\341\327\377\343\343" \ + "\331\377\222\354\354\341\377\2\246\246\236\377]aq\377\206\234\243\302" \ + "\377\2JLV\377\277\277\266\377\232\354\354\341\377\2\343\343\331\377\341" \ + "\341\327\377\216\354\354\341\377\2\335\335\322\377\352\352\337\377\203" \ + "\354\354\341\377\2\332\332\320\377\353\353\340\377\243\354\354\341\377" \ + "\2\217\220\212\377ns\211\377\203\234\243\302\377\2\225\234\272\377\227" \ + "\236\274\377\214\234\243\302\377\3\217\226\262\377STT\377\330\330\316" \ + "\377\233\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354" \ + "\341\377\3\345\345\332\377\333\333\320\377@BH\377\205\234\243\302\377" \ + "\2sx\217\377TXi\377\203\234\243\302\377\4\230\237\276\377\224\232\270" \ + "\377\234\243\302\377\220\227\264\377\206\234\243\302\377\2>\77E\377\343" \ + "\343\331\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377\222" \ + "\354\354\341\377\2\333\333\321\377@BI\377\206\234\243\302\377\2ns\211" \ + "\377}~z\377\232\354\354\341\377\2\353\353\340\377\332\332\320\377\216" \ + "\354\354\341\377\2\337\337\325\377\347\347\334\377\203\354\354\341\377" \ + "\2\336\336\323\377\347\347\334\377\243\354\354\341\377\2ggf\377\207\215" \ + "\250\377\203\234\243\302\377\2\223\232\267\377\231\240\276\377\214\234" \ + "\243\302\377\3\205\213\245\377bcb\377\336\336\323\377\233\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\330\330" \ + "\316\377\77@E\377\205\234\243\302\377\2dh|\377ch|\377\203\234\243\302" \ + "\377\5\227\235\273\377\225\234\272\377\234\243\302\377\221\230\265\377" \ + "\233\242\301\377\205\234\243\302\377\1=>A\377\204\354\354\341\377\2\353" \ + "\353\340\377\332\332\320\377\224\354\354\341\377\1""89<\377\206\234\243" \ + "\302\377\2\221\230\265\377CDE\377\233\354\354\341\377\2\332\332\320\377" \ + "\353\353\340\377\215\354\354\341\377\2\342\342\330\377\344\344\331\377" \ + "\203\354\354\341\377\2\341\341\327\377\343\343\331\377\243\354\354\341" \ + "\377\2GGI\377\232\241\300\377\203\234\243\302\377\2\221\230\265\377\233" \ + "\242\301\377\214\234\243\302\377\3z\200\230\377qro\377\345\345\332\377" \ + "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \ + "\377\2\332\332\320\377\77AE\377\205\234\243\302\377\2TWh\377sy\217\377" \ + "\203\234\243\302\377\5\225\233\271\377\227\236\274\377\234\243\302\377" \ + "\223\232\267\377\231\240\276\377\204\234\243\302\377\2\226\235\273\377" \ + "LLM\377\204\354\354\341\377\2\345\345\332\377\337\337\325\377\224\354" \ + "\354\341\377\2RSS\377\215\223\257\377\205\234\243\302\377\3\226\235\273" \ + "\3779;@\377\347\347\334\377\232\354\354\341\377\2\337\337\325\377\345" \ + "\345\332\377\215\354\354\341\377\2\345\345\332\377\341\341\327\377\203" \ + "\354\354\341\377\2\346\346\333\377\337\337\324\377\243\354\354\341\377" \ + "\1CEG\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3" \ + "pu\213\377\202\203}\377\350\350\335\377\233\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\233\354\354\341\377\2\335\335\322\377ABE\377" \ + "\205\234\243\302\377\2FIW\377\202\210\243\377\203\234\243\302\377\5\223" \ + "\232\267\377\231\240\276\377\234\243\302\377\225\233\271\377\227\236" \ + "\274\377\204\234\243\302\377\2}\203\233\377wwu\377\204\354\354\341\377" \ + "\202\342\342\330\377\224\354\354\341\377\2\215\215\210\377jo\204\377" \ + "\205\234\243\302\377\3\226\235\273\377TXe\377\265\265\254\377\232\354" \ + "\354\341\377\202\342\342\330\377\215\354\354\341\377\2\350\350\335\377" \ + "\337\337\324\377\203\354\354\341\377\2\352\352\337\377\334\334\322\377" \ + "\243\354\354\341\377\1BCG\377\204\234\243\302\377\1\220\227\264\377\215" \ + "\234\243\302\377\3fk\177\377\223\223\213\377\353\353\340\377\233\354" \ + "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2" \ + "\337\337\325\377CDF\377\205\234\243\302\377\2""9<G\377\222\231\266\377" \ + "\203\234\243\302\377\5\221\230\265\377\233\242\301\377\234\243\302\377" \ + "\227\235\273\377\225\234\272\377\204\234\243\302\377\2pu\213\377\217" \ + "\220\212\377\204\354\354\341\377\2\337\337\325\377\345\345\332\377\224" \ + "\354\354\341\377\2\302\302\271\377QT_\377\205\234\243\302\377\3\226\235" \ + "\273\377di}\377\224\224\216\377\232\354\354\341\377\2\345\345\332\377" \ + "\337\337\325\377\215\354\354\341\377\2\353\353\340\377\334\334\322\377" \ + "\203\354\354\341\377\2\353\353\340\377\332\332\320\377\243\354\354\341" \ + "\377\1ABF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377" \ + "\2_cs\377\241\241\231\377\234\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\233\354\354\341\377\3\342\342\330\377EFG\377\233\242\301\377" \ + "\204\234\243\302\377\1""02<\377\204\234\243\302\377\1\220\227\264\377" \ + "\202\234\243\302\377\2\231\240\276\377\224\232\270\377\204\234\243\302" \ + "\377\2ej}\377\241\241\232\377\204\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\224\354\354\341\377\2\331\331\317\377FHP\377\205\234\243" \ + "\302\377\3\226\235\273\377ty\220\377{{x\377\232\354\354\341\377\2\350" \ + "\350\335\377\335\335\322\377\216\354\354\341\377\1\333\333\321\377\204" \ + "\354\354\341\377\1\331\331\317\377\243\354\354\341\377\1\77AF\377\204" \ + "\234\243\302\377\1\220\227\264\377\215\234\243\302\377\2WZg\377\260\260" \ + "\250\377\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354" \ + "\354\341\377\3\345\345\332\377RSS\377\221\230\265\377\204\234\243\302" \ + "\377\1""02<\377\204\234\243\302\377\1\220\227\264\377\202\234\243\302" \ + "\377\2\233\242\301\377\222\230\265\377\204\234\243\302\377\2X\\m\377" \ + "\261\261\251\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377" \ + "\224\354\354\341\377\2\352\352\337\377=\77D\377\205\234\243\302\377\3" \ + "\226\235\273\377\203\211\243\377ccc\377\232\354\354\341\377\2\353\353" \ + "\340\377\332\332\320\377\216\354\354\341\377\1\333\333\321\377\204\354" \ + "\354\341\377\1\331\331\317\377\231\354\354\341\377\1\352\352\337\377" \ + "\210\351\351\336\377\2\350\350\335\377>\77E\377\203\232\241\277\377\2" \ + "\230\237\275\377\220\226\263\377\215\232\241\277\377\2NPY\377\275\275" \ + "\263\377\234\351\351\336\377\2\332\332\320\377\345\345\332\377\233\351" \ + "\351\336\377\3\345\345\332\377_`_\377\204\212\245\377\204\232\241\277" \ + "\377\1/1;\377\204\232\241\277\377\1\217\225\261\377\203\232\241\277\377" \ + "\1\217\225\261\377\204\232\241\277\377\2KN[\377\277\277\266\377\204\351" \ + "\351\336\377\1\326\326\314\377\226\351\351\336\377\1>@D\377\205\232\241" \ + "\277\377\3\224\233\270\377\217\225\261\377KLM\377\233\351\351\336\377" \ + "\1\326\326\314\377\216\351\351\336\377\1\330\330\316\377\204\351\351" \ + "\336\377\1\326\326\314\377\213\351\351\336\377\1\352\352\337\377\215" \ + "\354\354\341\377\1\342\342\330\377\210\334\334\322\377\2\330\330\316" \ + "\377<>D\377\203\221\230\265\377\2\217\226\262\377\210\217\252\377\215" \ + "\221\230\265\377\2FGP\377\271\271\260\377\234\334\334\322\377\2\316\316" \ + "\304\377\330\330\316\377\233\334\334\322\377\3\331\331\317\377ab`\377" \ + "y~\227\377\204\221\230\265\377\1-/8\377\204\221\230\265\377\1\206\215" \ + "\250\377\203\221\230\265\377\1\206\215\250\377\204\221\230\265\377\2" \ + "@CO\377\274\274\264\377\204\334\334\322\377\1\312\312\301\377\226\334" \ + "\334\322\377\1<=A\377\205\221\230\265\377\3\213\222\256\377\211\220\253" \ + "\377DEF\377\233\334\334\322\377\1\312\312\301\377\216\334\334\322\377" \ + "\1\314\314\303\377\204\334\334\322\377\1\312\312\301\377\213\334\334" \ + "\322\377\1\341\341\327\377\227\354\354\341\377\1\77@E\377\204\234\243" \ + "\302\377\1\221\230\265\377\215\234\243\302\377\2SVa\377\270\270\260\377" \ + "\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \ + "\377\3\346\346\333\377YZZ\377\214\223\256\377\204\234\243\302\377\1/" \ + "1;\377\204\234\243\302\377\1\220\227\264\377\203\234\243\302\377\1\220" \ + "\227\264\377\204\234\243\302\377\2QTc\377\272\272\262\377\204\354\354" \ + "\341\377\1\331\331\317\377\226\354\354\341\377\1=>C\377\205\234\243\302" \ + "\377\3\226\235\273\377\212\220\253\377YZZ\377\233\354\354\341\377\1\331" \ + "\331\317\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377" \ + "\1\331\331\317\377\243\354\354\341\377\1@AF\377\204\234\243\302\377\1" \ + "\220\227\264\377\215\234\243\302\377\2[_m\377\251\251\241\377\234\354" \ + "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\3" \ + "\343\343\331\377JKL\377\227\236\274\377\204\234\243\302\377\1/1:\377" \ + "\204\234\243\302\377\1\220\227\264\377\202\234\243\302\377\2\232\241" \ + "\277\377\222\231\266\377\204\234\243\302\377\2]at\377\251\251\241\377" \ + "\204\354\354\341\377\2\333\333\321\377\352\352\337\377\224\354\354\341" \ + "\377\2\347\347\334\377=\77E\377\205\234\243\302\377\3\226\235\273\377" \ + "~\204\235\377mnl\377\232\354\354\341\377\2\352\352\337\377\333\333\321" \ + "\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331" \ + "\331\317\377\243\354\354\341\377\1ACF\377\204\234\243\302\377\1\220\227" \ + "\264\377\215\234\243\302\377\2cgy\377\231\231\222\377\234\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\340\340" \ + "\326\377CCE\377\205\234\243\302\377\2""69C\377\224\232\270\377\203\234" \ + "\243\302\377\1\220\227\264\377\202\234\243\302\377\2\230\237\275\377" \ + "\224\233\270\377\204\234\243\302\377\2im\202\377\227\227\220\377\204" \ + "\354\354\341\377\2\336\336\323\377\347\347\334\377\224\354\354\341\377" \ + "\2\327\327\315\377FHP\377\205\234\243\302\377\3\226\235\273\377rx\217" \ + "\377\201\202~\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \ + "\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331\331" \ + "\317\377\243\354\354\341\377\1BCF\377\204\234\243\302\377\1\220\227\264" \ + "\377\215\234\243\302\377\3kp\205\377\212\212\204\377\352\352\337\377" \ + "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \ + "\377\2\336\336\323\377BCE\377\205\234\243\302\377\2ADR\377\205\213\246" \ + "\377\203\234\243\302\377\3\222\231\266\377\232\241\277\377\234\243\302" \ + "\377\202\226\235\273\377\204\234\243\302\377\2sx\217\377\203\203\177" \ + "\377\204\354\354\341\377\2\340\340\326\377\344\344\331\377\224\354\354" \ + "\341\377\2\254\254\244\377[_o\377\205\234\243\302\377\3\226\235\273\377" \ + "ej}\377\231\231\222\377\232\354\354\341\377\2\344\344\331\377\340\340" \ + "\326\377\215\354\354\341\377\2\351\351\336\377\336\336\323\377\203\354" \ + "\354\341\377\2\352\352\337\377\333\333\321\377\243\354\354\341\377\1" \ + "CDF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3v" \ + "{\222\377zzw\377\346\346\333\377\233\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\233\354\354\341\377\2\333\333\321\377@BE\377\205\234" \ + "\243\302\377\2NRa\377w}\224\377\203\234\243\302\377\5\224\233\270\377" \ + "\230\237\275\377\234\243\302\377\224\233\270\377\230\237\275\377\204" \ + "\234\243\302\377\2\204\212\245\377ghg\377\204\354\354\341\377\2\343\343" \ + "\331\377\341\341\327\377\224\354\354\341\377\2ssq\377z\200\230\377\205" \ + "\234\243\302\377\3\226\235\273\377KNW\377\312\312\301\377\232\354\354" \ + "\341\377\2\341\341\327\377\343\343\331\377\215\354\354\341\377\2\346" \ + "\346\333\377\340\340\326\377\203\354\354\341\377\2\350\350\335\377\335" \ + "\335\322\377\243\354\354\341\377\2TUU\377\222\230\265\377\203\234\243" \ + "\302\377\2\222\231\266\377\232\241\277\377\214\234\243\302\377\3\200" \ + "\206\237\377jjh\377\341\341\327\377\233\354\354\341\377\2\335\335\322" \ + "\377\350\350\335\377\233\354\354\341\377\2\330\330\316\377\77AE\377\205" \ + "\234\243\302\377\2\\`r\377hm\201\377\203\234\243\302\377\202\226\235" \ + "\273\377\3\234\243\302\377\222\231\266\377\232\241\277\377\204\234\243" \ + "\302\377\2\232\241\300\377CDE\377\204\354\354\341\377\2\350\350\335\377" \ + "\335\335\322\377\224\354\354\341\377\2BCD\377\230\237\275\377\205\234" \ + "\243\302\377\2\226\235\273\3779:>\377\233\354\354\341\377\2\335\335\322" \ + "\377\350\350\335\377\215\354\354\341\377\202\343\343\331\377\203\354" \ + "\354\341\377\2\344\344\331\377\340\340\326\377\243\354\354\341\377\2" \ + "{|x\377z\177\230\377\203\234\243\302\377\2\224\233\270\377\230\237\275" \ + "\377\214\234\243\302\377\3\212\221\254\377[\\[\377\332\332\320\377\233" \ + "\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377" \ + "\3\352\352\337\377\333\333\321\377>@E\377\205\234\243\302\377\2jn\204" \ + "\377Y]o\377\203\234\243\302\377\4\230\237\275\377\224\233\270\377\234" \ + "\243\302\377\220\227\264\377\206\234\243\302\377\1;=A\377\205\354\354" \ + "\341\377\1\331\331\317\377\224\354\354\341\377\1""89=\377\206\234\243" \ + "\302\377\2\215\224\260\377JKK\377\233\354\354\341\377\1\331\331\317\377" \ + "\216\354\354\341\377\2\340\340\326\377\346\346\333\377\203\354\354\341" \ + "\377\2\337\337\325\377\345\345\332\377\243\354\354\341\377\2\244\244" \ + "\235\377dh{\377\203\234\243\302\377\202\226\235\273\377\214\234\243\302" \ + "\377\4\225\233\271\377KLL\377\331\331\317\377\353\353\340\377\232\354" \ + "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \ + "\340\340\326\377\327\327\315\377FHO\377\205\234\243\302\377\2\205\213" \ + "\246\377DGU\377\203\234\243\302\377\4\232\241\277\377\222\231\266\377" \ + "\234\243\302\377\220\227\264\377\206\234\243\302\377\2IKT\377\323\323" \ + "\311\377\204\354\354\341\377\2\336\336\323\377\347\347\334\377\222\354" \ + "\354\341\377\2\312\312\301\377KMW\377\206\234\243\302\377\2jn\203\377" \ + "\205\206\200\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \ + "\216\354\354\341\377\2\336\336\323\377\351\351\336\377\203\354\354\341" \ + "\377\2\333\333\321\377\352\352\337\377\243\354\354\341\377\2\310\310" \ + "\277\377QS^\377\203\234\243\302\377\2\230\237\276\377\223\232\267\377" \ + "\215\234\243\302\377\3<=\77\377\340\340\326\377\344\344\331\377\232\354" \ + "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \ + "\331\331\317\377\302\302\271\377UXd\377\206\234\243\302\377\1/1;\377" \ + "\204\234\243\302\377\3\220\227\264\377\234\243\302\377\220\226\263\377" \ + "\206\234\243\302\377\2aex\377\244\244\234\377\204\354\354\341\377\2\346" \ + "\346\333\377\337\337\324\377\222\354\354\341\377\2\223\224\215\377fk" \ + "\177\377\206\234\243\302\377\2=\77E\377\320\320\306\377\232\354\354\341" \ + "\377\2\337\337\324\377\346\346\333\377\216\354\354\341\377\1\333\333" \ + "\321\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2" \ + "\350\350\335\377<=B\377\204\234\243\302\377\1\220\226\263\377\215\234" \ + "\243\302\377\3:<A\377\345\345\332\377\334\334\322\377\232\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\231\354\354\341\377\4\353\353" \ + "\340\377\331\331\317\377\216\216\211\377ot\212\377\206\234\243\302\377" \ + "\2""69D\377\224\233\270\377\203\234\243\302\377\3\220\227\264\377\227" \ + "\236\275\377\223\232\267\377\206\234\243\302\377\2\210\216\251\377\\" \ + "]\\\377\205\354\354\341\377\1\331\331\317\377\222\354\354\341\377\2E" \ + "FG\377\224\232\270\377\205\234\243\302\377\3\211\217\252\377RRR\377\342" \ + "\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341\377" \ + "\2\353\353\340\377\333\333\321\377\204\354\354\341\377\1\331\331\317" \ + "\377\245\354\354\341\377\2JKK\377\223\232\267\377\203\234\243\302\377" \ + "\2\222\230\265\377\232\241\277\377\214\234\243\302\377\3SUa\377\276\276" \ + "\265\377\331\331\317\377\232\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\231\354\354\341\377\4\342\342\330\377\340\340\326\377VWW\377" \ + "\220\226\263\377\206\234\243\302\377\2Z^p\377kp\207\377\203\234\243\302" \ + "\377\3\225\234\272\377\215\224\260\377\231\240\276\377\207\234\243\302" \ + "\377\1;<@\377\205\354\354\341\377\2\334\334\322\377\350\350\335\377\220" \ + "\354\354\341\377\2\321\321\307\377FHP\377\206\234\243\302\377\3MPZ\377" \ + "\272\272\261\377\342\342\330\377\231\354\354\341\377\2\350\350\335\377" \ + "\334\334\322\377\216\354\354\341\377\2\344\344\331\377\342\342\330\377" \ + "\203\354\354\341\377\2\345\345\332\377\337\337\324\377\245\354\354\341" \ + "\377\2\225\225\220\377im\201\377\203\234\243\302\377\2\227\236\274\377" \ + "\224\233\270\377\214\234\243\302\377\4ns\211\377\211\211\204\377\342" \ + "\342\330\377\340\340\326\377\231\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\231\354\354\341\377\3\330\330\316\377\353\353\340\377\77" \ + "@C\377\207\234\243\302\377\2\204\212\245\377CFS\377\203\234\243\302\377" \ + "\2\232\241\300\377\206\214\247\377\210\234\243\302\377\2SWd\377\277\277" \ + "\266\377\204\354\354\341\377\2\350\350\335\377\333\333\321\377\220\354" \ + "\354\341\377\2opn\377{\201\231\377\205\234\243\302\377\4\222\231\266" \ + "\377ABC\377\343\343\331\377\342\342\330\377\231\354\354\341\377\2\333" \ + "\333\321\377\347\347\334\377\216\354\354\341\377\2\334\334\322\377\352" \ + "\352\337\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\245" \ + "\354\354\341\377\2\335\335\322\377CDK\377\204\234\243\302\377\1\220\226" \ + "\263\377\214\234\243\302\377\5\217\226\262\377RSS\377\354\354\341\377" \ + "\330\330\316\377\353\353\340\377\230\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\230\354\354\341\377\4\341\341\327\377\340\340\326\377" \ + "\342\342\330\377ACI\377\210\234\243\302\377\1.09\377\203\234\243\302" \ + "\377\2\232\241\277\377\207\216\251\377\210\234\243\302\377\2\200\206" \ + "\237\377oom\377\205\354\354\341\377\2\334\334\322\377\347\347\334\377" \ + "\216\354\354\341\377\2\337\337\325\3778:>\377\206\234\243\302\377\4E" \ + "GP\377\273\273\262\377\343\343\331\377\342\342\330\377\230\354\354\341" \ + "\377\2\347\347\334\377\333\333\321\377\217\354\354\341\377\1\333\333" \ + "\321\377\204\354\354\341\377\1\330\330\316\377\247\354\354\341\377\2" \ + "CDF\377\231\240\276\377\203\234\243\302\377\2\220\227\264\377\233\242" \ + "\301\377\214\234\243\302\377\4<=@\377\354\354\341\377\344\344\331\377" \ + "\337\337\324\377\230\354\354\341\377\2\335\335\322\377\350\350\335\377" \ + "\227\354\354\341\377\5\353\353\340\377\327\327\315\377\354\354\341\377" \ + "\264\264\254\377[_m\377\210\234\243\302\377\2""7:D\377\220\226\263\377" \ + "\202\234\243\302\377\3\224\232\270\377\220\227\264\377\230\237\275\377" \ + "\210\234\243\302\377\2""89<\377\353\353\340\377\204\354\354\341\377\2" \ + "\351\351\336\377\332\332\320\377\216\354\354\341\377\2fge\377w|\224\377" \ + "\205\234\243\302\377\5sx\215\377iig\377\354\354\341\377\343\343\331\377" \ + "\342\342\330\377\230\354\354\341\377\2\331\331\317\377\351\351\336\377" \ + "\216\354\354\341\377\2\346\346\333\377\340\340\326\377\203\354\354\341" \ + "\377\2\347\347\334\377\335\335\322\377\247\354\354\341\377\2\204\204" \ + "\177\377sx\217\377\203\234\243\302\377\2\225\234\272\377\226\235\273" \ + "\377\214\234\243\302\377\5@BI\377\337\337\325\377\354\354\341\377\331" \ + "\331\317\377\352\352\337\377\227\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\227\354\354\341\377\5\337\337\324\377\343\343\331\377\354" \ + "\354\341\377}}y\377w}\225\377\210\234\243\302\377\2]at\377gl\200\377" \ + "\202\234\243\302\377\3\220\226\263\377\232\241\277\377\222\230\265\377" \ + "\210\234\243\302\377\2Z^l\377\245\245\236\377\205\354\354\341\377\2\336" \ + "\336\323\377\345\345\332\377\214\354\354\341\377\2\311\311\300\377BD" \ + "L\377\205\234\243\302\377\6\224\232\270\37778;\377\345\345\332\377\354" \ + "\354\341\377\343\343\331\377\342\342\330\377\227\354\354\341\377\2\345" \ + "\345\332\377\335\335\322\377\217\354\354\341\377\2\336\336\323\377\351" \ + "\351\336\377\203\354\354\341\377\2\337\337\324\377\345\345\332\377\247" \ + "\354\354\341\377\2\321\321\307\377KMV\377\203\234\243\302\377\2\233\242" \ + "\301\377\220\227\264\377\214\234\243\302\377\5\\`p\377\256\256\246\377" \ + "\354\354\341\377\347\347\334\377\334\334\322\377\227\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\352\352\337" \ + "\377\330\330\316\377\202\354\354\341\377\2JKK\377\225\234\272\377\210" \ + "\234\243\302\377\7\211\217\252\377<\77K\377\234\243\302\377\232\241\300" \ + "\377\221\230\265\377\234\243\302\377\220\226\263\377\210\234\243\302" \ + "\377\2\222\231\266\377ABC\377\205\354\354\341\377\2\353\353\340\377\330" \ + "\330\316\377\214\354\354\341\377\2EFG\377\212\221\254\377\204\234\243" \ + "\302\377\3\230\237\276\377<=D\377\270\270\257\377\202\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\330\330\316" \ + "\377\352\352\337\377\217\354\354\341\377\1\332\332\320\377\204\354\354" \ + "\341\377\1\330\330\316\377\251\354\354\341\377\1\77AC\377\204\234\243" \ + "\302\377\2\220\227\264\377\233\242\301\377\213\234\243\302\377\2|\201" \ + "\232\377nol\377\202\354\354\341\377\2\337\337\324\377\341\341\327\377" \ + "\226\354\354\341\377\2\335\335\322\377\350\350\335\377\225\354\354\341" \ + "\377\6\353\353\340\377\330\330\316\377\350\350\335\377\354\354\341\377" \ + "\352\352\337\3779:>\377\212\234\243\302\377\7""14=\377\221\230\264\377" \ + "\225\233\271\377\227\235\273\377\234\243\302\377\223\232\267\377\230" \ + "\237\276\377\210\234\243\302\377\2JLV\377\305\305\273\377\205\354\354" \ + "\341\377\2\344\344\331\377\334\334\322\377\212\354\354\341\377\2rrp\377" \ + "ej{\377\204\234\243\302\377\3\231\240\276\377>\77G\377\246\246\237\377" \ + "\203\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341" \ + "\377\2\334\334\322\377\344\344\331\377\217\354\354\341\377\2\347\347" \ + "\334\377\337\337\324\377\203\354\354\341\377\2\351\351\336\377\333\333" \ + "\321\377\251\354\354\341\377\2ssq\377~\204\235\377\203\234\243\302\377" \ + "\2\227\236\274\377\224\232\270\377\214\234\243\302\377\1""78;\377\203" \ + "\354\354\341\377\2\332\332\320\377\345\345\332\377\225\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\225\354\354\341\377\2\333\333\321" \ + "\377\344\344\331\377\202\354\354\341\377\2\254\254\244\377Y\\k\377\212" \ + "\234\243\302\377\3mr\207\377QUe\377\217\226\262\377\202\234\243\302\377" \ + "\2\232\241\300\377\220\227\264\377\210\234\243\302\377\2\205\213\246" \ + "\377YZY\377\206\354\354\341\377\2\337\337\325\377\340\340\326\377\210" \ + "\354\354\341\377\2\223\224\216\377QT`\377\204\234\243\302\377\3\232\241" \ + "\277\377ACJ\377\243\244\235\377\204\354\354\341\377\2\343\343\331\377" \ + "\342\342\330\377\225\354\354\341\377\2\340\340\326\377\337\337\325\377" \ + "\220\354\354\341\377\2\333\333\321\377\352\352\337\377\203\354\354\341" \ + "\377\2\340\340\326\377\343\343\331\377\251\354\354\341\377\2\305\305" \ + "\273\377LNX\377\204\234\243\302\377\2\220\227\264\377\232\241\300\377" \ + "\213\234\243\302\377\2TWd\377\265\265\255\377\202\354\354\341\377\3\353" \ + "\353\340\377\330\330\316\377\351\351\336\377\224\354\354\341\377\2\335" \ + "\335\322\377\350\350\335\377\224\354\354\341\377\2\337\337\325\377\340" \ + "\340\326\377\203\354\354\341\377\2QQR\377\215\223\257\377\212\234\243" \ + "\302\377\3\232\241\300\377&(1\377\225\233\271\377\203\234\243\302\377" \ + "\2\223\232\267\377\230\237\275\377\210\234\243\302\377\2@BJ\377\312\312" \ + "\301\377\206\354\354\341\377\2\333\333\321\377\345\345\332\377\206\354" \ + "\354\341\377\3\260\260\250\377@BI\377\233\242\301\377\203\234\243\302" \ + "\377\3\204\212\245\3779:\77\377\243\243\235\377\205\354\354\341\377\2" \ + "\343\343\331\377\342\342\330\377\224\354\354\341\377\2\345\345\332\377" \ + "\333\333\321\377\220\354\354\341\377\2\346\346\333\377\337\337\324\377" \ + "\204\354\354\341\377\2\330\330\316\377\353\353\340\377\252\354\354\341" \ + "\377\2KLL\377\211\217\253\377\203\234\243\302\377\2\231\240\276\377\222" \ + "\230\265\377\213\234\243\302\377\2\211\217\252\377XXX\377\203\354\354" \ + "\341\377\3\351\351\336\377\327\327\315\377\353\353\340\377\223\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377\2\344" \ + "\344\331\377\334\334\322\377\203\354\354\341\377\2\340\340\326\377=>" \ + "D\377\213\234\243\302\377\3\233\242\301\377ORc\377gk\200\377\203\234" \ + "\243\302\377\2\233\242\301\377\220\226\263\377\210\234\243\302\377\2" \ + "\211\217\253\377GHI\377\206\354\354\341\377\3\353\353\340\377\330\330" \ + "\316\377\350\350\335\377\204\354\354\341\377\3\225\225\220\377<=C\377" \ + "\227\235\273\377\202\234\243\302\377\4\232\241\277\377X[i\377LLM\377" \ + "\326\326\314\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\223\354\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377" \ + "\220\354\354\341\377\2\332\332\320\377\353\353\340\377\203\354\354\341" \ + "\377\2\344\344\331\377\337\337\324\377\253\354\354\341\377\2\310\310" \ + "\277\377BEM\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377" \ + "\213\234\243\302\377\2;<A\377\345\345\332\377\203\354\354\341\377\3\346" \ + "\346\333\377\330\330\316\377\351\351\336\377\222\354\354\341\377\2\335" \ + "\335\322\377\350\350\335\377\222\354\354\341\377\3\342\342\330\377\332" \ + "\332\320\377\353\353\340\377\203\354\354\341\377\2\221\221\214\377hl" \ + "\200\377\213\234\243\302\377\3\222\231\266\377\220\226\263\377,.7\377" \ + "\204\234\243\302\377\2\224\233\270\377\227\235\273\377\210\234\243\302" \ + "\377\2RUa\377\252\252\243\377\206\354\354\341\377\15\351\351\336\377" \ + "\330\330\316\377\346\346\333\377\354\354\341\377\346\346\333\377^_]\377" \ + "SVc\377\233\242\301\377\234\243\302\377\211\217\252\377WZh\37778;\377" \ + "\233\233\225\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\222\354\354\341\377\3\346\346\333\377\330\330\316\377\351\351\336\377" \ + "\220\354\354\341\377\2\344\344\331\377\340\340\326\377\204\354\354\341" \ + "\377\2\330\330\316\377\353\353\340\377\254\354\354\341\377\2[[[\377\177" \ + "\205\237\377\203\234\243\302\377\2\232\241\277\377\220\227\264\377\213" \ + "\234\243\302\377\2chy\377\234\234\225\377\204\354\354\341\377\3\350\350" \ + "\335\377\330\330\316\377\346\346\333\377\221\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\221\354\354\341\377\2\336\336\323\377\335\335" \ + "\322\377\205\354\354\341\377\2BCE\377\227\235\273\377\212\234\243\302" \ + "\377\5\232\241\277\377\220\227\264\377\234\243\302\377CFU\377x~\226\377" \ + "\204\234\243\302\377\1\220\226\263\377\210\234\243\302\377\3\225\234" \ + "\272\37778:\377\350\350\335\377\206\354\354\341\377\12\353\353\340\377" \ + "\331\331\317\377\313\313\302\377--.\377;>I\377\\`p\377QS_\377;<A\377" \ + "[\\[\377\265\265\255\377\212\354\354\341\377\2\343\343\331\377\342\342" \ + "\330\377\221\354\354\341\377\3\342\342\330\377\331\331\317\377\353\353" \ + "\340\377\221\354\354\341\377\1\332\332\320\377\204\354\354\341\377\2" \ + "\341\341\327\377\340\340\326\377\255\354\354\341\377\2\325\325\313\377" \ + ";=B\377\204\234\243\302\377\2\222\231\266\377\230\237\275\377\212\234" \ + "\243\302\377\2\224\233\270\377GHI\377\205\354\354\341\377\3\353\353\340" \ + "\377\331\331\317\377\342\342\330\377\220\354\354\341\377\2\335\335\322" \ + "\377\350\350\335\377\217\354\354\341\377\3\353\353\340\377\332\332\320" \ + "\377\342\342\330\377\205\354\354\341\377\2\322\322\310\377GIQ\377\213" \ + "\234\243\302\377\6\222\230\265\377\231\240\276\377\234\243\302\377\211" \ + "\217\252\37768C\377\233\242\301\377\203\234\243\302\377\2\226\235\273" \ + "\377\225\233\271\377\210\234\243\302\377\2jn\201\377vwt\377\210\354\354" \ + "\341\377\6\303\303\272\377}}y\377\235\235\226\377\261\261\251\377\306" \ + "\306\274\377\350\350\335\377\214\354\354\341\377\2\343\343\331\377\342" \ + "\342\330\377\220\354\354\341\377\2\336\336\323\377\335\335\322\377\222" \ + "\354\354\341\377\2\341\341\327\377\343\343\331\377\203\354\354\341\377" \ + "\2\353\353\340\377\327\327\315\377\257\354\354\341\377\2mmk\377ty\220" \ + "\377\203\234\243\302\377\2\233\242\301\377\220\226\263\377\213\234\243" \ + "\302\377\2DFM\377\327\327\315\377\206\354\354\341\377\202\335\335\322" \ + "\377\1\352\352\337\377\216\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\216\354\354\341\377\3\346\346\333\377\330\330\316\377\346\346" \ + "\333\377\206\354\354\341\377\2vvs\377x}\225\377\212\234\243\302\377\2" \ + "\231\240\276\377\222\230\265\377\203\234\243\302\377\2""46@\377\205\213" \ + "\246\377\204\234\243\302\377\2\220\226\263\377\233\242\301\377\210\234" \ + "\243\302\377\2BDM\377\270\270\257\377\210\354\354\341\377\3\341\341\327" \ + "\377\331\331\317\377\350\350\335\377\216\354\354\341\377\2\343\343\331" \ + "\377\342\342\330\377\216\354\354\341\377\3\351\351\336\377\331\331\317" \ + "\377\341\341\327\377\222\354\354\341\377\2\353\353\340\377\332\332\320" \ + "\377\204\354\354\341\377\2\337\337\325\377\342\342\330\377\257\354\354" \ + "\341\377\3\337\337\325\37778<\377\233\242\301\377\203\234\243\302\377" \ + "\2\225\233\271\377\225\234\272\377\212\234\243\302\377\2{\201\231\377" \ + "^^^\377\207\354\354\341\377\4\345\345\332\377\330\330\316\377\337\337" \ + "\325\377\353\353\340\377\214\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\214\354\354\341\377\4\350\350\335\377\332\332\320\377\334\334" \ + "\322\377\352\352\337\377\206\354\354\341\377\2\336\336\323\3779;\77\377" \ + "\212\234\243\302\377\3\233\242\301\377\217\226\262\377\232\241\300\377" \ + "\203\234\243\302\377\3fj\177\377/19\377\232\241\300\377\203\234\243\302" \ + "\377\2\230\237\275\377\222\230\265\377\210\234\243\302\377\3\224\233" \ + "\270\377569\377\337\337\324\377\210\354\354\341\377\4\350\350\335\377" \ + "\332\332\320\377\335\335\322\377\352\352\337\377\214\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\214\354\354\341\377\4\352\352\337" \ + "\377\335\335\322\377\332\332\320\377\350\350\335\377\223\354\354\341" \ + "\377\2\335\335\322\377\346\346\333\377\203\354\354\341\377\2\352\352" \ + "\337\377\330\330\316\377\261\354\354\341\377\2\201\202~\377jn\202\377" \ + "\204\234\243\302\377\2\221\230\265\377\230\237\275\377\212\234\243\302" \ + "\377\2ACJ\377\307\307\276\377\210\354\354\341\377\3\342\342\330\377\327" \ + "\327\315\377\342\342\330\377\213\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\212\354\354\341\377\4\352\352\337\377\334\334\322\377\332" \ + "\332\320\377\350\350\335\377\210\354\354\341\377\2eed\377z\177\230\377" \ + "\212\234\243\302\377\2\221\230\265\377\230\237\275\377\204\234\243\302" \ + "\377\3""9:@\377iig\377ei|\377\204\234\243\302\377\2\224\233\270\377\225" \ + "\233\271\377\210\234\243\302\377\2|\201\232\377QQQ\377\212\354\354\341" \ + "\377\4\345\345\332\377\330\330\316\377\337\337\324\377\353\353\340\377" \ + "\212\354\354\341\377\2\343\343\331\377\342\342\330\377\212\354\354\341" \ + "\377\4\353\353\340\377\337\337\324\377\330\330\316\377\345\345\332\377" \ + "\224\354\354\341\377\2\341\341\327\377\340\340\326\377\204\354\354\341" \ + "\377\2\335\335\322\377\345\345\332\377\261\354\354\341\377\3\347\347" \ + "\334\377669\377\230\237\276\377\203\234\243\302\377\3\233\242\301\377" \ + "\220\226\263\377\232\241\277\377\211\234\243\302\377\2\212\220\253\377" \ + "FFG\377\211\354\354\341\377\5\353\353\340\377\337\337\325\377\330\330" \ + "\316\377\337\337\324\377\347\347\334\377\210\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\207\354\354\341\377\5\353\353\340\377\343\343" \ + "\331\377\333\333\321\377\331\331\317\377\346\346\333\377\211\354\354" \ + "\341\377\2\314\314\303\377ACK\377\212\234\243\302\377\2\224\232\270\377" \ + "\225\233\271\377\204\234\243\302\377\5pu\212\377uur\377\350\350\335\377" \ + "568\377\216\225\261\377\204\234\243\302\377\2\222\230\265\377\227\236" \ + "\274\377\210\234\243\302\377\2^bq\377zzw\377\213\354\354\341\377\4\343" \ + "\343\331\377\330\330\316\377\335\335\322\377\345\345\332\377\210\354" \ + "\354\341\377\2\343\343\331\377\342\342\330\377\210\354\354\341\377\4" \ + "\345\345\332\377\335\335\322\377\330\330\316\377\343\343\331\377\225" \ + "\354\354\341\377\2\345\345\332\377\335\335\322\377\204\354\354\341\377" \ + "\2\351\351\336\377\331\331\317\377\263\354\354\341\377\2\251\251\241" \ + "\377FHQ\377\204\234\243\302\377\3\232\241\300\377\217\226\262\377\233" \ + "\242\301\377\211\234\243\302\377\2QT`\377\254\254\245\377\213\354\354" \ + "\341\377\6\346\346\333\377\335\335\322\377\330\330\316\377\335\335\322" \ + "\377\345\345\332\377\352\352\337\377\204\354\354\341\377\2\335\335\322" \ + "\377\350\350\335\377\204\354\354\341\377\2\351\351\336\377\341\341\327" \ + "\377\202\331\331\317\377\2\340\340\326\377\351\351\336\377\213\354\354" \ + "\341\377\2LMM\377\211\217\252\377\211\234\243\302\377\2\227\235\273\377" \ + "\222\230\265\377\204\234\243\302\377\7\213\221\255\37789;\377\343\343" \ + "\331\377\354\354\341\377\274\274\264\377<>E\377\233\242\301\377\204\234" \ + "\243\302\377\2\220\226\263\377\232\241\277\377\210\234\243\302\377\2" \ + "OQ]\377\221\221\214\377\214\354\354\341\377\6\350\350\335\377\337\337" \ + "\324\377\331\331\317\377\333\333\321\377\343\343\331\377\352\352\337" \ + "\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377\204\354\354" \ + "\341\377\6\352\352\337\377\343\343\331\377\333\333\321\377\331\331\317" \ + "\377\337\337\324\377\350\350\335\377\226\354\354\341\377\2\351\351\336" \ + "\377\332\332\320\377\204\354\354\341\377\3\353\353\340\377\330\330\316" \ + "\377\350\350\335\377\264\354\354\341\377\2}~z\377]`p\377\204\234\243" \ + "\302\377\2\230\237\276\377\220\227\264\377\211\234\243\302\377\3\224" \ + "\233\270\37789;\377\352\352\337\377\215\354\354\341\377\3\350\350\335" \ + "\377\337\337\325\377\333\333\321\377\203\331\331\317\377\3\332\332\320" \ + "\377\317\317\304\377\330\330\316\377\204\331\331\317\377\3\334\334\322" \ + "\377\342\342\330\377\353\353\340\377\215\354\354\341\377\2\262\262\253" \ + "\377NQ\\\377\211\234\243\302\377\2\231\240\276\377\220\226\263\377\204" \ + "\234\243\302\377\3\226\235\273\37767;\377\317\317\305\377\203\354\354" \ + "\341\377\2mnk\377fj}\377\204\234\243\302\377\3\232\241\300\377\217\226" \ + "\262\377\233\242\301\377\210\234\243\302\377\2DFO\377\245\246\237\377" \ + "\216\354\354\341\377\3\352\352\337\377\340\340\326\377\334\334\322\377" \ + "\203\331\331\317\377\4\332\332\320\377\325\325\312\377\324\324\311\377" \ + "\332\332\320\377\203\331\331\317\377\3\334\334\322\377\340\340\326\377" \ + "\352\352\337\377\230\354\354\341\377\3\353\353\340\377\331\331\317\377" \ + "\352\352\337\377\204\354\354\341\377\2\333\333\321\377\345\345\332\377" \ + "\266\354\354\341\377\2TUT\377sy\216\377\204\234\243\302\377\2\226\235" \ + "\273\377\223\232\267\377\211\234\243\302\377\2cgx\377\214\215\210\377" \ + "\223\354\354\341\377\3\353\353\340\377\331\331\317\377\346\346\333\377" \ + "\223\354\354\341\377\3\353\353\340\377:;=\377\223\232\267\377\210\234" \ + "\243\302\377\3\232\241\300\377\217\226\262\377\232\241\300\377\204\234" \ + "\243\302\377\2ACJ\377\262\262\253\377\204\354\354\341\377\3\347\347\334" \ + "\377679\377\211\217\253\377\204\234\243\302\377\2\230\237\276\377\220" \ + "\227\264\377\210\234\243\302\377\3\231\240\276\377<>D\377\264\264\255" \ + "\377\224\354\354\341\377\2\340\340\326\377\337\337\325\377\237\354\354" \ + "\341\377\2\333\333\321\377\347\347\334\377\204\354\354\341\377\2\337" \ + "\337\325\377\340\340\326\377\267\354\354\341\377\3\345\345\332\377<<" \ + "=\377\205\213\246\377\204\234\243\302\377\2\223\232\267\377\225\234\272" \ + "\377\210\234\243\302\377\3\232\241\300\37778<\377\321\321\307\377\223" \ + "\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377" \ + "\2\200\200|\377afw\377\210\234\243\302\377\3\233\242\301\377\220\226" \ + "\263\377\231\240\276\377\204\234\243\302\377\2VYf\377\214\215\210\377" \ + "\206\354\354\341\377\3\276\276\265\377>@H\377\226\235\273\377\204\234" \ + "\243\302\377\2\227\235\273\377\222\231\266\377\210\234\243\302\377\3" \ + "\226\235\273\377<>D\377\241\241\233\377\223\354\354\341\377\2\343\343" \ + "\331\377\342\342\330\377\236\354\354\341\377\2\336\336\323\377\344\344" \ + "\331\377\204\354\354\341\377\2\344\344\331\377\334\334\322\377\271\354" \ + "\354\341\377\3\325\325\313\377458\377\222\231\266\377\204\234\243\302" \ + "\377\2\222\231\266\377\223\232\267\377\210\234\243\302\377\3\212\220" \ + "\253\3779:;\377\342\342\330\377\222\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\222\354\354\341\377\2\252\252\244\377DGP\377\210\234" \ + "\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275\377\204\234" \ + "\243\302\377\2mr\206\377bca\377\210\354\354\341\377\3nol\377di|\377\230" \ + "\237\276\377\204\234\243\302\377\3\225\234\272\377\221\230\265\377\233" \ + "\242\301\377\207\234\243\302\377\3\232\241\277\377GIS\377\206\207\202" \ + "\377\222\354\354\341\377\2\343\343\331\377\342\342\330\377\234\354\354" \ + "\341\377\3\353\353\340\377\334\334\322\377\342\342\330\377\204\354\354" \ + "\341\377\2\350\350\335\377\331\331\317\377\273\354\354\341\377\3\274" \ + "\274\263\377:;B\377\232\241\300\377\204\234\243\302\377\3\225\234\272" \ + "\377\220\227\264\377\233\242\301\377\207\234\243\302\377\3x~\225\377" \ + "MMM\377\353\353\340\377\221\354\354\341\377\2\335\335\322\377\350\350" \ + "\335\377\221\354\354\341\377\3\311\311\300\37779=\377\230\237\275\377" \ + "\207\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277\377" \ + "\204\234\243\302\377\3\201\206\240\377EFF\377\351\351\336\377\210\354" \ + "\354\341\377\4\347\347\334\377BCD\377sw\216\377\232\241\300\377\204\234" \ + "\243\302\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234" \ + "\243\302\377\3VYg\377jjh\377\353\353\340\377\220\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\233\354\354\341\377\3\352\352\337\377\331" \ + "\331\317\377\346\346\333\377\204\354\354\341\377\3\352\352\337\377\330" \ + "\330\316\377\352\352\337\377\274\354\354\341\377\2\227\227\222\377LO" \ + "Z\377\205\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277" \ + "\377\207\234\243\302\377\2cgx\377pqn\377\221\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\220\354\354\341\377\3\336\336\323\37778;\377" \ + "\217\225\262\377\207\234\243\302\377\3\225\234\272\377\220\227\264\377" \ + "\233\242\301\377\204\234\243\302\377\3\217\226\262\37778;\377\336\336" \ + "\323\377\212\354\354\341\377\3\337\337\325\37789;\377{\201\232\377\205" \ + "\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\276\377\210" \ + "\234\243\302\377\3gl~\377@AB\377\321\321\307\377\217\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\232\354\354\341\377\3\347\347\334" \ + "\377\331\331\317\377\351\351\336\377\205\354\354\341\377\2\331\331\317" \ + "\377\347\347\334\377\276\354\354\341\377\3vvt\377QTa\377\233\242\301" \ + "\377\204\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275" \ + "\377\207\234\243\302\377\2JLW\377\233\234\226\377\220\354\354\341\377" \ + "\2\335\335\322\377\350\350\335\377\217\354\354\341\377\3\352\352\337" \ + "\377FGG\377\177\205\237\377\207\234\243\302\377\202\223\232\267\377\205" \ + "\234\243\302\377\3\212\221\254\37778<\377\310\310\277\377\214\354\354" \ + "\341\377\4\327\327\315\377457\377\202\210\243\377\233\242\301\377\204" \ + "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\210" \ + "\234\243\302\377\3\207\215\250\37778=\377\224\225\217\377\216\354\354" \ + "\341\377\2\343\343\331\377\342\342\330\377\231\354\354\341\377\3\343" \ + "\343\331\377\333\333\321\377\353\353\340\377\204\354\354\341\377\3\353" \ + "\353\340\377\332\332\320\377\343\343\331\377\300\354\354\341\377\3\225" \ + "\226\221\377\77AH\377\225\234\272\377\204\234\243\302\377\3\233\242\301" \ + "\377\220\227\264\377\225\234\272\377\206\234\243\302\377\3\232\241\277" \ + "\37789\77\377\267\267\256\377\217\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\216\354\354\341\377\3\353\353\340\377_`^\377mq\205\377\206" \ + "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\205" \ + "\234\243\302\377\3{\200\230\377;<>\377\323\323\311\377\216\354\354\341" \ + "\377\4\314\314\303\377126\377\201\206\240\377\231\240\276\377\205\234" \ + "\243\302\377\202\223\232\267\377\210\234\243\302\377\4\232\241\300\377" \ + "X\\j\377OPP\377\330\330\316\377\214\354\354\341\377\2\343\343\331\377" \ + "\342\342\330\377\230\354\354\341\377\202\337\337\324\377\205\354\354" \ + "\341\377\3\351\351\336\377\330\330\316\377\346\346\333\377\302\354\354" \ + "\341\377\3\272\272\261\37779<\377\212\221\254\377\205\234\243\302\377" \ + "\3\224\232\270\377\221\230\265\377\232\241\277\377\205\234\243\302\377" \ + "\3\224\232\270\377;=D\377\217\217\212\377\216\354\354\341\377\2\335\335" \ + "\322\377\350\350\335\377\215\354\354\341\377\3\337\337\324\377HII\377" \ + "ei{\377\206\234\243\302\377\3\226\235\273\377\217\226\262\377\230\237" \ + "\276\377\205\234\243\302\377\3gl~\377OOO\377\343\343\331\377\220\354" \ + "\354\341\377\4\312\312\301\377347\377z\177\230\377\227\236\274\377\205" \ + "\234\243\302\377\3\226\235\273\377\220\226\263\377\230\237\275\377\210" \ + "\234\243\302\377\4\200\206\237\3779:@\377mnk\377\337\337\324\377\212" \ + "\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377" \ + "\3\346\346\333\377\332\332\320\377\343\343\331\377\205\354\354\341\377" \ + "\3\346\346\333\377\330\330\316\377\351\351\336\377\304\354\354\341\377" \ + "\3\323\323\312\377<=\77\377{\200\230\377\205\234\243\302\377\4\232\241" \ + "\277\377\221\230\265\377\222\231\266\377\232\241\300\377\204\234\243" \ + "\302\377\4\233\242\301\377SWc\377__^\377\350\350\335\377\214\354\354" \ + "\341\377\2\335\335\322\377\350\350\335\377\214\354\354\341\377\3\306" \ + "\306\275\37777:\377}\203\233\377\205\234\243\302\377\3\230\237\275\377" \ + "\220\226\263\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \ + "QS_\377qqo\377\353\353\340\377\222\354\354\341\377\4\327\327\315\377" \ + "99;\377rx\217\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \ + "\223\232\267\377\220\227\264\377\231\240\276\377\210\234\243\302\377" \ + "\4tz\220\37789>\377|}y\377\344\344\331\377\210\354\354\341\377\2\343" \ + "\343\331\377\342\342\330\377\224\354\354\341\377\4\350\350\335\377\332" \ + "\332\320\377\337\337\324\377\353\353\340\377\205\354\354\341\377\3\341" \ + "\341\327\377\332\332\320\377\353\353\340\377\306\354\354\341\377\3\343" \ + "\343\331\377PPP\377gl~\377\206\234\243\302\377\4\230\237\276\377\220" \ + "\227\264\377\224\232\270\377\233\242\301\377\204\234\243\302\377\3os" \ + "\210\377>\77@\377\327\327\315\377\213\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\213\354\354\341\377\3\241\241\232\3779;@\377\217\226" \ + "\262\377\204\234\243\302\377\4\231\240\276\377\220\227\264\377\223\232" \ + "\267\377\233\242\301\377\205\234\243\302\377\3\225\233\271\377>@G\377" \ + "\232\232\225\377\225\354\354\341\377\4\340\340\326\377CDE\377gl\200\377" \ + "\222\230\265\377\206\234\243\302\377\1\232\241\277\377\202\222\230\265" \ + "\377\1\232\241\300\377\210\234\243\302\377\4ot\210\377:;\77\377aaa\377" \ + "\301\301\270\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\222\354\354\341\377\4\333\333\320\377\206\206\202\377789\377EFE\377" \ + "\206\354\354\341\377\2\335\335\322\377\336\336\323\377\312\354\354\341" \ + "\377\3stq\377QT_\377\233\242\301\377\206\234\243\302\377\3\227\236\274" \ + "\377\220\226\263\377\225\234\272\377\204\234\243\302\377\3\204\212\245" \ + "\377459\377\254\254\244\377\212\354\354\341\377\2\335\335\322\377\350" \ + "\350\335\377\211\354\354\341\377\4\340\340\326\377lmj\377NP\\\377\232" \ + "\241\277\377\203\234\243\302\377\1\232\241\300\377\202\222\230\265\377" \ + "\1\232\241\300\377\206\234\243\302\377\3\211\217\253\37789<\377\275\275" \ + "\264\377\227\354\354\341\377\5\350\350\335\377ijh\377HJS\377\213\221" \ + "\255\377\232\241\300\377\206\234\243\302\377\4\231\240\276\377\220\227" \ + "\264\377\224\232\270\377\233\242\301\377\210\234\243\302\377\5\203\211" \ + "\243\377PS^\377<=@\377\200\200|\377\322\322\310\377\203\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\217\354\354\341\377\7\337\337\325" \ + "\377\225\226\220\377CDE\377;=C\377gk\177\377:;B\377\302\302\271\377\204" \ + "\354\354\341\377\3\353\353\340\377\331\331\317\377\342\342\330\377\314" \ + "\354\354\341\377\3\233\233\226\37789>\377z\177\230\377\207\234\243\302" \ + "\377\4\225\234\272\377\220\226\263\377\223\232\267\377\231\240\276\377" \ + "\202\234\243\302\377\5\224\233\270\377Y\\j\377<=\77\377\227\227\222\377" \ + "\351\351\336\377\207\354\354\341\377\2\335\335\322\377\350\350\335\377" \ + "\207\354\354\341\377\4\324\324\312\377hig\377<>C\377uz\217\377\202\234" \ + "\243\302\377\2\233\242\301\377\226\235\273\377\202\221\230\265\377\1" \ + "\231\240\276\377\206\234\243\302\377\4\230\237\275\377\\`o\377AAC\377" \ + "\325\325\313\377\232\354\354\341\377\4\255\255\246\37756:\377w}\224\377" \ + "\225\234\272\377\207\234\243\302\377\4\230\237\275\377\220\227\264\377" \ + "\222\230\265\377\230\237\275\377\210\234\243\302\377\10\232\241\300\377" \ + "sx\217\377GIR\377:;\77\377JKL\377\201\202~\377\265\265\255\377\332\332" \ + "\320\377\212\354\354\341\377\13\340\340\326\377\264\264\254\377\177\200" \ + "|\377NNO\377;<\77\377;=D\377`dv\377\221\227\264\377\233\242\301\377I" \ + "KU\377\214\214\207\377\204\354\354\341\377\3\342\342\330\377\330\330" \ + "\316\377\346\346\333\377\316\354\354\341\377\4\333\333\321\377ddb\377" \ + "\77AH\377\205\213\245\377\207\234\243\302\377\13\231\240\276\377\223" \ + "\232\267\377\220\227\264\377\222\230\265\377\227\236\274\377\234\243" \ + "\302\377\230\237\275\377cgx\37778;\377\202\203\177\377\341\341\327\377" \ + "\205\354\354\341\377\2\335\335\322\377\350\350\335\377\205\354\354\341" \ + "\377\7\306\306\274\377UUU\377ACJ\377|\202\233\377\234\243\302\377\232" \ + "\241\300\377\225\233\271\377\202\220\227\264\377\2\225\234\272\377\233" \ + "\242\301\377\206\234\243\302\377\4\233\242\301\377hm\177\37767:\377\233" \ + "\234\225\377\235\354\354\341\377\5\332\332\320\377HII\377UXf\377\213" \ + "\221\255\377\227\236\274\377\207\234\243\302\377\6\232\241\277\377\224" \ + "\233\270\377\220\227\264\377\221\230\265\377\227\235\273\377\233\242" \ + "\301\377\210\234\243\302\377\30\224\233\270\377ty\220\377RUb\377;=C\377" \ + "9:\77\377;<\77\377=>A\377@AB\377KLL\377DDE\377ABD\377@BD\377ABE\377@" \ + "AE\377BCJ\377X\\j\377nr\210\377\211\217\253\377\224\233\270\377\232\241" \ + "\277\377\234\243\302\377\226\235\273\377CEM\377\217\220\212\377\203\354" \ + "\354\341\377\4\345\345\332\377\330\330\316\377\337\337\325\377\353\353" \ + "\340\377\321\354\354\341\377\4\317\317\305\377RSS\377HJS\377\215\224" \ + "\260\377\210\234\243\302\377\34\232\241\277\377\224\233\270\377\220\227" \ + "\264\377\221\230\265\377\226\235\273\377\230\237\275\377lq\205\377;<" \ + "A\377ABD\377\\]\\\377\204\204\200\377\254\254\244\377\317\317\305\377" \ + "\333\333\321\377\336\336\324\377\300\300\267\377\234\234\225\377stq\377" \ + "NOP\377<>@\377HJT\377\205\213\246\377\230\237\276\377\224\232\270\377" \ + "\220\226\263\377\221\230\265\377\227\235\273\377\233\242\301\377\210" \ + "\234\243\302\377\4tz\220\37778<\377\205\205\201\377\350\350\335\377\240" \ + "\354\354\341\377\5\232\233\224\377447\377dhz\377\217\226\262\377\230" \ + "\237\276\377\210\234\243\302\377\2\233\242\301\377\225\234\272\377\202" \ + "\220\227\264\377\3\225\233\271\377\231\240\276\377\233\242\301\377\206" \ + "\234\243\302\377\2\226\235\273\377\225\234\272\377\204\234\243\302\377" \ + "\5\225\233\271\377\232\241\300\377\233\242\301\377\231\240\276\377\225" \ + "\233\271\377\202\220\227\264\377\2\225\234\272\377\232\241\300\377\203" \ + "\234\243\302\377\3uz\221\37767:\377\255\255\246\377\202\354\354\341\377" \ + "\4\347\347\334\377\331\331\317\377\336\336\323\377\352\352\337\377\325" \ + "\354\354\341\377\4\277\277\266\377CDE\377RUb\377\224\233\270\377\211" \ + "\234\243\302\377\4\232\241\300\377\225\234\272\377\223\232\267\377\221" \ + "\230\265\377\202\220\227\264\377\12\202\207\241\377lq\207\377[_o\377" \ + "KNW\37789\77\377\77@H\377RUa\377aex\377uz\221\377\211\220\253\377\202" \ + "\220\227\264\377\3\222\230\265\377\224\232\270\377\230\237\275\377\212" \ + "\234\243\302\377\4\201\206\240\377=\77D\377opm\377\340\340\326\377\243" \ + "\354\354\341\377\6\346\346\333\377|}y\37778<\377sw\217\377\220\227\264" \ + "\377\232\241\277\377\211\234\243\302\377\4\233\242\301\377\227\235\273" \ + "\377\223\232\267\377\221\230\265\377\204\220\227\264\377\6\222\230\265" \ + "\377\224\232\270\377\220\226\263\377\217\225\262\377\224\232\270\377" \ + "\222\230\265\377\204\220\227\264\377\4\221\230\265\377\223\232\267\377" \ + "\227\235\273\377\233\242\301\377\204\234\243\302\377\6\222\230\265\377" \ + "FIQ\377efd\377\343\343\331\377\354\354\341\377\351\351\336\377\202\333" \ + "\333\321\377\1\351\351\336\377\331\354\354\341\377\4\254\254\245\377" \ + ":;=\377^br\377\223\232\267\377\217\234\243\302\377\6\232\241\300\377" \ + "\230\237\275\377\215\223\257\377\224\233\270\377\231\240\276\377\233" \ + "\242\301\377\217\234\243\302\377\4\177\204\236\377FHP\377\\]\\\377\326" \ + "\326\314\377\247\354\354\341\377\6\332\332\320\377efd\377:<A\377afx\377" \ + "\217\225\262\377\232\241\277\377\217\234\243\302\377\6\232\241\300\377" \ + "\230\237\276\377\221\230\265\377\220\227\264\377\230\237\276\377\232" \ + "\241\300\377\213\234\243\302\377\10lq\205\3779:<\377\274\274\263\377" \ + "\354\354\341\377\351\351\336\377\335\335\322\377\331\331\317\377\347" \ + "\347\334\377\334\354\354\341\377\6\353\353\340\377\240\240\232\377PQ" \ + "Q\377\77AF\377_cs\377\213\221\255\377\216\234\243\302\377\2\222\230\265" \ + "\377\231\240\276\377\215\234\243\302\377\6\232\241\277\377uz\222\377" \ + "KNW\377:;>\377kki\377\312\312\301\377\253\354\354\341\377\7\342\342\330" \ + "\377\212\212\206\37767:\377LO[\377\201\206\240\377\223\232\267\377\230" \ + "\237\276\377\216\234\243\302\377\2\226\235\273\377\225\234\272\377\212" \ + "\234\243\302\377\11\224\232\270\377aew\3779;\77\377wxu\377\343\343\330" \ + "\377\337\337\324\377\331\331\317\377\334\334\322\377\345\345\332\377" \ + "\341\354\354\341\377\6\347\347\334\377\253\253\243\377[[[\377<=A\377" \ + "VYf\377\201\206\240\377\213\234\243\302\377\2\222\230\265\377\231\240" \ + "\276\377\212\234\243\302\377\6\226\235\273\377lq\206\377EGN\377>\77A" \ + "\377z{w\377\312\312\301\377\261\354\354\341\377\7\262\262\252\377RRS" \ + "\37789>\377MP\\\377ou\213\377\220\226\263\377\227\236\274\377\213\234" \ + "\243\302\377\2\226\235\273\377\225\234\272\377\207\234\243\302\377\5" \ + "\233\242\301\377uz\222\377CEL\377EFG\377\231\231\222\377\202\330\330" \ + "\316\377\2\335\335\322\377\346\346\333\377\347\354\354\341\377\10\353" \ + "\353\340\377\272\272\262\377ijh\377;;>\377LOX\377gl\177\377~\204\235" \ + "\377\225\234\272\377\206\234\243\302\377\2\222\230\265\377\231\240\276" \ + "\377\206\234\243\302\377\7\214\223\256\377ty\220\377_br\377\77AF\377" \ + "DEF\377\213\214\206\377\326\326\314\377\266\354\354\341\377\12\353\353" \ + "\340\377\275\275\264\377stq\377=>\77\377<>D\377RVd\377im\202\377\204" \ + "\211\243\377\227\236\274\377\232\241\300\377\206\234\243\302\377\2\226" \ + "\235\273\377\225\234\272\377\204\234\243\302\377\11\230\237\276\377{" \ + "\201\231\377SVd\377569\377ppn\377\304\304\273\377\331\331\317\377\337" \ + "\337\324\377\350\350\335\377\356\354\354\341\377\26\312\312\301\377\235" \ + "\235\226\377stq\377NOP\377ABE\377>\77D\377>@F\377EGO\377LOY\377SVb\377" \ + "SWd\377UYf\377QS_\377JLU\377CDL\377>\77E\377\77AE\377CDE\377\\]\\\377" \ + "\205\205\200\377\255\255\245\377\337\337\325\377\275\354\354\341\377" \ + "\30\335\335\322\377\263\263\253\377\207\210\203\377Z[[\377\77\77A\377" \ + "9:\77\377<>E\377FHR\377LOZ\377RUc\377X\\l\377^bu\377bfz\377_bv\377Y]" \ + "m\377OS_\377CEO\37779<\377\77@A\377jji\377\250\250\240\377\337\337\324" \ + "\377\343\343\331\377\351\351\336\377\367\354\354\341\377\11\352\352\337" \ + "\377\337\337\324\377\323\323\311\377\307\307\276\377\260\260\250\377" \ + "\274\274\264\377\314\314\303\377\327\327\315\377\343\343\331\377\312" \ + "\354\354\341\377\13\340\340\326\377\315\315\303\377\302\302\271\377\267" \ + "\267\256\377\252\252\243\377\237\237\230\377\214\214\207\377\222\222" \ + "\213\377\254\254\244\377\277\277\266\377\325\325\313\377\377\354\354" \ + "\341\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354" \ + "\354\341\377\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206" \ + "\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377" \ + "\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341" \ + "\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343" \ + "\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335" \ + "\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342" \ + "\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377" \ + "\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377" \ + "\377\354\354\341\377\206\354\354\341\377\2\352\352\337\377\353\353\340" \ + "\377\323\354\354\341\377\2\353\353\340\377\352\352\337\377\377\354\354" \ + "\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377" \ + "\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354" \ + "\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341" \ + "\377\355\354\354\341\377\2\245\245\242\377\230\230\227\377\233\354\354" \ + "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\211\354\354" \ + "\341\377\2\245\245\242\377\232\232\231\377\225\354\354\341\377\2\223" \ + "\223\223\377\254\254\251\377\377\354\354\341\377\233\354\354\341\377" \ + "\2\245\245\242\377\230\230\227\377\233\354\354\341\377\3\302\302\274" \ + "\377\222\222\222\377\327\327\317\377\211\354\354\341\377\2\245\245\242" \ + "\377\232\232\231\377\225\354\354\341\377\2\223\223\223\377\254\254\251" \ + "\377\377\354\354\341\377\233\354\354\341\377\2\245\245\242\377\230\230" \ + "\227\377\233\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327" \ + "\317\377\211\354\354\341\377\2\245\245\242\377\232\232\231\377\225\354" \ + "\354\341\377\2\223\223\223\377\254\254\251\377\317\354\354\341\377\3" \ + "\337\337\325\377\274\274\264\377\324\324\312\377\212\354\354\341\377" \ + "\3\314\314\303\377\306\306\275\377\353\353\340\377\207\354\354\341\377" \ + "\4\347\347\334\377\302\302\271\377\310\310\277\377\350\350\335\377\210" \ + "\354\354\341\377\4\352\352\337\377\306\306\274\377\311\311\300\377\352" \ + "\352\337\377\211\354\354\341\377\4\353\353\340\377\337\337\326\377\333" \ + "\333\322\377\350\350\335\377\211\354\354\341\377\202\340\340\326\377" \ + "\204\354\354\341\377\3\350\350\335\377\332\332\321\377\343\343\331\377" \ + "\205\354\354\341\377\2\245\245\242\377\230\230\227\377\202\354\354\341" \ + "\377\3\343\343\331\377\333\333\322\377\352\352\337\377\207\354\354\341" \ + "\377\4\353\353\340\377\337\337\325\377\333\333\322\377\350\350\336\377" \ + "\207\354\354\341\377\1\352\352\340\377\202\334\334\323\377\4\351\351" \ + "\336\377\302\302\274\377\222\222\222\377\327\327\317\377\205\354\354" \ + "\341\377\6\347\347\335\377\331\331\320\377\340\340\326\377\354\354\341" \ + "\377\245\245\242\377\232\232\231\377\206\354\354\341\377\3\347\347\334" \ + "\377\331\331\320\377\342\342\330\377\210\354\354\341\377\6\344\344\332" \ + "\377\330\330\320\377\342\342\330\377\354\354\341\377\223\223\223\377" \ + "\254\254\251\377\315\354\354\341\377\2\323\323\312\377==:\377\203\0\0" \ + "\0\377\2\37\37\36\377\264\264\254\377\204\354\354\341\377\4\7\7\7\377" \ + "EEB\377\215\215\207\377\24\24\23\377\202\0\0\0\377\2\22\22\21\377\260" \ + "\260\250\377\204\354\354\341\377\3\336\336\323\377XXT\377\5\5\5\377\202" \ + "\0\0\0\377\3\11\11\10\377\206\206\177\377\353\353\340\377\202\354\354" \ + "\341\377\5\267\267\256\377\6\6\6\377xxr\377||v\377\15\15\15\377\202\0" \ + "\0\0\377\2!!\37\377\300\300\267\377\206\354\354\341\377\3\353\353\340" \ + "\377\302\302\274\377\226\226\226\377\203\222\222\222\377\2\266\266\262" \ + "\377\350\350\335\377\203\354\354\341\377\4\225\225\224\377\254\254\251" \ + "\377\314\314\305\377\233\233\232\377\202\222\222\222\377\5\236\236\234" \ + "\377\336\336\325\377\343\343\331\377\256\256\252\377\223\223\222\377" \ + "\202\222\222\222\377\2\260\260\254\377\351\351\336\377\203\354\354\341" \ + "\377\4\245\245\242\377\230\230\227\377\324\324\313\377\240\240\236\377" \ + "\202\222\222\222\377\2\224\224\224\377\310\310\301\377\204\354\354\341" \ + "\377\3\352\352\340\377\300\300\272\377\226\226\226\377\203\222\222\222" \ + "\377\2\270\270\263\377\350\350\335\377\203\354\354\341\377\3\353\353" \ + "\340\377\303\303\275\377\225\225\225\377\202\222\222\222\377\4\227\227" \ + "\226\377\241\241\237\377\222\222\222\377\327\327\317\377\203\354\354" \ + "\341\377\2\345\345\333\377\256\256\253\377\203\222\222\222\377\3\237" \ + "\237\235\377\231\231\230\377\232\232\231\377\204\354\354\341\377\2\333" \ + "\333\322\377\244\244\242\377\203\222\222\222\377\2\237\237\235\377\327" \ + "\327\317\377\204\354\354\341\377\2\336\336\325\377\245\245\242\377\203" \ + "\222\222\222\377\3\246\246\243\377\222\222\222\377\254\254\251\377\314" \ + "\354\354\341\377\11\337\337\325\377\30\30\27\377\7\7\7\377vvp\377\253" \ + "\253\243\377\216\216\207\377\33\33\32\377\2\2\2\377\264\264\254\377\203" \ + "\354\354\341\377\202\0\0\0\377\7\11\11\10\377YYU\377\206\206\177\377" \ + "cc^\377\3\3\3\377\6\6\6\377\320\320\306\377\202\354\354\341\377\11\345" \ + "\345\332\377$$\"\377\17\17\17\377\202\202|\377\272\272\261\377\255\255" \ + "\245\377HHD\377\0\0\0\377\225\225\216\377\202\354\354\341\377\12\265" \ + "\265\254\377\0\0\0\377\4\4\4\377\21\21\20\377``[\377\210\210\201\377" \ + "SSO\377\0\0\0\377**(\377\352\352\337\377\205\354\354\341\377\10\262\262" \ + "\256\377\223\223\223\377\271\271\264\377\325\325\315\377\327\327\316" \ + "\377\273\273\266\377\222\222\222\377\264\264\260\377\203\354\354\341" \ + "\377\17\222\222\222\377\223\223\223\377\224\224\224\377\263\263\257\377" \ + "\305\305\276\377\265\265\261\377\222\222\222\377\234\234\232\377\230" \ + "\230\227\377\237\237\235\377\274\274\266\377\303\303\275\377\243\243" \ + "\241\377\222\222\222\377\306\306\277\377\203\354\354\341\377\1\245\245" \ + "\242\377\202\222\222\222\377\6\254\254\251\377\302\302\274\377\276\276" \ + "\270\377\231\231\230\377\222\222\222\377\321\321\311\377\203\354\354" \ + "\341\377\3\260\260\254\377\223\223\223\377\272\272\265\377\202\326\326" \ + "\316\377\3\271\271\265\377\222\222\222\377\267\267\263\377\203\354\354" \ + "\341\377\11\274\274\266\377\222\222\222\377\244\244\242\377\305\305\276" \ + "\377\313\313\304\377\275\275\267\377\234\234\233\377\222\222\222\377" \ + "\327\327\317\377\202\354\354\341\377\11\352\352\337\377\240\240\236\377" \ + "\222\222\222\377\262\262\256\377\312\312\303\377\311\311\302\377\263" \ + "\263\257\377\224\224\224\377\232\232\231\377\203\354\354\341\377\11\330" \ + "\330\317\377\224\224\223\377\242\242\240\377\315\315\306\377\332\332" \ + "\321\377\314\314\305\377\236\236\234\377\225\225\225\377\342\342\330" \ + "\377\202\354\354\341\377\11\342\342\330\377\226\226\226\377\224\224\224" \ + "\377\272\272\265\377\314\314\305\377\306\306\300\377\255\255\252\377" \ + "\222\222\222\377\254\254\251\377\314\354\354\341\377\3ppk\377\0\0\0\377" \ + "\234\234\225\377\203\354\354\341\377\4\322\322\310\377\7\7\7\37700-\377" \ + "\353\353\340\377\202\354\354\341\377\3\0\0\0\377$$\"\377\321\321\307" \ + "\377\203\354\354\341\377\3\217\217\210\377\0\0\0\377eea\377\202\354\354" \ + "\341\377\3{{u\377\0\0\0\377\233\233\224\377\203\354\354\341\377\3\344" \ + "\344\331\377\12\12\11\377\36\36\35\377\202\354\354\341\377\4\265\265" \ + "\254\377\0\0\0\377@@=\377\332\332\320\377\203\354\354\341\377\3@@=\377" \ + "\0\0\0\377\310\310\277\377\204\354\354\341\377\3\326\326\316\377\222" \ + "\222\222\377\267\267\263\377\204\354\354\341\377\3\250\250\246\377\222" \ + "\222\222\377\341\341\327\377\202\354\354\341\377\3\222\222\222\377\235" \ + "\235\233\377\336\336\324\377\203\354\354\341\377\4\261\261\255\377\222" \ + "\222\222\377\272\272\265\377\352\352\337\377\202\354\354\341\377\3\344" \ + "\344\332\377\222\222\222\377\252\252\247\377\203\354\354\341\377\3\245" \ + "\245\242\377\224\224\224\377\331\331\320\377\203\354\354\341\377\3\333" \ + "\333\322\377\222\222\222\377\246\246\243\377\202\354\354\341\377\3\324" \ + "\324\313\377\222\222\222\377\272\272\265\377\204\354\354\341\377\10\246" \ + "\246\243\377\223\223\222\377\343\343\331\377\354\354\341\377\336\336" \ + "\325\377\223\223\223\377\246\246\243\377\351\351\337\377\203\354\354" \ + "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\202\354\354" \ + "\341\377\3\303\303\275\377\222\222\222\377\301\301\273\377\204\354\354" \ + "\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341\377\4\353" \ + "\353\340\377\245\245\242\377\225\225\225\377\346\346\333\377\203\354" \ + "\354\341\377\3\321\321\311\377\222\222\222\377\272\272\265\377\202\354" \ + "\354\341\377\3\261\261\255\377\222\222\222\377\323\323\313\377\204\354" \ + "\354\341\377\2\223\223\223\377\254\254\251\377\314\354\354\341\377\3" \ + "&&%\377\23\23\22\377\352\352\337\377\204\354\354\341\377\3SSO\377\0\0" \ + "\0\377\322\322\310\377\202\354\354\341\377\2\0\0\0\377AA>\377\204\354" \ + "\354\341\377\3\346\346\333\377\7\7\7\377//-\377\202\354\354\341\377\3" \ + "))'\377\34\34\33\377\351\351\336\377\204\354\354\341\377\7LLI\377\0\0" \ + "\0\377\340\340\326\377\354\354\341\377\265\265\254\377\0\0\0\377yys\377" \ + "\204\354\354\341\377\3xxr\377\0\0\0\377\254\254\244\377\204\354\354\341" \ + "\377\3\267\267\263\377\222\222\222\377\337\337\325\377\204\354\354\341" \ + "\377\3\305\305\276\377\222\222\222\377\322\322\312\377\202\354\354\341" \ + "\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3\300\300" \ + "\273\377\222\222\222\377\322\322\312\377\204\354\354\341\377\2\234\234" \ + "\232\377\236\236\235\377\203\354\354\341\377\2\245\245\242\377\230\230" \ + "\227\377\205\354\354\341\377\7\244\244\242\377\222\222\222\377\352\352" \ + "\337\377\354\354\341\377\264\264\260\377\223\223\223\377\341\341\327" \ + "\377\204\354\354\341\377\7\302\302\274\377\222\222\222\377\325\325\314" \ + "\377\354\354\341\377\303\303\275\377\222\222\222\377\317\317\310\377" \ + "\204\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377" \ + "\202\354\354\341\377\3\245\245\243\377\226\226\225\377\350\350\336\377" \ + "\204\354\354\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341" \ + "\377\3\340\340\326\377\222\222\222\377\267\267\263\377\204\354\354\341" \ + "\377\7\351\351\336\377\225\225\225\377\252\252\247\377\354\354\341\377" \ + "\353\353\340\377\224\224\224\377\244\244\242\377\205\354\354\341\377" \ + "\2\223\223\223\377\254\254\251\377\313\354\354\341\377\3\353\353\340" \ + "\377\7\7\7\37711/\377\205\354\354\341\377\3ssn\377\0\0\0\377\260\260" \ + "\250\377\202\354\354\341\377\2\0\0\0\377AA>\377\205\354\354\341\377\5" \ + "\37\37\36\377\24\24\23\377\354\354\341\377\352\352\337\377\7\7\7\377" \ + "\210\0\0\0\377\5\306\306\274\377\354\354\341\377\265\265\254\377\0\0" \ + "\0\377yys\377\204\354\354\341\377\3\207\207\200\377\0\0\0\377\245\245" \ + "\235\377\204\354\354\341\377\1\252\252\247\377\210\222\222\222\377\1" \ + "\310\310\301\377\202\354\354\341\377\2\222\222\222\377\252\252\247\377" \ + "\204\354\354\341\377\3\304\304\276\377\222\222\222\377\322\322\312\377" \ + "\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354\354\341" \ + "\377\2\245\245\242\377\230\230\227\377\205\354\354\341\377\5\260\260" \ + "\254\377\222\222\222\377\341\341\327\377\354\354\341\377\247\247\244" \ + "\377\210\222\222\222\377\5\312\312\303\377\354\354\341\377\265\265\261" \ + "\377\222\222\222\377\340\340\326\377\204\354\354\341\377\3\302\302\274" \ + "\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\230\230\227" \ + "\377\243\243\241\377\205\354\354\341\377\2\245\245\242\377\232\232\231" \ + "\377\202\354\354\341\377\1\322\322\312\377\210\222\222\222\377\5\237" \ + "\237\235\377\354\354\341\377\340\340\327\377\222\222\222\377\265\265" \ + "\260\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\313\354" \ + "\354\341\377\3\347\347\334\377\1\1\1\377885\377\205\354\354\341\377\3" \ + "{{u\377\0\0\0\377\247\247\237\377\202\354\354\341\377\2\0\0\0\377AA>" \ + "\377\205\354\354\341\377\6\40\40\36\377\30\30\26\377\354\354\341\377" \ + "\344\344\331\377\0\0\0\377++)\377\207\241\241\232\377\5\337\337\325\377" \ + "\354\354\341\377\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377" \ + "\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\2\245" \ + "\245\242\377\223\223\223\377\207\317\317\310\377\1\340\340\327\377\202" \ + "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \ + "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \ + "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \ + "\377\230\230\227\377\205\354\354\341\377\6\262\262\256\377\222\222\222" \ + "\377\342\342\330\377\354\354\341\377\242\242\240\377\225\225\225\377" \ + "\207\317\317\310\377\5\341\341\327\377\354\354\341\377\257\257\254\377" \ + "\222\222\222\377\345\345\333\377\204\354\354\341\377\7\302\302\274\377" \ + "\222\222\222\377\327\327\317\377\354\354\341\377\353\353\340\377\223" \ + "\223\222\377\250\250\245\377\205\354\354\341\377\2\245\245\242\377\232" \ + "\232\231\377\202\354\354\341\377\3\315\315\306\377\222\222\222\377\266" \ + "\266\261\377\206\317\317\310\377\5\324\324\313\377\354\354\341\377\332" \ + "\332\321\377\222\222\222\377\272\272\265\377\205\354\354\341\377\2\223" \ + "\223\223\377\254\254\251\377\314\354\354\341\377\202\35\35\34\377\205" \ + "\354\354\341\377\3``[\377\0\0\0\377\307\307\276\377\202\354\354\341\377" \ + "\2\0\0\0\377AA>\377\204\354\354\341\377\3\350\350\335\377\6\6\6\377<" \ + "<9\377\202\354\354\341\377\2\34\34\33\377\35\35\34\377\211\354\354\341" \ + "\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210" \ + "\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\3\262\262\256" \ + "\377\222\222\222\377\341\341\330\377\211\354\354\341\377\2\222\222\222" \ + "\377\252\252\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222" \ + "\377\322\322\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233" \ + "\377\203\354\354\341\377\2\245\245\242\377\230\230\227\377\205\354\354" \ + "\341\377\2\247\247\245\377\226\226\226\377\202\354\354\341\377\3\260" \ + "\260\254\377\222\222\222\377\344\344\332\377\210\354\354\341\377\3\271" \ + "\271\264\377\222\222\222\377\334\334\323\377\204\354\354\341\377\3\302" \ + "\302\274\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\233" \ + "\233\232\377\237\237\235\377\205\354\354\341\377\2\245\245\242\377\232" \ + "\232\231\377\202\354\354\341\377\3\332\332\321\377\222\222\222\377\271" \ + "\271\264\377\210\354\354\341\377\3\344\344\332\377\222\222\222\377\261" \ + "\261\255\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\314" \ + "\354\354\341\377\3RRN\377\0\0\0\377\272\272\262\377\203\354\354\341\377" \ + "\1\343\343\331\377\202\25\25\24\377\1\347\347\334\377\202\354\354\341" \ + "\377\2\0\0\0\377AA>\377\204\354\354\341\377\3\222\222\213\377\0\0\0\377" \ + "zzt\377\202\354\354\341\377\3RRN\377\0\0\0\377\240\240\230\377\205\354" \ + "\354\341\377\1\332\332\320\377\202\354\354\341\377\3\265\265\254\377" \ + "\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0\0\0\377\245" \ + "\245\235\377\204\354\354\341\377\3\307\307\300\377\222\222\222\377\271" \ + "\271\264\377\205\354\354\341\377\2\351\351\336\377\350\350\335\377\202" \ + "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \ + "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \ + "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \ + "\377\230\230\227\377\204\354\354\341\377\3\337\337\325\377\223\223\223" \ + "\377\254\254\250\377\202\354\354\341\377\3\304\304\276\377\222\222\222" \ + "\377\274\274\266\377\205\354\354\341\377\202\350\350\336\377\4\354\354" \ + "\341\377\310\310\302\377\222\222\222\377\277\277\272\377\204\354\354" \ + "\341\377\3\274\274\267\377\222\222\222\377\327\327\317\377\202\354\354" \ + "\341\377\3\253\253\247\377\222\222\222\377\335\335\323\377\203\354\354" \ + "\341\377\3\352\352\337\377\241\241\237\377\232\232\231\377\202\354\354" \ + "\341\377\4\350\350\336\377\230\230\227\377\231\231\230\377\343\343\331" \ + "\377\205\354\354\341\377\6\345\345\333\377\354\354\341\377\353\353\340" \ + "\377\231\231\230\377\230\230\227\377\350\350\336\377\203\354\354\341" \ + "\377\3\346\346\334\377\223\223\222\377\254\254\251\377\314\354\354\341" \ + "\377\11\312\312\301\377\5\5\5\377\"\"\40\377\271\271\260\377\351\351" \ + "\336\377\321\321\307\377GGC\377\0\0\0\377\216\216\207\377\203\354\354" \ + "\341\377\11\0\0\0\377\31\31\30\377\221\221\212\377\306\306\274\377\305" \ + "\305\273\377\203\203}\377\10\10\7\377\35\35\34\377\344\344\331\377\202" \ + "\354\354\341\377\1\321\321\307\377\202\13\13\12\377\6\206\206\177\377" \ + "\320\320\306\377\336\336\323\377\257\257\247\377nni\377\26\26\25\377" \ + "\202\354\354\341\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341" \ + "\377\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377" \ + "\12\352\352\337\377\242\242\240\377\222\222\222\377\270\270\263\377\336" \ + "\336\324\377\350\350\335\377\331\331\320\377\304\304\275\377\234\234" \ + "\232\377\332\332\321\377\202\354\354\341\377\2\222\222\222\377\252\252" \ + "\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222\377\322\322" \ + "\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354" \ + "\354\341\377\11\245\245\242\377\224\224\224\377\310\310\301\377\341\341" \ + "\327\377\347\347\335\377\325\325\315\377\240\240\237\377\222\222\222" \ + "\377\333\333\322\377\202\354\354\341\377\22\352\352\337\377\240\240\237" \ + "\377\222\222\222\377\271\271\265\377\336\336\325\377\350\350\335\377" \ + "\331\331\320\377\303\303\275\377\233\233\232\377\335\335\324\377\354" \ + "\354\341\377\350\350\336\377\231\231\230\377\224\224\224\377\306\306" \ + "\300\377\336\336\324\377\321\321\312\377\260\260\254\377\202\222\222" \ + "\222\377\1\327\327\317\377\202\354\354\341\377\11\323\323\313\377\222" \ + "\222\222\377\237\237\236\377\322\322\313\377\335\335\324\377\312\312" \ + "\303\377\240\240\237\377\222\222\222\377\232\232\231\377\203\354\354" \ + "\341\377\11\311\311\302\377\222\222\222\377\240\240\236\377\322\322\312" \ + "\377\345\345\333\377\342\342\330\377\317\317\307\377\256\256\253\377" \ + "\262\262\256\377\202\354\354\341\377\11\301\301\273\377\222\222\222\377" \ + "\252\252\247\377\327\327\317\377\333\333\322\377\304\304\276\377\232" \ + "\232\231\377\222\222\222\377\254\254\251\377\315\354\354\341\377\10\244" \ + "\244\235\377\20\20\17\377\0\0\0\377\3\3\3\377\0\0\0\377\2\2\2\377uup" \ + "\377\352\352\337\377\203\354\354\341\377\3\0\0\0\377\14\14\13\377\4\4" \ + "\4\377\203\0\0\0\377\2))'\377\307\307\276\377\204\354\354\341\377\2\267" \ + "\267\256\377++)\377\205\0\0\0\377\1""996\377\202\354\354\341\377\3\265" \ + "\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0" \ + "\0\0\377\245\245\235\377\205\354\354\341\377\2\341\341\330\377\256\256" \ + "\252\377\205\222\222\222\377\2\235\235\234\377\340\340\327\377\202\354" \ + "\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3" \ + "\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \ + "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\3\245\245\242" \ + "\377\223\223\223\377\225\225\225\377\203\222\222\222\377\2\225\225\225" \ + "\377\314\314\305\377\204\354\354\341\377\2\340\340\327\377\254\254\251" \ + "\377\205\222\222\222\377\2\236\236\234\377\342\342\330\377\202\354\354" \ + "\341\377\2\324\324\314\377\227\227\226\377\203\222\222\222\377\4\241" \ + "\241\237\377\261\261\255\377\222\222\222\377\327\327\317\377\203\354" \ + "\354\341\377\1\274\274\267\377\204\222\222\222\377\3\261\261\255\377" \ + "\240\240\236\377\232\232\231\377\204\354\354\341\377\2\306\306\300\377" \ + "\230\230\227\377\204\222\222\222\377\2\224\224\224\377\301\301\273\377" \ + "\202\354\354\341\377\2\350\350\336\377\256\256\252\377\203\222\222\222" \ + "\377\4\223\223\223\377\275\275\270\377\223\223\222\377\254\254\251\377" \ + "\316\354\354\341\377\5\326\326\314\377\236\236\226\377zzt\377\222\222" \ + "\213\377\306\306\275\377\205\354\354\341\377\7\0\0\0\377AA>\377\327\327" \ + "\315\377\236\236\226\377\216\216\207\377\265\265\254\377\346\346\333" \ + "\377\206\354\354\341\377\6\351\351\336\377\267\267\256\377\223\223\214" \ + "\377\177\177y\377\233\233\224\377\312\312\301\377\203\354\354\341\377" \ + "\3\337\337\324\377\260\260\250\377\317\317\305\377\204\354\354\341\377" \ + "\3\323\323\312\377\260\260\250\377\332\332\320\377\207\354\354\341\377" \ + "\5\334\334\323\377\315\315\306\377\302\302\274\377\312\312\303\377\331" \ + "\331\320\377\204\354\354\341\377\2\325\325\315\377\333\333\322\377\204" \ + "\354\354\341\377\3\342\342\330\377\325\325\315\377\345\345\333\377\204" \ + "\354\354\341\377\2\331\331\320\377\330\330\317\377\203\354\354\341\377" \ + "\7\332\332\321\377\331\331\320\377\346\346\334\377\314\314\305\377\300" \ + "\300\272\377\312\312\303\377\341\341\327\377\207\354\354\341\377\5\334" \ + "\334\323\377\314\314\305\377\302\302\274\377\312\312\303\377\332\332" \ + "\321\377\205\354\354\341\377\10\342\342\330\377\312\312\303\377\302\302" \ + "\274\377\322\322\313\377\351\351\337\377\341\341\330\377\325\325\315" \ + "\377\347\347\334\377\204\354\354\341\377\7\330\330\320\377\304\304\275" \ + "\377\306\306\300\377\332\332\321\377\354\354\341\377\332\332\321\377" \ + "\327\327\317\377\205\354\354\341\377\6\346\346\333\377\323\323\313\377" \ + "\305\305\277\377\305\305\276\377\321\321\311\377\346\346\334\377\204" \ + "\354\354\341\377\10\353\353\340\377\323\323\313\377\301\301\273\377\312" \ + "\312\303\377\340\340\326\377\354\354\341\377\326\326\315\377\334\334" \ + "\323\377\330\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333" \ + "\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333\354\354\341" \ + "\377\2\0\0\0\377AA>\377\377\354\354\341\377\240\354\354\341\377") diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init index 3a5cb653aa..a966638074 100644 --- a/packages/psplash/files/psplash-init +++ b/packages/psplash/files/psplash-init @@ -1,6 +1,16 @@ #!/bin/sh +for x in $(cat /proc/cmdline); do + case $x in + psplash=false) + echo "Boot splashscreen disabled" + exit 0; + ;; + esac +done + export TMPDIR=/mnt/.psplash mount tmpfs -t tmpfs $TMPDIR -o,size=40k /usr/bin/psplash & + diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index e2bdbce4b7..eebe2179da 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r2" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND diff --git a/packages/pth/pth_2.0.0.bb b/packages/pth/pth_2.0.0.bb index a0c3056157..8c7f5772a4 100644 --- a/packages/pth/pth_2.0.0.bb +++ b/packages/pth/pth_2.0.0.bb @@ -6,7 +6,7 @@ PR = "r1" SRC_URI = "ftp://ftp.ossp.org/pkg/lib/pth/pth-${PV}.tar.gz" -inherit autotools +inherit autotools do_configure() { gnu-configize diff --git a/packages/pth/pth_2.0.2.bb b/packages/pth/pth_2.0.2.bb index 282db55b26..78c06bfd93 100644 --- a/packages/pth/pth_2.0.2.bb +++ b/packages/pth/pth_2.0.2.bb @@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz" PARALLEL_MAKE="" -inherit autotools +inherit autotools do_configure() { gnu-configize diff --git a/packages/puzzles/puzzles_r6915.bb b/packages/puzzles/puzzles_r6915.bb index 2c1d17dca8..4349a4154b 100644 --- a/packages/puzzles/puzzles_r6915.bb +++ b/packages/puzzles/puzzles_r6915.bb @@ -19,14 +19,14 @@ do_install () { install -d ${D}/${prefix}/ install -d ${D}/${prefix}/games/ oe_runmake install - + install -d ${D}/${datadir}/ install -d ${D}/${datadir}/applications/ install -d ${D}/${datadir}/pixmaps/ install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ - cd ${D}/${prefix}/games + cd ${D}/${prefix}/games for prog in *; do if [ -x $prog ]; then echo "making ${D}/${datadir}/applications/$prog.desktop" diff --git a/packages/pvrusb2-mci/pvrusb2-mci.inc b/packages/pvrusb2-mci/pvrusb2-mci.inc new file mode 100644 index 0000000000..2e1fdac02d --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci.inc @@ -0,0 +1,6 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +AUTHOR = "Mike Isely" +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +SECTION = "kernel/modules" +PRIORITY = "optional" +LICENSE = "GPL" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb index c556e638c2..93fa743e53 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb @@ -1,13 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" -PR = "r0" +require pvrusb2-mci.inc + # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-20050911/driver" @@ -19,9 +16,9 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb index 009bf45be2..a62c6f3d42 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" -PR = "r0" +require pvrusb2-mci.inc + RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400" # It in fact also requires kernel-module-saa7115", but for now is using the local ones. @@ -21,7 +18,7 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb index 9ea0c51450..bd8070708e 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -1,13 +1,11 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-20051016/driver" @@ -19,9 +17,9 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb index 33d015aafc..25a08d9bff 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -1,15 +1,13 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2" #SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \ -# file://Makefile.patch;patch=1" +# file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-20051113" @@ -21,18 +19,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_compile() { +do_compile() { cd ivtv; oe_runmake - cd ../driver; oe_runmake + cd ../driver; oe_runmake } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb index 3712f3239b..9f91a111ad 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" RRECOMMEND = "kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060101.tar.bz2" S = "${WORKDIR}/pvrusb2-mci-20060101" @@ -19,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_compile() { +do_compile() { cd ivtv; oe_runmake - cd ../driver; oe_runmake + cd ../driver; oe_runmake } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb index d547c979d4..d8c17cbde6 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" RRECOMMEND = "kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060103.tar.bz2" S = "${WORKDIR}/pvrusb2-mci-20060103" @@ -19,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_compile() { +do_compile() { cd ivtv; oe_runmake - cd ../driver; oe_runmake + cd ../driver; oe_runmake } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb index e5a19514a9..fa8a68432d 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" RRECOMMEND = "kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060121.tar.bz2" S = "${WORKDIR}/pvrusb2-mci-20060121" @@ -19,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_compile() { +do_compile() { cd ivtv; oe_runmake - cd ../driver; oe_runmake + cd ../driver; oe_runmake } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb index c95f942189..e80430f7d0 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r2" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -19,12 +17,12 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb index 583c7825fe..ac5b82be94 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -19,12 +17,12 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb index 4c4ab65d99..8f1cc4465b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb @@ -1,12 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -22,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb index 640297662f..8f1cc4465b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb @@ -1,13 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -23,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb index 640297662f..8f1cc4465b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb @@ -1,13 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -23,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb index 640297662f..8f1cc4465b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb @@ -1,13 +1,10 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - + SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -23,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb index 0ff030a8e4..b2ad76d007 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ @@ -13,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \ 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" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -33,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb index 0ff030a8e4..b2ad76d007 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ @@ -13,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \ 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" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -33,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb index 0ff030a8e4..b2ad76d007 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ @@ -13,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \ 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" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -33,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb index c6e8c6d1c5..adf2fe6c5e 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb @@ -1,9 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -AUTHOR = "Mike Isely" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -SECTION = "kernel/modules" -PRIORITY = "optional" -LICENSE = "GPL" +require pvrusb2-mci.inc + RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ kernel-module-tuner \ @@ -13,7 +9,6 @@ RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-v4l1-compat \ kernel-module-v4l2-common \ kernel-module-videodev" -PR = "r0" SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ file://hotplug.functions \ @@ -39,7 +34,7 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb index f70640c27f..626a8ef47a 100644 --- a/packages/pwc/pwc_10.0.12-rc1.bb +++ b/packages/pwc/pwc_10.0.12-rc1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" PR = "r0" SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" + file://Makefile.patch;patch=1" S = "${WORKDIR}/pwc-${PV}" @@ -21,12 +21,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" + 'KDIR=${STAGING_KERNEL_DIR}'" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" -do_install() { +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 } diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb index 9777a14955..26213ee84a 100644 --- a/packages/pwc/pwc_10.0.6a.bb +++ b/packages/pwc/pwc_10.0.6a.bb @@ -20,10 +20,10 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +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 } diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb index f5a876afc2..b3adc80ee5 100644 --- a/packages/pwc/pwc_10.0.7a.bb +++ b/packages/pwc/pwc_10.0.7a.bb @@ -19,10 +19,10 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +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 } diff --git a/packages/pwc/pwc_10.0.9-rc1.bb b/packages/pwc/pwc_10.0.9-rc1.bb index 7632ba5ebd..6067c0b1aa 100644 --- a/packages/pwc/pwc_10.0.9-rc1.bb +++ b/packages/pwc/pwc_10.0.9-rc1.bb @@ -19,10 +19,10 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +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 } diff --git a/packages/pwlib/pwlib_1.6.6.4.bb b/packages/pwlib/pwlib_1.6.6.4.bb index efb88b35ee..c41400c001 100644 --- a/packages/pwlib/pwlib_1.6.6.4.bb +++ b/packages/pwlib/pwlib_1.6.6.4.bb @@ -100,9 +100,9 @@ do_stage() { done install -d ${STAGING_LIBDIR} - + oe_libinstall -C lib libpt_linux_x86_r ${STAGING_LIBDIR} - + ln -sf ${STAGING_LIBDIR}/libpt_linux_x86_r.so ${STAGING_LIBDIR}/libpt.so install -d ${STAGING_DATADIR}/pwlib/make diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.4-manifest.inc index c116628678..35017aefe7 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.4-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Nov 6 00:30:11 2006 +### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Dec 25 00:05:05 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -18,7 +18,7 @@ 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="ml1" +PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " @@ -38,7 +38,7 @@ RDEPENDS_python-codecs="python-core" FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml1" +PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " @@ -48,7 +48,7 @@ RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml1" +PR_python-core="ml0" RDEPENDS_python-core="" FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python " @@ -133,7 +133,7 @@ RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml1" +PR_python-netclient="ml0" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" 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.* " @@ -148,7 +148,7 @@ RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml1" +PR_python-curses="ml0" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so " @@ -238,7 +238,7 @@ 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="ml1" +PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " @@ -258,7 +258,7 @@ RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml1" +PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " diff --git a/packages/tslib/tslib/h1940/.mtn2git_empty b/packages/python/python-2.4.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h1940/.mtn2git_empty +++ b/packages/python/python-2.4.4/.mtn2git_empty diff --git a/packages/python/python-2.4.3/autohell.patch b/packages/python/python-2.4.4/autohell.patch index b0eebb9ce8..b0eebb9ce8 100644 --- a/packages/python/python-2.4.3/autohell.patch +++ b/packages/python/python-2.4.4/autohell.patch diff --git a/packages/python/python-2.4.3/bindir-libdir.patch b/packages/python/python-2.4.4/bindir-libdir.patch index 27ae5dce5b..27ae5dce5b 100644 --- a/packages/python/python-2.4.3/bindir-libdir.patch +++ b/packages/python/python-2.4.4/bindir-libdir.patch diff --git a/packages/python/python-2.4.3/crosscompile.patch b/packages/python/python-2.4.4/crosscompile.patch index f917bb2567..f917bb2567 100644 --- a/packages/python/python-2.4.3/crosscompile.patch +++ b/packages/python/python-2.4.4/crosscompile.patch diff --git a/packages/python/python-2.4.3/fix-tkinter-detection.patch b/packages/python/python-2.4.4/fix-tkinter-detection.patch index 602aa8e021..602aa8e021 100644 --- a/packages/python/python-2.4.3/fix-tkinter-detection.patch +++ b/packages/python/python-2.4.4/fix-tkinter-detection.patch diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.4/sitebranding.patch index 85bb83a506..85bb83a506 100644 --- a/packages/python/python-2.4.3/sitebranding.patch +++ b/packages/python/python-2.4.4/sitebranding.patch diff --git a/packages/python/python-imaging_1.1.5.bb b/packages/python/python-imaging_1.1.5.bb index 6814287768..11b0705593 100644 --- a/packages/python/python-imaging_1.1.5.bb +++ b/packages/python/python-imaging_1.1.5.bb @@ -26,7 +26,7 @@ do_install() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} - + distutils_do_install install -d ${D}${datadir}/doc/${PN}/html/ diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index 6c603df852..d78bba7e8a 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -18,7 +18,7 @@ inherit palmtop sip distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" SIP_MODULES = "qwt" -SIP_FEATURES = "${WORKDIR}/features" +SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " EXTRA_QMAKEVARS_POST += "TARGET=qwt \ @@ -34,7 +34,7 @@ EXTRA_QMAKEVARS_POST += "TARGET=qwt \ do_generate_prepend() { echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro - + echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip echo "TEMPLATE=lib" >>sip/qwtmod.sip echo 'SOURCES = $B' >>sip/qwtmod.sip diff --git a/packages/python/python-pyzeroconf_0.12.bb b/packages/python/python-pyzeroconf_0.12.bb index d2efbbddf2..a5e439feb6 100644 --- a/packages/python/python-pyzeroconf_0.12.bb +++ b/packages/python/python-pyzeroconf_0.12.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/pyzeroconf-${PV}" inherit distutils-base do_install() { - + install -d ${D}${libdir} install -d ${D}${libdir}/${PYTHON_DIR} install -d ${D}${libdir}/${PYTHON_DIR}/site-packages diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb index 33609dfe08..10ee54deb1 100644 --- a/packages/python/python-quicklauncher_0.0.1.bb +++ b/packages/python/python-quicklauncher_0.0.1.bb @@ -22,5 +22,5 @@ do_install() { install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/ install -m 0755 testapp.py ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/ } - + diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.4.bb index dfa828bcd9..1a565875c8 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.4.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml8" +PR = "ml0" PYTHON_MAJMIN = "2.4" diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb index 3353af97f7..18c3e64d73 100644 --- a/packages/qc-usb/qc-usb-messenger_0.8.bb +++ b/packages/qc-usb/qc-usb-messenger_0.8.bb @@ -18,10 +18,10 @@ do_compile () { 'CC="${KERNEL_CC}"' \ 'LD="${KERNEL_LD}"' \ 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ - all + all } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc } diff --git a/packages/qc-usb/qc-usb-messenger_1.1.bb b/packages/qc-usb/qc-usb-messenger_1.1.bb index 311f572f0f..19f0e766ff 100644 --- a/packages/qc-usb/qc-usb-messenger_1.1.bb +++ b/packages/qc-usb/qc-usb-messenger_1.1.bb @@ -17,10 +17,10 @@ do_compile () { 'CC="${KERNEL_CC}"' \ 'LD="${KERNEL_LD}"' \ 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ - all + all } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc } diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb index c04da5335a..0061c830c9 100644 --- a/packages/qclockchange/qclockchange_0.1a.bb +++ b/packages/qclockchange/qclockchange_0.1a.bb @@ -18,5 +18,5 @@ do_install() { install -m 0755 qclockchange ${D}${palmtopdir}/bin/qclockchange install -m 0644 ipkg/opt/QtPalmtop/pics/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png - install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop + install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop } diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc index d0d6604ec5..4adc4cb4c0 100644 --- a/packages/qemu/qemu-native.inc +++ b/packages/qemu/qemu-native.inc @@ -2,10 +2,6 @@ FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" # prefix = "${STAGING_DIR}/${BUILD_SYS}" DEPENDS = "libsdl-native" -do_configure_prepend() { - sed -i -e s,sdl-config,sdl-config-native, configure -} - python __anonymous() { from bb import which, data diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 5b30fa07bc..2dcabe3261 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -19,12 +19,12 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { - # Install the OE build templates + # Install the OE build templates for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template + do + install -d ${S}/mkspecs/$template install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h done QMAKESPEC= diff --git a/packages/qmatrix/qmatrix_1.1.0.bb b/packages/qmatrix/qmatrix_1.1.0.bb index a47d00fa56..057701e9b5 100644 --- a/packages/qmatrix/qmatrix_1.1.0.bb +++ b/packages/qmatrix/qmatrix_1.1.0.bb @@ -14,7 +14,7 @@ MACHTYPE_c7x0 = "sl700" MACHTYPE_tosa = "sl700" do_configure_append() { - ln -v -f -s config/config-${MACHTYPE}.h config.h + ln -v -f -s config/config-${MACHTYPE}.h config.h ln -v -f -s config/config.mk-${MACHTYPE} config.mk if [ "${MACHTYPE}" = "sl300" ] then diff --git a/packages/qof/files/libsql-no-host-includes.patch b/packages/qof/files/libsql-no-host-includes.patch new file mode 100644 index 0000000000..345aa2d4ba --- /dev/null +++ b/packages/qof/files/libsql-no-host-includes.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2006-12-30 13:42:56.000000000 +0100 ++++ qof-0.6.0/lib/libsql/Makefile.am 2006-12-30 13:46:03.952227000 +0100 +@@ -30,9 +30,6 @@ + @CFLAGS@ \ + @GLIB_CFLAGS@ + +-INCLUDES = \ +- -I$(includedir) +- + parser.c: parser.y + $(YACC) -v -d -o parser.c -p sql parser.y + diff --git a/packages/qof/qof_0.6.0.bb b/packages/qof/qof_0.6.0.bb index e43a7e4adf..9c35993cb7 100644 --- a/packages/qof/qof_0.6.0.bb +++ b/packages/qof/qof_0.6.0.bb @@ -1,20 +1,20 @@ -LICENSE = "GPL" HOMEPAGE = "http://qof.sourceforge.net/" +LICENSE = "GPL" DEPENDS = "glib-2.0 libxml2 libtool zlib" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://fix-includes.patch;patch=1" - - -FILES_${PN} += "/usr/share/xml" -PARALLEL_MAKE="" + file://libsql-no-host-includes.patch;patch=1 \ + file://fix-includes.patch;patch=1 \ + " inherit autotools pkgconfig +PARALLEL_MAKE = "" do_stage() { -autotools_stage_all + autotools_stage_all } +FILES_${PN} += "/usr/share/xml" diff --git a/packages/qof/qof_0.7.2.bb b/packages/qof/qof_0.7.2.bb new file mode 100644 index 0000000000..985e8d6cfd --- /dev/null +++ b/packages/qof/qof_0.7.2.bb @@ -0,0 +1,19 @@ +HOMEPAGE = "http://qof.sourceforge.net/" +LICENSE = "GPL" + +DEPENDS = "glib-2.0 libxml2 libtool zlib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + " +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-error-on-warning" + +PARALLEL_MAKE = "" + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "/usr/share/xml" + diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb index ab756470cc..4483b8cce7 100644 --- a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb +++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb @@ -33,7 +33,7 @@ do_stage() { for header in account.h accountopt.h away.h blist.h buddyicon.h cmds.h config.h connection.h conversation.h core.h debug.h eventloop.h ft.h gaim.h imgstore.h log.h md5.h network.h notify.h plugin.h pluginpref.h pounce.h prefix.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h server.h sha.h signals.h sound.h sslconn.h status.h stringref.h util.h value.h version.h xmlnode.h do if [ -e ${S}/src/$header ]; then - install -m 0644 ${S}/src/$header $GAIM_DIR + install -m 0644 ${S}/src/$header $GAIM_DIR fi if [ -e ${S}/$header ]; then install -m 0644 ${S}/$header $GAIM_DIR diff --git a/packages/qpe-games/aliens-qt_1.0.0.bb b/packages/qpe-games/aliens-qt_1.0.0.bb index 9ee17f935b..77099bfe15 100644 --- a/packages/qpe-games/aliens-qt_1.0.0.bb +++ b/packages/qpe-games/aliens-qt_1.0.0.bb @@ -24,7 +24,7 @@ do_compile_prepend () { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/atomic_1.0.1.bb b/packages/qpe-games/atomic_1.0.1.bb index 4b6910544b..33e8aa2dff 100644 --- a/packages/qpe-games/atomic_1.0.1.bb +++ b/packages/qpe-games/atomic_1.0.1.bb @@ -29,7 +29,7 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/checkers_1.0.5ern.bb b/packages/qpe-games/checkers_1.0.5ern.bb index d27b5f9832..c01b10b206 100644 --- a/packages/qpe-games/checkers_1.0.5ern.bb +++ b/packages/qpe-games/checkers_1.0.5ern.bb @@ -19,7 +19,7 @@ APPDESKTOP = "${S}" do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } diff --git a/packages/qpe-games/crossword_0.0.3.bb b/packages/qpe-games/crossword_0.0.3.bb index 74adbf68b7..b46c0d92f2 100644 --- a/packages/qpe-games/crossword_0.0.3.bb +++ b/packages/qpe-games/crossword_0.0.3.bb @@ -18,7 +18,7 @@ APPDESKTOP = "${S}" do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } pkg_postinst() { diff --git a/packages/qpe-games/fish_1.1.0.bb b/packages/qpe-games/fish_1.1.0.bb index 74990e824a..e2d4083510 100644 --- a/packages/qpe-games/fish_1.1.0.bb +++ b/packages/qpe-games/fish_1.1.0.bb @@ -26,7 +26,7 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/glider_1.0.0.bb b/packages/qpe-games/glider_1.0.0.bb index e2cbe15c65..681d5abb43 100644 --- a/packages/qpe-games/glider_1.0.0.bb +++ b/packages/qpe-games/glider_1.0.0.bb @@ -24,7 +24,7 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/icebloxx_1.0.0.bb b/packages/qpe-games/icebloxx_1.0.0.bb index 8c88eb0f74..64706ab56f 100644 --- a/packages/qpe-games/icebloxx_1.0.0.bb +++ b/packages/qpe-games/icebloxx_1.0.0.bb @@ -24,7 +24,7 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/mahjongg_1.0.0.bb b/packages/qpe-games/mahjongg_1.0.0.bb index 50dd78ba76..869721dfa5 100644 --- a/packages/qpe-games/mahjongg_1.0.0.bb +++ b/packages/qpe-games/mahjongg_1.0.0.bb @@ -29,7 +29,7 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/maki_1.0.4ern.bb b/packages/qpe-games/maki_1.0.4ern.bb index 3d72ea9742..da14c23548 100644 --- a/packages/qpe-games/maki_1.0.4ern.bb +++ b/packages/qpe-games/maki_1.0.4ern.bb @@ -20,7 +20,7 @@ APPDESKTOP = "${S}" do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/nmm_0.0.2.bb b/packages/qpe-games/nmm_0.0.2.bb index 7a37244d24..72f89a97eb 100644 --- a/packages/qpe-games/nmm_0.0.2.bb +++ b/packages/qpe-games/nmm_0.0.2.bb @@ -18,13 +18,13 @@ APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/pairs_1.1.1.bb b/packages/qpe-games/pairs_1.1.1.bb index 28ccf9bebf..22a248b346 100644 --- a/packages/qpe-games/pairs_1.1.1.bb +++ b/packages/qpe-games/pairs_1.1.1.bb @@ -16,14 +16,14 @@ APPTYPE = "binary" APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } diff --git a/packages/qpe-games/pdamaze_1.0.0.bb b/packages/qpe-games/pdamaze_1.0.0.bb index ffc847413c..8e4443946d 100644 --- a/packages/qpe-games/pdamaze_1.0.0.bb +++ b/packages/qpe-games/pdamaze_1.0.0.bb @@ -17,13 +17,13 @@ APPTYPE = "binary" APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/pipeman_1.0.0.bb b/packages/qpe-games/pipeman_1.0.0.bb index b0d661eae6..61fa122f67 100644 --- a/packages/qpe-games/pipeman_1.0.0.bb +++ b/packages/qpe-games/pipeman_1.0.0.bb @@ -18,13 +18,13 @@ APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/shisensho_1.0.0.bb b/packages/qpe-games/shisensho_1.0.0.bb index 70cd759942..a72d3d8444 100644 --- a/packages/qpe-games/shisensho_1.0.0.bb +++ b/packages/qpe-games/shisensho_1.0.0.bb @@ -17,13 +17,13 @@ APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/sokoban_1.3.8ern.bb b/packages/qpe-games/sokoban_1.3.8ern.bb index a8fe6c6226..b284ca23f4 100644 --- a/packages/qpe-games/sokoban_1.3.8ern.bb +++ b/packages/qpe-games/sokoban_1.3.8ern.bb @@ -17,14 +17,14 @@ APPTYPE = "binary" APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images oe_runmake -C levels } do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } inherit opie diff --git a/packages/qpe-games/tron_1.0.0.bb b/packages/qpe-games/tron_1.0.0.bb index 2438fa8d45..3f0ac867ad 100644 --- a/packages/qpe-games/tron_1.0.0.bb +++ b/packages/qpe-games/tron_1.0.0.bb @@ -20,7 +20,7 @@ APPDESKTOP = "${S}" do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - + } diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb index d7573691f6..3541ac9610 100644 --- a/packages/qpe-games/win4_1.0.1.bb +++ b/packages/qpe-games/win4_1.0.1.bb @@ -18,7 +18,7 @@ APPDESKTOP = "${S}" do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb index 5bf5f47eb6..3a2b3c5e46 100644 --- a/packages/qpe-games/zrev7_1.0.1.bb +++ b/packages/qpe-games/zrev7_1.0.1.bb @@ -17,7 +17,7 @@ APPDESKTOP = "${S}" inherit opie do_compile_prepend() { - oe_runmake -C images + oe_runmake -C images } do_install () { diff --git a/packages/qpenmapfe/qpenmapfe_1.0.0.bb b/packages/qpenmapfe/qpenmapfe_1.0.0.bb index a99ec2559a..f3bcc9948b 100644 --- a/packages/qpenmapfe/qpenmapfe_1.0.0.bb +++ b/packages/qpenmapfe/qpenmapfe_1.0.0.bb @@ -18,5 +18,5 @@ inherit opie do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics/ - + } diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb index 5198829604..1d73f880c8 100644 --- a/packages/qpf-fonts/qpf-arabic_1.0.bb +++ b/packages/qpf-fonts/qpf-arabic_1.0.bb @@ -8,11 +8,11 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/arabeyes/arabic-fonts-${PV}.tar.gz" S = "${WORKDIR}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb index aebe58337f..d10fda6117 100644 --- a/packages/qpf-fonts/qpf-freemono_1.0.bb +++ b/packages/qpf-fonts/qpf-freemono_1.0.bb @@ -9,11 +9,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz S = "${WORKDIR}/${PN}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb index 3044981176..116c48d5d1 100644 --- a/packages/qpf-fonts/qpf-freeserif_1.0.bb +++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb @@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz S = "${WORKDIR}/${PN}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb index bd44bb60a0..9607030393 100644 --- a/packages/qpf-fonts/qpf-helvetica_1.0.bb +++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb @@ -8,11 +8,11 @@ PR = "r1" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2" S = "${WORKDIR}/helvetica" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for font in *.qpf; do +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for font in *.qpf; do install -m 644 $font ${D}${palmqtdir}/lib/fonts/ - done -} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb index aa0804cadd..f4c50faf71 100644 --- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb @@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar S = "${WORKDIR}/${PN}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb index 861690ee0f..8c1d8d02bc 100644 --- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb @@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar S = "${WORKDIR}/${PN}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb index f5101f5b47..6eefff1c20 100644 --- a/packages/qpf-fonts/qpf-unifont_1.0.bb +++ b/packages/qpf-fonts/qpf-unifont_1.0.bb @@ -8,11 +8,11 @@ PR = "r1" SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2" S = "${WORKDIR}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb index 8b9dd5dbd6..9c5600cb9d 100644 --- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb +++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb @@ -4,20 +4,21 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/" RPROVIDES = "virtual/japanese-font" +PR = "r1" SRC_URI = "http://prdownloads.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz" S = "${WORKDIR}" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ cd unismall* - for i in *_100_*.qpf; do + for i in *_100_*.qpf; do ln -sf $i $(echo $i | sed 's/_100_/_160_/') done - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} done -} +} inherit qpf diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb index d1fff823fe..87cb4d758b 100644 --- a/packages/qpf-fonts/qpf-utopia_1.0.bb +++ b/packages/qpf-fonts/qpf-utopia_1.0.bb @@ -9,11 +9,11 @@ PR = "r1" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2" S = "${WORKDIR}/utopia" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} inherit qpf diff --git a/packages/qpphoto/qpphoto_1.0.2.bb b/packages/qpphoto/qpphoto_1.0.2.bb index 9cd1314bb0..9ef9b4ef3a 100644 --- a/packages/qpphoto/qpphoto_1.0.2.bb +++ b/packages/qpphoto/qpphoto_1.0.2.bb @@ -30,7 +30,7 @@ do_install() { # install -d ${D}${bindir} install -m 0644 qpPhoto.png ${D}${palmtopdir}/pics -# install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications +# install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications # install -m 0755 qpPhoto ${D}${bindir} } diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb index dfefd444b7..25c64379d9 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -60,7 +60,7 @@ do_configure() { unset QMAKESPEC ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++ - #export QMAKESPEC="linux-oe-g++" + #export QMAKESPEC="linux-oe-g++" #rm -rf ./mkspecs #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ diff --git a/packages/quagga/quagga_0.99.3.bb b/packages/quagga/quagga_0.99.6.bb index 5b3f76a762..6bcc251730 100644 --- a/packages/quagga/quagga_0.99.3.bb +++ b/packages/quagga/quagga_0.99.6.bb @@ -1,3 +1,3 @@ -PR = "r4" +PR = "r0" require quagga.inc diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb index c28052df0c..86210e4621 100644 --- a/packages/quake/quake1_0.0.1.bb +++ b/packages/quake/quake1_0.0.1.bb @@ -14,7 +14,7 @@ SRC_URI = "http://mirror1.pdaXrom.org/rc9/src/quake1src.tar.bz2 \ S = "${WORKDIR}/quake1src" -inherit autotools +inherit autotools EXTRA_OEMAKE = "-e" diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index ed19483d6b..12ff1c5bcd 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -25,11 +25,11 @@ do_configure() { --with-x=${STAGING_DIR}/${HOST_SYS} \ --with-openssl=${STAGING_DIR}/${HOST_SYS} \ --with-oss \ - --without-debug + --without-debug } do_compile() { - oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/' + oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/' } do_install() { diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb index d0ff2a8d7c..6dfce726fe 100644 --- a/packages/readline/readline_4.3.bb +++ b/packages/readline/readline_4.3.bb @@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \ file://acinclude.m4" S = "${WORKDIR}/readline-${PV}" -inherit autotools +inherit autotools do_configure () { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ diff --git a/packages/tslib/tslib/h2200/.mtn2git_empty b/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h2200/.mtn2git_empty +++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty diff --git a/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch new file mode 100644 index 0000000000..a117f2c19b --- /dev/null +++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch @@ -0,0 +1,33 @@ +--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~ 2006-06-05 19:29:45.240611000 -0400 ++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h 2006-06-05 19:30:29.588212000 -0400 +@@ -38,15 +38,22 @@ + # define extern_inline + #endif + +-#include <asm/unaligned.h> ++#define get_unaligned(ptr) \ ++({ \ ++ struct __attribute__((packed)) { \ ++ typeof(*(ptr)) __v; \ ++ } *__p = (void *)(ptr); \ ++ __p->__v; \ ++}) ++ ++#define put_unaligned(val, ptr) \ ++do { \ ++ struct __attribute__((packed)) { \ ++ typeof(*(ptr)) __v; \ ++ } *__p = (void *)(ptr); \ ++ __p->__v = (val); \ ++} while(0) + +-#ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) +-# define get_unaligned(ptr) (*(ptr)) +-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) +-#endif +-#endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) + #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0) diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb index 7738f5370c..6a5c01f0fd 100644 --- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb +++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb @@ -2,8 +2,12 @@ DESCRIPTION = "User-level tools for ReiserFS filesystems" SECTION = "base" LICENSE = "GPL" RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs" +PR = "r1" + +SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \ + file://header-fix.patch;patch=1 \ + " -SRC_URI = "ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz" S = "${WORKDIR}/reiserfsprogs-${PV}" inherit autotools diff --git a/packages/resistorui/resistorui_0.9.bb b/packages/resistorui/resistorui_0.9.bb index 44d464e8a4..41e50c01e4 100644 --- a/packages/resistorui/resistorui_0.9.bb +++ b/packages/resistorui/resistorui_0.9.bb @@ -16,5 +16,5 @@ inherit opie do_install () { install -d ${D}${palmtopdir}/pics/ install -m 0644 resistorUI.png ${D}${palmtopdir}/pics/ - + } diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb index 0518ef08eb..d698d5b958 100644 --- a/packages/rox/rox-filer_2.5.bb +++ b/packages/rox/rox-filer_2.5.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/${P}/ROX-Filer/src/" do_compile() { ../AppRun --compile -} +} do_install() { install -d ${D}${bindir} @@ -32,13 +32,13 @@ do_install() { cp -r ${WORKDIR}/${P}/Choices ${D}${datadir}/rox rm -rf ${D}${datadir}rox/Choices/MIME-info/ cp ${WORKDIR}/${P}/ROX-Filer/*.xml ${D}${datadir}/rox - + cp ${WORKDIR}/${P}/ROX-Filer/Help/{Changes,README*,TODO} ${D}${datadir}/doc/rox cp ${WORKDIR}/${P}/ROX-Filer/Help/*html ${D}${datadir}/doc/rox/html cp ${WORKDIR}/${P}/ROX-Filer/style.css ${D}${datadir}/doc/rox/html cp -r ${WORKDIR}/${P}/ROX-Filer/images ${D}${datadir}/rox cp -r ${WORKDIR}/${P}/ROX-Filer/ROX ${D}${datadir}/rox - + # cp ROX-Filer/ROX-Filer ${D}/usr/bin/rox cp ${WORKDIR}/${P}/ROX-Filer/.DirIcon ${D}${datadir}/rox/.DirIcon cp ${WORKDIR}/${P}/rox.xml ${D}${datadir}/mime/packages diff --git a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb index 23d6fead53..3a12fba3ca 100644 --- a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb +++ b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb @@ -20,6 +20,6 @@ do_stage() { my_PERL="/usr/bin/env perl" sed -e "s%/[a-zA-Z0-9/]*/bin/perl%$my_PERL%g" -i ${STAGING_BINDIR}/rpm2cpio.pl - - chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl + + chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl } diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb index 78e2d6eef7..ab7ae43428 100644 --- a/packages/rsync/rsync_2.6.9.bb +++ b/packages/rsync/rsync_2.6.9.bb @@ -13,5 +13,5 @@ do_install_append() { install -d ${D}/etc install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc } - + EXTRA_OEMAKE='STRIP=""' diff --git a/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb index 7eaf109312..f80984bc7a 100644 --- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb +++ b/packages/rxvt-unicode/rxvt-unicode_7.7.bb @@ -12,7 +12,7 @@ FILES_${PN}-control = "${bindir}/rxvtc" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ - file://signedchar.patch;patch=1" + file://signedchar.patch;patch=1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/packages/rxvt-unicode/rxvt-unicode_7.9.bb b/packages/rxvt-unicode/rxvt-unicode_7.9.bb index 5903d08d62..72d686bffd 100644 --- a/packages/rxvt-unicode/rxvt-unicode_7.9.bb +++ b/packages/rxvt-unicode/rxvt-unicode_7.9.bb @@ -12,7 +12,7 @@ FILES_${PN}-control = "${bindir}/rxvtc" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ - file://signedchar.patch;patch=1" + file://signedchar.patch;patch=1" PR = "r0" inherit autotools update-alternatives diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index e5ff6a3025..365d208028 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -43,27 +43,27 @@ do_install_append() { rmdir ${D}/sbin install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/samba/private" - + install -c -m 755 ${WORKDIR}/init-essential ${D}${sysconfdir}/init.d/samba - - install -d "${D}${sysconfdir}/samba" - install -d "${D}/usr/share/samba/help" - + + install -d "${D}${sysconfdir}/samba" + install -d "${D}/usr/share/samba/help" + install -m 0644 ${WORKDIR}/smb-essential-inactive.conf "${D}${sysconfdir}/samba/" install -m 0644 ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf" install -m 0644 ${WORKDIR}/Managing-Samba.txt ${D}/usr/share/samba/help - + } do_configure_append() { distro_up="`echo "${DISTRO}" | awk '{printf("%s\n",toupper($0))}'`" - + cat ${WORKDIR}/smb-essential-inactive.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential-inactive.conf_ - mv ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf + mv ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf cat ${WORKDIR}/smb-essential.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential.conf_ - mv ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf + mv ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf } FILES_${PN} = "${bindir}/smbpasswd \ diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb index f034aed6eb..838a958a66 100644 --- a/packages/sane-backends/sane-backends_1.0.15.bb +++ b/packages/sane-backends/sane-backends_1.0.15.bb @@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/ file://Makefile.in.patch;patch=1 \ file://saned.xinetd \ " - + EXTRA_OECONF = "--disable-translations" inherit autotools diff --git a/packages/tslib/tslib/h3600/.mtn2git_empty b/packages/sapwood/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h3600/.mtn2git_empty +++ b/packages/sapwood/.mtn2git_empty diff --git a/packages/tslib/tslib/h3900/.mtn2git_empty b/packages/sapwood/sapwood/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h3900/.mtn2git_empty +++ b/packages/sapwood/sapwood/.mtn2git_empty diff --git a/packages/sapwood/sapwood/sockets.patch b/packages/sapwood/sapwood/sockets.patch new file mode 100644 index 0000000000..1568206e2a --- /dev/null +++ b/packages/sapwood/sapwood/sockets.patch @@ -0,0 +1,113 @@ +--- configure.in.old 2005-06-10 17:04:52.000000000 +0200 ++++ configure.in 2005-06-10 17:20:47.000000000 +0200 +@@ -13,61 +13,61 @@ + AC_PROG_MAKE_SET + + dnl abstract sockets namespace checks, from dbus +-AC_ARG_ENABLE(abstract-sockets, +- [AC_HELP_STRING([--enable-abstract-sockets], +- [use abstract socket namespace (linux only)])], +- [enable_abstract_sockets=$enableval], +- [enable_abstract_sockets=auto]) +- +-AC_MSG_CHECKING(abstract socket namespace) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ ++#AC_ARG_ENABLE(abstract-sockets, ++# [AC_HELP_STRING([--enable-abstract-sockets], ++# [use abstract socket namespace (linux only)])], ++# [enable_abstract_sockets=$enableval], ++# [enable_abstract_sockets=no]) ++# ++#AC_MSG_CHECKING(abstract socket namespace) ++#AC_RUN_IFELSE([AC_LANG_PROGRAM( ++#[[ + #include <sys/types.h> + #include <stdlib.h> + #include <stdio.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <errno.h> +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_MSG_RESULT($have_abstract_sockets) +- +-if test x$enable_abstract_sockets = xyes; then +- if test x$have_abstract_sockets = xno; then +- AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) +- fi +-fi +- +-if test x$enable_abstract_sockets = xno; then +- have_abstract_sockets=no +-fi ++#]], ++#[[ ++# int listen_fd; ++# struct sockaddr_un addr; ++# ++# listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); ++ ++# if (listen_fd < 0) ++# { ++# fprintf (stderr, "socket() failed: %s\n", strerror (errno)); ++# exit (1); ++# } ++# ++# memset (&addr, '\0', sizeof (addr)); ++# addr.sun_family = AF_UNIX; ++# strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); ++# addr.sun_path[0] = '\0'; /* this is what makes it abstract */ ++# ++# if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) ++# { ++# fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", ++# strerror (errno)); ++# exit (1); ++# } ++# else ++# exit (0); ++#]])], ++# [have_abstract_sockets=no], ++# [have_abstract_sockets=no]) ++#AC_MSG_RESULT($have_abstract_sockets) ++ ++#if test x$enable_abstract_sockets = xyes; then ++# if test x$have_abstract_sockets = xno; then ++# AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) ++# fi ++#fi ++ ++#if test x$enable_abstract_sockets = xno; then ++have_abstract_sockets=no ++#fi + + if test x$have_abstract_sockets = xyes; then + AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb new file mode 100644 index 0000000000..9651ff3916 --- /dev/null +++ b/packages/sapwood/sapwood_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GTK theme engine Sapwood" +LICENSE = "LGPL" + +DEPENDS = "gtk+" + +PV = "2.43+svn${SRCDATE}" + +SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \ + file://sockets.patch;patch=1 \ + " + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-abstract-sockets=no" + +do_install_append () { + install -d ${D}${sysconfdir}/osso-af-init + install -m755 ${S}/debian/sapwood-server.sh ${D}${sysconfdir}/osso-af-init/sapwood-server.sh +} + +FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/" + diff --git a/packages/schroedinger/schroedinger_0.2.0.0.bb b/packages/schroedinger/schroedinger_0.2.0.0.bb index 1fea3339be..7812f30da7 100644 --- a/packages/schroedinger/schroedinger_0.2.0.0.bb +++ b/packages/schroedinger/schroedinger_0.2.0.0.bb @@ -1,5 +1,5 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/" -LICENSE = "MPL/GPL/LGPL and MIT" +LICENSE = "MPL/GPL/LGPL and MIT" DEPENDS = "liboil gstreamer gst-plugins-base" SRC_URI = "${SOURCEFORGE_MIRROR}/schrodinger/${P}.tar.gz" diff --git a/packages/scsi-idle/scsi-idle_2.4.23.bb b/packages/scsi-idle/scsi-idle_2.4.23.bb index 38cd739e9d..6085112c63 100644 --- a/packages/scsi-idle/scsi-idle_2.4.23.bb +++ b/packages/scsi-idle/scsi-idle_2.4.23.bb @@ -11,7 +11,7 @@ PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/s/scsi-idle/scsi-idle_${PV}-5.tar.gz \ file://makefile.patch;patch=1 \ - file://scsi-idle.init.patch;patch=1" + file://scsi-idle.init.patch;patch=1" S = "${WORKDIR}/scsi-idle-${PV}" diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index f23cccae70..44035e633c 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,4 +1,4 @@ -require 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.0.bb b/packages/scummvm/scummvm_0.6.0.bb index 38f0c7ea98..1aecd20bc4 100644 --- a/packages/scummvm/scummvm_0.6.0.bb +++ b/packages/scummvm/scummvm_0.6.0.bb @@ -9,16 +9,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ file://tremor.patch;patch=1 \ file://mouse.patch;patch=1 " -inherit autotools +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" EXTRA_OECONF = "--host=${HOST_SYS} \ --backend=sdl \ - --with-sdl-prefix=${STAGING_BINDIR}/.. \ --disable-alsa \ --with-ogg-prefix=${STAGING_LIBDIR}/.. \ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \ - --with-mad-prefix=${STAGING_BINDIR}/.. " + --with-mad-prefix=${STAGING_BINDIR_CROSS}/.. " do_configure() { ./configure ${EXTRA_OECONF} diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb index f7a04cf6f2..bc015e3d52 100644 --- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb +++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb @@ -19,10 +19,10 @@ do_install() { install -d ${D}${bindir} install -m 0755 testcore ${D}${bindir}/testcore install -m 0755 atitest ${D}${bindir}/atitest - + install -d ${D}${libdir} install -m 0755 libaticore.so.1.0.1 ${D}${libdir}/libaticore.so.1.0.1 - + install -d ${D}${includedir} install -m 0644 aticore.h ${D}${includedir}/aticore.h diff --git a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb index 538d25e80d..3fa80452f6 100644 --- a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb +++ b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb @@ -29,39 +29,39 @@ do_install() { install -d ${D}${palmtopdir}/bin/ install -d ${D}${palmtopdir}/etc/ install -d ${D}${palmtopdir}/pics/ - + install -d ${D}/opt/QtPalmtop.compat/bin install -d ${D}/opt/QtPalmtop.compat/binlib install -d ${D}/opt/QtPalmtop.compat/lib - + install -d ${D}${sysconfdir}/init.d - - install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings + + install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}${palmtopdir}/etc/quickexec.libs install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}${palmtopdir}/pics/libraries.png - + install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib - + install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}${sysconfdir}/init.d - + cd ${D}${palmtopdir}/bin for file in chkhinge makecompat qeserver quickexec runcompat do ln -s /opt/QtPalmtop.compat/bin/$file done - + cd ${D}/opt/QtPalmtop.compat/lib ln -s libqpe.so.1.5.0 libqpe.so.1.5 ln -s libqpe.so.1.5.0 libqpe.so.1 ln -s libqpe.so.1.5.0 libqpe.so - + ln -s libqte.so.2.3.7 libqte.so.2.3.2 - ln -s libqte.so.2.3.7 libqte.so.2.3 + ln -s libqte.so.2.3.7 libqte.so.2.3 ln -s libqte.so.2.3.7 libqte.so.2 ln -s libqte.so.2.3.7 libqte.so - - + + } pkg_postinst() { diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb index 2ac73c6042..7fc60aa250 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb @@ -35,7 +35,7 @@ do_install() { ${D}${sysconfdir}/default \ ${D}${base_sbindir} \ ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/ - + install -m 0755 ${WORKDIR}/sdmgr ${D}${base_sbindir}/ install -m 0755 ${WORKDIR}/sdcontrol ${D}${sysconfdir} install -m 0755 ${WORKDIR}/sd ${D}${sysconfdir}/init.d/ diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb index d41282942a..9929aa8c9f 100644 --- a/packages/sidplayer/sidplayer_1.5.0.bb +++ b/packages/sidplayer/sidplayer_1.5.0.bb @@ -20,5 +20,5 @@ do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ ${D}${palmtopdir}/pics - cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/ + cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/ } diff --git a/packages/silo/silo_1.4.8.bb b/packages/silo/silo_1.4.8.bb index ee107edeed..41a3d3aaf5 100644 --- a/packages/silo/silo_1.4.8.bb +++ b/packages/silo/silo_1.4.8.bb @@ -9,7 +9,8 @@ do_compile() { oe_runmake CC="${CC} -m32" LD="${LD}" HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" OECFLAGS="${CFLAGS}" OELDFLAGS="-L${STAGING_LIBDIR} -rpath-link ${STAGING_LIBDIR}" NM="${TARGET_SYS}-nm" } +# Should this package be installing into native? - not good... RP do_stage() { - install tilo/maketilo ${STAGING_BINDIR} - install tilo/tilo.sh ${STAGING_BINDIR} + install tilo/maketilo ${STAGING_BINDIR_NATIVE} + install tilo/tilo.sh ${STAGING_BINDIR_NATIVE} } diff --git a/packages/simpad-utilities/genboot-native.bb b/packages/simpad-utilities/genboot-native.bb index 3e98947eca..47b9b34640 100644 --- a/packages/simpad-utilities/genboot-native.bb +++ b/packages/simpad-utilities/genboot-native.bb @@ -11,7 +11,7 @@ inherit native do_compile() { cp ${WORKDIR}/*.h ${WORKDIR}/*.c . - ${CC} -I. -o genboot gen_boot.c + ${CC} -I. -o genboot gen_boot.c } do_stage() { diff --git a/packages/slang/slang_1.4.9.bb b/packages/slang/slang_1.4.9.bb index 5cb3629cf9..492bd7d9a0 100644 --- a/packages/slang/slang_1.4.9.bb +++ b/packages/slang/slang_1.4.9.bb @@ -6,7 +6,7 @@ LICENSE = "GPL Artistic" SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://Makefile.patch;patch=1" -inherit autotools +inherit autotools acpaths = "-I ${S}/autoconf" EXTRA_OECONF="--enable-warnings" diff --git a/packages/slugos-init/files/reflash b/packages/slugos-init/files/reflash index 7ba60e6933..131f0b67de 100644 --- a/packages/slugos-init/files/reflash +++ b/packages/slugos-init/files/reflash @@ -16,10 +16,38 @@ load_functions sysconf case "$(machine)" in nslu2) isnslu2=1 + isdsmg600= + isnas100d= + imageok=1 + apexpart="Loader" + usrpart= kpart="Kernel" ffspart="Flashdisk";; +nas100d) + isnslu2= + isdsmg600= + isnas100d=1 + imageok=1 + apexpart= + usrpart="usr" + kpart="kernel" + ffspart="filesystem";; +dsmg600) + isnslu2= + isdsmg600=1 + isnas100d= + imageok=1 + apexpart= + usrpart="usr" + kpart="kernel" + ffspart="filesystem";; *) isnslu2= + isdsmg600= + isnas100d= + imageok= + apexpart= + usrpart= kpart="kernel" ffspart="filesystem";; esac @@ -32,9 +60,12 @@ esac ffsfile= kfile= imgfile= +preserve_config=1 while test $# -gt 0 do case "$1" in + -n) preserve_config= + shift;; -k) shift test $# -gt 0 || { echo "reflash: -k: give the file containing the kernel image" >&2 @@ -50,9 +81,10 @@ do ffsfile="$1" shift;; -i) shift - test -n "$isnslu2" || { - echo "reflash: -i: only supported on the LinkSys NSLU2" >&2 - echo " use -k and -j to specify the kernel and root file system" >&2 + test -n "$imageok" || { + echo "reflash: -i: only supported on the LinkSys NSLU2," >&2 + echo " Iomega NAS 100d and D-Link DSM-G600 systems; use -k and -j" >&2 + echo " to specify the kernel and root file system instead." >&2 exit 1 } test $# -gt 0 || { @@ -61,15 +93,16 @@ do } imgfile="$1" shift;; - *) if test -n "$isnslu2" + *) if test -n "$imageok" then - echo "reflash: usage: $0 [-k kernel] [-j rootfs] [-i image]" >&2 + echo "reflash: usage: $0 [-n] [-k kernel] [-j rootfs] [-i image]" >&2 else - echo "reflash: usage: $0 [-k kernel] [-j rootfs]" >&2 + echo "reflash: usage: $0 [-n] [-k kernel] [-j rootfs]" >&2 fi + echo " -n: do not attempt to preserve the configuration" >&2 echo " -k file: the new compressed kernel image ('zImage')" >&2 echo " -j file: the new root file system (jffs2)" >&2 - test -n "$isnslu2" && + test -n "$imageok" && echo " -i file: a complete flash image (gives both kernel and jffs2)" >&2 echo " The current jffs2 will be umounted if mounted." >&2 exit 1;; @@ -77,7 +110,7 @@ do done # # Sanity check on the arguments (note that the first case can only fire -# on NSLU2 because of the check for -i above.) +# on NSLU2 or DSM-G600 because of the check for -i above.) if test -n "$imgfile" -a -n "$ffsfile" -a -n "$kfile" then echo "reflash: specify at most two files" >&2 @@ -93,7 +126,7 @@ fi # Perform basic checks on the input (must exist, size must be ok). if test -n "$imgfile" then - if test -r "$imgfile" + if test -r "$imgfile" -a -n "$isnslu2" then # read the partition table and from this find the offset # and size of $kpart and $ffspart partitions. The following @@ -105,7 +138,11 @@ then # works in ash, no guarantees about other shells! while read size base name do - if test "$name" = "$kpart" + if test "$name" = "$apexpart" + then + imgapexsize="$size" + imgapexoffset="$base" + elif test "$name" = "$kpart" then imgksize="$size" imgkoffset="$base" @@ -162,6 +199,52 @@ EOI echo "reflash: $imgfile: failed to find $ffspart" >&2 exit 1 } + elif test -r "$imgfile" -a \( -n "$isdsmg600" -o -n "$isnas100d" \) + then + # + # For the DSM-G600, this is really easy - the image is just + # a tar file. So, extract the contents of the tar file, and + # set the kernel and filesystem variables (if not already set) + # to point to the extracted content. Content will look like: + # + # drwxr-xr-x 500/500 0 2006-11-25 23:47:59 firmupgrade + # -rw-r--r-- 500/500 4718592 2006-12-02 16:32:51 firmupgrade/rootfs.gz + # -rw-r--r-- 500/500 40 2006-11-25 22:15:41 firmupgrade/version.msg + # -rw-r--r-- 500/500 0 2006-11-25 23:47:59 firmupgrade/usr.cramfs + # -rw-rw-r-- 500/500 1306872 2006-12-02 16:33:37 firmupgrade/ip-ramdisk + # + # Heuristic: if the size of usr.cramfs is zero, the firmware + # is not a D-Link firmware for the device. (The version.msg + # file is not useful for this purpose; it describes the hardware, + # not the firmware version in the image!) + # + # TODO: If usr.cramfs is non-zero, we should flash that, too, just + # to make sure that it matches the native firmware's kernel + # and rootfs that we're now flashing back onto the device. + + echo "reflash: unpacking DSM-G600/NAS-100d image file" >&2 + tar -x -f "$imgfile" -C /var/tmp || { + echo "reflash: unable to unpack image file to be flashed" >&2 + exit 1 + } + + if test -z "$kfile" + then + kfile="/var/tmp/firmupgrade/ip-ramdisk" + fi + + if test -z "$ffsfile" + then + ffsfile="/var/tmp/firmupgrade/rootfs.gz" + fi + + if test -s "/var/tmp/firmupgrade/usr.cramfs" + then + echo "reflash: Native flash being restored" >&2 + usrfile="/var/tmp/firmupgrade/usr.cramfs" + preserve_config= + fi + else echo "reflash: $imgfile: image file not found" >&2 exit 1 @@ -193,6 +276,19 @@ then else ffsfile="$imgfile" fi +if test -n "$usrfile" +then + if test ! -r "$usrfile" + then + echo "reflash: $usrfile: usr file system image file not found" >&2 + exit 1 + fi + # values override those from the image + imgusrsize="$(devio "<<$usrfile" 'pr$')" + imgusroffset=0 +else + usrfile= +fi # # INPUTS OK, CHECKING THE ENVIRONMENT # ----------------------------------- @@ -238,6 +334,26 @@ then exit 1 } fi +# +usrdev= +usrsize=0 +if test -n "$usrfile" +then + usrdev="$(mtblockdev $usrpart)" + test -n "$usrdev" -a -b "$usrdev" || { + echo "reflash: $usrpart($usrdev): cannot find $usrpart mtd partition." >&2 + echo " check /proc/mtd, either the partition does not exist or there is no" >&2 + echo " corresponding block device." >&2 + exit 1 + } + usrsize="$(devio "<<$usrdev" 'pr$')" + # + # check the input file size + test -n "$imgusrsize" -a "$imgusrsize" -gt 0 -a "$imgusrsize" -le "$usrsize" || { + echo "reflash: $usrfile: bad $usrpart size ($imgusrsize, max $usrsize)" >&2 + exit 1 + } +fi # # INPUTS OK, ENVIRONMENT OK, UMOUNT ANY EXISTING MOUNT OF THE FLASHDISK @@ -280,7 +396,7 @@ fi # PRESERVE EXISTING CONFIGURATION # ------------------------------- # Only required if the flash partition will be written -if test -n "$ffsdev" +if test -n "$ffsdev" -a -n "$preserve_config" then echo "reflash: preserving existing configuration file" >&2 # @@ -352,6 +468,14 @@ do_ffs() { fb #t-,255' } # +do_usr() { + devio $progress "$@" "<<$usrfile" ">>$usrdev" ' + # usrfs is at imgusroffset[imgusrsize] + ' "<= $imgusroffset" "cp $imgusrsize" ' + # fill with 255 + fb #t-,255' +} +# # check_status $? type file(offset,size) device # check the devio status code (given in $1) check_status() { @@ -384,6 +508,13 @@ check_status() { esac } # +if test -n "$usrdev" +then + echo -n "reflash: writing usrfs to $usrdev " >&2 + do_usr + check_status $? usrfs "$usrfile($imgusroffset,$imgusrsize)" "$usrdev" +fi +# if test -n "$ffsdev" then echo -n "reflash: writing rootfs to $ffsdev " >&2 @@ -399,6 +530,19 @@ then fi # # verify - this just produces a warning +if test -n "$usrdev" +then + echo -n "reflash: verifying new usr image " >&2 + if do_usr -v + then + echo " done" >&2 + else + echo " failed" >&2 + echo "reflash: WARNING: usrfs flash image verification failed" >&2 + echo " The system is may be bootable." >&2 + fi +fi +# if test -n "$ffsdev" then echo -n "reflash: verifying new flash image " >&2 @@ -432,7 +576,7 @@ fi # RESTORE THE OLD CONFIGURATION # ----------------------------- # If not write the rootfs none of the following is required - exit now. -test -n "$ffsdev" || exit 0 +test -n "$ffsdev" -a -n "$preserve_config" || exit 0 # echo "reflash: restoring saved configuration files" >&2 # diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 94f156f3ef..b75511ec67 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r76" +PR = "r77" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -66,7 +66,7 @@ do_install() { ${D}${base_sbindir} \ ${D}/initrd \ ${D}/boot - + # linuxrc rm -f ${D}/linuxrc ln -s boot/flash ${D}/linuxrc @@ -90,7 +90,7 @@ do_install() { # # Init scripts install -m 0644 functions ${D}${sysconfdir}/default - install -m 0644 modulefunctions ${D}${sysconfdir}/default + install -m 0644 modulefunctions ${D}${sysconfdir}/default for s in ${INITSCRIPTS} do install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/ diff --git a/packages/smartmontools/smartmontools.inc b/packages/smartmontools/smartmontools.inc new file mode 100644 index 0000000000..908343d548 --- /dev/null +++ b/packages/smartmontools/smartmontools.inc @@ -0,0 +1,8 @@ +SECTION = "console/utils" +DESCRIPTION = "Control and monitor storage systems using S.M.A.R.T." +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz" +S = "${WORKDIR}/smartmontools-${PV}" + +inherit autotools diff --git a/packages/smartmontools/smartmontools_5.33.bb b/packages/smartmontools/smartmontools_5.33.bb index 908343d548..ec9a10d4c5 100644 --- a/packages/smartmontools/smartmontools_5.33.bb +++ b/packages/smartmontools/smartmontools_5.33.bb @@ -1,8 +1 @@ -SECTION = "console/utils" -DESCRIPTION = "Control and monitor storage systems using S.M.A.R.T." -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz" -S = "${WORKDIR}/smartmontools-${PV}" - -inherit autotools +include smartmontools.inc diff --git a/packages/smartmontools/smartmontools_5.37.bb b/packages/smartmontools/smartmontools_5.37.bb new file mode 100644 index 0000000000..ec9a10d4c5 --- /dev/null +++ b/packages/smartmontools/smartmontools_5.37.bb @@ -0,0 +1 @@ +include smartmontools.inc diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb index fdd9419bc4..af849a7778 100644 --- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb +++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb @@ -10,13 +10,13 @@ SRC_URI = "cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg;da file://compile.patch;patch=1" S = "${WORKDIR}/smpeg" -inherit autotools +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" CFLAGS_append = " -I${STAGING_INCDIR}/SDL" EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \ - --without-gtk --disable-gtk-player \ - --with-sdl-prefix=${STAGING_LIBDIR}/.. \ - --with-sdl-exec-prefix=${STAGING_BINDIR}/.." + --without-gtk --disable-gtk-player" do_configure_prepend () { touch NEWS AUTHORS ChangeLog @@ -35,8 +35,8 @@ do_stage() { cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \ | sed -e "s,-I/usr/include/smpeg, ," \ | sed -e "s,libdirs ,mickey_is_cool ," \ - | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/smpeg-config - chmod a+rx ${STAGING_BINDIR}/smpeg-config + | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config + chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config } PACKAGES =+ "plaympeg " diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb index 357a097b0f..50f4e1d617 100644 --- a/packages/sofia-sip/sofia-sip_1.11.7.bb +++ b/packages/sofia-sip/sofia-sip_1.11.7.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" inherit autotools pkgconfig - + do_stage() { autotools_stage_all } diff --git a/packages/sox/sox_12.17.5.bb b/packages/sox/sox_12.17.5.bb index a3cd84e726..6c70eaad7b 100644 --- a/packages/sox/sox_12.17.5.bb +++ b/packages/sox/sox_12.17.5.bb @@ -4,7 +4,7 @@ DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ It converts audio files among various standard audio file formats \ -and can apply different effects and filters to the audio data." +and can apply different effects and filters to the audio data." LICENSE="GPL" HOMEPAGE="http://sox.sourceforge.net" diff --git a/packages/spca5xx/spca5xx_20060501.bb b/packages/spca5xx/spca5xx_20060501.bb index 1a9b528178..3e523c83a8 100644 --- a/packages/spca5xx/spca5xx_20060501.bb +++ b/packages/spca5xx/spca5xx_20060501.bb @@ -15,10 +15,10 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake 'KERNELDIR=${STAGING_KERNEL_DIR}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +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 } diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/squeezeclient/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h4000/.mtn2git_empty +++ b/packages/squeezeclient/.mtn2git_empty diff --git a/packages/tslib/tslib/h5000/.mtn2git_empty b/packages/squeezeclient/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h5000/.mtn2git_empty +++ b/packages/squeezeclient/files/.mtn2git_empty diff --git a/packages/squeezeclient/files/makefile.patch b/packages/squeezeclient/files/makefile.patch new file mode 100644 index 0000000000..8e64a70399 --- /dev/null +++ b/packages/squeezeclient/files/makefile.patch @@ -0,0 +1,57 @@ +--- + makefile.linux | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +Index: SlimProtoLib/makefile.linux +=================================================================== +--- SlimProtoLib.orig/makefile.linux 2006-12-31 11:09:10.000000000 +0000 ++++ SlimProtoLib/makefile.linux 2006-12-31 12:34:11.000000000 +0000 +@@ -1,6 +1,4 @@ +-CC=gcc +- +-CFLAGS=-Wall -Werror -DSLIMPROTO_DEBUG -g ++CFLAGS+=-Wall -DSLIMPROTO_DEBUG -g + + INCLUDE=-Ilib/portaudio_v18/pa_common -Ilib/portaudio_v18/pablio -Ilib/portmixer/px_common -Isrc + +@@ -20,24 +18,30 @@ SQUEEZESLAVEFILES:=src/squeezeslave/sque + + all : bin/squeezeslave + +-lib/libportaudio.a: $(PORTAUDIOFILES:.c=.o) +- ar cru lib/libportaudio.a $^ +- ranlib lib/libportaudio.a ++LIBVERSION:=3.0.0 + +-lib/libslimproto.a: $(SLIMPROTOFILES:.c=.o) +- ar cru lib/libslimproto.a $^ +- ranlib lib/libslimproto.a ++lib/libportaudio.so.$(LIBVERSION): $(PORTAUDIOFILES:.c=.o) ++ ${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@ ++ ln -s $(@F) lib/libportaudio.so + +-bin/squeezeslave : $(SQUEEZESLAVEFILES:.c=.o) $(PORTMIXERFILES:.c=.o) lib/libslimproto.a lib/libportaudio.a +- ${CC} -o bin/squeezeslave $^ /usr/local/lib/libmad.a /usr/local/lib/libFLAC.a /usr/lib/libvorbisfile.a /usr/lib/libvorbis.a /usr/lib/libogg.a -lpthread -lm ++lib/libslimproto.so.$(LIBVERSION): $(SLIMPROTOFILES:.c=.o) ++ ${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@ ++ ln -s $(@F) lib/libslimproto.so + ++lib/libportmixer.so.$(LIBVERSION): $(PORTMIXERFILES:.c=.o) ++ ${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@ ++ ln -s $(@F) lib/libportmixer.so ++ ++bin/squeezeslave: $(SQUEEZESLAVEFILES:.c=.o) lib/libportaudio.so.$(LIBVERSION) lib/libportmixer.so.$(LIBVERSION) lib/libslimproto.so.$(LIBVERSION) ++ ${CC} -o bin/squeezeslave $(LDFLAGS) $(LDFLAGS) $^ -Llib -lmad -lFLAC -lvorbisfile -lvorbis -logg -lpthread -lm -lslimproto -lportaudio -lportmixer + + clean: + @{ for FILE in $(PORTAUDIOFILES:.c=.o) \ + $(SLIMPROTOFILES:.c=.o) \ + $(SQUEEZESLAVEFILES:.c=.o) \ +- lib/libportaudio.a \ +- lib/libslimproto.a \ ++ lib/libportaudio*.so \ ++ lib/libportmixer*.so \ ++ lib/libslimproto*.so \ + bin/squeezeslave; do \ + test -e $$FILE && echo $$FILE || true; \ + test -e $$FILE && $(RM) $$FILE 2>/dev/null || true; \ diff --git a/packages/squeezeclient/files/runfix.patch b/packages/squeezeclient/files/runfix.patch new file mode 100644 index 0000000000..c2c48095a2 --- /dev/null +++ b/packages/squeezeclient/files/runfix.patch @@ -0,0 +1,17 @@ +--- + src/squeezeslave/squeezeslave.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: SlimProtoLib/src/squeezeslave/squeezeslave.c +=================================================================== +--- SlimProtoLib.orig/src/squeezeslave/squeezeslave.c 2006-12-31 11:09:09.000000000 +0000 ++++ SlimProtoLib/src/squeezeslave/squeezeslave.c 2006-12-31 13:44:04.000000000 +0000 +@@ -41,7 +41,7 @@ char macaddress[6] = { 1, 1, 1, 1, 1, 1 + int main(int argc, char *argv[]) {
+ char *slimserver_address = "127.0.0.1";
+ int output_device_id = -1;
+- char c;
++ int c;
+ int i;
+
+ while (1) {
diff --git a/packages/squeezeclient/files/varinit.patch b/packages/squeezeclient/files/varinit.patch new file mode 100644 index 0000000000..5844dc67b5 --- /dev/null +++ b/packages/squeezeclient/files/varinit.patch @@ -0,0 +1,17 @@ +--- + src/slimaudio/slimaudio_http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: SlimProtoLib/src/slimaudio/slimaudio_http.c +=================================================================== +--- SlimProtoLib.orig/src/slimaudio/slimaudio_http.c 2006-12-31 11:09:09.000000000 +0000 ++++ SlimProtoLib/src/slimaudio/slimaudio_http.c 2006-12-31 11:16:37.000000000 +0000 +@@ -91,7 +91,7 @@ int slimaudio_http_close(slimaudio_t *au + static void *http_thread(void *ptr) {
+ slimaudio_t *audio = (slimaudio_t *) ptr;
+ #ifdef SLIMPROTO_DEBUG
+- int last_state;
++ int last_state=0;
+ #endif
+
+ pthread_mutex_lock(&audio->http_mutex);
diff --git a/packages/squeezeclient/squeezeslave_svn.bb b/packages/squeezeclient/squeezeslave_svn.bb new file mode 100644 index 0000000000..03fbb0ede0 --- /dev/null +++ b/packages/squeezeclient/squeezeslave_svn.bb @@ -0,0 +1,31 @@ +SECTION = "console/multimedia" +DESCRIPTION = "command line audio playback client for SlimServer" +LICENSE = "GPL" +DEPENDS += "libmad flac libvorbis" +PV = "3.0+svn-${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \ + file://varinit.patch;patch=1 \ + file://runfix.patch;patch=1 \ + file://makefile.patch;patch=1" + + +S = "${WORKDIR}/softsqueeze/SlimProtoLib" + +CFLAGS += "-D_GNU_SOURCE" + +inherit autotools + +do_compile() { + oe_runmake LDFLAGS=${TARGET_LDFLAGS} -f makefile.linux +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 bin/squeezeslave ${D}/${bindir} + oe_libinstall -C lib -so libslimproto ${D}${libdir} + oe_libinstall -C lib -so libportaudio ${D}${libdir} + oe_libinstall -C lib -so libportmixer ${D}${libdir} +} + diff --git a/packages/ssmtp/ssmtp-2.60.9/configure.patch b/packages/ssmtp/ssmtp-2.60.9/configure.patch deleted file mode 100644 index 2feaa8a80c..0000000000 --- a/packages/ssmtp/ssmtp-2.60.9/configure.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ssmtp-2.60/./configure.in~configure -+++ ssmtp-2.60/./configure.in -@@ -1,5 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(ssmtp.c) -+AC_INIT -+AC_CONFIG_SRCDIR([ssmtp.c]) - - dnl Checks for programs. - AC_PROG_INSTALL -@@ -13,8 +14,7 @@ - - - AC_CACHE_CHECK([for obsolete openlog],ssmtp_cv_obsolete_openlog, -- [ AC_TRY_COMPILE([#include <syslog.h> ] , [ openlog("xx",1); ] , -- ssmtp_cv_obsolete_openlog=yes, ssmtp_cv_obsolete_openlog=no)] -+ [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <syslog.h> ]], [[ openlog("xx",1); ]])],[ssmtp_cv_obsolete_openlog=yes],[ssmtp_cv_obsolete_openlog=no])] - ) - - -@@ -70,4 +70,5 @@ - fi - enableval="" - --AC_OUTPUT(Makefile) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT diff --git a/packages/ssmtp/ssmtp-2.60.9/ldflags.patch b/packages/ssmtp/ssmtp-2.60.9/ldflags.patch deleted file mode 100644 index 0cbda2c85d..0000000000 --- a/packages/ssmtp/ssmtp-2.60.9/ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ssmtp-2.60/Makefile.in~ldflags -+++ ssmtp-2.60/Makefile.in -@@ -36,6 +36,7 @@ - - - CFLAGS=-Wall @DEFS@ $(EXTRADEFS) @CFLAGS@ -+LDFLAGS=@LDFLAGS@ - - .PHONY: all - all: ssmtp -@@ -78,7 +79,7 @@ - - # Binaries: - ssmtp: $(OBJS) -- $(CC) -o ssmtp $(OBJS) @LIBS@ -+ $(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@ - - .PHONY: clean - clean: diff --git a/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf b/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf deleted file mode 100644 index 201292f8b9..0000000000 --- a/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf +++ /dev/null @@ -1,13 +0,0 @@ -# -# /etc/ssmtp.conf -- a config file for sSMTP sendmail. -# -# The person who gets all mail for userids < 1000 -root=postmaster -# The place where the mail goes. The actual machine name is required -# no MX records are consulted. Commonly mailhosts are named mail.domain.com -# The example will fit if you are in domain.com and you mailhub is so named. -mailhub=mail -# Where will the mail seem to come from? -#rewriteDomain=localhost.localdomain -# The full hostname -hostname=localhost.localdomain diff --git a/packages/ssmtp/ssmtp_2.60.9.bb b/packages/ssmtp/ssmtp_2.60.9.bb deleted file mode 100644 index e0381db640..0000000000 --- a/packages/ssmtp/ssmtp_2.60.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "console/network" -DEPENDS = "openssl" -DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." -LICENSE = "GPL" -SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.tar.gz \ - file://ldflags.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://ssmtp.conf" -S = "${WORKDIR}/${PN}-2.60" - -inherit autotools - -EXTRA_OECONF = "--enable-ssl" -do_compile () { - oe_runmake 'LDFLAGS=${LDFLAGS}' -} - -do_install () { - oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ - 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \ - 'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install - install -d ${D}${sysconfdir}/ssmtp - install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf -} diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index a177f91ac3..c8461ab29c 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -35,5 +35,5 @@ pkg_postinst () { } pkg_postrm () { - update-alternatives --remove ${sbindir}/sendmail sendmail + update-alternatives --remove ${sbindir}/sendmail sendmail } diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb index 1d93789adf..34e76566cd 100644 --- a/packages/startup-monitor/startup-monitor_0.18-2.bb +++ b/packages/startup-monitor/startup-monitor_0.18-2.bb @@ -4,6 +4,6 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox" -inherit gpe pkgconfig +inherit gpe pkgconfig #SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${P}.tar.gz" diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb index 42a3f13735..c48e89ce0b 100644 --- a/packages/startup-notification/startup-notification_0.5.bb +++ b/packages/startup-notification/startup-notification_0.5.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11" -inherit autotools pkgconfig +inherit autotools pkgconfig SRC_URI = "http://freedesktop.org/Software/startup-notification/releases/startup-notification-${PV}.tar.gz" diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb index bccabba5ec..0be545d0fc 100644 --- a/packages/startup-notification/startup-notification_0.8.bb +++ b/packages/startup-notification/startup-notification_0.8.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11" -inherit autotools pkgconfig +inherit autotools pkgconfig SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz" diff --git a/packages/stunnel/stunnel-4.05/automake.patch b/packages/stunnel/stunnel-4.05/automake.patch deleted file mode 100644 index a1baa151d5..0000000000 --- a/packages/stunnel/stunnel-4.05/automake.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -urN stunnel-4.05.orig/Makefile.am stunnel-4.05/Makefile.am ---- stunnel-4.05.orig/Makefile.am 2003-01-11 23:30:48.000000000 -0500 -+++ stunnel-4.05/Makefile.am 2004-03-21 20:57:58.000000000 -0500 -@@ -1,4 +1,4 @@ --SUBDIRS = src doc tools -+SUBDIRS = src doc - - # extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe - # extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl diff --git a/packages/stunnel/stunnel-4.05/configure.patch b/packages/stunnel/stunnel-4.05/configure.patch deleted file mode 100644 index 5764796aaa..0000000000 --- a/packages/stunnel/stunnel-4.05/configure.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: stunnel-4.05/configure.ac -=================================================================== ---- stunnel-4.05.orig/configure.ac 2003-12-28 15:47:49.000000000 -0500 -+++ stunnel-4.05/configure.ac 2005-04-01 22:14:39.751121880 -0500 -@@ -176,8 +176,30 @@ - [AC_MSG_RESULT([no])]; LIBS="$saved_LIBS") - - dnl Check PTY device files. --AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) --AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) -+AC_ARG_WITH(ptmx, -+ [ --with-ptmx /dev/ptmx exists (default: check for existance)], -+ [ -+ if test x"$withval" = "xyes"; then -+ AC_DEFINE(HAVE_DEV_PTMX) -+ fi -+ ], -+ [ -+ # Check for ptmx device -+ AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) -+ ] -+) -+AC_ARG_WITH(ptc, -+ [ --with-ptc /dev/ptc exists (default: check for existance)], -+ [ -+ if test x"$withval" = "xyes"; then -+ AC_DEFINE(HAVE_DEV_PTS_AND_PTC) -+ fi -+ ], -+ [ -+ # Check for ptc device -+ AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) -+ ] -+) - - dnl Checks for header files. - # AC_HEADER_DIRENT diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb deleted file mode 100644 index 5f61b1c125..0000000000 --- a/packages/stunnel/stunnel_4.05.bb +++ /dev/null @@ -1,8 +0,0 @@ -require stunnel.inc - -PR = "r1" -SRC_URI = "ftp://stunnel.mirt.net/stunnel/OBSOLETE/stunnel-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://automake.patch;patch=1 \ - file://init \ - file://stunnel.conf" diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb index ac0b821d35..3c65d1d0a8 100644 --- a/packages/subversion/subversion_1.4.0.bb +++ b/packages/subversion/subversion_1.4.0.bb @@ -1,12 +1,10 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util-0.9.12 neon" +DEPENDS = "apr-util neon" LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" PR = "r0" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1" @@ -15,8 +13,13 @@ EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" + inherit autotools +export LDFLAGS += " -L${STAGING_LIBDIR} " + do_configure() { + gnu-configize + libtoolize --force oe_runconf } diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb index 59acb5767b..42ea6039fa 100644 --- a/packages/supertux/supertux_0.1.2.bb +++ b/packages/supertux/supertux_0.1.2.bb @@ -11,6 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" -inherit autotools +inherit autotools # FIXME: Add .desktop file for Opie/Qtopia diff --git a/packages/tslib/tslib/h6300/.mtn2git_empty b/packages/swfdec/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h6300/.mtn2git_empty +++ b/packages/swfdec/.mtn2git_empty diff --git a/packages/tslib/tslib/htcuniversal/.mtn2git_empty b/packages/swfdec/swfdec/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/htcuniversal/.mtn2git_empty +++ b/packages/swfdec/swfdec/.mtn2git_empty diff --git a/packages/tslib/tslib/hx2000/.mtn2git_empty b/packages/swfdec/swfdec/arm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/hx2000/.mtn2git_empty +++ b/packages/swfdec/swfdec/arm/.mtn2git_empty diff --git a/packages/swfdec/swfdec/fix-cross-build.patch b/packages/swfdec/swfdec/fix-cross-build.patch new file mode 100644 index 0000000000..d83e66a17b --- /dev/null +++ b/packages/swfdec/swfdec/fix-cross-build.patch @@ -0,0 +1,14 @@ +--- /tmp/Makefile.am 2006-12-29 18:42:25.000000000 +0100 ++++ swfdec-0.4.0/libswfdec/js/Makefile.am 2006-12-29 18:42:47.522227000 +0100 +@@ -93,11 +93,4 @@ + -DXP_UNIX -DDEBUG -fno-strict-aliasing + libjs_la_LDFLAGS = -lm + +-CLEANFILES = jsautocfg.h +- +-jsapi.c: jsautocfg.h +- +-jsautocfg.h: jscpucfg +- ./jscpucfg >jsautocfg.h +- + diff --git a/packages/tslib/tslib/hx4700/.mtn2git_empty b/packages/swfdec/swfdec/powerpc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/hx4700/.mtn2git_empty +++ b/packages/swfdec/swfdec/powerpc/.mtn2git_empty diff --git a/packages/swfdec/swfdec_0.4.0.bb b/packages/swfdec/swfdec_0.4.0.bb new file mode 100644 index 0000000000..778302c140 --- /dev/null +++ b/packages/swfdec/swfdec_0.4.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations." +LICENSE = ""LGPL + +DEPENDS = "pango cairo liboil zlib libmad gtk+ alsa-lib" + +SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.4/${P}.tar.gz \ + file://jsautocfg.h \ + file://fix-cross-build.patch;patch=1" + +inherit autotools pkgconfig lib_package + +do_configure_append() { + cp -f ${WORKDIR}/jsautocfg.h ${S}/libswfdec/js +} + diff --git a/packages/sword/sword_1.5.7.bb b/packages/sword/sword_1.5.7.bb index 1c12334d37..e20dadc23f 100644 --- a/packages/sword/sword_1.5.7.bb +++ b/packages/sword/sword_1.5.7.bb @@ -9,7 +9,7 @@ PR = "r5" SRC_URI = "http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz" -inherit autotools +inherit autotools EXTRA_OECONF = "--without-clucene --without-curl" diff --git a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb index 39ed9152aa..29ba157c89 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb @@ -1,5 +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" +S = "${WORKDIR}/mailmbox-1.12.1" diff --git a/packages/sylpheed/sylpheed_2.2.7.bb b/packages/sylpheed/sylpheed_2.2.7.bb index 6223624fc5..b22512b32f 100644 --- a/packages/sylpheed/sylpheed_2.2.7.bb +++ b/packages/sylpheed/sylpheed_2.2.7.bb @@ -21,7 +21,7 @@ do_configure_prepend() { mkdir -p m4 } -inherit autotools +inherit autotools do_install_append() { install -d ${D}${datadir}/applications diff --git a/packages/sylpheed/sylpheed_2.2.9.bb b/packages/sylpheed/sylpheed_2.2.9.bb index 6223624fc5..b22512b32f 100644 --- a/packages/sylpheed/sylpheed_2.2.9.bb +++ b/packages/sylpheed/sylpheed_2.2.9.bb @@ -21,7 +21,7 @@ do_configure_prepend() { mkdir -p m4 } -inherit autotools +inherit autotools do_install_append() { install -d ${D}${datadir}/applications diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb index d5dd98e1fc..2aa7152425 100644 --- a/packages/synergy/synergy_1.2.7.bb +++ b/packages/synergy/synergy_1.2.7.bb @@ -9,7 +9,7 @@ PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz" do_configure_prepend() { - grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' + grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' } inherit autotools diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb index a255ad15c3..a05728f0a5 100644 --- a/packages/syslinux/syslinux-native_2.11.bb +++ b/packages/syslinux/syslinux-native_2.11.bb @@ -1,38 +1,10 @@ -# syslinux-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="A multi-purpose linux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -LICENSE="GPL" - PR="r1" SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \ -file://edx_assume_zero.patch;patch=1" - -S="${WORKDIR}/syslinux-${PV}" - -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native - -DEPENDS="nasm-native" + file://edx_assume_zero.patch;patch=1" -inherit native +require syslinux.inc do_compile() { oe_runmake syslinux } - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 755 ${S}/syslinux ${STAGING_BINDIR} - - # When building media, the syslinux binary isn't nearly as useful - # as the DOS data files, so we copy those into a special location - # for usage during a image build stage - - install -d ${STAGING_DATADIR}/syslinux - install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys - install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss -} diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb index 4cf7873f36..28d750aab5 100644 --- a/packages/syslinux/syslinux-native_3.11.bb +++ b/packages/syslinux/syslinux-native_3.11.bb @@ -1,39 +1,5 @@ -# syslinux-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="A multi-purpose linux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -LICENSE="GPL" - PR="r1" -SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " - -S="${WORKDIR}/syslinux-${PV}" - -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native - -DEPENDS="nasm-native" - -inherit native - -STAGE_TEMP="${WORKDIR}/stage_temp" - -do_stage() { - install -d ${STAGE_TEMP} - oe_runmake install INSTALLROOT="${STAGE_TEMP}" - - install -d ${STAGING_BINDIR} - install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} - - # When building media, the syslinux binary isn't nearly as useful - # as the DOS data files, so we copy those into a special location - # for usage during a image build stage +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 " - install -d ${STAGING_DATADIR}/syslinux - install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin - install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys - install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss -} +require syslinux3.inc diff --git a/packages/syslinux/syslinux-native_3.31.bb b/packages/syslinux/syslinux-native_3.31.bb new file mode 100644 index 0000000000..6971874ea3 --- /dev/null +++ b/packages/syslinux/syslinux-native_3.31.bb @@ -0,0 +1,3 @@ +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc new file mode 100644 index 0000000000..41be168d12 --- /dev/null +++ b/packages/syslinux/syslinux.inc @@ -0,0 +1,29 @@ +# syslinux-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="A multi-purpose linux bootloader" +HOMEPAGE="http://syslinux.zytor.com/" +LICENSE="GPL" + +# If you really want to run syslinux, you need mtools. We just want the +# ldlinux.* stuff for now, so skip mtools-native +DEPENDS="nasm-native" + +S="${WORKDIR}/syslinux-${PV}" + + +inherit native + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 ${S}/syslinux ${STAGING_BINDIR} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + install -d ${STAGING_DATADIR}/syslinux + install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys + install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss +} diff --git a/packages/syslinux/syslinux3.inc b/packages/syslinux/syslinux3.inc new file mode 100644 index 0000000000..25942aab84 --- /dev/null +++ b/packages/syslinux/syslinux3.inc @@ -0,0 +1,20 @@ +require syslinux.inc + +STAGE_TEMP="${WORKDIR}/stage_temp" + +do_stage() { + install -d ${STAGE_TEMP} + oe_runmake install INSTALLROOT="${STAGE_TEMP}" + + install -d ${STAGING_BINDIR} + install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + install -d ${STAGING_DATADIR}/syslinux + install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin + install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys + install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss +} diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb index 87f85da430..ecfc27fafb 100644 --- a/packages/taglib/taglibc_1.4.bb +++ b/packages/taglib/taglibc_1.4.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/taglib-${PV}" inherit autotools qmake-base pkgconfig binconfig do_configure() { - echo running oe_runconf to get pkgconfig and binconfig files created + echo running oe_runconf to get pkgconfig and binconfig files created oe_runconf cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \ qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4898e84a33..d94847586c 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r15" +PR = "r16" PACKAGES = "task-base \ task-base-minimal \ @@ -44,7 +44,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DISTRO_CORE_PACKAGE ?= "task-base-core-default" # -# task-base +# task-base # RDEPENDS_task-base = "\ ${DISTRO_CORE_PACKAGE} \ @@ -60,6 +60,7 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ @@ -117,7 +118,7 @@ RDEPENDS_task-base-core-default = '\ fuser \ setserial' # Lets see if we can kill off hotplug... -# ${HOTPLUG} +# ${HOTPLUG} # ${@bootstrap_modutils_rdepends(d)} @@ -191,6 +192,10 @@ task-base-pcmcia26-rrecommends = "\ ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \ ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}" +task-base-bluetooth-rdepends = "\ + blueprobe \ + bluez-utils" + task-base-bluetooth-rrecommends = "\ kernel-module-bluetooth \ kernel-module-l2cap \ @@ -289,22 +294,22 @@ task-distro-nfs-rrecommends = "\ # Tosort -# kernel-module-ipv6 +# kernel-module-ipv6 # kernel-module-nvrd # kernel-module-mip6-mn # kernel-module-tun -# kernel-module-ide-disk +# kernel-module-ide-disk # kernel-module-ide-probe-mo # kernel-module-loop -# kernel-module-vfat +# kernel-module-vfat # kernel-module-ext2 -# kernel-module-sco +# kernel-module-sco # kernel-module-af_packet -# kernel-module-ip-gre -# kernel-module-ip-tables +# kernel-module-ip-gre +# kernel-module-ip-tables # kernel-module-ipip -# kernel-module-des +# kernel-module-des # kernel-module-md5 # kernel-module-8250 -# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz +# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index bbc40457f7..b93c5b7165 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment" -PR = "r3" +PR = "r4" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -106,7 +106,6 @@ RDEPENDS_gpe-task-connectivity := "\ RDEPENDS_gpe-task-apps-extra := "\ gpe-filemanager \ - gpe-nmf \ gpe-soundbite \ mbmerlin" diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 984fa61584..616968ea36 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -170,7 +170,7 @@ RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-e opie-rdesktop opie-wellenreiter opie-irc \ opie-mediaplayer2 \ qpdf2" -# konqueror-embedded +# konqueror-embedded RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \ opie-tetrix" diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb index 98f0a2d368..cd050342aa 100644 --- a/packages/tasks/task-ossie.bb +++ b/packages/tasks/task-ossie.bb @@ -7,7 +7,7 @@ PACKAGES = "task-ossie" ALLOW_EMPTY = "1" -IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}" +PACKAGE_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}" OSSIE_BASE = "screen procps xerces-c omniorb usrp" OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader" diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb deleted file mode 100644 index 14397e288c..0000000000 --- a/packages/tasks/task-pivotboot.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Basic packages required for a pivot root image" -PR = "r0" - -# The PIVOTBOOT_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" -PIVOTBOOT_EXTRA_RDEPENDS ?= "" -PIVOTBOOT_EXTRA_RRECOMMENDS ?= "" - -RDEPENDS = 'base-files base-passwd busybox \ - netbase modutils-initscripts \ - ${HOTPLUG} \ - ${PIVOTBOOT_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)}' - -RRECOMMENDS = '${PIVOTBOOT_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb index dccdd13bdf..f9d3f7bfc7 100644 --- a/packages/tasks/task-proper-tools.bb +++ b/packages/tasks/task-proper-tools.bb @@ -1,5 +1,5 @@ -DESCRIPTION = "Proper tools for busybox haters" -PR = "r2" +DESCRIPTION = "Full versions of tools provided by busybox" +PR = "r4" PACKAGE_ARCH = "all" ALLOW_EMPTY_${PN} = "1" @@ -12,6 +12,7 @@ RDEPENDS = "\ sed \ wget \ patch \ + tar \ diffutils \ less \ vim \ @@ -20,4 +21,8 @@ RDEPENDS = "\ module-init-tools \ " - +# +# binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info +# +# busybox tar does not understand '--no-same-owner' option which bitbake use +# diff --git a/packages/tasks/task-self-hosting.bb b/packages/tasks/task-self-hosting.bb new file mode 100644 index 0000000000..87604a2dab --- /dev/null +++ b/packages/tasks/task-self-hosting.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "All tools needed for OpenEmbedded build" +SECTION = "devel" +LICENSE = "MIT" +RDEPENDS = "cpp gcc-symlinks binutils-symlinks \ + perl perl-modules bitbake bash \ + task-proper-tools glibc-utils \ + linux-libc-headers-dev glibc-dev \ + texinfo make cvs subversion monotone-6" + +# +# quilt-native REQ bash and perl/perl-modules +# binutils REQ texinfo +# +# bitbake will fetch all needed python modules +# +# toolchain: +# - gcc-symlinks will fetch gcc +# - binutils-symlinks will fetch binutils +# - glibc-utils REQ cpp +# +# problems: +# - binutils-symlinks conflict with busybox +# - glibc-dev conflict with libc-linux-headers-dev +# - perl is so granulated that it is probably impossible +# to find out which packages are needed +# + +ALLOW_EMPTY = "1" + +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb index 0e52268cfd..7ffcc9a37f 100644 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ b/packages/tcpdump/tcpdump_3.9.3.bb @@ -9,7 +9,7 @@ PR = "r2" SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ file://tcpdump_configure_no_-O2.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--without-crypto" diff --git a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty b/packages/testdisk/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty +++ b/packages/testdisk/.mtn2git_empty diff --git a/packages/testdisk/testdisk_6.5+6.6-WIP.bb b/packages/testdisk/testdisk_6.5+6.6-WIP.bb new file mode 100644 index 0000000000..278c41cc99 --- /dev/null +++ b/packages/testdisk/testdisk_6.5+6.6-WIP.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "TestDisk is a powerful free data recovery software! It was primarily designed to help recover lost partitions and/or make non-booting disks bootable again when these symptoms are caused by faulty software, certain types of viruses or human error (such as accidentally deleting your Partition Table)." +LICENSE = "GPLv2" + +DEPENDS = "jpeg ncurses e2fsprogs-libs" + +SRC_URI = "http://www.cgsecurity.org/testdisk-6.6-WIP.tar.bz2" +S = "${WORKDIR}/testdisk-6.6-WIP" + +inherit autotools pkgconfig + +PACKAGES =+ "photorec" + +DESCRIPTION_photorec = "Photorec is file data recovery software designed to recover lost files including video, documents and archives from Hard Disks and CDRom and lost pictures (Photo Recovery) from digital camera memory." +FILES_photorec = "${sbindir}/photorec" diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb index f38bab7c10..68e5184439 100644 --- a/packages/tetex/tetex_3.0.bb +++ b/packages/tetex/tetex_3.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems" -HOMEPAGE = "http://www.tug.org/tetex" +HOMEPAGE = "http://www.tug.org/tetex" LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" diff --git a/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/texinfo/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/nokia770/.mtn2git_empty +++ b/packages/texinfo/.mtn2git_empty diff --git a/packages/texinfo/texinfo_4.8a.bb b/packages/texinfo/texinfo_4.8a.bb new file mode 100644 index 0000000000..7386226408 --- /dev/null +++ b/packages/texinfo/texinfo_4.8a.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Documentation system for on-line information and printed output" +HOMEPAGE = "http://www.gnu.org/software/texinfo/" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "ncurses" + +SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.bz2" + +inherit autotools gettext + +S = "${WORKDIR}/texinfo-4.8/" diff --git a/packages/thc/thcrut_1.2.5.bb b/packages/thc/thcrut_1.2.5.bb index 57e91d3417..2efec91167 100644 --- a/packages/thc/thcrut_1.2.5.bb +++ b/packages/thc/thcrut_1.2.5.bb @@ -6,11 +6,11 @@ LICENSE = "GPL" PR = "r1" SRC_URI = "http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz \ - file://configure_in.patch;patch=1;pnum=0" + file://configure_in.patch;patch=1;pnum=0" S = "${WORKDIR}/thcrut-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF = "--with-ssl=${STAGING_LIBDIR}/.." diff --git a/packages/tickypip/tickypip-levels_1.1.bb b/packages/tickypip/tickypip-levels_1.1.bb index 4e090db80a..c24044a168 100644 --- a/packages/tickypip/tickypip-levels_1.1.bb +++ b/packages/tickypip/tickypip-levels_1.1.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/" # packs in PalmGear. # # Packs available on PalmGear: Pak1, Pak3, Pak8, Pak9, Pak10 -# +# # URL: http://palmgear.com/index.cfm?fuseaction=software.developer&userID=862314499 # # I also got permission to distribute rest of levelpacks which was available diff --git a/packages/timesleuth/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb index 386695d5a9..655e9fd50c 100644 --- a/packages/timesleuth/timesleuth_1.0.5.bb +++ b/packages/timesleuth/timesleuth_1.0.5.bb @@ -18,7 +18,7 @@ APPDESKTOP = "${S}" do_install () { install -d ${D}${palmtopdir}/pics/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/ - + } inherit opie diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb index 676da9859f..8efe72d45c 100644 --- a/packages/timezones/timezones_1.2.0.bb +++ b/packages/timezones/timezones_1.2.0.bb @@ -20,7 +20,7 @@ python populate_packages_prepend() { pkgpattern = "timezone-%s" pkgdescription = "Timezone for %s" - do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern, + do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern, description=pkgdescription,allow_dirs=True ) } diff --git a/packages/tin/files/configure.patch b/packages/tin/files/configure.patch deleted file mode 100644 index 4059fe086f..0000000000 --- a/packages/tin/files/configure.patch +++ /dev/null @@ -1,205 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- tin-1.7.3/configure.in~configure -+++ tin-1.7.3/configure.in -@@ -34,8 +34,9 @@ - dnl - dnl Process this file with autoconf to produce a configure script. - --AC_PREREQ(2.13.20020210) --AC_INIT(include/tin.h) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([include/tin.h]) - AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin) - AC_PREFIX_DEFAULT(/usr/local) - -@@ -406,7 +407,7 @@ - CF_NCURSES_LIBS(ncursesw) - CF_NCURSES_VERSION - CF_XOPEN_CURSES -- test "$cf_cv_need_xopen_extension" = unknown && AC_ERROR(X/Open curses not found) -+ test "$cf_cv_need_xopen_extension" = unknown && AC_MSG_ERROR([X/Open curses not found]) - ;; - curses) #(vi - CF_CURSES_CPPFLAGS -@@ -432,25 +433,25 @@ - fi - - ## debugging libraries (do this after other libraries) --AC_MSG_CHECKING(if you want dbmalloc library) -+AC_MSG_CHECKING([if you want dbmalloc library]) - debug_malloc=none --AC_ARG_WITH(dbmalloc, -+AC_ARG_WITH([dbmalloc], - [ --with-dbmalloc use Conor Cahill's dbmalloc library], -- [AC_MSG_RESULT(yes) -- AC_CHECK_LIB(dbmalloc,debug_malloc, -- AC_CHECK_HEADER(dbmalloc.h,debug_malloc=DBMALLOC))], -- AC_MSG_RESULT(no)) -+ [AC_MSG_RESULT([yes]) -+ AC_CHECK_LIB([dbmalloc],[debug_malloc],[ -+ AC_CHECK_HEADER([dbmalloc.h],[debug_malloc=DBMALLOC])])], -+ AC_MSG_RESULT([no])) - --AC_MSG_CHECKING(if you want dmalloc library) --AC_ARG_WITH(dmalloc, -+AC_MSG_CHECKING([if you want dmalloc library]) -+AC_ARG_WITH([dmalloc], - [ --with-dmalloc use Gray Watson's dmalloc library], - [AC_MSG_RESULT(yes) -- AC_CHECK_LIB(dmalloc,dmalloc_debug, -- AC_CHECK_HEADER(dmalloc.h,debug_malloc=DMALLOC))], -+ AC_CHECK_LIB([dmalloc],[dmalloc_debug],[ -+ AC_CHECK_HEADER([dmalloc.h],[debug_malloc=DMALLOC])])], - AC_MSG_RESULT(no)) - --AC_MSG_CHECKING(if you want debugging-trace) --AC_ARG_WITH(trace, -+AC_MSG_CHECKING([if you want debugging-trace]) -+AC_ARG_WITH([trace], - [ --with-trace use debugging/traces], - [use_trace=yes], - [use_trace=no]) -@@ -667,7 +668,7 @@ - - ### checks for compiler characteristics - CF_MAKEFLAGS --AC_LANG_C -+AC_LANG([C]) - AC_C_CONST - AC_C_INLINE - CF_CPP_EXPANDS -@@ -763,14 +764,13 @@ - - dnl test to see if quad_t is defined - AC_MSG_CHECKING(for quad_t) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #if 0 - #include <stdlib.h> - #include <stddef.h> - #endif /* 0 */ --],[quad_t x; x = 0], --ac_cv_quad_t=yes, ac_cv_quad_t=no) -+]], [[quad_t x; x = 0]])],[ac_cv_quad_t=yes],[ac_cv_quad_t=no]) - AC_MSG_RESULT($ac_cv_quad_t) - if test $ac_cv_quad_t = yes; then - AC_DEFINE(HAVE_QUAD_T) -@@ -778,10 +778,9 @@ - - dnl test to see if long long is defined - AC_MSG_CHECKING(for long long) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> --],[long long x; x = 0], --ac_cv_long_long=yes, ac_cv_long_long=no) -+]], [[long long x; x = 0]])],[ac_cv_long_long=yes],[ac_cv_long_long=no]) - AC_MSG_RESULT($ac_cv_long_long) - if test $ac_cv_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG) -@@ -789,7 +788,7 @@ - - dnl test to see if nl_item is defined - AC_MSG_CHECKING(for nl_item) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_LANGINFO_H - #include <langinfo.h> - #else -@@ -797,8 +796,7 @@ - #include <nl_types.h> - #endif - #endif --],[nl_item x; x = 0], --ac_cv_nl_item=yes, ac_cv_nl_item=no) -+]], [[nl_item x; x = 0]])],[ac_cv_nl_item=yes],[ac_cv_nl_item=no]) - AC_MSG_RESULT($ac_cv_nl_item) - if test $ac_cv_nl_item = yes; then - AC_DEFINE(HAVE_NL_ITEM) -@@ -845,14 +843,13 @@ - cf_save_LIBS="$LIBS" - cf_try_icuuc="no" - LIBS="$LIBS -licuuc" -- AC_TRY_LINK([#include <unicode/unorm.h>], [ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unicode/unorm.h>]], [[ - int32_t needed, ustr = NULL; - UErrorCode status; -- needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [ -+ needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);]])],[ - AC_DEFINE(HAVE_LIBICUUC) -- cf_try_icuuc="yes"], -- LIBS=$cf_save_LIBS -- ) -+ cf_try_icuuc="yes"],[LIBS=$cf_save_LIBS -+ ]) - AC_MSG_RESULT($cf_try_icuuc) - ]) - ]) -@@ -866,15 +863,13 @@ - AC_MSG_CHECKING(if we should include termcap.h) - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$srcdir/include" -- AC_TRY_COMPILE([ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define HAVE_TERMCAP_H 1 --#include <tcurses.h>],[ -+#include <tcurses.h>]], [[ - #ifdef NCURSES_VERSION - make an error - #endif --], -- [cf_result=yes], -- [cf_result=no]) -+]])],[cf_result=yes],[cf_result=no]) - AC_MSG_RESULT($cf_result) - CFLAGS="$cf_save_CFLAGS" - test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H) -@@ -889,8 +884,7 @@ - cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" - elif test ".$cf_cv_termlib" = .termcap ; then - # BSD 'tputs()' may need 'PC' to be set. -- AC_TRY_LINK([],[extern char PC; PC = 0], -- [AC_DEFINE(HAVE_EXTERN_TCAP_PC)]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char PC; PC = 0]])],[AC_DEFINE(HAVE_EXTERN_TCAP_PC)],[]) - cf_tc_funcs="tgetint tgetnum tparam tparm" - cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" - fi -@@ -1172,7 +1166,7 @@ - - CF_CHECK_HEADERS(iconv.h) - AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension) --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #ifdef HAVE_ICONV_H - # include <iconv.h> - #endif /* HAVE_ICONV_H */ -@@ -1185,11 +1179,8 @@ - if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1)) - exit(1); - exit(0); --}], -- AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no), -- AC_MSG_RESULT(unknown) --) -+}]])],[AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(unknown) -+]) - - - # tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test -@@ -1223,6 +1214,7 @@ - CF_DEFINE_STRING(TIN_LDFLAGS, "$LDFLAGS") - CF_DEFINE_STRING(TIN_LIBS, "$LIBS") - --AC_OUTPUT($PCRE_MAKEFILE -+AC_CONFIG_FILES([$PCRE_MAKEFILE - $SUB_MAKEFILE -- src/Makefile) -+ src/Makefile]) -+AC_OUTPUT diff --git a/packages/tin/files/makecfg-buildcc.patch b/packages/tin/files/makecfg-buildcc.patch deleted file mode 100644 index 2b3dba44f9..0000000000 --- a/packages/tin/files/makecfg-buildcc.patch +++ /dev/null @@ -1,24 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- tin-1.7.3/src/Makefile.in~makecfg-buildcc -+++ tin-1.7.3/src/Makefile.in -@@ -462,7 +462,7 @@ - ./makecfg $(SRCDIR)/tincfg.tbl tincfg.h - - makecfg$(EXEEXT): $(OBJDIR)/makecfg.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/makecfg.o @LIBS@ -+ $(BUILD_CC) $(BUILD_LDFLAGS) -o $@ $(OBJDIR)/makecfg.o - - $(OBJDIR)/active.o: $(SRCDIR)/active.c $(TIN_DEP) - $(OBJDIR)/art.o: $(SRCDIR)/art.c $(TIN_DEP) \ -@@ -519,6 +519,7 @@ - $(OBJDIR)/main.o: $(SRCDIR)/main.c $(TIN_DEP) \ - $(INCDIR)/version.h - $(OBJDIR)/makecfg.o: $(SRCDIR)/makecfg.c $(TIN_DEP) -+ $(BUILD_CC) $(BUILD_CFLAGS) -c -I../include -I../pcre -o $@ $(SRCDIR)/makecfg.c - $(OBJDIR)/memory.o: $(SRCDIR)/memory.c $(TIN_DEP) \ - $(INCDIR)/rfc2046.h - $(OBJDIR)/mimetypes.o: $(SRCDIR)/mimetypes.c $(TIN_DEP) diff --git a/packages/tin/tin.inc b/packages/tin/tin.inc new file mode 100644 index 0000000000..e66fe8c67a --- /dev/null +++ b/packages/tin/tin.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "Tin is a powerful text mode news reader." +SECTION = "console/network" +DEPENDS = "ncurses libpcre" +LICENSE = "GPL" + +inherit autotools + +EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.." diff --git a/packages/tin/tin_1.7.3.bb b/packages/tin/tin_1.7.3.bb deleted file mode 100644 index 3383f74757..0000000000 --- a/packages/tin/tin_1.7.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Tin is a powerful text mode news reader." -SECTION = "console/network" -DEPENDS = "ncurses" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \ - file://makecfg-buildcc.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-screen=ncurses" -CFLAGS += "-DM_UNIX" - -do_compile() { - ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c pcre/dftables.c - ${BUILD_CC} dftables.o -o pcre/dftables - oe_runmake build -} diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb index 560184f413..2b783b2a58 100644 --- a/packages/tin/tin_1.9.1.bb +++ b/packages/tin/tin_1.9.1.bb @@ -1,16 +1,11 @@ -DESCRIPTION = "Tin is a powerful text mode news reader." -SECTION = "console/network" -DEPENDS = "ncurses pcre" -LICENSE = "GPL" +require tin.inc + PR = "r0" -SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools - PARALLEL_MAKE = "" -EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.." export BUILD_CFLAGS += "-I${S}/include -DHAVE_CONFIG_H" diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb index 68e6899756..9019ffc1a9 100644 --- a/packages/tinymail/tinymail_svn.bb +++ b/packages/tinymail/tinymail_svn.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus gconf-dbus libgnomeui" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices" LICENSE = "GPL" @@ -15,7 +15,7 @@ SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=http \ file://gtk-doc.m4 \ file://gtk-doc.make" -inherit pkgconfig autotools +inherit pkgconfig autotools S = "${WORKDIR}/trunk" do_configure_prepend() { @@ -50,7 +50,7 @@ FILES_tinymail-camel-lite-dev += "${libdir}/libcamel-lite*.so \ ${libdir}/libcamel-lite*.a \ ${libdir}/libcamel-lite*.la \ ${libdir}/camel-lite-1.2/camel-providers/*.la \ - ${libdir}/camel-lite-1.2/camel-providers/*.a " + ${libdir}/camel-lite-1.2/camel-providers/*.a " FILES_tinymail-camel-lite-dbg += "${libdir}/camel-lite-1.2/camel-providers/.debug" diff --git a/packages/totem/totem_0.99.15.bb b/packages/totem/totem_0.99.15.bb index 028a0d66fe..3defdaebe6 100644 --- a/packages/totem/totem_0.99.15.bb +++ b/packages/totem/totem_0.99.15.bb @@ -23,7 +23,7 @@ LDFLAGS_append = " -Wl,--export-dynamic" pkg_postinst_totem() { #!/bin/sh -if [ -n "$D" ]; then exit 1; fi; +if [ -n "$D" ]; then exit 1; fi; SOURCE=`gconftool-2 --get-default-source` GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \ /etc/gconf/schemas/totem.schemas > /dev/null diff --git a/packages/totem/totem_1.0.4.bb b/packages/totem/totem_1.0.4.bb index 617b4aa9d0..a12f307ffa 100644 --- a/packages/totem/totem_1.0.4.bb +++ b/packages/totem/totem_1.0.4.bb @@ -26,7 +26,7 @@ LDFLAGS_append = " -Wl,--export-dynamic" pkg_postinst_totem() { #!/bin/sh -if [ -n "$D" ]; then exit 1; fi; +if [ -n "$D" ]; then exit 1; fi; SOURCE=`gconftool-2 --get-default-source` GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \ /etc/gconf/schemas/totem.schemas > /dev/null diff --git a/packages/transconnect/transconnect_1.3-beta.bb b/packages/transconnect/transconnect_1.3-beta.bb index 807943daf8..45d9f87b61 100644 --- a/packages/transconnect/transconnect_1.3-beta.bb +++ b/packages/transconnect/transconnect_1.3-beta.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/transconnect-1.3-Beta" LDFLAGS_append = " -shared" do_compile () { # build with local resolv.conf and dns over tcp support - oe_runmake localtcp + oe_runmake localtcp } do_install () { diff --git a/packages/tsclient/tsclient_0.132.bb b/packages/tsclient/tsclient_0.132.bb index b6a73c0728..9f7955f5ee 100644 --- a/packages/tsclient/tsclient_0.132.bb +++ b/packages/tsclient/tsclient_0.132.bb @@ -13,7 +13,7 @@ SRC_URI="http://www.gnomepro.com/tsclient/tsclient-${PV}.tar.gz \ DEPENDS="gtk+ intltool-native" -inherit autotools +inherit autotools EXTRA_OECONF=" --without-applet --without-ica" @@ -26,4 +26,4 @@ FILES_${PN}="${bindir} \ ${datadir}/pixmaps/tsclient/colors.png \ ${datadir}/pixmaps/tsclient/keyboard.png \ ${datadir}/pixmaps/tsclient/program.png \ - ${datadir}/pixmaps/tsclient/sound.png" + ${datadir}/pixmaps/tsclient/sound.png" diff --git a/packages/tslib/tslib-maemo/multievent.patch b/packages/tslib/tslib-maemo/multievent.patch deleted file mode 100644 index 854e7af5dd..0000000000 --- a/packages/tslib/tslib-maemo/multievent.patch +++ /dev/null @@ -1,843 +0,0 @@ ---- tslib/plugins/linear.c~multievent -+++ tslib/plugins/linear.c -@@ -39,14 +39,12 @@ - linear_read(struct tslib_module_info *info, struct ts_sample *samp, int nr) - { - struct tslib_linear *lin = (struct tslib_linear *)info; -- int ret; -+ int ret, i = 0; - int xtemp,ytemp; - - ret = info->next->ops->read(info->next, samp, nr); - if (ret >= 0) { -- int nr; -- -- for (nr = 0; nr < ret; nr++, samp++) { -+ for (i = 0; i < ret; i++, samp++) { - #ifdef DEBUG - fprintf(stderr,"BEFORE CALIB--------------------> %d %d %d\n",samp->x, samp->y, samp->pressure); - #endif /*DEBUG*/ -@@ -66,6 +64,7 @@ - samp->y = tmp; - } - } -+ ret = i; - } - - return ret; ---- tslib/plugins/dejitter.c~multievent -+++ tslib/plugins/dejitter.c -@@ -24,7 +24,6 @@ - - struct tslib_threshold { - struct tslib_module_info module; -- int pthreshold; - int xdelta; - int ydelta; - int delta2; -@@ -36,40 +35,28 @@ - static int threshold_read(struct tslib_module_info *info, struct ts_sample *samp, int nr) - { - struct tslib_threshold *thr = (struct tslib_threshold *)info; -- struct ts_sample *s; -- int ret; -+ struct ts_sample *src = samp, *dest = samp; -+ int ret, i = 0; - - ret = info->next->ops->read(info->next, samp, nr); - if (ret >= 0) { -- int nr = 0; -- -- for (s = samp; s < samp + ret; s++) { -+ for (i = 0; i < ret; i++, samp++) { - int dr2; - #ifdef DEBUG -- fprintf(stderr,"BEFORE DEJITTER---------------> %d %d %d\n",s->x,s->y,s->pressure); -+ fprintf(stderr,"BEFORE DEJITTER---------------> %d %d %d\n", samp->x, samp->y, samp->pressure); - #endif /*DEBUG*/ -- thr->down = (s->pressure >= thr->pthreshold); -- if (thr->down) { -- dr2 = (thr->x - s->x)*(thr->x - s->x) -- + (thr->y - s->y)*(thr->y - s->y); -- if(dr2 < thr->delta2) { -- s->x = thr->x; -- s->y = thr->y; -- } else { -- thr->x = s->x; -- thr->y = s->y; -- } -- -+ dr2 = (thr->x - samp->x)*(thr->x - samp->x) -+ + (thr->y - samp->y)*(thr->y - samp->y); -+ if(dr2 < thr->delta2) { -+ samp->x = thr->x; -+ samp->y = thr->y; - } else { -- s->x = thr->x; -- s->y = thr->y; -+ thr->x = samp->x; -+ thr->y = samp->y; - } -- -- -- samp[nr++] = *s; - } - -- ret = nr; -+ ret = i; - } - return ret; - } -@@ -106,10 +93,6 @@ - thr->ydelta = v; - break; - -- case 3: -- thr->pthreshold = v; -- break; -- - default: - return -1; - } -@@ -120,7 +103,6 @@ - { - { "xdelta", (void *)1, threshold_limit }, - { "ydelta", (void *)2, threshold_limit }, -- { "pthreshold", (void *)3, threshold_limit } - }; - - //#define NR_VARS (sizeof(threshold_vars) / sizeof(threshold_vars[0])) -@@ -138,7 +120,6 @@ - - thr->xdelta = 10; - thr->ydelta = 10; -- thr->pthreshold = 100; - - if (tslib_parse_vars(&thr->module, threshold_vars, NR_VARS, params)) { - free(thr); ---- tslib/plugins/variance.c~multievent -+++ tslib/plugins/variance.c -@@ -9,25 +9,36 @@ - * $Id: variance.c,v 1.3 2002/11/08 23:28:55 dlowder Exp $ - * - * Variance filter for touchscreen values -+ * -+ * Policy question (applies to all tslib modules that consume events): -+ * 1) User requests a read of 5 events using nr. -+ * 2) Lower layers return us 4 events. -+ * 3) Perform variance calculation, we now only have _1_ event. -+ * 4) Do we, a) duplicate this data across the user requested 4 events, -+ * b) push up the single event -+ * c) loop on the read from the lower layers to obtain -+ * the user's requested number of events, unless we hit -+ * a pen_up. - */ -+ - #include <errno.h> - #include <stdlib.h> - #include <string.h> - #include <limits.h> -- - #include <stdio.h> - - #include "tslib.h" - #include "tslib-filter.h" - -+#define NR_INIT -1 - #define NR_LAST 4 - - struct tslib_variance { - struct tslib_module_info module; - int nr; -- unsigned int pthreshold; - unsigned int xlimit; - unsigned int ylimit; -+ unsigned int pthreshold; - struct ts_sample last[NR_LAST]; - }; - -@@ -37,8 +48,7 @@ - * least variance, and average them. - */ - static int --variance_calculate(struct tslib_variance *var, struct ts_sample *samp, -- struct ts_sample *s) -+variance_calculate(struct tslib_variance *var, struct ts_sample *dest, struct ts_sample *src) - { - int i, j; - int diff_x, min_x, i_x, j_x; -@@ -100,11 +110,11 @@ - } - } - -- samp->x = (var->last[i_x].x + var->last[j_x].x) / 2; -- samp->y = (var->last[i_y].y + var->last[j_y].y) / 2; -- samp->pressure = (var->last[i_p].pressure + var->last[j_p].pressure) / 2; -- samp->tv.tv_sec = s->tv.tv_sec; -- samp->tv.tv_usec = s->tv.tv_usec; -+ dest->x = (var->last[i_x].x + var->last[j_x].x) / 2; -+ dest->y = (var->last[i_y].y + var->last[j_y].y) / 2; -+ dest->pressure = (var->last[i_p].pressure + var->last[j_p].pressure) / 2; -+ dest->tv.tv_sec = src->tv.tv_sec; -+ dest->tv.tv_usec = src->tv.tv_usec; - - return 1; - } -@@ -112,55 +122,57 @@ - static int variance_read(struct tslib_module_info *info, struct ts_sample *samp, int nr) - { - struct tslib_variance *var = (struct tslib_variance *)info; -- struct ts_sample *s; -- int ret; -- -- ret = info->next->ops->read(info->next, samp, nr); -- if (ret >= 0) { -- int nr = 0; -- -- for (s = samp; s < samp + ret; s++) { -- if (s->pressure < var->pthreshold) { -- /* -- * Pen was released. Reset our state and -- * pass up the release information. -- */ --// samp[nr].x = 0; --// samp[nr].y = 0; -- samp[nr].pressure = s->pressure; -- samp[nr].tv.tv_sec = s->tv.tv_sec; -- samp[nr].tv.tv_usec = s->tv.tv_usec; -- -- nr++; -- -- var->nr = 0; -- continue; -- } else if (var->nr == -1) { -- /* -- * Pen was pressed. Inform upper layers -- * immediately. -- */ -- samp[nr] = *s; -- nr++; -- } -- -- if (var->nr >= 0) { -- var->last[var->nr].x = s->x; -- var->last[var->nr].y = s->y; -- var->last[var->nr].pressure = s->pressure; -- } -- -- var->nr++; -+ struct ts_sample *src = samp, *dest = samp; -+ int ret, i = 0; - -- if (var->nr == NR_LAST) { -- if (variance_calculate(var, samp + nr, s)) -- nr++; -- var->nr = 0; -+ /* -+ * NOTES: -+ * -+ * Loop on read, collecting events until we hit nr, unless -+ * we hit a pen up or encounter a failure. -+ */ -+ while ((i < nr) && (ret != -1)) { -+ ret = info->next->ops->read(info->next, dest + i, nr - i); -+ if (ret >= 0) { -+ for (src = dest + i; src < dest + ret; src++) { -+ if (src->pressure < var->pthreshold) { -+ /* pen released, reset var->nr, -+ * do a calc based on what we have so -+ * far, and let this event flow up */ -+ if (variance_calculate(var, dest + i, src)) -+ i++; -+ var->nr = NR_INIT; -+ ret = -1; /* break outer loop, push up event */ -+ break; -+ } else if (var->nr == NR_INIT) { -+ /* -+ * First pen down event. Inform upper layers -+ * immediately for responsiveness. -+ */ -+ var->nr = 0; -+ i++; -+ ret = -1; /* break outer loop */ -+ break; -+ } -+ -+ if (var->nr >= 0) { -+ var->last[var->nr].x = src->x; -+ var->last[var->nr].y = src->y; -+ var->last[var->nr].pressure = src->pressure; -+ } -+ -+ var->nr++; -+ -+ if (var->nr == NR_LAST) { -+ if (variance_calculate(var, dest + i, src)) -+ i++; -+ var->nr = 0; -+ } - } - } -- -- ret = nr; - } -+ /* if we've collected at least one event, send it up */ -+ if (i != 0) ret = i; - return ret; - } - -@@ -196,10 +208,6 @@ - var->ylimit = v; - break; - -- case 3: -- var->pthreshold = v; -- break; -- - default: - return -1; - } -@@ -210,7 +218,6 @@ - { - { "xlimit", (void *)1, variance_limit }, - { "ylimit", (void *)2, variance_limit }, -- { "pthreshold", (void *)3, variance_limit } - }; - - #define NR_VARS (sizeof(variance_vars) / sizeof(variance_vars[0])) -@@ -218,6 +225,7 @@ - struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - { - struct tslib_variance *var; -+ char *pthresvar; - - var = malloc(sizeof(struct tslib_variance)); - if (var == NULL) -@@ -225,10 +233,15 @@ - - var->module.ops = &variance_ops; - -- var->nr = -1; -+ var->nr = NR_INIT; - var->xlimit = 160; - var->ylimit = 160; - var->pthreshold = 100; -+ pthresvar = getenv("TSLIB_PTHRES"); -+ if (pthresvar != NULL) { -+ int p = strtol(pthresvar, (char **)NULL, 10); -+ if (p != -1) var->pthreshold = p; -+ } - - if (tslib_parse_vars(&var->module, variance_vars, NR_VARS, params)) { - free(var); ---- tslib/README~multievent -+++ tslib/README -@@ -36,6 +36,19 @@ - usages. They are by no means exhaustive, nor probably even good examples. - They are basically the programs I used to test this library. - -+Module Creation Notes -+===================== -+ -+For those creating tslib modules, it is important to note a couple things with -+regard to handling of the ability for a user to request more than one ts event -+at a time. The first thing to note is that the lower layers may send up less -+events than the user requested, but only if that was a result of a pen release. -+Next, your module should send up just as many events as the user requested in -+nr. If your module is one that consumes events, such as variance, then you -+loop on the read from the lower layers, and only send the events up when -+1) you have the number of events requested by the user, or 2) one of the events -+from the lower layers was a pen release. -+ - - Module Parameters - ================= ---- tslib/src/ts_read_raw.c~multievent -+++ tslib/src/ts_read_raw.c -@@ -14,10 +14,10 @@ - * - * Read raw pressure, x, y, and timestamp from a touchscreen device. - */ -+ - #include "config.h" - - #include <stdio.h> -- - #include <stdlib.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> -@@ -25,79 +25,27 @@ - #include <sys/time.h> - #include <sys/types.h> - --#ifdef USE_INPUT_API --#include <linux/input.h> --#else --struct ts_event { /* Used in UCB1x00 style touchscreens (the default) */ -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; -- struct timeval stamp; --}; --struct h3600_ts_event { /* Used in the Compaq IPAQ */ -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --}; --struct mk712_ts_event { /* Used in the Hitachi Webpad */ -- unsigned int header; -- unsigned int x; -- unsigned int y; -- unsigned int reserved; --}; --struct arctic2_ts_event { /* Used in the IBM Arctic II */ -- signed short pressure; -- signed int x; -- signed int y; -- int millisecs; -- int flags; --}; --struct collie_ts_event { /* Used in the Sharp Zaurus SL-5000d and SL-5500 */ -- long y; -- long x; -- long pressure; -- long long millisecs; --}; --struct corgi_ts_event { /* Used in the Sharp Zaurus SL-C700 */ -- short pressure; -- short x; -- short y; -- short millisecs; --}; --#endif /* USE_INPUT_API */ -- - #include "tslib-private.h" - --int ts_read_raw(struct tsdev *ts, struct ts_sample *samp, int nr) --{ - #ifdef USE_INPUT_API -+#include <linux/input.h> -+ -+static inline int get_input_event(struct tsdev *ts, struct ts_sample *samp) { - struct input_event ev; --#else -- struct ts_event *evt; -- struct h3600_ts_event *hevt; -- struct mk712_ts_event *mevt; -- struct arctic2_ts_event *aevt; -- struct collie_ts_event *collie_evt; -- struct corgi_ts_event *corgi_evt; --#endif /* USE_INPUT_API */ -- int ret; -- int total = 0; -+ struct timeval tv = {0, 0}; -+ fd_set fdset; -+ int ret = 0; - -- char *tseventtype=NULL; -- char *defaulttseventtype="UCB1x00"; -+ /* event vars */ -+ static int curr_x = 0, curr_y = 0; -+ int curr_p = 0, next_x = 0, next_y = 0; - --#ifdef USE_INPUT_API -- /* warning: maybe those static vars should be part of the tsdev struct? */ -- static int curr_x = 0, curr_y = 0, curr_p = 0; -- static int got_curr_x = 0, got_curr_y = 0; -- int got_curr_p = 0; -- int next_x, next_y; -+ /* state variables */ -+ int got_curr_x = 0, got_curr_y = 0, got_curr_p = 0; - int got_next_x = 0, got_next_y = 0; - int got_tstamp = 0; - -- while (total < nr) { -+ while (1) { - ret = read(ts->fd, &ev, sizeof(struct input_event)); - if (ret < sizeof(struct input_event)) break; - -@@ -146,177 +94,231 @@ - samp->tv = ev.time; - } - -- if ( (!got_curr_x || !got_curr_y) && !got_curr_p && -- !got_next_x && !got_next_y ) { -- /* -- * The current event is not complete yet. -- * Give the kernel a chance to feed us more. -- */ -- struct timeval tv = {0, 0}; -- fd_set fdset; -- FD_ZERO(&fdset); -- FD_SET(ts->fd, &fdset); -- ret = select(ts->fd+1, &fdset, NULL, NULL, &tv); -- if (ret == 1) continue; -- if (ret == -1) break; -+ if (got_curr_x && got_curr_y && got_curr_p) { -+ /* we have a complete event */ -+ samp->x = curr_x; -+ samp->y = curr_y; -+ samp->pressure = curr_p; -+ ret = 0; /* indicate success */ -+ if (got_next_x) curr_x = next_x; -+ if (got_next_y) curr_y = next_y; -+ break; - } - -- /* We consider having a complete ts event */ -- samp->x = curr_x; -- samp->y = curr_y; -- samp->pressure = curr_p; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- samp++; -- total++; -- -- /* get ready for next event */ -- if (got_next_x) curr_x = next_x; else got_curr_x = 0; -- if (got_next_y) curr_y = next_y; else got_curr_y = 0; -- got_next_x = got_next_y = got_tstamp = 0; -+ /* -+ * The current event is not complete yet. -+ * Give the kernel a chance to feed us more. -+ */ -+ FD_ZERO(&fdset); -+ FD_SET(ts->fd, &fdset); -+ ret = select(ts->fd+1, &fdset, NULL, NULL, &tv); -+ if (ret == 1) continue; -+ if (ret == -1) break; - } - -- if (ret) ret = -1; -- if (total) ret = total; -+// fprintf(stdout, "%s: returning %d\n", __FUNCTION__, ret); -+ if (ret != 0) ret = -1; -+ return ret; -+} -+ - #else -+ -+struct ucb1x00_ts_event { /* Used in UCB1x00 style touchscreens (the default) */ -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short pad; -+ struct timeval stamp; -+}; -+struct h3600_ts_event { /* Used in the Compaq IPAQ */ -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short pad; -+}; -+struct mk712_ts_event { /* Used in the Hitachi Webpad */ -+ unsigned int header; -+ unsigned int x; -+ unsigned int y; -+ unsigned int reserved; -+}; -+struct arctic2_ts_event { /* Used in the IBM Arctic II */ -+ signed short pressure; -+ signed int x; -+ signed int y; -+ int millisecs; -+ int flags; -+}; -+struct collie_ts_event { /* Used in the Sharp Zaurus SL-5000d and SL-5500 */ -+ long y; -+ long x; -+ long pressure; -+ long long millisecs; -+}; -+struct corgi_ts_event { /* Used in the Sharp Zaurus SL-C700 */ -+ short pressure; -+ short x; -+ short y; -+ short millisecs; -+}; -+ -+static inline int get_ucb1x00_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct ucb1x00_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct ucb1x00_ts_event)); -+ if (ret > 0) { -+ samp->x = evt.x; -+ samp->y = evt.y; -+ samp->pressure = evt.pressure; -+ samp->tv.tv_usec = evt.stamp.tv_usec; -+ samp->tv.tv_sec = evt.stamp.tv_sec; -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+static inline int get_h3600_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct h3600_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct h3600_ts_event)); -+ if (ret > 0) { -+ samp->x = evt.x; -+ samp->y = evt.y; -+ samp->pressure = evt.pressure; -+ gettimeofday(&samp->tv, NULL); -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+static inline int get_mk712_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct mk712_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct mk712_ts_event)); -+ if (ret > 0) { -+ samp->x = (short)evt.x; -+ samp->y = (short)evt.y; -+ if(evt.header==0) -+ samp->pressure=1; -+ else -+ samp->pressure=0; -+ gettimeofday(&samp->tv, NULL); -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+static inline int get_arctic2_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct arctic2_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct arctic2_ts_event)); -+ if (ret > 0) { -+ samp->x = (short)evt.x; -+ samp->y = (short)evt.y; -+ samp->pressure = evt.pressure; -+ gettimeofday(&samp->tv, NULL); -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+static inline int get_collie_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct collie_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct collie_ts_event)); -+ if (ret > 0) { -+ samp->x = evt.x; -+ samp->y = evt.y; -+ samp->pressure = evt.pressure; -+ samp->tv.tv_usec = evt.millisecs % 1000; -+ samp->tv.tv_sec = evt.millisecs / 1000; -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+static inline int get_corgi_event(struct tsdev *ts, struct ts_sample *samp) { -+ struct corgi_ts_event evt; -+ int ret = read(ts->fd, &evt, sizeof(struct corgi_ts_event)); -+ if (ret > 0) { -+ samp->x = evt.x; -+ samp->y = evt.y; -+ samp->pressure = evt.pressure; -+ samp->tv.tv_usec = evt.millisecs % 1000; -+ samp->tv.tv_sec = evt.millisecs / 1000; -+ ret = 0; /* success */ -+ } -+ return ret; -+} -+ -+#endif -+ -+int ts_read_raw(struct tsdev *ts, struct ts_sample *samp, int nr) -+{ -+ int ret; -+ int total = 0; -+ int pen_down = 1; -+ static short x_save = 0, y_save = 0; -+ static int pthres = -1; -+ -+#ifndef USE_INPUT_API -+ char *tseventtype=NULL; -+ char *defaulttseventtype="UCB1x00"; - tseventtype = getenv("TSLIB_TSEVENTTYPE"); - if(tseventtype==NULL) tseventtype=defaulttseventtype; -+#endif - -- if( strcmp(tseventtype,"H3600") == 0) { /* iPAQ style h3600 touchscreen events */ -- hevt = alloca(sizeof(*hevt) * nr); -- ret = read(ts->fd, hevt, sizeof(*hevt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*hevt); -- while(ret >= sizeof(*hevt)) { -- samp->x = hevt->x; -- samp->y = hevt->y; -- samp->pressure = hevt->pressure; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- gettimeofday(&samp->tv,NULL); -- samp++; -- hevt++; -- ret -= sizeof(*hevt); -- } -- } else { -- return -1; -- } -- } else if( strcmp(tseventtype,"MK712") == 0) { /* Hitachi Webpad events */ -- mevt = alloca(sizeof(*mevt) * nr); -- ret = read(ts->fd, mevt, sizeof(*mevt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*mevt); -- while(ret >= sizeof(*mevt)) { -- samp->x = (short)mevt->x; -- samp->y = (short)mevt->y; -- if(mevt->header==0) -- samp->pressure=1; -- else -- samp->pressure=0; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- gettimeofday(&samp->tv,NULL); -- samp++; -- mevt++; -- ret -= sizeof(*mevt); -- } -- } else { -- return -1; -- } -- -- } else if( strcmp(tseventtype,"ARCTIC2") == 0) { /* IBM Arctic II events */ -- aevt = alloca(sizeof(*aevt) * nr); -- ret = read(ts->fd, aevt, sizeof(*aevt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*aevt); -- while(ret >= sizeof(*aevt)) { -- samp->x = (short)aevt->x; -- samp->y = (short)aevt->y; -- samp->pressure = aevt->pressure; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- gettimeofday(&samp->tv,NULL); -- samp++; -- aevt++; -- ret -= sizeof(*aevt); -- } -+ while ((total < nr) && pen_down) { -+// fprintf(stdout, "total: %d, nr: %d\n", total, nr); -+#ifdef USE_INPUT_API -+ ret = get_input_event(ts, samp); -+#else -+ if (strcmp(tseventtype, "H3600") == 0) { -+ /* iPAQ style h3600 touchscreen events */ -+ ret = get_h3600_event(ts, samp); -+ } else if (strcmp(tseventtype, "MK712") == 0) { -+ /* Hitachi Webpad events */ -+ ret = get_mk712_event(ts, samp); -+ } else if (strcmp(tseventtype, "ARCTIC2") == 0) { -+ /* IBM Arctic II events */ -+ ret = get_arctic2_event(ts, samp); -+ } else if (strcmp(tseventtype, "COLLIE") == 0) { -+ /* Sharp Zaurus SL-5000d/5500 events */ -+ ret = get_collie_event(ts, samp); -+ } else if (strcmp(tseventtype,"CORGI") == 0) { -+ /* Sharp Zaurus SL-C700 events */ -+ ret = get_corgi_event(ts, samp); - } else { -- return -1; -+ /* Use normal UCB1x00 type events */ -+ ret = get_ucb1x00_event(ts, samp); - } -+#endif -+ if (ret != 0) break; - -- } else if( strcmp(tseventtype,"COLLIE") == 0) { /* Sharp Zaurus SL-5000d/5500 events */ -- collie_evt = alloca(sizeof(*collie_evt) * nr); -- ret = read(ts->fd, collie_evt, sizeof(*collie_evt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*collie_evt); -- while(ret >= sizeof(*collie_evt)) { -- samp->x = collie_evt->x; -- samp->y = collie_evt->y; -- samp->pressure = collie_evt->pressure; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- samp->tv.tv_usec = collie_evt->millisecs % 1000; -- samp->tv.tv_sec = collie_evt->millisecs / 1000; -- samp++; -- collie_evt++; -- ret -= sizeof(*collie_evt); -+ if (pthres == -1) { -+ char *pthresvar = getenv("TSLIB_PTHRES"); -+ pthres = 100; -+ if (pthresvar != NULL) { -+ int p = strtol(pthresvar, (char **)NULL, 10); -+ if (p != -1) pthres = p; - } -- } else { -- return -1; - } - -- } else if( strcmp(tseventtype,"CORGI") == 0) { /* Sharp Zaurus SL-C700 events */ -- corgi_evt = alloca(sizeof(*corgi_evt) * nr); -- ret = read(ts->fd, corgi_evt, sizeof(*corgi_evt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*corgi_evt); -- while(ret >= sizeof(*corgi_evt)) { -- samp->x = corgi_evt->x; -- samp->y = corgi_evt->y; -- samp->pressure = corgi_evt->pressure; --#ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); --#endif /*DEBUG*/ -- samp->tv.tv_usec = corgi_evt->millisecs % 1000; -- samp->tv.tv_sec = corgi_evt->millisecs / 1000; -- samp++; -- corgi_evt++; -- ret -= sizeof(*corgi_evt); -- } -+ if (samp->pressure < pthres) { -+ /* pen released, send events up */ -+ pen_down = 0; -+ /* set x and y to previous values */ -+ samp->x = x_save; -+ samp->y = y_save; - } else { -- return -1; -+ pen_down = 1; -+ x_save = samp->x; -+ y_save = samp->y; - } -- -- } else { /* Use normal UCB1x00 type events */ -- evt = alloca(sizeof(*evt) * nr); -- ret = read(ts->fd, evt, sizeof(*evt) * nr); -- if(ret > 0) { -- int nr = ret / sizeof(*evt); -- while(ret >= sizeof(*evt)) { -- samp->x = evt->x; -- samp->y = evt->y; -- samp->pressure = evt->pressure; - #ifdef DEBUG -- fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); -+ fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x, samp->y, samp->pressure); - #endif /*DEBUG*/ -- samp->tv.tv_usec = evt->stamp.tv_usec; -- samp->tv.tv_sec = evt->stamp.tv_sec; -- samp++; -- evt++; -- ret -= sizeof(*evt); -- } -- } else { -- return -1; -- } -+ samp++; -+ total++; - } -- ret = nr; --#endif /* USE_INPUT_API */ - -+ if (ret != 0) ret = -1; -+ if (total) ret = total; - return ret; - } - diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh deleted file mode 100644 index 0ff219b31f..0000000000 --- a/packages/tslib/tslib/akita/tslib.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh deleted file mode 100644 index 0ff219b31f..0000000000 --- a/packages/tslib/tslib/c7x0/tslib.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh deleted file mode 100644 index f73e39c5d9..0000000000 --- a/packages/tslib/tslib/h1940/tslib.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh deleted file mode 100644 index b096bfb96e..0000000000 --- a/packages/tslib/tslib/h2200/tslib.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/touchscreen/0raw - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh deleted file mode 100644 index 6c480f46af..0000000000 --- a/packages/tslib/tslib/h3600/tslib.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/touchscreen/0raw - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh deleted file mode 100644 index 6c480f46af..0000000000 --- a/packages/tslib/tslib/h3900/tslib.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/touchscreen/0raw - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh deleted file mode 100644 index 6c480f46af..0000000000 --- a/packages/tslib/tslib/h4000/tslib.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/touchscreen/0raw - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h5000/tslib.sh b/packages/tslib/tslib/h5000/tslib.sh deleted file mode 100644 index b096bfb96e..0000000000 --- a/packages/tslib/tslib/h5000/tslib.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/touchscreen/0raw - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh deleted file mode 100644 index b3318fd820..0000000000 --- a/packages/tslib/tslib/h6300/tslib.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE - diff --git a/packages/tslib/tslib/htcuniversal/ts.conf b/packages/tslib/tslib/htcuniversal/ts.conf deleted file mode 100644 index 09309719f2..0000000000 --- a/packages/tslib/tslib/htcuniversal/ts.conf +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh deleted file mode 100644 index cc7e6b724a..0000000000 --- a/packages/tslib/tslib/htcuniversal/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/hx2000/tslib.sh b/packages/tslib/tslib/hx2000/tslib.sh deleted file mode 100644 index 586d5c7deb..0000000000 --- a/packages/tslib/tslib/hx2000/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/hx4700/tslib.sh b/packages/tslib/tslib/hx4700/tslib.sh deleted file mode 100644 index 586d5c7deb..0000000000 --- a/packages/tslib/tslib/hx4700/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh deleted file mode 100644 index 586d5c7deb..0000000000 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/nokia770/tslib.sh b/packages/tslib/tslib/nokia770/tslib.sh deleted file mode 100644 index b7acc274c0..0000000000 --- a/packages/tslib/tslib/nokia770/tslib.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 - -export TSLIB_TSDEVICE diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh deleted file mode 100644 index 664bda426a..0000000000 --- a/packages/tslib/tslib/poodle/tslib.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/qemuarm/tslib.sh b/packages/tslib/tslib/qemuarm/tslib.sh deleted file mode 100644 index b7acc274c0..0000000000 --- a/packages/tslib/tslib/qemuarm/tslib.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 - -export TSLIB_TSDEVICE diff --git a/packages/tslib/tslib/smdk2440/tslib.sh b/packages/tslib/tslib/smdk2440/tslib.sh deleted file mode 100644 index 586d5c7deb..0000000000 --- a/packages/tslib/tslib/smdk2440/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh deleted file mode 100644 index 0ff219b31f..0000000000 --- a/packages/tslib/tslib/spitz/tslib.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh deleted file mode 100644 index 0ff219b31f..0000000000 --- a/packages/tslib/tslib/tosa/tslib.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -esac - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/ts.conf-corgi-2.4 b/packages/tslib/tslib/ts.conf-corgi-2.4 deleted file mode 100644 index 07fbbea2a8..0000000000 --- a/packages/tslib/tslib/ts.conf-corgi-2.4 +++ /dev/null @@ -1,5 +0,0 @@ -module_raw corgi -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/ts.conf-h3600-2.4 b/packages/tslib/tslib/ts.conf-h3600-2.4 deleted file mode 100644 index 20729b6154..0000000000 --- a/packages/tslib/tslib/ts.conf-h3600-2.4 +++ /dev/null @@ -1,5 +0,0 @@ -module_raw h3600 -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/tslib.sh b/packages/tslib/tslib/tslib.sh index e69de29bb2..5221b05b8a 100644 --- a/packages/tslib/tslib/tslib.sh +++ b/packages/tslib/tslib/tslib.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +TSLIB_TSDEVICE=/dev/input/touchscreen0 + +export TSLIB_TSDEVICE + diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index 165c6396ce..0ece5b0331 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -4,13 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PR = "r5" +PR = "r7" SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ file://ts.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" @@ -33,19 +31,10 @@ 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 | h5000 | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000) - install -d ${D}${datadir}/tslib - install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/ - ;; - c7x0 | spitz | akita | tosa ) - install -d ${D}${datadir}/tslib - install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/ - ;; - collie | poodle ) + collie ) install -d ${D}${datadir}/tslib install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/ ;; - simpad ) install -d ${D}${datadir}/tslib install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/ @@ -57,15 +46,24 @@ do_install_append() { SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -# People should consider using udev's /dev/input/touchscreen0 symlink +# People should consider using udev's /dev/input/touchscreen0 symlink # instead of detect-stylus -RDEPENDS_tslib-conf_h3600 = "detect-stylus" -RDEPENDS_tslib-conf_h3900 = "detect-stylus" -RDEPENDS_tslib-conf_blueangel = "detect-stylus" +#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" RPROVIDES_tslib-conf = "libts-0.0-conf" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +# Machines with machine specific patches PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" +# Machines with machine specific config files (tslib.sh) +PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}" +PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}" PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate" DEBIAN_NOAUTONAME_tslib-conf = "1" diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb index 1515edab9d..5bedf5aafc 100644 --- a/packages/ttf-fonts/ttf-gentium_1.02.bb +++ b/packages/ttf-fonts/ttf-gentium_1.02.bb @@ -33,95 +33,95 @@ FILES_${PN} = "${datadir}/fonts/truetype/GenI*.ttf \ # # License -# +# # Gentium is released under the SIL Open Font License - please read it carefully # and do not download the fonts unless you agree to the terms of the license: -# +# # This Font Software is Copyright (c) 2003-2005, SIL International # (http://scripts.sil.org/). All Rights Reserved. -# +# # "Gentium" is a Reserved Font Name for this Font Software. "SIL" is a Reserved # Font Name for this Font Software. -# +# # This Font Software is licensed under the SIL Open Font License, Version 1.0. No # modification of the license is permitted, only verbatim copy is allowed. This # license is copied below, and is also available with a FAQ # at:http://scripts.sil.org/OFL SIL OPEN FONT LICENSE -# -# Version 1.0 - 22 November 2005 +# +# Version 1.0 - 22 November 2005 # # PREAMBLE -# +# # The goals of the Open Font License (OFL) are to stimulate worldwide development # of cooperative font projects, to support the font creation efforts of academic # and linguistic communities, and to provide an open framework in which fonts may # be shared and improved in partnership with others. -# +# # The OFL allows the licensed fonts to be used, studied, modified and # redistributed freely as long as they are not sold by themselves. The fonts, # including any derivative works, can be bundled, embedded, redistributed and # sold with any software provided that the font names of derivative works are # changed. The fonts and derivatives, however, cannot be released under any other -# type of license. +# type of license. # # DEFINITIONS -# +# # "Font Software" refers to any and all of the following: -# +# # * font files data files source code build scripts documentation -# +# # "Reserved Font Name" refers to the Font Software name as seen by users and any # other names as specified after the copyright statement. -# +# # "Standard Version" refers to the collection of Font Software components as # distributed by the Copyright Holder. -# +# # "Modified Version" refers to any derivative font software made by adding to, # deleting, or substituting -- in part or in whole -- any of the components of # the Standard Version, by changing formats or by porting the Font Software to a # new environment. -# +# # "Author" refers to any designer, engineer, programmer, technical writer or -# other person who contributed to the Font Software. +# other person who contributed to the Font Software. # # PERMISSION & CONDITIONS -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy of # the Font Software, to use, study, copy, merge, embed, modify, redistribute, and # sell modified and unmodified copies of the Font Software, subject to the # following conditions: -# +# # 1) Neither the Font Software nor any of its individual components, in Standard # or Modified Versions, may be sold by itself. -# +# # 2) Standard or Modified Versions of the Font Software may be bundled, # redistributed and sold with any software, provided that each copy contains the # above copyright notice and this license. These can be included either as # stand-alone text files, human-readable headers or in the appropriate # machine-readable metadata fields within text or binary files as long as those # fields can be easily viewed by the user. -# +# # 3) No Modified Version of the Font Software may use the Reserved Font Name(s), # in part or in whole, unless explicit written permission is granted by the # Copyright Holder. This restriction applies to all references stored in the Font # Software, such as the font menu name and other font description fields, which # are used to differentiate the font from others. -# +# # 4) The name(s) of the Copyright Holder or the Author(s) of the Font Software # shall not be used to promote, endorse or advertise any Modified Version, except # to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or # with their explicit written permission. -# +# # 5) The Font Software, modified or unmodified, in part or in whole, must be # distributed using this license, and may not be distributed under any other -# license. +# license. # # TERMINATION -# +# # This license becomes null and void if any of the above conditions are not met. # # DISCLAIMER -# +# # THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, diff --git a/packages/uae/e-uae_0.8.28.bb b/packages/uae/e-uae_0.8.28.bb index cb59f88957..f8f95e846a 100644 --- a/packages/uae/e-uae_0.8.28.bb +++ b/packages/uae/e-uae_0.8.28.bb @@ -8,13 +8,13 @@ PR = "r0" SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \ file://configure.patch;patch=1" -inherit autotools +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \ --without-gtk --enable-jit --disable-natmem \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-sdl-exec-prefix=${STAGING_BINDIR}/.. \ - --with-sdl-prefix=${STAGING_LIBDIR}/.." + --with-zlib=${STAGING_LIBDIR}/.." CFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 " CXXFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 " diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index a24682af45..638f1cb713 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/u-boot-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.h.patch;patch=1 \ file://fw_env.c.patch;patch=1 \ file://tools-Makefile.patch;patch=1 \ diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb index 2b29674e7a..ca6baece4c 100644 --- a/packages/uboot/u-boot_1.1.4.bb +++ b/packages/uboot/u-boot_1.1.4.bb @@ -26,7 +26,7 @@ SRC_URI_append_gumstix = "\ SRC_URI_append_amsdelta = "\ http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1" -SRC_URI_append_dht-walnut= "\ +SRC_URI_append_dht-walnut= "\ file://u-boot-dht-walnut-df2.patch;patch=1" diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/u-boot_1.1.6.bb index 617babcf4a..b45e86611b 100644 --- a/packages/uboot/uboot_cvs.bb +++ b/packages/uboot/u-boot_1.1.6.bb @@ -1,31 +1,35 @@ DESCRIPTION = "U-boot bootloader" +PROVIDES = "virtual/bootloader" SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -PROVIDES = "virtual/bootloader" -S = "${WORKDIR}/u-boot" +PR = "r0" -SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ - file://arm_flags.patch;patch=1" +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}" -inherit base +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + +PACKAGE_ARCH = "${MACHINE_ARCH}" do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS oe_runmake ${UBOOT_MACHINE} oe_runmake all } +do_stage() { + install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} +} + do_deploy () { install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin + 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/u-boot_git.bb b/packages/uboot/u-boot_git.bb new file mode 100644 index 0000000000..fa59bab085 --- /dev/null +++ b/packages/uboot/u-boot_git.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "U-boot bootloader" +PROVIDES = "virtual/bootloader" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " + +S = "${WORKDIR}/git" + +#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#inherit base + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_stage() { + install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE} +} + +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 a41d5d7082..4e50706087 100644 --- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb +++ b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb @@ -1,4 +1,37 @@ -require uboot_cvs.bb +BROKEN = "1" +#not fetchable patch used +DESCRIPTION = "U-boot bootloader" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" +SRCDATE = "20050818" +PV = "0.0+cvs${SRCDATE}" +PR = "r3" + +PROVIDES = "virtual/bootloader" + +S = "${WORKDIR}/u-boot" + +SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ + file://arm_flags.patch;patch=1 \ + ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" 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" + +inherit base + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + diff --git a/packages/uclibc++/uclibc++_0.1.9.bb b/packages/uclibc++/uclibc++_0.1.9.bb index fff6daf691..aaa9447f92 100644 --- a/packages/uclibc++/uclibc++_0.1.9.bb +++ b/packages/uclibc++/uclibc++_0.1.9.bb @@ -12,10 +12,10 @@ SRC_URI = "http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2 \ file://defconfig" S = "${WORKDIR}/uClibc++" -# uClibc++ runtime prefix directory (UCLIBCXX_RUNTIME_PREFIX) [/usr/$(TARGET_ARCH)-linux-uclibc] (NEW) -# uClibc++ header file subdirectory (UCLIBCXX_RUNTIME_INCLUDE_SUBDIR) [/include] (NEW) +# uClibc++ runtime prefix directory (UCLIBCXX_RUNTIME_PREFIX) [/usr/$(TARGET_ARCH)-linux-uclibc] (NEW) +# uClibc++ header file subdirectory (UCLIBCXX_RUNTIME_INCLUDE_SUBDIR) [/include] (NEW) # uClibc++ library subdirectory (UCLIBCXX_RUNTIME_LIB_SUBDIR) [/lib] (NEW) -# uClibc++ application file subdirectory (UCLIBCXX_RUNTIME_BIN_SUBDIR) [/bin] (NEW) +# uClibc++ application file subdirectory (UCLIBCXX_RUNTIME_BIN_SUBDIR) [/bin] (NEW) do_unpack_real () { bzcat uClibc++-${PV}.tbz2 | tar -xvf - diff --git a/packages/tslib/tslib/poodle/.mtn2git_empty b/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/poodle/.mtn2git_empty +++ b/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config b/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config new file mode 100644 index 0000000000..6e606f6be3 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config @@ -0,0 +1,181 @@ +# +# Automatically generated make config: don't edit +# Wed Dec 20 21:41:18 2006 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/cross/powerpc-linux-uclibc" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +UCLIBC_SUSV3_LEGACY=y +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +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_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/tslib/tslib/qemuarm/.mtn2git_empty b/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/qemuarm/.mtn2git_empty +++ b/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty diff --git a/packages/uclibc/uclibc-cvs/efika/uClibc.config b/packages/uclibc/uclibc-cvs/efika/uClibc.config new file mode 100644 index 0000000000..23b221d662 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/efika/uClibc.config @@ -0,0 +1,180 @@ +# +# Automatically generated make config: don't edit +# Wed Dec 20 11:05:48 2006 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/staging/dht-walnut-linux-uclibc/kernel" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +# COMPAT_ATEXIT is not set +# UCLIBC_SUSV3_LEGACY is not set +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +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_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/error_print_progname.patch b/packages/uclibc/uclibc-cvs/error_print_progname.patch new file mode 100644 index 0000000000..6c10ec6b3c --- /dev/null +++ b/packages/uclibc/uclibc-cvs/error_print_progname.patch @@ -0,0 +1,11 @@ +--- /libc/misc/error/orig-error.c 2006-11-29 14:28:13.000000000 -0500 ++++ /libc/misc/error/error.c 2006-12-20 22:54:16.000000000 -0500 +@@ -44,7 +44,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-/* void (*error_print_progname) (void) = NULL; */ ++ void (*error_print_progname) (void) = NULL; + + extern __typeof(error) __error attribute_hidden; + void __error (int status, int errnum, const char *message, ...) diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 1a829a3640..d81cfc636a 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -121,7 +121,7 @@ do_configure() { oe_runmake oldconfig } -do_install_prepend() { +do_stage() { # Install into the cross dir (this MUST be done first because we # will install crt1.o in the install_dev stage and gcc needs it) oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index ef9c40d463..48b1785a14 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -1,6 +1,6 @@ # UCLIBC_BASE should be the latest released revision of uclibc (that way # the config files will typically be correct!) uclibc-cvs takes precedence -# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date +# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date # try removing it # # UCLIBC_BASE can be set in a distro file, but whether this works depends @@ -17,15 +17,16 @@ require uclibc.inc PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" -#recent versions uclibc require real kernel headers +#recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" #as stated above, uclibc needs real kernel-headers #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... -KERNEL_SOURCE = "${STAGING_KERNEL_DIR}" +KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI += "svn://uclibc.org/trunk;module=uClibc" +SRC_URI += " file://error_print_progname.patch;patch=1" S = "${WORKDIR}/uClibc" diff --git a/packages/udev/udev-092/local.rules b/packages/udev/udev-092/local.rules index 2308b52c4a..5b926018f5 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,*a0,1,*18,*", SYMLINK+="input/touchscreen0" +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules index 2308b52c4a..5b926018f5 100644 --- a/packages/udev/udev-097/local.rules +++ b/packages/udev/udev-097/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,*a0,1,*18,*", SYMLINK+="input/touchscreen0" +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-100/local.rules b/packages/udev/udev-100/local.rules index 2308b52c4a..5b926018f5 100644 --- a/packages/udev/udev-100/local.rules +++ b/packages/udev/udev-100/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,*a0,1,*18,*", SYMLINK+="input/touchscreen0" +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 1ae2c3b596..92e37de4f7 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES = "hotplug" -PR = "r14" +PR = "r15" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -59,10 +59,10 @@ do_install_append_h2200() { } pkg_postinst_append() { - + # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter, # causing confusion with fsck on boot - + while read dev mp fs junk do if test "$mp" = "/" @@ -71,6 +71,6 @@ pkg_postinst_append() { echo "$root_partition" >> /etc/udev/mount.blacklist fi done < /etc/fstab - + } diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 29709c6209..84c414fd0d 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -8,7 +8,7 @@ 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 = "r5" +PR = "r6" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -59,10 +59,10 @@ do_install_append_h2200() { } pkg_postinst_append() { - + # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter, # causing confusion with fsck on boot - + while read dev mp fs junk do if test "$mp" = "/" @@ -71,7 +71,7 @@ pkg_postinst_append() { echo "$root_partition" >> /etc/udev/mount.blacklist fi done < /etc/fstab - + } diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index dd956668ed..288157ef3f 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ 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 = "r4" +PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -60,10 +60,10 @@ do_install_append_h2200() { } pkg_postinst_append() { - + # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter, # causing confusion with fsck on boot - + while read dev mp fs junk do if test "$mp" = "/" @@ -72,6 +72,6 @@ pkg_postinst_append() { echo "$root_partition" >> /etc/udev/mount.blacklist fi done < /etc/fstab - + } diff --git a/packages/tslib/tslib/smdk2440/.mtn2git_empty b/packages/unrar/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/smdk2440/.mtn2git_empty +++ b/packages/unrar/.mtn2git_empty diff --git a/packages/unrar/unrar-native_3.4.3.bb b/packages/unrar/unrar-native_3.4.3.bb new file mode 100644 index 0000000000..4b87691e89 --- /dev/null +++ b/packages/unrar/unrar-native_3.4.3.bb @@ -0,0 +1,14 @@ +require unrar.inc +inherit native + +do_stage() { + install unrar ${STAGING_BINDIR} +} + +do_package() { + : +} + +do_install() { + : +} diff --git a/packages/unrar/unrar.inc b/packages/unrar/unrar.inc new file mode 100644 index 0000000000..4887ac9fb2 --- /dev/null +++ b/packages/unrar/unrar.inc @@ -0,0 +1,7 @@ +SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz" +S = "${WORKDIR}/unrar" + +do_compile() { + oe_runmake -f makefile.unix +} + diff --git a/packages/unrar/unrar_3.4.3.bb b/packages/unrar/unrar_3.4.3.bb new file mode 100644 index 0000000000..39d81990e2 --- /dev/null +++ b/packages/unrar/unrar_3.4.3.bb @@ -0,0 +1,6 @@ +require unrar.inc + +do_install() { + install -d ${D}${bindir} + install -m 0755 unrar ${D}${bindir} +} diff --git a/packages/usbutils/usbutils_0.70.bb b/packages/usbutils/usbutils_0.70.bb index 4e68f26d3b..0dbd799993 100644 --- a/packages/usbutils/usbutils_0.70.bb +++ b/packages/usbutils/usbutils_0.70.bb @@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "1" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz" S = "${WORKDIR}/usbutils-${PV}" -inherit autotools +inherit autotools EXTRA_OECONF = "--program-prefix=" sbindir = "/sbin" diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb index 45209b6bf4..4b084eb58c 100644 --- a/packages/usbutils/usbutils_cvs.bb +++ b/packages/usbutils/usbutils_cvs.bb @@ -9,7 +9,7 @@ PR = "r3" SRC_URI = "cvs://anonymous@linux-usb.cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils" S = "${WORKDIR}/usbutils" -inherit autotools +inherit autotools EXTRA_OECONF = "--program-prefix=" sbindir = "/sbin" diff --git a/packages/util-linux/util-linux-native_2.12r.bb b/packages/util-linux/util-linux-native_2.12r.bb index d6c60786de..27c053000d 100644 --- a/packages/util-linux/util-linux-native_2.12r.bb +++ b/packages/util-linux/util-linux-native_2.12r.bb @@ -23,7 +23,7 @@ do_compile () { install ${WORKDIR}/make_include ${S}/make_include install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h install ${WORKDIR}/defines.h ${S}/defines.h - oe_runmake + oe_runmake } do_stage () { diff --git a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb index 3e797bd80d..10d2d4acdd 100644 --- a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb +++ b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb @@ -14,15 +14,15 @@ S = "${WORKDIR}/verasansmono" FILES_${PN} += "/opt" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + cd ${WORKDIR} files=`find . -name "*.qpf"` - for i in $files; do + for i in $files; do install -m 644 $i ${D}${palmqtdir}/lib/fonts/ - done -} + done +} pkg_postinst () { #!/bin/sh diff --git a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb index 07ca7bda9a..86f2ef9446 100644 --- a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb +++ b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb @@ -10,12 +10,12 @@ PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large" SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz" S = "${WORKDIR}/vera-qpf" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} +do_install () { + install -d ${D}${palmqtdir}/lib/fonts/ + for i in *.qpf; do + install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} + done +} pkg_postinst () { #!/bin/sh diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb index a6f4cd62fb..871bc1d37c 100644 --- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb +++ b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb @@ -6,24 +6,24 @@ PACKAGE_ARCH = "all" PR = "r3" RDEPENDS = "fontconfig-utils" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" -do_install () { - install -d ${D}${prefix}/share/fonts/ttf/ - for i in *.ttf; do - install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} - done +do_install () { + install -d ${D}${prefix}/share/fonts/ttf/ + for i in *.ttf; do + install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} + done # fontconfig ships this too. not sure what to do about it. - #install -d ${D}${sysconfdir}/fonts - #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf + #install -d ${D}${sysconfdir}/fonts + #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf - install -d ${D}${prefix}/share/doc/${PN}/ - for i in *.TXT; do - install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i - done -} + install -d ${D}${prefix}/share/doc/${PN}/ + for i in *.TXT; do + install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i + done +} pkg_postinst () { #!/bin/sh diff --git a/packages/vino/vino_2.16.0.bb b/packages/vino/vino_2.16.0.bb index 0780d0d409..a7639a248d 100644 --- a/packages/vino/vino_2.16.0.bb +++ b/packages/vino/vino_2.16.0.bb @@ -9,5 +9,5 @@ do_configure() { libtoolize --force gnu-configize oe_runconf -} +} diff --git a/packages/visual-boot/visual-boot.bb b/packages/visual-boot/visual-boot.bb index e3bad2a4aa..1336971c54 100644 --- a/packages/visual-boot/visual-boot.bb +++ b/packages/visual-boot/visual-boot.bb @@ -25,17 +25,17 @@ do_install() { install -d ${D}/etc/init.d install -d ${D}/etc/rcS.d install -d ${D}/etc/rc5.d - + install -m 0644 ${WORKDIR}/*.raw.gz ${D}/usr/share/visual-boot install -m 0755 ${WORKDIR}/visual-boot.init ${D}/etc/init.d/visual-boot - + # We can not use update-rc.d to enable visual-boot right after flashing ln -s /etc/init.d/visual-boot ${D}/etc/rcS.d/S34visual-boot-mountall ln -s /etc/init.d/visual-boot ${D}/etc/rcS.d/S39visual-boot-networking - ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S19visual-boot-apm - ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S22visual-boot-bt + ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S19visual-boot-apm + ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S22visual-boot-bt ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S98visual-boot-x11 - ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S99visual-boot-zaurusd - + ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S99visual-boot-zaurusd + } diff --git a/packages/vnc/vnc_3.3.7.bb b/packages/vnc/vnc_3.3.7.bb index 06fa0fedf2..f0060e383d 100644 --- a/packages/vnc/vnc_3.3.7.bb +++ b/packages/vnc/vnc_3.3.7.bb @@ -18,4 +18,4 @@ do_install() { install -d ${D}/usr/bin/ install -m 0755 vncviewer/vncviewer ${D}/usr/bin/vncviewer } - + diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb index 14f10afa5f..7b8a75dd3b 100644 --- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb +++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb @@ -9,7 +9,7 @@ SECTION = "console/multimedia" SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools +inherit autotools EXTRA_OECONF = "--without-flac --without-speex \ --with-ogg-libraries=${STAGING_LIBDIR}/ \ diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb index cc5f8bc5b8..2e576bd2e4 100644 --- a/packages/wget/wget_1.9.1.bb +++ b/packages/wget/wget_1.9.1.bb @@ -16,7 +16,7 @@ EXTRA_OECONF = "--enable-ipv6 --without-ssl" # The unslung kernel does not support ipv6 EXTRA_OECONF_unslung = "--without-ssl" -# SlugOS kernels do not support ipv6. Can be loaded as a module. +# SlugOS kernels do not support ipv6. Can be loaded as a module. EXTRA_OECONF_slugos = "--without-ssl" do_configure () { diff --git a/packages/tslib/tslib/spitz/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/spitz/.mtn2git_empty +++ b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=driver ridlist + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb index 92f3375cda..60b29999ef 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb @@ -49,7 +49,7 @@ do_install() { # Listen closely... sssshhh... can you hear the wlan-ng build system suck? rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk + rm -f ${KERNEL_SOURCE}/../../config.mk } FILES_${PN} = "/lib" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb new file mode 100644 index 0000000000..dd320276f5 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb @@ -0,0 +1,8 @@ +require wlan-ng-modules.inc + +SRCDATE = "20061109" +PV = "0.2.5+svn${SRCDATE}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " +S = "${WORKDIR}/trunk" + diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb index c3fb8f8767..46ff13e3f0 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb @@ -34,7 +34,7 @@ export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" do_configure () { install -m 0755 ${WORKDIR}/defconfig-gnutls .config - + if [ "x$HAS_PCI" == "x1" ] ; then echo "CONFIG_DRIVER_MADWIFI=y" >> .config echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config diff --git a/packages/wrt/wrt-init.bb b/packages/wrt/wrt-init.bb index bae51c6816..b3ea137f1a 100644 --- a/packages/wrt/wrt-init.bb +++ b/packages/wrt/wrt-init.bb @@ -8,12 +8,12 @@ do_install() { install -d ${D}${sysconfdir}/rcS.d \ ${D}${sysconfdir}/rc2.d \ ${D}${sysconfdir}/init.d - + install -m 0755 ${WORKDIR}/mount ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/wrtboot ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/wrtvlans ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/finished ${D}${sysconfdir}/init.d - + ln -s ../init.d/mount ${D}${sysconfdir}/rcS.d/S05mount ln -s ../init.d/wrtboot ${D}${sysconfdir}/rcS.d/S10wrtboot ln -s ../init.d/wrtvlans ${D}${sysconfdir}/rcS.d/S30wrtvlans diff --git a/packages/wrt/wrt-utils.bb b/packages/wrt/wrt-utils.bb index d1cd4c9cc5..42a7460412 100644 --- a/packages/wrt/wrt-utils.bb +++ b/packages/wrt/wrt-utils.bb @@ -15,11 +15,11 @@ TARGET_CFLAGS =+ "-I${STAGING_KERNEL_DIR}/include" do_compile() { make -C libshared TARGET_CC="${CC}" make -C libnvram TARGET_CC="${CC}" - + ${CC} ${CFLAGS} -Iinclude -o wlc wlc.c -L./libshared -lshared ${CC} ${CFLAGS} -o jffs2root jffs2root.c ${CC} ${CFLAGS} -o mtd mtd.c - + make -C ../linksys-wlconf TOP=${S} SRCBASE=${S} LDFLAGS="-L${S}/libnvram -lnvram -L${S}/libshared -lshared" ${KERNEL_CC} -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ @@ -34,11 +34,11 @@ do_install() { install -m 644 libshared/libshared.so ${D}/${libdir} install -m 755 libnvram/nvram ${D}/usr/sbin/ install -m 644 libnvram/libnvram.so ${D}/${libdir} - + install -m 755 wlc ${D}/usr/sbin/ install -m 755 jffs2root ${D}/sbin/ install -m 755 mtd ${D}/sbin/ - + install -m 755 ../linksys-wlconf/wlconf ${D}/usr/sbin/ install -m 644 wlcompat.o ${D}/lib/modules/${KERNEL_VERSION}/ } diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb index d1a054f1b6..07d9199ae1 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxbase/wxbase_2.6.2.bb @@ -15,7 +15,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-largefile" -LEAD_SONAME = "libwx_base-2.6.so*" +LEAD_SONAME = "libwx_base-2.6.so*" do_configure() { oe_runconf @@ -23,17 +23,17 @@ do_configure() { do_stage() { install -d ${STAGING_INCDIR}/wx-2.6/wx - cp -pR include/wx ${STAGING_INCDIR}/wx-2.6 + 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 wxwin.m4 ${STAGING_DATADIR}/aclocal ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ - -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 } FILES_${PN} += " \ diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb index 79dcc46b6e..772ea4e27f 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxbase/wxbase_2.7+cvs.bb @@ -16,7 +16,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gui --enable-largefile" -LEAD_SONAME = "libwx_base-2.7*" +LEAD_SONAME = "libwx_base-2.7*" do_configure() { oe_runconf @@ -24,7 +24,7 @@ do_configure() { do_stage() { install -d ${STAGING_INCDIR}/wx-2.7/wx - cp -pR include/wx ${STAGING_INCDIR}/wx-2.7 + 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 @@ -49,5 +49,5 @@ do_install() { ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config install -d ${D}${docdir}/${PN}-${PV} install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} + install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} } diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb index 1de87c04eb..a5855dff08 100644 --- a/packages/xcalibrate/xcalibrate_20060312.bb +++ b/packages/xcalibrate/xcalibrate_20060312.bb @@ -10,7 +10,7 @@ SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ file://xextproto.patch;patch=1" S = "${WORKDIR}/XCalibrate" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index a5b435795a..c3eeffc478 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -9,7 +9,7 @@ SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ file://xextproto.patch;patch=1" S = "${WORKDIR}/XCalibrate" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/xcalibrate/xcalibrate_git.bb b/packages/xcalibrate/xcalibrate_git.bb index 6448eedd5b..7b2b4d3b63 100644 --- a/packages/xcalibrate/xcalibrate_git.bb +++ b/packages/xcalibrate/xcalibrate_git.bb @@ -8,7 +8,7 @@ DESCRIPTION = "XCalibrate client-side library" SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libXCalibrate;protocol=git" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb index 2c1d6ae9f5..44d1b92e2f 100644 --- a/packages/xcompmgr/xcompmgr_cvs.bb +++ b/packages/xcompmgr/xcompmgr_cvs.bb @@ -8,4 +8,4 @@ DESCRIPTION = "X Compositing Manager" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr" S = "${WORKDIR}/xcompmgr" -inherit autotools +inherit autotools diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb index c60edc5b83..f133e9524c 100644 --- a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb +++ b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb @@ -7,7 +7,7 @@ SECTION = "x11/wm" inherit xfce -# No ${PN} for this one +# No ${PN} for this one PACKAGES="" PACKAGES_DYNAMIC = "xfwm4-theme-*" 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 98b49f99ac..051a9e5f63 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 = "libx11-native libfontenc-native" +DEPENDS = "libx11-native libfontenc-native freetype-native" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2" diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index ce84d5dde1..b1291037b4 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -19,8 +19,8 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} do_configure() { sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - - oe_runconf + + oe_runconf } do_stage() { diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb index 07a5659300..e12d658230 100644 --- a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb +++ b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb @@ -8,4 +8,4 @@ DEPENDS = "bdftopcf-native" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz" -inherit native autotools pkgconfig +inherit native autotools pkgconfig diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb index d633a9c6d1..86e7b62b63 100644 --- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb +++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb @@ -8,4 +8,4 @@ DEPENDS = "bdftopcf-native" SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz" -inherit native autotools pkgconfig +inherit native autotools pkgconfig 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 4e39aa6ace..7ed04075c8 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb new file mode 100644 index 0000000000..5ae8247296 --- /dev/null +++ b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb @@ -0,0 +1,23 @@ +require xorg-lib-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-2.1.12" + + +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." + +DEPENDS += " libxrender freetype fontconfig" +PROVIDES = "xft" + +XORG_PN = "libXft" + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..75b4a9956b --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "X server for Imageon Cards from freedesktop.org" +DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" + +COMPATIBLE_MACHINE = "(c7x0|hx4700)" + +SECTION = "x11/base" +LICENSE = "MIT" + +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" + +PR = "r0" + +FILESPATH = "${FILE_DIRNAME}/xserver-kdrive" + +SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + 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://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kdrive-vidmemarea.patch;patch=1 \ + file://kdrive-imageon.patch;patch=1" + +S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" +W100_OECONF_arm = "--enable-imageon" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" + +FILES_${PN} = "${libdir}/xserver/SecurityPolicy \ + ${bindir}/Ximageon" 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 b7e192dc76..d4a184b484 100644 --- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb @@ -17,7 +17,7 @@ SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserv S = "${WORKDIR}/xserver" -inherit autotools pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr" diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch new file mode 100644 index 0000000000..376074951f --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch @@ -0,0 +1,8583 @@ + +# Author: Manuel Teira <manuel.teira@telefonica.net> (sirfred in #oe) +# Description: New driver for the Imageon ATI Card. Implementing: +# -Hardware solid fills +# -Hardware bitblt +# -Hardware cursors +# -XV Extension +# -Internal and External Imageon offscreen memory support +# -Hardware RandR rotation (without using a shadow framebuffer) + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xorg-server-X11R7.1-1.1.0.orig/configure.ac~kdrive-imageon ++++ xorg-server-X11R7.1-1.1.0.orig/configure.ac +@@ -435,6 +435,7 @@ + AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) + AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) + AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) ++AC_ARG_ENABLE(imageon, AS_HELP_STRING([--enable-imageon], [Build the kdrive Ximageon server (default: no)]), [KDRIVEIMAGEON=$enableval], [KDRIVEIMAGEON=no]) + dnl xprint + AC_ARG_ENABLE(freetype, AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no]) + AC_ARG_WITH(freetype-config, AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto) +@@ -1509,6 +1510,11 @@ + AC_SUBST([XSDL_INCS]) + + ++AM_CONDITIONAL(KDRIVEIMAGEON, [test "x$KDRIVEIMAGEON" = xyes]) ++if test "x$KDRIVEIMAGEON" = xyes; then ++ AC_DEFINE(KDRIVEIMAGEON, 1, [Build Ximageon server]) ++fi ++ + dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers) + AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) + AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) +@@ -1750,6 +1756,7 @@ + hw/kdrive/epson/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile ++hw/kdrive/imageon/Makefile + hw/kdrive/i810/Makefile + hw/kdrive/linux/Makefile + hw/kdrive/mach64/Makefile +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/Makefile.am~kdrive-imageon ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/Makefile.am +@@ -1,18 +1,9 @@ +-if KDRIVEVESA +-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ +- smi via +-endif +- + if KDRIVEFBDEV + FBDEV_SUBDIRS = fbdev + endif + +-if XSDLSERVER +-XSDL_SUBDIRS = sdl +-endif +- +-if XEPHYR +-XEPHYR_SUBDIRS = ephyr ++if KDRIVEIMAGEON ++IMAGEON_SUBDIRS = imageon + endif + + SUBDIRS = \ +@@ -20,9 +11,9 @@ + linux \ + $(XSDL_SUBDIRS) \ + $(FBDEV_SUBDIRS) \ ++ $(IMAGEON_SUBDIRS) \ + $(VESA_SUBDIRS) \ +- $(XEPHYR_SUBDIRS) \ +- fake ++ $(XEPHYR_SUBDIRS) + + DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ + smi via fbdev sdl ephyr src linux fake sis300 +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/Makefile.am +@@ -0,0 +1,47 @@ ++if KDRIVEFBDEV ++FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev ++FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a ++endif ++ ++INCLUDES = \ ++ @KDRIVE_INCS@ \ ++ $(FBDEV_INCLUDES) \ ++ @KDRIVE_CFLAGS@ ++ ++bin_PROGRAMS = Ximageon ++ ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ ++noinst_LIBRARIES = libimageon.a ++ ++libimageon_a_SOURCES = \ ++ imageon.h \ ++ imageon_regs.h \ ++ imageon_const.h \ ++ imageon.c \ ++ imageon_cursor.c \ ++ imageon_draw.c \ ++ imageon_support.c \ ++ imageon_video.c ++ ++ ++ ++Ximageon_SOURCES = \ ++ imageon_stub.c ++ ++W100_LIBS = \ ++ libimageon.a \ ++ $(FBDEV_LIBS) \ ++ @KDRIVE_LIBS@ ++ ++Ximageon_LDADD = \ ++ $(W100_LIBS) \ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) ++ ++ ++Ximageon_DEPENDENCIES = \ ++ libimageon.a \ ++ $(FBDEV_LIBS) +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon.c +@@ -0,0 +1,523 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++#include "imageon.h" ++#include "imageon_regs.h" ++ ++struct pci_id_entry w100_pci_ids[] = { ++ {0x1002, 0x5644, 0, "ATI Imageon 3200"}, ++ {0x1002, 0x5741, 0, "ATI Imageon 100"}, ++ {0x1002, 0x5744, 0, "ATI Imageon 3220"}, ++ {0, 0, 0, NULL} ++}; ++ ++static Bool ++W100Map(KdCardInfo * card, W100CardInfo *w100c) ++{ ++ w100c->mem_base = (CARD8 *) KdMapDevice(W100_MEM_BASE, ++ W100_MEM_SIZE); ++ ++ if (w100c->mem_base == NULL) { ++ return FALSE; ++ } ++ ++ w100c->reg_base = w100c->mem_base + W100_REG_OFFSET; ++ ++ /* ++ * It doesn't matter mapping all the area as registers. ++ * There's only difference when HAVE_ASM_MTRR_H is defined. ++ * So, this call is doing nothing. ++ */ ++ KdSetMappedMode(W100_MEM_BASE, W100_MEM_SIZE, ++ KD_MAPPED_MODE_REGISTERS); ++ ++ return TRUE; ++} ++ ++static void ++W100Unmap(KdCardInfo * card, W100CardInfo *w100c) ++{ ++ if (w100c->mem_base) { ++ KdResetMappedMode(W100_MEM_BASE, W100_MEM_SIZE, ++ KD_MAPPED_MODE_REGISTERS); ++ KdUnmapDevice((void *) w100c->mem_base, W100_MEM_SIZE); ++ w100c->mem_base = w100c->reg_base = 0; ++ } ++} ++ ++static Bool ++W100CardInit(KdCardInfo * card) ++{ ++ W100CardInfo *w100c; ++ int i; ++ int ext_mem; ++ int int_mem; ++ Bool initialized = FALSE; ++ ++ w100c = xcalloc(sizeof(W100CardInfo), 1); ++ if (w100c == NULL) ++ return FALSE; ++ ++ if (!initialized && fbdevInitialize(card, &w100c->fbdev)) { ++ initialized = TRUE; ++ } ++ ++ if (!initialized || !W100Map(card, w100c)) { ++ xfree(w100c); ++ return FALSE; ++ } ++ card->driver = w100c; ++ ++ for (i = 0; w100_pci_ids[i].name != NULL; i++) { ++ if (w100_pci_ids[i].device == card->attr.deviceID) { ++ w100c->pci_id = &w100_pci_ids[i]; ++ break; ++ } ++ } ++ ErrorF("Using ATI card: %s\n", w100c->pci_id->name); ++ ++ ext_mem = MMIO_IN32(mmMC_EXT_MEM_LOCATION); ++ int_mem = MMIO_IN32(mmMC_FB_LOCATION); ++ ++ w100c->memareas[0].priority = KD_VIDMEM_MAXPRIO; ++ w100c->memareas[0].start = (CARD8 *) ((int_mem & 0xffff) << 8); ++ w100c->memareas[0].size = ++ (((int_mem >> 16) & 0xffff) - (int_mem & 0xffff)) << 8; ++ ++ ++ w100c->memareas[1].priority = KD_VIDMEM_MINPRIO; ++ w100c->memareas[1].start = (CARD8 *)((ext_mem & 0xffff) << 8); ++ w100c->memareas[1].size = ++ (((ext_mem >> 16) & 0xffff) - (ext_mem & 0xffff)) << 8; ++ ++ /* Get some register values */ ++ w100c->regs.ENG_CNTL = MMIO_IN32(mmENG_CNTL); ++ w100c->regs.VIDEO_CTRL = MMIO_IN32(mmVIDEO_CTRL); ++ w100c->regs.GRAPHIC_H_DISP = MMIO_IN32(mmGRAPHIC_H_DISP); ++ w100c->regs.GRAPHIC_V_DISP = MMIO_IN32(mmGRAPHIC_V_DISP); ++ ++ DBG_IMAGEON(("Internal memory at 0x%08x(0x%08x), size %d bytes\n" ++ "External memory at 0x%08x(0x%08x), size %d bytes\n", ++ w100c->memareas[0].start, ++ W100_CARD2HOST(w100c->memareas[0].start), ++ w100c->memareas[0].size, ++ w100c->memareas[1].start, ++ W100_CARD2HOST(w100c->memareas[1].start), ++ w100c->memareas[1].size)); ++ ++ /* TODO: Change this to honour the framebuffer initial orientation? */ ++ w100c->defaultRandR = RR_Rotate_90; ++ w100c->hwScreen.randr = w100c->defaultRandR; ++ return TRUE; ++} ++ ++ ++static void ++W100CardFini(KdCardInfo * card) ++{ ++ W100CardInfo *w100c = (W100CardInfo *) card->driver; ++ ++ W100Unmap(card, w100c); ++ fbdevCardFini(card); ++} ++ ++static void ++W100MemSetup(KdScreenInfo *screen) ++{ ++ W100CardInfo(screen); ++ W100MemArea *mem; ++ int fb_size, i; ++ ++ /* Clear the VideoMemAreas set up by the framebuffer initialization */ ++ for (i = 0; i < screen->num_videomem_areas; i++) { ++ xfree(screen->videomem_areas[i]); ++ } ++ xfree(screen->videomem_areas); ++ ++ screen->videomem_areas = xcalloc(sizeof(KdVideoMemArea *), ++ W100_MEMAREAS); ++ screen->num_videomem_areas = W100_MEMAREAS; ++ ++ fb_size = screen->fb[0].byteStride * screen->height; ++ DBG_IMAGEON(("Framebuffer required size: %d bytes\n", fb_size)); ++ /* Try to place the framebuffer in the best VideoMemArea */ ++ for (i = 0; i < W100_MEMAREAS; i++) { ++ mem = &w100c->memareas[i]; ++ screen->videomem_areas[i] = xcalloc(sizeof(KdVideoMemArea), 1); ++ if (fb_size <= mem->size) { ++ DBG_IMAGEON(("Setting FrameBuffer to w100 address 0x%08x\n", ++ mem->start)); ++ screen->fb[0].frameBuffer = W100_CARD2HOST(mem->start); ++ screen->videomem_areas[i]->priority = mem->priority; ++ screen->videomem_areas[i]->base = W100_CARD2HOST(mem->start); ++ screen->videomem_areas[i]->size = mem->size; ++ screen->videomem_areas[i]->available_offset = fb_size; ++ } else { ++ screen->videomem_areas[i]->priority = mem->priority; ++ screen->videomem_areas[i]->base = W100_CARD2HOST(mem->start); ++ screen->videomem_areas[i]->size = mem->size; ++ screen->videomem_areas[i]->available_offset = 0; ++ } ++ DBG_IMAGEON(("New videomem_area(priority:%d, start:0x%08x, size:%d, available_offset:%d\n", ++ screen->videomem_areas[i]->priority, ++ screen->videomem_areas[i]->base, ++ screen->videomem_areas[i]->size, ++ screen->videomem_areas[i]->available_offset)); ++ } ++ ++ w100c->hwScreen.x = 0; ++ w100c->hwScreen.y = 0; ++ w100c->hwScreen.width = screen->width; ++ w100c->hwScreen.height = screen->height; ++ w100c->hwScreen.bpp = screen->fb[0].bitsPerPixel; ++ w100c->hwScreen.offset = W100_HOST2CARD(screen->fb[0].frameBuffer); ++ ++ ++ DBG_IMAGEON(("HWScreen(x:%d,y:%d,width:%d,height:%d,bpp:%d,offset:0x%08x" ++ "(0x%08x), randr:%d)\n", ++ w100c->hwScreen.x, ++ w100c->hwScreen.y, ++ w100c->hwScreen.width, ++ w100c->hwScreen.height, ++ w100c->hwScreen.bpp, ++ w100c->hwScreen.offset, ++ screen->fb[0].frameBuffer, ++ w100c->hwScreen.randr)); ++} ++ ++static Bool ++W100ScreenInit(KdScreenInfo * screen) ++{ ++ W100ScreenInfo *w100s; ++ W100CardInfo(screen); ++ Bool success = FALSE; ++ ++ w100s = xcalloc(sizeof(W100ScreenInfo), 1); ++ if (w100s == NULL) ++ return FALSE; ++ ++ w100s->w100c = w100c; ++ w100s->screen = screen; ++ screen->driver = w100s; ++ ++ if (screen->fb[0].depth == 0) { ++ screen->fb[0].depth = 16; ++ } ++ ++ success = fbdevScreenInitialize(screen, &w100s->fbdev); ++ ++ if (!success) { ++ screen->driver = NULL; ++ xfree(w100s); ++ return FALSE; ++ } ++ ++ W100MemSetup(screen); ++ ++ return TRUE; ++} ++ ++static void ++W100ScreenFini(KdScreenInfo * screen) ++{ ++ W100ScreenInfo *w100s = (W100ScreenInfo *) screen->driver; ++ W100CardInfo *w100c = screen->card->driver; ++ ++ fbdevScreenFini(screen); ++ xfree(w100s); ++ screen->driver = 0; ++} ++ ++static Bool ++W100InitScreen(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ W100InitVideo(pScreen); ++ return fbdevInitScreen(pScreen); ++} ++ ++#ifdef RANDR ++ ++static Bool W100RandRSetConfig(ScreenPtr pScreen, ++ Rotation randr, ++ int rate, ++ RRScreenSizePtr pSize) ++{ ++ KdScreenPriv(pScreen); ++ KdScreenInfo *screen = pScreenPriv->screen; ++ W100CardInfo(pScreenPriv); ++ Bool screenEnabled = pScreenPriv->enabled; ++ KdMouseMatrix m; ++ ++ DBG_IMAGEON(("W100RandRSetConfig(randr:%d,pSize:%dx%d)\n", ++ randr, pSize->width, pSize->height)); ++ ++ ++ if (screenEnabled) { ++ KdDisableScreen(pScreen); ++ } ++ KdOffscreenSwapOut(screen->pScreen); ++ ++ if (randr & (RR_Rotate_0|RR_Rotate_180)) { ++ pScreen->width = w100c->fbdev.var.xres; ++ pScreen->height = w100c->fbdev.var.yres; ++ pScreen->mmWidth = screen->width_mm; ++ pScreen->mmHeight = screen->height_mm; ++ } else { ++ pScreen->width = w100c->fbdev.var.yres; ++ pScreen->height = w100c->fbdev.var.xres; ++ pScreen->mmWidth = screen->height_mm; ++ pScreen->mmHeight = screen->width_mm; ++ } ++ ++ KdComputeMouseMatrix(&m, randr, screen->width, screen->height); ++ KdSetMouseMatrix(&m); ++ ++ screen->width = pScreen->width; ++ screen->height = pScreen->height; ++ screen->fb[0].byteStride = screen->width * screen->fb[0].bitsPerPixel / 8; ++ ++ (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen), ++ pScreen->width, ++ pScreen->height, ++ screen->fb[0].depth, ++ screen->fb[0].bitsPerPixel, ++ screen->fb[0].byteStride, ++ screen->fb[0].frameBuffer); ++ ++ ++ w100c->hwScreen.randr &= ~RR_Rotate_All; ++ switch (randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ switch (w100c->defaultRandR) { ++ case RR_Rotate_0: ++ w100c->hwScreen.randr |= RR_Rotate_0; ++ break; ++ case RR_Rotate_90: ++ w100c->hwScreen.randr |= RR_Rotate_90; ++ break; ++ case RR_Rotate_180: ++ w100c->hwScreen.randr |= RR_Rotate_180; ++ break; ++ case RR_Rotate_270: ++ w100c->hwScreen.randr |= RR_Rotate_270; ++ break; ++ } ++ break; ++ case RR_Rotate_90: ++ switch (w100c->defaultRandR) { ++ case RR_Rotate_0: ++ w100c->hwScreen.randr |= RR_Rotate_90; ++ break; ++ case RR_Rotate_90: ++ w100c->hwScreen.randr |= RR_Rotate_0; ++ break; ++ case RR_Rotate_180: ++ w100c->hwScreen.randr |= RR_Rotate_270; ++ break; ++ case RR_Rotate_270: ++ w100c->hwScreen.randr |= RR_Rotate_180; ++ break; ++ } ++ break; ++ case RR_Rotate_180: ++ switch (w100c->defaultRandR) { ++ case RR_Rotate_0: ++ w100c->hwScreen.randr |= RR_Rotate_180; ++ break; ++ case RR_Rotate_90: ++ w100c->hwScreen.randr |= RR_Rotate_270; ++ break; ++ case RR_Rotate_180: ++ w100c->hwScreen.randr |= RR_Rotate_0; ++ break; ++ case RR_Rotate_270: ++ w100c->hwScreen.randr |= RR_Rotate_90; ++ break; ++ } ++ break; ++ case RR_Rotate_270: ++ switch (w100c->defaultRandR) { ++ case RR_Rotate_0: ++ w100c->hwScreen.randr |= RR_Rotate_270; ++ break; ++ case RR_Rotate_90: ++ w100c->hwScreen.randr |= RR_Rotate_180; ++ break; ++ case RR_Rotate_180: ++ w100c->hwScreen.randr |= RR_Rotate_90; ++ break; ++ case RR_Rotate_270: ++ w100c->hwScreen.randr |= RR_Rotate_0; ++ break; ++ } ++ break; ++ } ++ ++ if (screenEnabled) { ++ KdEnableScreen(pScreen); ++ } ++ ++ return TRUE; ++} ++ ++static Bool W100RandRInit(ScreenPtr pScreen) ++{ ++ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); ++ ++ pScrPriv->rrSetConfig = W100RandRSetConfig; ++ return TRUE; ++} ++ ++#endif ++ ++static Bool ++W100FinishInitScreen(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ if (!fbdevFinishInitScreen(pScreen)) ++ return FALSE; ++ ++#ifdef RANDR ++ if (!W100RandRInit(pScreen)) ++ return FALSE; ++#endif ++ return TRUE; ++} ++ ++static Bool ++W100CreateResources(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ return fbdevCreateResources(pScreen); ++} ++ ++static void ++W100Preserve(KdCardInfo * card) ++{ ++ W100CardInfo *w100c = card->driver; ++ ++ fbdevPreserve(card); ++} ++ ++static void ++W100Restore(KdCardInfo * card) ++{ ++ W100CardInfo *w100c = card->driver; ++ fbdevRestore(card); ++} ++ ++static Bool ++W100DPMS(ScreenPtr pScreen, int mode) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ return fbdevDPMS(pScreen, mode); ++} ++ ++static Bool ++W100Enable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ DBG_IMAGEON(("W100Enable\n")); ++ ++ if (!fbdevEnable(pScreen)) ++ return FALSE; ++ ++ if (w100c->mem_base == NULL) { ++ if (!W100Map(pScreenPriv->screen->card, w100c)) { ++ return FALSE; ++ } ++ W100MemSetup(pScreenPriv->screen); ++ } ++ return TRUE; ++} ++ ++static void ++W100Disable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ DBG_IMAGEON(("W100Disable\n")); ++ W100Unmap(pScreenPriv->card, w100c); ++ ++ fbdevDisable(pScreen); ++} ++ ++static void ++W100GetColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ fbdevGetColors(pScreen, fb, n, pdefs); ++} ++ ++static void ++W100PutColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ ++ fbdevPutColors(pScreen, fb, n, pdefs); ++} ++ ++KdCardFuncs W100Funcs = { ++ W100CardInit, /* cardinit */ ++ W100ScreenInit, /* scrinit */ ++ W100InitScreen, /* initScreen */ ++ W100FinishInitScreen, /* finishInitScreen */ ++ W100CreateResources, /* createRes */ ++ W100Preserve, /* preserve */ ++ W100Enable, /* enable */ ++ W100DPMS, /* dpms */ ++ W100Disable, /* disable */ ++ W100Restore, /* restore */ ++ W100ScreenFini, /* scrfini */ ++ W100CardFini, /* cardfini */ ++ ++ W100CursorInit, /* initCursor */ ++ W100CursorEnable, /* enableCursor */ ++ W100CursorDisable, /* disableCursor */ ++ W100CursorFini, /* finiCursor */ ++ W100RecolorCursor, /* recolorCursor */ ++ ++ W100InitAccel, /* initAccel */ ++ W100EnableAccel, /* enableAccel */ ++ W100DisableAccel, /* disableAccel */ ++ W100FiniAccel, /* finiAccel */ ++ ++ W100GetColors, /* getColors */ ++ W100PutColors, /* putColors */ ++}; +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_const.h +@@ -0,0 +1,161 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef __IMAGEON_CONST_H__ ++#define __IMAGEON_CONST_H__ ++ ++// DP_GUI_MASTER_CNTL.GMC_Brush_DataType ++// DP_DATATYPE.Brush_DataType ++#define DP_BRUSH_8x8MONOOPA 0 //8x8 mono pattern (expanded to frgd, bkgd) ++#define DP_BRUSH_8x8MONOTRA 1 //8x8 mono pattern (expanded to frgd, leave_alone) ++#define DP_PEN_32x1MONOOPA 6 //32x1 mono pattern (expanded to frgd, bkgd) ++#define DP_PEN_32x1MONOTRA 7 //32x1 mono pattern (expanded to frgd, leave_alone) ++#define DP_BRUSH_8x8COLOR 10 //8x8 color pattern ++#define DP_BRUSH_SOLIDCOLOR 13 //solid color pattern (frgd) ++#define DP_BRUSH_NONE 15 //no brush used ++ ++#define SIZE_BRUSH_8x8MONO 2 ++#define SIZE_PEN_32x1MONO 1 ++#define SIZE_BRUSH_8x8COLOR_8 16 ++#define SIZE_BRUSH_8x8COLOR_16 32 ++#define MAX_BRUSH_SIZE SIZE_BRUSH_8x8COLOR_16 ++ ++// DP_GUI_MASTER_CNTL.GMC_Dst_DataType ++// DP_DATATYPE.Dp_Dst_DataType ++#define DP_DST_8BPP 2 // 8 bpp grey scale ++#define DP_DST_16BPP_1555 3 //16 bpp aRGB 1555 ++#define DP_DST_16BPP_444 5 //16 bpp aRGB 4444 ++ ++// DP_GUI_MASTER_CNTL.GMC_Src_DataType ++// DP_DATATYPE.Dp_Src_DataType ++#define DP_SRC_1BPP_OPA 0 //mono (expanded to frgd, bkgd) ++#define DP_SRC_1BPP_TRA 1 //mono (expanded to frgd, leave_alone) ++#define DP_SRC_COLOR_SAME_AS_DST 3 //color (same as DST) ++#define DP_SRC_SOLID_COLOR_BLT 4 //solid color for Blt (use frgd) ++#define DP_SRC_4BPP 5 //4 bpp ++#define DP_SRC_12BPP_PACKED 6 //12 bpp packed ++ ++// DP_GUI_MASTER_CNTL.GMC_Byte_Pix_Order ++// DP_DATATYPE.Dp_Byte_Pix_Order ++#define DP_PIX_ORDER_MSB2LSB 0 //monochrome pixel order from MSBit to LSBit ++#define DP_PIX_ORDER_LSB2MSB 1 //monochrome pixel order from LSBit to MSBit ++ ++// DP_GUI_MASTER_CNTL.GMC_Dp_Src_Source ++#define DP_SRC_MEM_LINEAR 1 //loaded from memory (linear trajectory) ++#define DP_SRC_MEM_RECTANGULAR 2 //loaded from memory (rectangular trajectory) ++#define DP_SRC_HOSTDATA_BIT 3 //loaded from hostdata (linear trajectory) ++#define DP_SRC_HOSTDATA_BYTE 4 //loaded from hostdata (linear trajectory & byte-aligned) ++ ++// DP_GUI_MASTER_CNTL.GMC_Dp_Op ++#define DP_OP_ROP 0 ++#define DP_OP_ARITHMETIC 1 ++ ++// E2_ARITHMETIC_CNTL.opcode ++#define E2_OPC_GLBALP_ADD_SRC2 0 ++#define E2_OPC_GLBALP_SUB_SRC2 1 ++#define E2_OPC_SRC1_ADD_SRC2 2 ++#define E2_OPC_SRC1_SUB_SRC2 3 ++#define E2_OPC_DST_SADDBLEND_SRC2 4 ++#define E2_OPC_DST_CADDBLEND_SRC2 5 ++#define E2_OPC_DST_CSUBBLEND_SRC2 6 ++#define E2_OPC_LF_SRC2 7 ++#define E2_OPC_SCALE_SRC2 8 ++#define E2_OPC_STRETCH_SRC2 9 ++#define E2_OPC_SRC1_4BPPCPYWEXP 10 ++#define E2_OPC_MC1 11 ++#define E2_OPC_MC2 12 ++#define E2_OPC_MC1_IDCT 13 ++#define E2_OPC_MC2_IDCT 14 ++#define E2_OPC_IDCT_ONLY_IFRAME 15 ++ ++// E2_ARITHMETIC_CNTL.clamp ++#define E2_CLAMP_OFF 0 ++#define E2_CLAMP_ON 1 ++ ++// E2_ARITHMETIC_CNTL.rounding ++#define E2_ROUNDING_TRUNCATE 0 ++#define E2_ROUNDING_TO_INFINITY 1 ++ ++// E2_ARITHMETIC_CNTL.srcblend ++#define E2_SRCBLEND_GLOBALALPHA 0 ++#define E2_SRCBLEND_ZERO 1 ++#define E2_SRCBLEND_SRC2ALPHA 2 ++#define E2_SRCBLEND_DSTALPHA 3 ++#define E2_SRCBLEND_ALPHA1PLANE 4 ++ ++// E2_ARITHMETIC_CNTL.destblend ++#define E2_DSTBLEND_GLOBALALPHA 0 ++#define E2_DSTBLEND_ZERO 1 ++#define E2_DSTBLEND_SRC2ALPHA 2 ++#define E2_DSTBLEND_DSTALPHA 3 ++#define E2_DSTBLEND_ALPHA1PLANE 4 ++ ++// LCD_FORMAT.lcd_type ++#define LCDTYPE_TFT333 0 ++#define LCDTYPE_TFT444 1 ++#define LCDTYPE_TFT555 2 ++#define LCDTYPE_TFT666 3 ++#define LCDTYPE_COLSTNPACK4 4 ++#define LCDTYPE_COLSTNPACK8F1 5 ++#define LCDTYPE_COLSTNPACK8F2 6 ++#define LCDTYPE_COLSTNPACK16 7 ++#define LCDTYPE_MONSTNPACK4 8 ++#define LCDTYPE_MONSTNPACK8 9 ++ ++// CP_RB_CNTL.rb_bufsz ++#define RB_SIZE_2K 8 ++#define RB_SIZE_4K 9 ++#define RB_SIZE_8K 10 ++#define RB_SIZE_16K 11 ++#define RB_SIZE_32K 12 ++#define RB_SIZE_64K 13 ++ ++// GRAPHIC_CTRL.color_depth ++#define COLOR_DEPTH_1BPP 0 ++#define COLOR_DEPTH_2BPP 1 ++#define COLOR_DEPTH_4BPP 2 ++#define COLOR_DEPTH_8BPP 3 ++#define COLOR_DEPTH_332 4 ++#define COLOR_DEPTH_A444 5 ++#define COLOR_DEPTH_A555 6 ++ ++// VIDEO_CTRL.video_mode ++#define VIDEO_MODE_422 0 ++#define VIDEO_MODE_420 1 ++ ++// CLR_CMP_CNTL.cmp_fcn_src ++#define CMP_FCN_SRC_NEQ 4 ++#define CMP_FCN_SRC_EQ 5 ++ ++// CLR_CMP_CNTL.cmp_src ++#define CMP_SRC_SRC 1 ++ ++// Overlay formats ++#define OVLFORMAT_YUV422 (6) ++#define OVLFORMAT_YUV420 (7) ++#define OVLFORMAT_RGB565 (5) ++#define OVLFORMAT_EQU_DISPLAY (8) ++ ++#define W100_CLK_SRC_XTAL 0 ++#define W100_CLK_SRC_PLL 1 ++ ++#endif +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_cursor.c +@@ -0,0 +1,571 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++ ++#include "cursorstr.h" ++#include "imageon.h" ++#include "imageon_regs.h" ++ ++#define W100_CURSOR_HEIGHT (16) ++#define W100_CURSOR_PITCH (4) ++#define W100_CURSOR_WIDTH (16) ++#define W100_CURSOR_SIZE W100_CURSOR_PITCH * W100_CURSOR_WIDTH ++ ++static CARD16 expand2bpp[256]; ++ ++static CARD16 spread_byte(CARD8 b) ++{ ++ CARD16 s = b; ++ ++ s = ((s & 0x00f0) << 4) | (s & 0x000f); ++ s = ((s & 0x0c0c) << 2) | (s & 0x0303); ++ s = ((s & 0x2222) << 1) | (s & 0x1111); ++ return s; ++} ++ ++static void W100InitExpansionTable() ++{ ++ int i; ++ for (i = 0; i < 256; i++) { ++ expand2bpp[i] = spread_byte(i); ++ } ++} ++ ++#define BigEndian(v) \ ++ (((v & 0x000000ff) << 24) | \ ++ ((v & 0x0000ff00) << 8) | \ ++ ((v & 0x00ff0000) >> 8) | \ ++ ((v & 0xff000000) >> 24)) ++ ++#define PixelOffset(x, y) \ ++ (((y) * W100_CURSOR_PITCH + ((x) / 4)) >> 2) ++ ++#define PixelShift(x, y) \ ++ (2 * ((x) % W100_CURSOR_WIDTH)) ++ ++#define PixelMask(x, y) \ ++ ((0xc0000000) >> PixelShift(x, y)) ++ ++#define PixelVal(src, x, y) \ ++ ((*(src + PixelOffset(x, y)) & PixelMask(x, y)) >> (30 - PixelShift(x, y))) ++ ++#define SetPixelVal(ptr, x, y, val) \ ++ *(((CARD32 *)(ptr)) + PixelOffset(x, y)) = \ ++ *(((CARD32 *)(ptr)) + PixelOffset(x, y)) & ~PixelMask(x, y) | \ ++ ((val) & 0x03) << (30 - PixelShift(x2, y2)) ++ ++#define DUMP_CURSOR(src) do { \ ++ int x; \ ++ int y; \ ++ for (y = 0; y < W100_CURSOR_HEIGHT; y++) { \ ++ DBG_IMAGEON(("Line %02d: ", y)); \ ++ for (x = 0; x < W100_CURSOR_WIDTH; x++) { \ ++ DBG_IMAGEON(("%d", PixelVal(src,x,y))); \ ++ } \ ++ DBG_IMAGEON(("\n")); \ ++ } \ ++ DBG_IMAGEON((".\n")); \ ++} while (0) ++ ++static void ++W100RotateCursor(int randr, CARD32 *src, CARD32 *dst) ++{ ++ int x1, y1, x2, y2; ++ ++ switch (randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ x1 = 0; ++ y1 = 0; ++ for (y2 = 0; y2 < W100_CURSOR_HEIGHT; y2++) { ++ for (x2 = W100_CURSOR_WIDTH - 1; x2 >= 0; --x2) { ++ SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1)); ++ ++x1; ++ if (x1 >= W100_CURSOR_WIDTH) { ++ x1 = 0; ++ ++y1; ++ } ++ } ++ } ++ break; ++ case RR_Rotate_90: ++ x1 = 0; ++ y1 = 0; ++ for (x2 = W100_CURSOR_WIDTH - 1; x2 >= 0; --x2) { ++ for (y2 = W100_CURSOR_HEIGHT - 1; y2 >=0; --y2) { ++ SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1)); ++ ++x1; ++ if (x1 >= W100_CURSOR_WIDTH) { ++ x1 = 0; ++ ++y1; ++ } ++ } ++ } ++ break; ++ case RR_Rotate_180: ++ x1 = 0; ++ y1 = 0; ++ for (y2 = W100_CURSOR_HEIGHT - 1; y2 >= 0; --y2) { ++ for (x2 = W100_CURSOR_WIDTH - 1; x2 >= 0; --x2) { ++ SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1)); ++ ++x1; ++ if (x1 >= W100_CURSOR_WIDTH) { ++ x1 = 0; ++ ++y1; ++ } ++ } ++ } ++ break; ++ case RR_Rotate_270: ++ x1 = 0; ++ y1 = 0; ++ for (x2 = 0; x2 < W100_CURSOR_WIDTH; x2++) { ++ for (y2 = W100_CURSOR_HEIGHT - 1; y2 >= 0; --y2) { ++ SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1)); ++ ++x1; ++ if (x1 >= W100_CURSOR_WIDTH) { ++ x1 = 0; ++ ++y1; ++ } ++ } ++ } ++ break; ++ } ++} ++ ++static void ++W100SetCursorColors(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ CursorPtr pCursor = pCurPriv->pCursor; ++ CursorBitsPtr bits = pCursor->bits; ++ cursor_color_u fgcolor; ++ cursor_color_u bgcolor; ++ ++ fgcolor.f.cur_color_r = pCursor->foreRed >> 8; ++ fgcolor.f.cur_color_g = pCursor->foreGreen >> 8; ++ fgcolor.f.cur_color_b = pCursor->foreBlue >> 8; ++ ++ bgcolor.f.cur_color_r = pCursor->backRed >> 8; ++ bgcolor.f.cur_color_g = pCursor->backGreen >> 8; ++ bgcolor.f.cur_color_b = pCursor->backBlue >> 8; ++ ++ DBG_IMAGEON(("W100SetCursorColors fg(%02x,%02x,%02x), bg(%02x,%02x,%02x)\n", ++ fgcolor.f.cur_color_r, ++ fgcolor.f.cur_color_g, ++ fgcolor.f.cur_color_b, ++ bgcolor.f.cur_color_r, ++ bgcolor.f.cur_color_g, ++ bgcolor.f.cur_color_b)); ++ ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmCURSOR1_COLOR0, bgcolor.val); ++ MMIO_OUT32(mmCURSOR1_COLOR1, fgcolor.val); ++ W100EnableDisplayUpdate(w100c); ++ ++} ++ ++static void ++W100LoadCursor(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ CursorPtr pCursor = pCurPriv->pCursor; ++ CursorBitsPtr bits = pCursor->bits; ++ CARD32 *dst; ++ CARD8 tmpCursor0[W100_CURSOR_SIZE]; ++ CARD8 tmpCursor1[W100_CURSOR_SIZE]; ++ CARD32 expValue, expMask; ++ CARD32 *src; ++ CARD32 *mask; ++ int lwsrc; ++ int line, i; ++ int h, w; ++ ++ DBG_IMAGEON(("W100LoadCursor(xhot:%d,yhot:%d,width:%d,height:%d)\n", ++ bits->xhot, bits->yhot, ++ bits->width, bits->height)); ++ ++ pCurPriv->pCursor = pCursor; ++ pCurPriv->xhot = bits->xhot; ++ pCurPriv->yhot = bits->yhot; ++ ++ memset(tmpCursor0, 0xaa, W100_CURSOR_SIZE); ++ ++ h = bits->height; ++ w = bits->width; ++ if (h > W100_CURSOR_HEIGHT) { ++ h = W100_CURSOR_HEIGHT; ++ } ++ ++ if (w > W100_CURSOR_WIDTH) { ++ w = W100_CURSOR_WIDTH; ++ } ++ ++ src = (CARD32*) bits->source; ++ dst = (CARD32*) tmpCursor0; ++ mask = (CARD32*) bits->mask; ++ ++ lwsrc = BitmapBytePad(bits->width) >> 2; ++ ++ for (line = 0; line < h; line++) { ++ for (i = 0; i < lwsrc; i++) { ++ expValue = ++ (expand2bpp[src[i] & 0xff]) | ++ (expand2bpp[(src[i] >> 8) & 0xff] << 16); ++ expMask = ++ (expand2bpp[mask[i] & 0xff]) | ++ (expand2bpp[(mask[i] >> 8) & 0xff] << 16); ++ expMask |= (expMask << 1); /* Expand 01 -> 11, 00 -> 00 */ ++ dst[i] = (0xaaaaaaaa & ~expMask) | (expValue & expMask); ++ } ++ src += lwsrc; ++ mask += lwsrc; ++ dst += lwsrc; ++ } ++ ++ /* Rotate the pixmap to get the correct orientation */ ++ W100RotateCursor(w100c->hwScreen.randr, ++ (CARD32*) tmpCursor0, ++ (CARD32*) tmpCursor1); ++ ++ /* Correct endianness */ ++ src = (CARD32*) tmpCursor1; ++ dst = (CARD32*) (pCurPriv->area->vidmem->base + pCurPriv->area->offset); ++ for (line = 0; line < h; line++) { ++ for (i = 0; i < lwsrc; i++) { ++ dst[i] = BigEndian(src[i]); ++ } ++ src += lwsrc; ++ dst += lwsrc; ++ } ++ W100SetCursorColors(pScreen); ++} ++ ++static void ++W100UnloadCursor(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ cursor_h_pos_u hpos; ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ DBG_IMAGEON(("W100UnloadCursor pCurPriv:%p\n", pCurPriv)); ++ ++ hpos.val = pCurPriv->hpos; ++ hpos.f.cur_en = 0; ++ ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmCURSOR1_H_POS, hpos.val); ++ W100EnableDisplayUpdate(w100c); ++ pCurPriv->hpos = hpos.val; ++} ++ ++static void ++W100MoveCursor(ScreenPtr pScreen, int x, int y) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ CARD16 xoffs, yoffs; ++ cursor_offset_u cursor_offset; ++ cursor_h_pos_u hpos; ++ cursor_v_pos_u vpos; ++ graphic_h_disp_u graphic_hdisp; ++ graphic_v_disp_u graphic_vdisp; ++ int tx, ty; ++ ++ if (!pCurPriv->has_cursor) { ++ return; ++ } ++ if (!pScreenPriv->enabled) { ++ return; ++ } ++ ++ DBG_IMAGEON(("W100MoveCursor(x:%d,y:%d)\n", x, y)); ++ ++ graphic_hdisp.val = w100c->regs.GRAPHIC_H_DISP; ++ graphic_vdisp.val = w100c->regs.GRAPHIC_V_DISP; ++ ++ xoffs = 0; ++ yoffs = 0; ++ ++ x -= pCurPriv->xhot; ++ if (x < 0) { ++ switch(w100c->hwScreen.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ case RR_Rotate_180: ++ xoffs = -x; ++ break; ++ case RR_Rotate_90: ++ case RR_Rotate_270: ++ yoffs = -y; ++ break; ++ } ++ x = 0; ++ } ++ y -= pCurPriv->yhot; ++ if (y < 0) { ++ switch(w100c->hwScreen.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ case RR_Rotate_180: ++ yoffs = -y; ++ break; ++ case RR_Rotate_90: ++ case RR_Rotate_270: ++ xoffs = -y; ++ break; ++ } ++ y = 0; ++ } ++ ++ tx = W100MapToHWX(w100c, x, y, pCurPriv->width, pCurPriv->height); ++ ty = W100MapToHWY(w100c, x, y, pCurPriv->width, pCurPriv->height); ++ ++ DBG_IMAGEON(("W100MoveCursor dst(x:%d,y:%d)," ++ "mapped(x:%d,y:%d,xoffs:%d,yoffs:%d\n", ++ x, y, tx, ty, xoffs, yoffs)); ++ ++ cursor_offset.f.cur_x_offset = xoffs; ++ cursor_offset.f.cur_y_offset = yoffs; ++ cursor_offset.f.cur_offset = (CARD32) ++ W100_HOST2CARD(pCurPriv->area->vidmem->base ++ + pCurPriv->area->offset); ++ hpos.f.cur_en = 1; ++ hpos.f.cur_h_start = graphic_hdisp.f.graphic_h_start + tx; ++ hpos.f.cur_h_end = hpos.f.cur_h_start + pCurPriv->width; ++ vpos.f.cur_v_start = graphic_vdisp.f.graphic_v_start + ty; ++ vpos.f.cur_v_end = vpos.f.cur_v_start + pCurPriv->height; ++ ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmCURSOR1_OFFSET, cursor_offset.val); ++ MMIO_OUT32(mmCURSOR1_V_POS, vpos.val); ++ MMIO_OUT32(mmCURSOR1_H_POS, hpos.val); ++ W100EnableDisplayUpdate(w100c); ++ ++ pCurPriv->hpos = hpos.val; ++ pCurPriv->vpos = vpos.val; ++ pCurPriv->coffset = cursor_offset.val; ++ ++} ++ ++ ++static Bool ++W100RealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ if (!pScreenPriv->enabled) { ++ return TRUE; ++ } ++ ++ if (pCursor && pCurPriv->pCursor == pCursor) { ++ int x, y; ++ miPointerPosition(&x, &y); ++ W100LoadCursor(pScreen); ++ W100MoveCursor(pScreen, x, y); ++ } ++ return TRUE; ++} ++ ++ ++static Bool ++W100UnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) ++{ ++ return TRUE; ++} ++ ++ ++static void ++W100SetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ pCurPriv->pCursor = pCursor; ++ ++ if (!pScreenPriv->enabled) { ++ return; ++ } ++ ++ if (pCursor) { ++ W100LoadCursor(pScreen); ++ W100MoveCursor(pScreen, x, y); ++ } else { ++ W100UnloadCursor(pScreen); ++ } ++} ++ ++ ++miPointerSpriteFuncRec W100PointerSpriteFuncs = { ++ W100RealizeCursor, ++ W100UnrealizeCursor, ++ W100SetCursor, ++ W100MoveCursor, ++}; ++ ++static void ++W100QueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight, ++ ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ switch (class) { ++ case CursorShape: ++ if (*pwidth > pCurPriv->width) { ++ *pwidth = pCurPriv->width; ++ } ++ if (*pheight > pCurPriv->height) { ++ *pheight = pCurPriv->height; ++ } ++ if (*pwidth > pScreen->width) { ++ *pwidth = pScreen->width; ++ } ++ if (*pheight > pScreen->height) { ++ *pheight = pScreen->height; ++ } ++ break; ++ default: ++ fbQueryBestSize(class, pwidth, pheight, pScreen); ++ break; ++ } ++} ++ ++static void ++W100CursorSave(ScreenPtr pScreen, KdOffscreenArea *area) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ DBG_IMAGEON(("W100CursorSave\n")); ++ ++ pCurPriv->area = NULL; ++} ++ ++void ++W100CursorEnable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ if (!pCurPriv->has_cursor) { ++ return; ++ } ++ ++ DBG_IMAGEON(("W100CursorEnable\n")); ++ ++ if (pCurPriv->area == NULL) { ++ pCurPriv->area = KdOffscreenAlloc(pScreen, ++ W100_CURSOR_SIZE, 0, TRUE, ++ W100CursorSave, w100s); ++ } ++ if (pCurPriv->area == NULL) { ++ FatalError("Couldn't allocate offscreen memory for cursor.\n"); ++ } ++ if (pCurPriv->pCursor) { ++ int x, y; ++ miPointerPosition(&x, &y); ++ W100LoadCursor(pScreen); ++ W100MoveCursor(pScreen, x, y); ++ } else { ++ W100UnloadCursor(pScreen); ++ } ++} ++ ++ ++void ++W100CursorDisable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ DBG_IMAGEON(("W100CursorDisable\n")); ++ ++ if (!pScreenPriv->enabled || !pCurPriv->has_cursor) { ++ return; ++ } ++ ++ if (pCurPriv->pCursor) { ++ W100UnloadCursor(pScreen); ++ } ++} ++ ++Bool ++W100CursorInit(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ DBG_IMAGEON(("W100CursorInit\n")); ++ ++ pCurPriv->width = W100_CURSOR_WIDTH; ++ pCurPriv->height = W100_CURSOR_HEIGHT; ++ pScreen->QueryBestSize = W100QueryBestSize; ++ miPointerInitialize(pScreen, ++ &W100PointerSpriteFuncs, ++ &kdPointerScreenFuncs, ++ FALSE); ++ pCurPriv->has_cursor = TRUE; ++ pCurPriv->pCursor = NULL; ++ W100InitExpansionTable(); ++ return TRUE; ++} ++ ++ ++void ++W100RecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef) ++{ ++ return; ++} ++ ++ ++void ++W100CursorFini(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100Cursor *pCurPriv = &w100s->cursor; ++ ++ pCurPriv->has_cursor = FALSE; ++ pCurPriv->pCursor = NULL; ++} +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_draw.c +@@ -0,0 +1,241 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++ ++#include "imageon.h" ++#include "imageon_regs.h" ++#include "imageon_const.h" ++#include "imageon_support.h" ++#include "kaa.h" ++ ++static W100CardInfo *currentCard; ++ ++void ++W100WaitMarker(ScreenPtr pScreen, int marker) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100WaitIdle(w100c); ++} ++ ++Bool ++W100PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) ++{ ++ KdScreenPriv(pPix->drawable.pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100CardInfo(pScreenPriv); ++ int fifoEntries = 4; ++ ++ DBG_IMAGEON(("W100PrepareSolid(alu:%d, pm:0x%08x, fg:%d)\n", ++ alu, pm, fg)); ++ ++ W100ResetContext(w100c); ++ W100SetPixelMask(w100c, pm); ++ ++ if (W100SetDestinationPixmap(pPix)) { ++ if (w100c->ctx.mask.enable) { ++ ++fifoEntries; ++ } ++ if (W100WaitCmdFifoEntries(w100c, fifoEntries)) { ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeSolidGmc(w100c, alu)); ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ MMIO_OUT32(mmDP_BRUSH_FRGD_CLR, fg); ++ ++ if (w100c->ctx.mask.enable) { ++ MMIO_OUT32(mmDP_WRITE_MSK, pm); ++ } ++ currentCard = w100c; ++ return TRUE; ++ } ++ } ++ ErrorF("Error in W100PrepareSolid\n"); ++ return FALSE; ++} ++ ++void ++W100Solid(int x1, int y1, int x2, int y2) ++{ ++ W100CardInfo *w100c = currentCard; ++ DBG_IMAGEON(("W100Solid(x1:%d,y1:%d,x2:%d,y2:%d)\n", x1, y1, x2, y2)); ++ ++ if (W100WaitCmdFifoEntries(w100c, 2)) { ++ MMIO_OUT32(mmDST_Y_X, (y1 << 16) | x1); ++ MMIO_OUT32(mmDST_HEIGHT_WIDTH, ((y2 - y1) << 16) | (x2 - x1)); ++ } else { ++ ErrorF("Error in W100Solid\n"); ++ } ++} ++ ++void ++W100DoneSolid(void) ++{ ++} ++ ++ ++Bool ++W100PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, ++ int dx, int dy, int alu, Pixel pm) ++{ ++ KdScreenPriv(pDst->drawable.pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100CardInfo(pScreenPriv); ++ dp_datatype_u datatype; ++ ++ int fifoEntries = 6; ++ ++ W100ResetContext(w100c); ++ W100SetPixelMask(w100c, pm); ++ W100SetXForm(w100c, dx, dy); ++ ++ if (W100SetSourcePixmap(pSrc) && W100SetDestinationPixmap(pDst)) { ++ DBG_IMAGEON(("W100PrepareCopy(src(pitch:%d,offset:0x%08x)," ++ "dst(pitch:%d,offset:0x%08x))\n", ++ w100c->ctx.src.pitch, ++ w100c->ctx.src.offset, ++ w100c->ctx.dst.pitch, ++ w100c->ctx.dst.offset)); ++ if (w100c->ctx.mask.enable) { ++ ++fifoEntries; ++ } ++ ++ if (W100WaitCmdFifoEntries(w100c, fifoEntries)) { ++ MMIO_OUT32(mmSRC_PITCH, w100c->ctx.src.pitch); ++ MMIO_OUT32(mmSRC_OFFSET, w100c->ctx.src.offset); ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeCopyGmc(w100c, alu)); ++ if (w100c->ctx.mask.enable) { ++ MMIO_OUT32(mmDP_WRITE_MSK, pm); ++ } ++ MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath); ++ currentCard = w100c; ++ return TRUE; ++ } ++ } ++ ErrorF("Error in W100PrepareCopy\n"); ++ return FALSE; ++} ++ ++void ++W100Copy(int srcX, int srcY, int dstX, int dstY, int w, int h) ++{ ++ W100CardInfo *w100c = currentCard; ++ DBG_IMAGEON(("W100Copy(src(x:%d,y:%d),dst(x:%d,y:%d),w:%d,h:%d)\n", ++ srcX, srcY, ++ dstX, dstY, ++ w, h)); ++ if (w100c->ctx.xform.dx < 0) { ++ dstX += w - 1; ++ srcX += w - 1; ++ } ++ ++ if (w100c->ctx.xform.dy < 0) { ++ dstY += h - 1; ++ srcY += h - 1; ++ } ++ ++ if (W100WaitCmdFifoEntries(w100c, 3)) { ++ MMIO_OUT32(mmSRC_Y_X, (srcY << 16) | srcX); ++ MMIO_OUT32(mmDST_Y_X, (dstY << 16) | dstX); ++ MMIO_OUT32(mmDST_HEIGHT_WIDTH, (h << 16) | w); ++ } else { ++ ErrorF("Error in W100Copy\n"); ++ } ++} ++ ++void ++W100DoneCopy(void) ++{ ++} ++ ++Bool ++W100InitAccel(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ ++ ++ DBG_IMAGEON(("W100InitAccel: %d/%d depth/bpp\n", ++ pScreenPriv->screen->fb[0].depth, ++ pScreenPriv->screen->fb[0].bitsPerPixel)); ++ ++ memset(&w100s->kaa, 0, sizeof(KaaScreenInfoRec)); ++ w100s->kaa.waitMarker = W100WaitMarker; ++ w100s->kaa.PrepareSolid = W100PrepareSolid; ++ w100s->kaa.Solid = W100Solid; ++ w100s->kaa.DoneSolid = W100DoneSolid; ++ w100s->kaa.PrepareCopy = W100PrepareCopy; ++ w100s->kaa.Copy = W100Copy; ++ w100s->kaa.DoneCopy = W100DoneCopy; ++ ++ w100s->kaa.flags |= KAA_OFFSCREEN_PIXMAPS; ++ /* Offset alignment, not sure if this is enough */ ++ w100s->kaa.offsetAlign = 0; ++ w100s->kaa.pitchAlign = 16; ++ ++ if (!kaaDrawInit(pScreen, &w100s->kaa)) { ++ return FALSE; ++ } ++ DBG_IMAGEON(("KAA flags: 0x%08x\n", w100s->kaa.flags)); ++ return TRUE; ++} ++ ++void ++W100EnableAccel(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100CardInfo(pScreenPriv); ++ ++ DBG_IMAGEON(("W100EnableAccel\n")); ++ ++ w100s->kaa.PrepareBlend = NULL; ++ w100s->kaa.Blend = NULL; ++ w100s->kaa.DoneBlend = NULL; ++ w100s->kaa.CheckComposite = NULL; ++ w100s->kaa.PrepareComposite = NULL; ++ w100s->kaa.Composite = NULL; ++ w100s->kaa.DoneComposite = NULL; ++ w100s->kaa.UploadToScreen = NULL; ++ w100s->kaa.UploadToScratch = NULL; ++ ++ W100SetupGraphicEngine(w100c); ++ W100SetupGraphicWindow(w100c); ++ ++ kaaMarkSync(pScreen); ++} ++ ++void ++W100DisableAccel(ScreenPtr pScreen) ++{ ++ DBG_IMAGEON(("W100DisableAccel\n")); ++} ++ ++void ++W100FiniAccel(ScreenPtr pScreen) ++{ ++ DBG_IMAGEON(("W100FiniAccel\n")); ++} +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon.h +@@ -0,0 +1,229 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef _IMAGEON_H_ ++#define _IMAGEON_H_ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++ ++#include <fbdev.h> ++ ++#include <kxv.h> ++ ++#define DEBUG_IMAGEON 0 ++#if DEBUG_IMAGEON ++#define DBG_IMAGEON(a) ErrorF a ++#else ++#define DBG_IMAGEON(a) ++#endif ++ ++ ++#define W100_MEM_BASE (0x08000000) ++#define W100_REG_OFFSET (0x00010000) ++#define W100_REG_BASE (W100_MEM_BASE + W100_REG_OFFSET) ++#define W100_MEM_SIZE (0x01000000) ++#define W100_REG_SIZE (0x00002000) ++#define W100_CMDFIFO_SIZE (16) ++ ++#define W100_CARD2HOST(x) (w100c->mem_base + (CARD32)(x)) ++#define W100_HOST2CARD(x) ((x) - (CARD32)(w100c->mem_base)) ++#define W100_MEMAREAS (2) ++ ++#define MMIO_OUT32(a, v) (*(VOL32 *)((w100c->reg_base) + (a)) = (v)) ++#define MMIO_IN32(a) (*(VOL32 *)((w100c->reg_base) + (a))) ++ ++#define W100_MAX(x, y) ((x) > (y) ? x : y) ++#define W100_MIN(x, y) ((x) < (y) ? x : y) ++ ++#define TIMEOUT_LOCALS struct timeval _target, _curtime; ++ ++static inline Bool ++tv_le(struct timeval *tv1, struct timeval *tv2) ++{ ++ if (tv1->tv_sec < tv2->tv_sec || ++ (tv1->tv_sec == tv2->tv_sec && ++ tv1->tv_usec < tv2->tv_usec)) ++ return TRUE; ++ else ++ return FALSE; ++} ++ ++#define WHILE_NOT_TIMEOUT(_timeout) \ ++ gettimeofday(&_target, NULL); \ ++ _target.tv_usec += ((_timeout) * 1000000); \ ++ _target.tv_sec += _target.tv_usec / 1000000; \ ++ _target.tv_usec = _target.tv_usec % 1000000; \ ++ while (gettimeofday(&_curtime, NULL), tv_le(&_curtime, &_target)) ++ ++#define TIMEDOUT() (!tv_le(&_curtime, &_target)) ++ ++typedef volatile CARD8 VOL8; ++typedef volatile CARD16 VOL16; ++typedef volatile CARD32 VOL32; ++ ++struct pci_id_entry { ++ CARD16 vendor; ++ CARD16 device; ++ CARD8 caps; ++ char *name; ++}; ++ ++typedef struct _W100MemArea { ++ CARD8 *start; ++ CARD32 size; ++ CARD8 priority; ++} W100MemArea; ++ ++typedef struct _W100CardInfo { ++ FbdevPriv fbdev; ++ struct pci_id_entry *pci_id; ++ CARD8 *mem_base; ++ CARD8 *reg_base; ++ W100MemArea memareas[W100_MEMAREAS]; ++ int cmdfifo_entries; ++ struct { ++ CARD32 ENG_CNTL; ++ CARD32 VIDEO_CTRL; ++ CARD32 GRAPHIC_H_DISP; ++ CARD32 GRAPHIC_V_DISP; ++ } regs; ++ struct { ++ CARD8 *offset; ++ CARD16 x; ++ CARD16 y; ++ CARD16 width; ++ CARD16 height; ++ int randr; ++ CARD8 bpp; ++ } hwScreen; ++ int defaultRandR; ++ CARD8 last_dst_videomem; ++ CARD8 last_src_videomem; ++ struct { ++ struct { ++ CARD8 datatype; ++ CARD32 pitch; ++ CARD32 offset; ++ CARD8 videomem; ++ } dst; ++ struct { ++ CARD8 datatype; ++ CARD32 pitch; ++ CARD32 offset; ++ CARD8 videomem; ++ } src; ++ struct { ++ int dx; ++ int dy; ++ int randr; ++ Bool mirror; ++ CARD32 dataPath; ++ } xform; ++ struct { ++ Pixel pm; ++ Bool enable; ++ } mask; ++ } ctx; ++} W100CardInfo; ++ ++#define W100GetCardInfo(kd) ((W100CardInfo *) ((kd)->card->driver)) ++#define W100CardInfo(kd) W100CardInfo *w100c = W100GetCardInfo(kd) ++ ++typedef struct _W100Cursor { ++ int width, height; ++ int xhot, yhot; ++ Bool has_cursor; ++ CursorPtr pCursor; ++ KdOffscreenArea *area; ++ CARD32 vpos; ++ CARD32 hpos; ++ CARD32 coffset; ++} W100Cursor; ++ ++typedef struct _W100ScreenInfo { ++ FbdevScrPriv fbdev; ++ KaaScreenInfoRec kaa; ++ W100CardInfo *w100c; ++ KdScreenInfo *screen; ++ KdVideoAdaptorPtr pAdaptor; ++ W100Cursor cursor; ++} W100ScreenInfo; ++ ++#define W100GetScreenInfo(kd) ((W100ScreenInfo *) ((kd)->screen->driver)) ++#define W100ScreenInfo(kd) W100ScreenInfo *w100s = W100GetScreenInfo(kd) ++ ++typedef enum _W100VideoStatus { ++ W100_OVERLAY_ON = 1, ++ W100_OVERLAY_CONFIGURED = 2 ++} W100VideoStatus; ++ ++ ++typedef struct _W100PortPriv { ++ CARD32 videoStatus; ++ CARD32 videoCtrl; ++ RegionRec clip; ++ KdOffscreenArea *offSurface; ++ CARD32 offSize; ++ KdOffscreenArea *ovlSurface; ++ CARD32 ovlSize; ++ CARD32 YPlaneOffset; ++ CARD32 UPlaneOffset; ++ CARD32 VPlaneOffset; ++ CARD32 colorKey; ++ CARD8 brightness; ++ CARD32 maxOverlaySize; ++ CARD16 ovlX; ++ CARD16 ovlY; ++ CARD16 ovlWidth; ++ CARD16 ovlHeight; ++ CARD8 videoHorExp; ++ CARD8 videoVerExp; ++ int id; ++} W100PortPrivRec, *W100PortPrivPtr; ++ ++extern KdCardFuncs W100Funcs; ++ ++/* imageon_draw.c */ ++void W100WaitMarker(ScreenPtr pScreen, int marker); ++Bool W100PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg); ++void W100Solid(int x1, int y1, int x2, int y2); ++Bool W100PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, ++ int dx, int dy, int alu, Pixel pm); ++void W100Copy(int srcX, int srcY, int dstX, int dstY, int w, int h); ++void W100DoneCopy(void); ++Bool W100InitAccel(ScreenPtr pScreen); ++void W100EnableAccel(ScreenPtr pScreen); ++void W100DisableAccel(ScreenPtr pScreen); ++void W100FiniAccel(ScreenPtr pScreen); ++/* imageon_cursor.c */ ++void W100CursorEnable(ScreenPtr pScreen); ++void W100CursorDisable(ScreenPtr pScreen); ++Bool W100CursorInit(ScreenPtr pScreen); ++void W100RecolorCursor(ScreenPtr pScreen, int ndef, xColorItem * pdef); ++void W100CursorFini(ScreenPtr pScreen); ++ ++ ++ ++ ++#endif /* _IMAGEON_H_ */ +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_regs.h +@@ -0,0 +1,4155 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef __IMAGEON_REGS_H__ ++#define __IMAGEON_REGS_H__ ++ ++/* Block CIF Start: */ ++#define mmCHIP_ID 0x0000 ++#define mmREVISION_ID 0x0004 ++#define mmWRAP_BUF_A 0x0008 ++#define mmWRAP_BUF_B 0x000C ++#define mmWRAP_TOP_DIR 0x0010 ++#define mmWRAP_START_DIR 0x0014 ++#define mmCIF_CNTL 0x0018 ++#define mmCFGREG_BASE 0x001C ++#define mmCIF_IO 0x0020 ++#define mmCIF_READ_DBG 0x0024 ++#define mmCIF_WRITE_DBG 0x0028 ++#define cfgIND_ADDR_A_0 0x0000 ++#define cfgIND_ADDR_A_1 0x0001 ++#define cfgIND_ADDR_A_2 0x0002 ++#define cfgIND_DATA_A 0x0003 ++#define cfgREG_BASE 0x0004 ++#define cfgINTF_CNTL 0x0005 ++#define cfgSTATUS 0x0006 ++#define cfgCPU_DEFAULTS 0x0007 ++#define cfgIND_ADDR_B_0 0x0008 ++#define cfgIND_ADDR_B_1 0x0009 ++#define cfgIND_ADDR_B_2 0x000A ++#define cfgIND_DATA_B 0x000B ++#define cfgPM4_RPTR 0x000C ++#define cfgSCRATCH 0x000D ++#define cfgPM4_WRPTR_0 0x000E ++#define cfgPM4_WRPTR_1 0x000F ++/* Block CIF End: */ ++ ++/* Block CP Start: */ ++#define mmCP_RB_CNTL 0x0210 ++#define mmCP_RB_BASE 0x0214 ++#define mmCP_RB_RPTR_ADDR 0x0218 ++#define mmCP_RB_RPTR 0x021C ++#define mmCP_RB_RPTR_WR 0x02F8 ++#define mmCP_RB_WPTR 0x0220 ++#define mmCP_IB_BASE 0x0228 ++#define mmCP_IB_BUFSZ 0x022C ++#define mmCP_CSQ_CNTL 0x0230 ++#define mmCP_CSQ_APER_PRIMARY 0x0300 ++#define mmCP_CSQ_APER_INDIRECT 0x0340 ++#define mmCP_ME_CNTL 0x0240 ++#define mmCP_ME_RAM_ADDR 0x0244 ++#define mmCP_ME_RAM_RADDR 0x0248 ++#define mmCP_ME_RAM_DATAH 0x024C ++#define mmCP_ME_RAM_DATAL 0x0250 ++#define mmCP_DEBUG 0x025C ++#define mmSCRATCH_REG0 0x0260 ++#define mmSCRATCH_REG1 0x0264 ++#define mmSCRATCH_REG2 0x0268 ++#define mmSCRATCH_REG3 0x026C ++#define mmSCRATCH_REG4 0x0270 ++#define mmSCRATCH_REG5 0x0274 ++#define mmSCRATCH_UMSK 0x0280 ++#define mmSCRATCH_ADDR 0x0284 ++#define mmCP_CSQ_ADDR 0x02E4 ++#define mmCP_CSQ_DATA 0x02E8 ++#define mmCP_CSQ_STAT 0x02EC ++#define mmCP_STAT 0x02F0 ++#define mmGEN_INT_CNTL 0x0200 ++#define mmGEN_INT_STATUS 0x0204 ++/* Block CP End: */ ++ ++/* Block DISPLAY Start: */ ++#define mmLCD_FORMAT 0x0410 ++#define mmGRAPHIC_CTRL 0x0414 ++#define mmGRAPHIC_OFFSET 0x0418 ++#define mmGRAPHIC_PITCH 0x041C ++#define mmCRTC_TOTAL 0x0420 ++#define mmACTIVE_H_DISP 0x0424 ++#define mmACTIVE_V_DISP 0x0428 ++#define mmGRAPHIC_H_DISP 0x042C ++#define mmGRAPHIC_V_DISP 0x0430 ++#define mmVIDEO_CTRL 0x0434 ++#define mmGRAPHIC_KEY 0x0438 ++#define mmVIDEO_Y_OFFSET 0x043C ++#define mmVIDEO_Y_PITCH 0x0440 ++#define mmVIDEO_U_OFFSET 0x0444 ++#define mmVIDEO_U_PITCH 0x0448 ++#define mmVIDEO_V_OFFSET 0x044C ++#define mmVIDEO_V_PITCH 0x0450 ++#define mmVIDEO_H_POS 0x0454 ++#define mmVIDEO_V_POS 0x0458 ++#define mmBRIGHTNESS_CNTL 0x045C ++#define mmCURSOR1_OFFSET 0x0460 ++#define mmCURSOR1_H_POS 0x0464 ++#define mmCURSOR1_V_POS 0x0468 ++#define mmCURSOR1_COLOR0 0x046C ++#define mmCURSOR1_COLOR1 0x0470 ++#define mmCURSOR2_OFFSET 0x0474 ++#define mmCURSOR2_H_POS 0x0478 ++#define mmCURSOR2_V_POS 0x047C ++#define mmCURSOR2_COLOR0 0x0480 ++#define mmCURSOR2_COLOR1 0x0484 ++#define mmDISP_INT_CNTL 0x0488 ++#define mmCRTC_SS 0x048C ++#define mmCRTC_LS 0x0490 ++#define mmCRTC_REV 0x0494 ++#define mmCRTC_DCLK 0x049C ++#define mmCRTC_GS 0x04A0 ++#define mmCRTC_VPOS_GS 0x04A4 ++#define mmCRTC_GCLK 0x04A8 ++#define mmCRTC_GOE 0x04AC ++#define mmCRTC_FRAME 0x04B0 ++#define mmCRTC_FRAME_VPOS 0x04B4 ++#define mmGPIO_DATA 0x04B8 ++#define mmGPIO_CNTL1 0x04BC ++#define mmGPIO_CNTL2 0x04C0 ++#define mmLCDD_CNTL1 0x04C4 ++#define mmLCDD_CNTL2 0x04C8 ++#define mmGENLCD_CNTL1 0x04CC ++#define mmGENLCD_CNTL2 0x04D0 ++#define mmDISP_DEBUG 0x04D4 ++#define mmDISP_DB_BUF_CNTL 0x04D8 ++#define mmDISP_CRC_SIG 0x04DC ++#define mmCRTC_DEFAULT_COUNT 0x04E0 ++#define mmLCD_BACKGROUND_COLOR 0x04E4 ++#define mmCRTC_PS2 0x04E8 ++#define mmCRTC_PS2_VPOS 0x04EC ++#define mmCRTC_PS1_ACTIVE 0x04F0 ++#define mmCRTC_PS1_NACTIVE 0x04F4 ++#define mmCRTC_GCLK_EXT 0x04F8 ++#define mmCRTC_ALW 0x04FC ++#define mmCRTC_ALW_VPOS 0x0500 ++#define mmCRTC_PSK 0x0504 ++#define mmCRTC_PSK_HPOS 0x0508 ++#define mmCRTC_CV4_START 0x050C ++#define mmCRTC_CV4_END 0x0510 ++#define mmCRTC_CV4_HPOS 0x0514 ++#define mmCRTC_ECK 0x051C ++#define mmREFRESH_CNTL 0x0520 ++#define mmGENLCD_CNTL3 0x0524 ++#define mmGPIO_DATA2 0x0528 ++#define mmGPIO_CNTL3 0x052C ++#define mmGPIO_CNTL4 0x0530 ++#define mmCHIP_STRAP 0x0534 ++#define mmDISP_DEBUG2 0x0538 ++#define mmDEBUG_BUS_CNTL 0x053C ++#define mmGAMMA_VALUE1 0x0540 ++#define mmGAMMA_VALUE2 0x0544 ++#define mmGAMMA_SLOPE 0x0548 ++#define mmGEN_STATUS 0x054C ++#define mmHW_INT 0x0550 ++/* Block DISPLAY End: */ ++ ++/* Block GFX Start: */ ++#define mmDST_OFFSET 0x1004 ++#define mmDST_PITCH 0x1008 ++#define mmDST_PITCH_OFFSET 0x102C ++#define mmDST_X 0x101C ++#define mmDST_Y 0x1020 ++#define mmDST_X_Y 0x1194 ++#define mmDST_Y_X 0x1038 ++#define mmDST_WIDTH 0x100C ++#define mmDST_HEIGHT 0x1010 ++#define mmDST_WIDTH_HEIGHT 0x1198 ++#define mmDST_HEIGHT_WIDTH 0x103C ++#define mmDST_HEIGHT_WIDTH_8 0x118C ++#define mmDST_HEIGHT_Y 0x11A0 ++#define mmDST_WIDTH_X 0x1188 ++#define mmDST_WIDTH_X_INCY 0x119C ++#define mmDST_LINE_START 0x1090 ++#define mmDST_LINE_END 0x1094 ++#define mmBRUSH_OFFSET 0x108C ++#define mmBRUSH_Y_X 0x1074 ++#define mmDP_BRUSH_FRGD_CLR 0x107C ++#define mmDP_BRUSH_BKGD_CLR 0x1078 ++#define mmSRC2_OFFSET 0x1060 ++#define mmSRC2_PITCH 0x1064 ++#define mmSRC2_PITCH_OFFSET 0x1068 ++#define mmSRC2_X 0x1050 ++#define mmSRC2_Y 0x1054 ++#define mmSRC2_X_Y 0x1058 ++#define mmSRC2_WIDTH 0x1080 ++#define mmSRC2_HEIGHT 0x1084 ++#define mmSRC2_INC 0x1088 ++#define mmSRC_OFFSET 0x11AC ++#define mmSRC_PITCH 0x11B0 ++#define mmSRC_PITCH_OFFSET 0x1028 ++#define mmSRC_X 0x1014 ++#define mmSRC_Y 0x1018 ++#define mmSRC_X_Y 0x1190 ++#define mmSRC_Y_X 0x1034 ++#define mmSRC_WIDTH 0x1040 ++#define mmSRC_HEIGHT 0x1044 ++#define mmSRC_INC 0x1048 ++#define mmHOST_DATA0 0x13C0 ++#define mmHOST_DATA1 0x13C4 ++#define mmHOST_DATA2 0x13C8 ++#define mmHOST_DATA3 0x13CC ++#define mmHOST_DATA4 0x13D0 ++#define mmHOST_DATA5 0x13D4 ++#define mmHOST_DATA6 0x13D8 ++#define mmHOST_DATA7 0x13DC ++#define mmHOST_DATA_LAST 0x13E0 ++#define mmDP_SRC_FRGD_CLR 0x1240 ++#define mmDP_SRC_BKGD_CLR 0x1244 ++#define mmSC_LEFT 0x1140 ++#define mmSC_RIGHT 0x1144 ++#define mmSC_TOP 0x1148 ++#define mmSC_BOTTOM 0x114C ++#define mmSRC_SC_RIGHT 0x1154 ++#define mmSRC_SC_BOTTOM 0x115C ++#define mmDP_CNTL 0x11C8 ++#define mmDP_CNTL_DST_DIR 0x11CC ++#define mmDP_DATATYPE 0x12C4 ++#define mmDP_MIX 0x12C8 ++#define mmDP_WRITE_MSK 0x12CC ++#define mmCLR_CMP_CLR_SRC 0x1234 ++#define mmCLR_CMP_CLR_DST 0x1238 ++#define mmCLR_CMP_CNTL 0x1230 ++#define mmCLR_CMP_MSK 0x123C ++#define mmDEFAULT_PITCH_OFFSET 0x10A0 ++#define mmDEFAULT_SC_BOTTOM_RIGHT 0x10A8 ++#define mmDEFAULT2_SC_BOTTOM_RIGHT 0x10AC ++#define mmREF1_PITCH_OFFSET 0x10B8 ++#define mmREF2_PITCH_OFFSET 0x10BC ++#define mmREF3_PITCH_OFFSET 0x10C0 ++#define mmREF4_PITCH_OFFSET 0x10C4 ++#define mmREF5_PITCH_OFFSET 0x10C8 ++#define mmREF6_PITCH_OFFSET 0x10CC ++#define mmDP_GUI_MASTER_CNTL 0x106C ++#define mmSC_TOP_LEFT 0x11BC ++#define mmSC_BOTTOM_RIGHT 0x11C0 ++#define mmSRC_SC_BOTTOM_RIGHT 0x11C4 ++#define mmGLOBAL_ALPHA 0x1210 ++#define mmFILTER_COEF 0x1214 ++#define mmMVC_CNTL_START 0x11E0 ++#define mmE2_ARITHMETIC_CNTL 0x1220 ++#define mmDEBUG0 0x1280 ++#define mmDEBUG1 0x1284 ++#define mmDEBUG2 0x1288 ++#define mmDEBUG3 0x128C ++#define mmDEBUG4 0x1290 ++#define mmDEBUG5 0x1294 ++#define mmDEBUG6 0x1298 ++#define mmDEBUG7 0x129C ++#define mmDEBUG8 0x12A0 ++#define mmDEBUG9 0x12A4 ++#define mmDEBUG10 0x12A8 ++#define mmDEBUG11 0x12AC ++#define mmDEBUG12 0x12B0 ++#define mmDEBUG13 0x12B4 ++#define mmDEBUG14 0x12B8 ++#define mmDEBUG15 0x12BC ++#define mmENG_CNTL 0x13E8 ++#define mmENG_PERF_CNT 0x13F0 ++/* Block GFX End: */ ++ ++/* Block IDCT Start: */ ++#define mmIDCT_RUNS 0x0C00 ++#define mmIDCT_LEVELS 0x0C04 ++#define mmIDCT_CONTROL 0x0C3C ++#define mmIDCT_AUTH_CONTROL 0x0C08 ++#define mmIDCT_AUTH 0x0C0C ++/* Block IDCT End: */ ++ ++/* Block MC Start: */ ++#define mmMEM_CNTL 0x0180 ++#define mmMEM_ARB 0x0184 ++#define mmMC_FB_LOCATION 0x0188 ++#define mmMEM_EXT_CNTL 0x018C ++#define mmMC_EXT_MEM_LOCATION 0x0190 ++#define mmMEM_EXT_TIMING_CNTL 0x0194 ++#define mmMEM_SDRAM_MODE_REG 0x0198 ++#define mmMEM_IO_CNTL 0x019C ++#define mmMC_DEBUG 0x01A0 ++#define mmMC_BIST_CTRL 0x01A4 ++#define mmMC_BIST_COLLAR_READ 0x01A8 ++#define mmTC_MISMATCH 0x01AC ++#define mmMC_PERF_MON_CNTL 0x01B0 ++#define mmMC_PERF_COUNTERS 0x01B4 ++/* Block MC End: */ ++ ++/* Block RBBM Start: */ ++#define mmWAIT_UNTIL 0x1400 ++#define mmISYNC_CNTL 0x1404 ++#define mmRBBM_GUICNTL 0x1408 ++#define mmRBBM_STATUS 0x0140 ++#define mmRBBM_STATUS_alt_1 0x140C ++#define mmRBBM_CNTL 0x0144 ++#define mmRBBM_SOFT_RESET 0x0148 ++#define mmNQWAIT_UNTIL 0x0150 ++#define mmRBBM_DEBUG 0x016C ++#define mmRBBM_CMDFIFO_ADDR 0x0170 ++#define mmRBBM_CMDFIFO_DATAL 0x0174 ++#define mmRBBM_CMDFIFO_DATAH 0x0178 ++#define mmRBBM_CMDFIFO_STAT 0x017C ++/* Block RBBM End: */ ++ ++/* Block CG Start: */ ++#define mmCLK_PIN_CNTL 0x0080 ++#define mmPLL_REF_FB_DIV 0x0084 ++#define mmPLL_CNTL 0x0088 ++#define mmSCLK_CNTL 0x008C ++#define mmPCLK_CNTL 0x0090 ++#define mmCLK_TEST_CNTL 0x0094 ++#define mmPWRMGT_CNTL 0x0098 ++#define mmPWRMGT_STATUS 0x009C ++/* Block CG End: */ ++ ++/* default value definitions */ ++#define defCHIP_ID 0x00001002 ++#define defREVISION_ID 0x00000000 ++#define defWRAP_BUF_A 0x01000000 ++#define defWRAP_BUF_B 0x01000000 ++#define defWRAP_TOP_DIR 0x00000000 ++#define defWRAP_START_DIR 0x00000000 ++//#define defCIF_CNTL 0x00082900 ++#define defCIF_CNTL 0x00182d00 //??updated by Tobey Z.for Sharp,Oct11,2002 ++#define defCFGREG_BASE 0x00000000 ++//#define defCIF_IO 0x000c0800 ++#define defCIF_IO 0x000C0902 //??updated by Tobey Z.for Sharp,Oct11,2002 ++#define defCIF_READ_DBG 0x00018223 ++#define defCIF_WRITE_DBG 0x00002100 ++#define defIND_ADDR_A_0 0x00000000 ++#define defIND_ADDR_A_1 0x00000000 ++#define defIND_ADDR_A_2 0x00000000 ++#define defIND_DATA_A 0x00000000 ++#define defREG_BASE 0x00000001 ++#define defINTF_CNTL 0x00000011 ++#define defSTATUS 0x00000000 ++#define defCPU_DEFAULTS 0x00000006 ++#define defIND_ADDR_B_0 0x00000000 ++#define defIND_ADDR_B_1 0x00000000 ++#define defIND_ADDR_B_2 0x00000000 ++#define defIND_DATA_B 0x00000000 ++#define defPM4_RPTR 0x00000000 ++#define defSCRATCH 0x00000000 ++#define defPM4_WRPTR_0 0x00000000 ++#define defPM4_WRPTR_1 0x00000000 ++#define defCP_RB_CNTL 0x00000000 ++#define defCP_RB_BASE 0x00000000 ++#define defCP_RB_RPTR_ADDR 0x00000000 ++#define defCP_RB_RPTR 0x00000000 ++#define defCP_RB_RPTR_WR 0x00000000 ++#define defCP_RB_WPTR 0x00000000 ++#define defCP_IB_BASE 0x00000000 ++#define defCP_IB_BUFSZ 0x00000000 ++#define defCP_CSQ_CNTL 0x00000000 ++#define defCP_CSQ_APER_PRIMARY 0x00000000 ++#define defCP_CSQ_APER_INDIRECT 0x00000000 ++#define defCP_ME_CNTL 0x40000000 ++#define defCP_ME_RAM_ADDR 0x00000000 ++#define defCP_ME_RAM_RADDR 0x00000000 ++#define defCP_ME_RAM_DATAH 0x00000000 ++#define defCP_ME_RAM_DATAL 0x00000000 ++#define defCP_DEBUG 0x00000000 ++#define defSCRATCH_REG0 0x00000000 ++#define defSCRATCH_REG1 0x00000000 ++#define defSCRATCH_REG2 0x00000000 ++#define defSCRATCH_REG3 0x00000000 ++#define defSCRATCH_REG4 0x00000000 ++#define defSCRATCH_REG5 0x00000000 ++#define defSCRATCH_UMSK 0x00000000 ++#define defSCRATCH_ADDR 0x00000000 ++#define defCP_CSQ_ADDR 0x00000000 ++#define defCP_CSQ_DATA 0x00000000 ++#define defCP_CSQ_STAT 0x00000000 ++#define defCP_STAT 0x00000000 ++#define defGEN_INT_CNTL 0x00000000 ++#define defGEN_INT_STATUS_rd 0x00080000 ++#define defGEN_INT_STATUS_wr 0x00000000 ++#define defLCD_FORMAT 0x00000000 ++#define defGRAPHIC_CTRL 0x00000000 ++#define defGRAPHIC_OFFSET 0x00000000 ++#define defGRAPHIC_PITCH 0x00000000 ++#define defCRTC_TOTAL 0x00000000 ++#define defACTIVE_H_DISP 0x00000000 ++#define defACTIVE_V_DISP 0x00000000 ++#define defGRAPHIC_H_DISP 0x00000000 ++#define defGRAPHIC_V_DISP 0x00000000 ++#define defVIDEO_CTRL 0x00000000 ++#define defGRAPHIC_KEY 0x00000000 ++#define defVIDEO_Y_OFFSET 0x00000000 ++#define defVIDEO_Y_PITCH 0x00000000 ++#define defVIDEO_U_OFFSET 0x00000000 ++#define defVIDEO_U_PITCH 0x00000000 ++#define defVIDEO_V_OFFSET 0x00000000 ++#define defVIDEO_V_PITCH 0x00000000 ++#define defVIDEO_H_POS 0x00000000 ++#define defVIDEO_V_POS 0x00000000 ++#define defBRIGHTNESS_CNTL 0x00000000 ++#define defCURSOR1_OFFSET 0x00000000 ++#define defCURSOR1_H_POS 0x00000000 ++#define defCURSOR1_V_POS 0x00000000 ++#define defCURSOR1_COLOR0 0x00000000 ++#define defCURSOR1_COLOR1 0x00000000 ++#define defCURSOR2_OFFSET 0x00000000 ++#define defCURSOR2_H_POS 0x00000000 ++#define defCURSOR2_V_POS 0x00000000 ++#define defCURSOR2_COLOR0 0x00000000 ++#define defCURSOR2_COLOR1 0x00000000 ++#define defDISP_INT_CNTL 0x00000000 ++#define defCRTC_SS 0x00000000 ++#define defCRTC_LS 0x00000000 ++#define defCRTC_REV 0x00000000 ++#define defCRTC_DCLK 0x00000000 ++#define defCRTC_GS 0x00000000 ++#define defCRTC_VPOS_GS 0x00000000 ++#define defCRTC_GCLK 0x00000000 ++#define defCRTC_GOE 0x00000000 ++#define defCRTC_FRAME 0x00000000 ++#define defCRTC_FRAME_VPOS 0x00000000 ++#define defGPIO_DATA 0x00000000 ++#define defGPIO_CNTL1 0xff00ff00 ++#define defGPIO_CNTL2 0x00000000 ++#define defLCDD_CNTL1 0x0000ffff ++#define defLCDD_CNTL2 0x00000000 ++#define defGENLCD_CNTL1 0x00aaa002 ++#define defGENLCD_CNTL2 0x00000002 ++#define defDISP_DEBUG 0x00000000 ++#define defDISP_DB_BUF_CNTL_rd 0x00000000 ++#define defDISP_DB_BUF_CNTL_wr 0x00000000 ++#define defDISP_CRC_SIG 0x00000000 ++#define defCRTC_DEFAULT_COUNT 0x00000000 ++#define defLCD_BACKGROUND_COLOR 0x00000000 ++#define defCRTC_PS2 0x00000000 ++#define defCRTC_PS2_VPOS 0x00000000 ++#define defCRTC_PS1_ACTIVE 0x00000000 ++#define defCRTC_PS1_NACTIVE 0x00000000 ++#define defCRTC_GCLK_EXT 0x00000000 ++#define defCRTC_ALW 0x00000000 ++#define defCRTC_ALW_VPOS 0x00000000 ++#define defCRTC_PSK 0x00000000 ++#define defCRTC_PSK_HPOS 0x00000000 ++#define defCRTC_CV4_START 0x00000000 ++#define defCRTC_CV4_END 0x00000000 ++#define defCRTC_CV4_HPOS 0x00000000 ++#define defCRTC_ECK 0x00000000 ++#define defREFRESH_CNTL 0x00000000 ++#define defGENLCD_CNTL3 0x000002aa ++#define defGPIO_DATA2 0x00000000 ++#define defGPIO_CNTL3 0x00000000 ++#define defGPIO_CNTL4 0x00000000 ++#define defCHIP_STRAP 0x00000000 ++#define defDISP_DEBUG2 0x00000000 ++#define defDEBUG_BUS_CNTL 0x00000000 ++#define defGAMMA_VALUE1 0x00000000 ++#define defGAMMA_VALUE2 0x00000000 ++#define defGAMMA_SLOPE 0x00000000 ++#define defGEN_STATUS 0x00000000 ++#define defHW_INT 0x00000000 ++#define defDST_OFFSET 0x00000000 ++#define defDST_PITCH 0x00000000 ++#define defDST_PITCH_OFFSET 0x00000000 ++#define defDST_X 0x00000000 ++#define defDST_Y 0x00000000 ++#define defDST_X_Y 0x00000000 ++#define defDST_Y_X 0x00000000 ++#define defDST_WIDTH 0x00000000 ++#define defDST_HEIGHT 0x00000000 ++#define defDST_WIDTH_HEIGHT 0x00000000 ++#define defDST_HEIGHT_WIDTH 0x00000000 ++#define defDST_HEIGHT_WIDTH_8 0x00000000 ++#define defDST_HEIGHT_Y 0x00000000 ++#define defDST_WIDTH_X 0x00000000 ++#define defDST_WIDTH_X_INCY 0x00000000 ++#define defDST_LINE_START 0x00000000 ++#define defDST_LINE_END 0x00000000 ++#define defBRUSH_OFFSET 0x00000000 ++#define defBRUSH_Y_X 0x00000000 ++#define defDP_BRUSH_FRGD_CLR 0x00000000 ++#define defDP_BRUSH_BKGD_CLR 0x00000000 ++#define defSRC2_OFFSET 0x00000000 ++#define defSRC2_PITCH 0x00000000 ++#define defSRC2_PITCH_OFFSET 0x00000000 ++#define defSRC2_X 0x00000000 ++#define defSRC2_Y 0x00000000 ++#define defSRC2_X_Y 0x00000000 ++#define defSRC2_WIDTH 0x00000000 ++#define defSRC2_HEIGHT 0x00000000 ++#define defSRC2_INC 0x00000000 ++#define defSRC_OFFSET 0x00000000 ++#define defSRC_PITCH 0x00000000 ++#define defSRC_PITCH_OFFSET 0x00000000 ++#define defSRC_X 0x00000000 ++#define defSRC_Y 0x00000000 ++#define defSRC_X_Y 0x00000000 ++#define defSRC_Y_X 0x00000000 ++#define defSRC_WIDTH 0x00000000 ++#define defSRC_HEIGHT 0x00000000 ++#define defSRC_INC 0x00000000 ++#define defHOST_DATA0 0x00000000 ++#define defHOST_DATA1 0x00000000 ++#define defHOST_DATA2 0x00000000 ++#define defHOST_DATA3 0x00000000 ++#define defHOST_DATA4 0x00000000 ++#define defHOST_DATA5 0x00000000 ++#define defHOST_DATA6 0x00000000 ++#define defHOST_DATA7 0x00000000 ++#define defHOST_DATA_LAST 0x00000000 ++#define defDP_SRC_FRGD_CLR 0x00000000 ++#define defDP_SRC_BKGD_CLR 0x00000000 ++#define defSC_LEFT 0x00000000 ++#define defSC_RIGHT 0x00000000 ++#define defSC_TOP 0x00000000 ++#define defSC_BOTTOM 0x00000000 ++#define defSRC_SC_RIGHT 0x00000000 ++#define defSRC_SC_BOTTOM 0x00000000 ++#define defDP_CNTL 0x00000000 ++#define defDP_CNTL_DST_DIR 0x00000000 ++#define defDP_DATATYPE 0x00000000 ++#define defDP_MIX 0x00000000 ++#define defDP_WRITE_MSK 0x00000000 ++#define defCLR_CMP_CLR_SRC 0x00000000 ++#define defCLR_CMP_CLR_DST 0x00000000 ++#define defCLR_CMP_CNTL 0x00000000 ++#define defCLR_CMP_MSK 0x00000000 ++#define defDEFAULT_PITCH_OFFSET 0x00000000 ++#define defDEFAULT_SC_BOTTOM_RIGHT 0x00000000 ++#define defDEFAULT2_SC_BOTTOM_RIGHT 0x00000000 ++#define defREF1_PITCH_OFFSET 0x00000000 ++#define defREF2_PITCH_OFFSET 0x00000000 ++#define defREF3_PITCH_OFFSET 0x00000000 ++#define defREF4_PITCH_OFFSET 0x00000000 ++#define defREF5_PITCH_OFFSET 0x00000000 ++#define defREF6_PITCH_OFFSET 0x00000000 ++#define defDP_GUI_MASTER_CNTL 0x00000000 ++#define defSC_TOP_LEFT 0x00000000 ++#define defSC_BOTTOM_RIGHT 0x00000000 ++#define defSRC_SC_BOTTOM_RIGHT 0x00000000 ++#define defGLOBAL_ALPHA 0x00000000 ++#define defFILTER_COEF 0x00000000 ++#define defMVC_CNTL_START 0x00000000 ++#define defE2_ARITHMETIC_CNTL 0x00000000 ++#define defDEBUG0 0x00000000 ++#define defDEBUG1 0x00000000 ++#define defDEBUG2 0x00000000 ++#define defDEBUG3 0x00000000 ++#define defDEBUG4 0x00000000 ++#define defDEBUG5 0x00000000 ++#define defDEBUG6 0x00000000 ++#define defDEBUG7 0x00000000 ++#define defDEBUG8 0x00000000 ++#define defDEBUG9 0x00000000 ++#define defDEBUG10 0x00000000 ++#define defDEBUG11 0x00000000 ++#define defDEBUG12 0x00000000 ++#define defDEBUG13 0x00000000 ++#define defDEBUG14 0x00000000 ++#define defDEBUG15 0x00000000 ++#define defENG_CNTL 0x00000003 ++#define defENG_PERF_CNT 0x00000000 ++#define defIDCT_RUNS 0x00000000 ++#define defIDCT_LEVELS 0x00000000 ++#define defIDCT_CONTROL 0x00000000 ++#define defIDCT_AUTH_CONTROL 0x00000000 ++#define defIDCT_AUTH 0x00000000 ++#define defMEM_CNTL 0x00000006 ++#define defMEM_ARB 0x00000000 ++#define defMC_FB_LOCATION 0x00ff0000 ++#define defMEM_EXT_CNTL 0x00040010 ++#define defMC_EXT_MEM_LOCATION 0x07ff0000 ++#define defMEM_EXT_TIMING_CNTL 0x00140c73 ++#define defMEM_SDRAM_MODE_REG 0x00050000 ++#define defMEM_IO_CNTL 0x00ff00ff ++#define defMC_DEBUG 0x00000000 ++#define defMC_BIST_CTRL 0x00000000 ++#define defMC_BIST_COLLAR_READ 0x00000000 ++#define defTC_MISMATCH 0x00000000 ++#define defMC_PERF_MON_CNTL 0x00000000 ++#define defMC_PERF_COUNTERS 0x00000000 ++#define defWAIT_UNTIL 0xc5cdcdcd ++#define defISYNC_CNTL 0x00000000 ++#define defRBBM_GUICNTL 0x00000000 ++#define defRBBM_STATUS 0x81cdcd40 ++#define defRBBM_CNTL 0x0000000f ++#define defRBBM_SOFT_RESET 0x00000000 ++#define defNQWAIT_UNTIL 0x00000001 ++#define defRBBM_DEBUG 0x00000000 ++#define defRBBM_CMDFIFO_ADDR 0x0000000d ++#define defRBBM_CMDFIFO_DATAL 0xcdcdcdcd ++#define defRBBM_CMDFIFO_DATAH 0x00000dcd ++#define defRBBM_CMDFIFO_STAT 0x00000d0d ++#define defCLK_PIN_CNTL 0x0000003f ++#define defPLL_REF_FB_DIV 0x5a500000 ++#define defPLL_CNTL 0x4b000203 ++#define defSCLK_CNTL 0x00ff0300 ++#define defPCLK_CNTL 0x00010000 ++#define defCLK_TEST_CNTL 0x00000000 ++#define defPWRMGT_CNTL 0x00000004 ++#define defPWRMGT_STATUS 0x00000001 ++ ++#define CFG_BASE_BOOT_DEFAULT 0x0 ++#define CFG_BASE_VALUE 0x0 ++#define REG_BASE_BOOT_DEFAULT 0x01 ++#define REG_BASE_VALUE 0x10000 ++#define MEM_INT_BASE_VALUE 0x100000 ++#define MEM_INT_TOP_VALUE_W100 0x15ffff ++#define MEM_EXT_BASE_VALUE 0x800000 ++#define MEM_EXT_TOP_VALUE 0x9fffff ++#define WRAP_BUF_BASE_VALUE 0x80000 ++#define WRAP_BUF_TOP_VALUE 0xbffff ++ ++ ++/* data structure definitions */ ++ ++typedef struct _chip_id_t { ++ unsigned long vendor_id : 16; ++ unsigned long device_id : 16; ++ } chip_id_t; ++ ++typedef union { ++ unsigned long val : 32; ++ chip_id_t f; ++} chip_id_u; ++ ++typedef struct _revision_id_t { ++ unsigned long minor_rev_id : 4; ++ unsigned long major_rev_id : 4; ++ unsigned long : 24; ++ } revision_id_t; ++ ++typedef union { ++ unsigned long val : 32; ++ revision_id_t f; ++} revision_id_u; ++ ++typedef struct _wrap_buf_a_t { ++ unsigned long offset_addr_a : 24; ++ unsigned long block_size_a : 3; ++ unsigned long : 5; ++ } wrap_buf_a_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_buf_a_t f; ++} wrap_buf_a_u; ++ ++typedef struct _wrap_buf_b_t { ++ unsigned long offset_addr_b : 24; ++ unsigned long block_size_b : 3; ++ unsigned long : 5; ++ } wrap_buf_b_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_buf_b_t f; ++} wrap_buf_b_u; ++ ++typedef struct _wrap_top_dir_t { ++ unsigned long top_addr : 23; ++ unsigned long : 9; ++ } wrap_top_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_top_dir_t f; ++} wrap_top_dir_u; ++ ++typedef struct _wrap_start_dir_t { ++ unsigned long start_addr : 23; ++ unsigned long : 9; ++ } wrap_start_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_start_dir_t f; ++} wrap_start_dir_u; ++ ++typedef struct _cif_cntl_t { ++ unsigned long swap_reg : 2; ++ unsigned long swap_fbuf_1 : 2; ++ unsigned long swap_fbuf_2 : 2; ++ unsigned long swap_fbuf_3 : 2; ++ unsigned long pmi_int_disable : 1; ++ unsigned long pmi_schmen_disable : 1; ++ unsigned long intb_oe : 1; ++ unsigned long en_wait_to_compensate_dq_prop_dly : 1; ++ unsigned long compensate_wait_rd_size : 2; ++ unsigned long wait_asserted_timeout_val : 2; ++ unsigned long wait_masked_val : 2; ++ unsigned long en_wait_timeout : 1; ++ unsigned long en_one_clk_setup_before_wait : 1; ++ unsigned long interrupt_active_high : 1; ++ unsigned long en_overwrite_straps : 1; ++ unsigned long strap_wait_active_hi : 1; ++ unsigned long lat_busy_count : 2; ++ unsigned long lat_rd_pm4_sclk_busy : 1; ++ unsigned long dis_system_bits : 1; ++ unsigned long dis_mr : 1; ++ unsigned long cif_spare_1 : 4; ++ } cif_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_cntl_t f; ++} cif_cntl_u; ++ ++typedef struct _cfgreg_base_t { ++ unsigned long cfgreg_base : 24; ++ unsigned long : 8; ++ } cfgreg_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cfgreg_base_t f; ++} cfgreg_base_u; ++ ++typedef struct _cif_io_t { ++ unsigned long dq_srp : 1; ++ unsigned long dq_srn : 1; ++ unsigned long dq_sp : 4; ++ unsigned long dq_sn : 4; ++ unsigned long waitb_srp : 1; ++ unsigned long waitb_srn : 1; ++ unsigned long waitb_sp : 4; ++ unsigned long waitb_sn : 4; ++ unsigned long intb_srp : 1; ++ unsigned long intb_srn : 1; ++ unsigned long intb_sp : 4; ++ unsigned long intb_sn : 4; ++ unsigned long : 2; ++ } cif_io_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_io_t f; ++} cif_io_u; ++ ++typedef struct _cif_read_dbg_t { ++ unsigned long unpacker_pre_fetch_trig_gen : 2; ++ unsigned long dly_second_rd_fetch_trig : 1; ++ unsigned long rst_rd_burst_id : 1; ++ unsigned long dis_rd_burst_id : 1; ++ unsigned long en_block_rd_when_packer_is_not_emp : 1; ++ unsigned long dis_pre_fetch_cntl_sm : 1; ++ unsigned long rbbm_chrncy_dis : 1; ++ unsigned long rbbm_rd_after_wr_lat : 2; ++ unsigned long dis_be_during_rd : 1; ++ unsigned long one_clk_invalidate_pulse : 1; ++ unsigned long dis_chnl_priority : 1; ++ unsigned long rst_read_path_a_pls : 1; ++ unsigned long rst_read_path_b_pls : 1; ++ unsigned long dis_reg_rd_fetch_trig : 1; ++ unsigned long dis_rd_fetch_trig_from_ind_addr : 1; ++ unsigned long dis_rd_same_byte_to_trig_fetch : 1; ++ unsigned long dis_dir_wrap : 1; ++ unsigned long dis_ring_buf_to_force_dec : 1; ++ unsigned long dis_addr_comp_in_16bit : 1; ++ unsigned long clr_w : 1; ++ unsigned long err_rd_tag_is_3 : 1; ++ unsigned long err_load_when_ful_a : 1; ++ unsigned long err_load_when_ful_b : 1; ++ unsigned long : 7; ++ } cif_read_dbg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_read_dbg_t f; ++} cif_read_dbg_u; ++ ++typedef struct _cif_write_dbg_t { ++ unsigned long packer_timeout_count : 2; ++ unsigned long en_upper_load_cond : 1; ++ unsigned long en_chnl_change_cond : 1; ++ unsigned long dis_addr_comp_cond : 1; ++ unsigned long dis_load_same_byte_addr_cond : 1; ++ unsigned long dis_timeout_cond : 1; ++ unsigned long dis_timeout_during_rbbm : 1; ++ unsigned long dis_packer_ful_during_rbbm_timeout : 1; ++ unsigned long en_dword_split_to_rbbm : 1; ++ unsigned long en_dummy_val : 1; ++ unsigned long dummy_val_sel : 1; ++ unsigned long mask_pm4_wrptr_dec : 1; ++ unsigned long dis_mc_clean_cond : 1; ++ unsigned long err_two_reqi_during_ful : 1; ++ unsigned long err_reqi_during_idle_clk : 1; ++ unsigned long err_global : 1; ++ unsigned long en_wr_buf_dbg_load : 1; ++ unsigned long en_wr_buf_dbg_path : 1; ++ unsigned long sel_wr_buf_byte : 3; ++ unsigned long dis_rd_flush_wr : 1; ++ unsigned long dis_packer_ful_cond : 1; ++ unsigned long dis_invalidate_by_ops_chnl : 1; ++ unsigned long en_halt_when_reqi_err : 1; ++ unsigned long cif_spare_2 : 5; ++ unsigned long : 1; ++ } cif_write_dbg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_write_dbg_t f; ++} cif_write_dbg_u; ++ ++typedef struct _ind_addr_a_0_t { ++ unsigned char ind_addr_a_0 : 8; ++ } ind_addr_a_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_0_t f; ++} ind_addr_a_0_u; ++ ++typedef struct _ind_addr_a_1_t { ++ unsigned char ind_addr_a_1 : 8; ++ } ind_addr_a_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_1_t f; ++} ind_addr_a_1_u; ++ ++typedef struct _ind_addr_a_2_t { ++ unsigned char ind_addr_a_2 : 8; ++ } ind_addr_a_2_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_2_t f; ++} ind_addr_a_2_u; ++ ++typedef struct _ind_data_a_t { ++ unsigned char ind_data_a : 8; ++ } ind_data_a_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_data_a_t f; ++} ind_data_a_u; ++ ++typedef struct _reg_base_t { ++ unsigned char reg_base : 8; ++ } reg_base_t; ++ ++typedef union { ++ unsigned char val : 8; ++ reg_base_t f; ++} reg_base_u; ++ ++typedef struct _intf_cntl_t { ++ unsigned char ad_inc_a : 1; ++ unsigned char ring_buf_a : 1; ++ unsigned char rd_fetch_trigger_a : 1; ++ unsigned char rd_data_rdy_a : 1; ++ unsigned char ad_inc_b : 1; ++ unsigned char ring_buf_b : 1; ++ unsigned char rd_fetch_trigger_b : 1; ++ unsigned char rd_data_rdy_b : 1; ++ } intf_cntl_t; ++ ++typedef union { ++ unsigned char val : 8; ++ intf_cntl_t f; ++} intf_cntl_u; ++ ++typedef struct _status_t { ++ unsigned char wr_fifo_available_space : 2; ++ unsigned char fbuf_wr_pipe_emp : 1; ++ unsigned char soft_reset : 1; ++ unsigned char system_pwm_mode : 2; ++ unsigned char mem_access_dis : 1; ++ unsigned char en_pre_fetch : 1; ++ } status_t; ++ ++typedef union { ++ unsigned char val : 8; ++ status_t f; ++} status_u; ++ ++typedef struct _cpu_defaults_t { ++ unsigned char unpack_rd_data : 1; ++ unsigned char access_ind_addr_a : 1; ++ unsigned char access_ind_addr_b : 1; ++ unsigned char access_scratch_reg : 1; ++ unsigned char pack_wr_data : 1; ++ unsigned char transition_size : 1; ++ unsigned char en_read_buf_mode : 1; ++ unsigned char rd_fetch_scratch : 1; ++ } cpu_defaults_t; ++ ++typedef union { ++ unsigned char val : 8; ++ cpu_defaults_t f; ++} cpu_defaults_u; ++ ++typedef struct _ind_addr_b_0_t { ++ unsigned char ind_addr_b_0 : 8; ++ } ind_addr_b_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_0_t f; ++} ind_addr_b_0_u; ++ ++typedef struct _ind_addr_b_1_t { ++ unsigned char ind_addr_b_1 : 8; ++ } ind_addr_b_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_1_t f; ++} ind_addr_b_1_u; ++ ++typedef struct _ind_addr_b_2_t { ++ unsigned char ind_addr_b_2 : 8; ++ } ind_addr_b_2_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_2_t f; ++} ind_addr_b_2_u; ++ ++typedef struct _ind_data_b_t { ++ unsigned char ind_data_b : 8; ++ } ind_data_b_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_data_b_t f; ++} ind_data_b_u; ++ ++typedef struct _pm4_rptr_t { ++ unsigned char pm4_rptr : 8; ++ } pm4_rptr_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_rptr_t f; ++} pm4_rptr_u; ++ ++typedef struct _scratch_t { ++ unsigned char scratch : 8; ++ } scratch_t; ++ ++typedef union { ++ unsigned char val : 8; ++ scratch_t f; ++} scratch_u; ++ ++typedef struct _pm4_wrptr_0_t { ++ unsigned char pm4_wrptr_0 : 8; ++ } pm4_wrptr_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_wrptr_0_t f; ++} pm4_wrptr_0_u; ++ ++typedef struct _pm4_wrptr_1_t { ++ unsigned char pm4_wrptr_1 : 6; ++ unsigned char rd_fetch_pm4_rptr : 1; ++ unsigned char wrptr_atomic_update_w : 1; ++ } pm4_wrptr_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_wrptr_1_t f; ++} pm4_wrptr_1_u; ++ ++typedef struct _cp_rb_cntl_t { ++ unsigned long rb_bufsz : 6; ++ unsigned long : 2; ++ unsigned long rb_blksz : 6; ++ unsigned long : 2; ++ unsigned long buf_swap : 2; ++ unsigned long max_fetch : 2; ++ unsigned long : 7; ++ unsigned long rb_no_update : 1; ++ unsigned long : 3; ++ unsigned long rb_rptr_wr_ena : 1; ++ } cp_rb_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_cntl_t f; ++} cp_rb_cntl_u; ++ ++typedef struct _cp_rb_base_t { ++ unsigned long : 2; ++ unsigned long rb_base : 22; ++ unsigned long : 8; ++ } cp_rb_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_base_t f; ++} cp_rb_base_u; ++ ++typedef struct _cp_rb_rptr_addr_t { ++ unsigned long rb_rptr_swap : 2; ++ unsigned long rb_rptr_addr : 22; ++ unsigned long : 8; ++ } cp_rb_rptr_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_addr_t f; ++} cp_rb_rptr_addr_u; ++ ++typedef struct _cp_rb_rptr_t { ++ unsigned long rb_rptr : 23; ++ unsigned long : 9; ++ } cp_rb_rptr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_t f; ++} cp_rb_rptr_u; ++ ++typedef struct _cp_rb_rptr_wr_t { ++ unsigned long rb_rptr_wr : 23; ++ unsigned long : 9; ++ } cp_rb_rptr_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_wr_t f; ++} cp_rb_rptr_wr_u; ++ ++typedef struct _cp_rb_wptr_t { ++ unsigned long rb_wptr : 23; ++ unsigned long : 9; ++ } cp_rb_wptr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_wptr_t f; ++} cp_rb_wptr_u; ++ ++typedef struct _cp_ib_base_t { ++ unsigned long : 2; ++ unsigned long ib_base : 22; ++ unsigned long : 8; ++ } cp_ib_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_ib_base_t f; ++} cp_ib_base_u; ++ ++typedef struct _cp_ib_bufsz_t { ++ unsigned long ib_bufsz : 23; ++ unsigned long : 9; ++ } cp_ib_bufsz_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_ib_bufsz_t f; ++} cp_ib_bufsz_u; ++ ++typedef struct _cp_csq_cntl_t { ++ unsigned long csq_cnt_primary : 8; ++ unsigned long csq_cnt_indirect : 8; ++ unsigned long : 12; ++ unsigned long csq_mode : 4; ++ } cp_csq_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_cntl_t f; ++} cp_csq_cntl_u; ++ ++typedef struct _cp_csq_aper_primary_t { ++ unsigned long cp_csq_aper_primary : 32; ++ } cp_csq_aper_primary_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_aper_primary_t f; ++} cp_csq_aper_primary_u; ++ ++typedef struct _cp_csq_aper_indirect_t { ++ unsigned long cp_csq_aper_indirect : 32; ++ } cp_csq_aper_indirect_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_aper_indirect_t f; ++} cp_csq_aper_indirect_u; ++ ++typedef struct _cp_me_cntl_t { ++ unsigned long me_stat : 16; ++ unsigned long me_statmux : 5; ++ unsigned long : 8; ++ unsigned long me_busy : 1; ++ unsigned long me_mode : 1; ++ unsigned long me_step : 1; ++ } cp_me_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_cntl_t f; ++} cp_me_cntl_u; ++ ++typedef struct _cp_me_ram_addr_t { ++ unsigned long me_ram_addr : 8; ++ unsigned long : 24; ++ } cp_me_ram_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_addr_t f; ++} cp_me_ram_addr_u; ++ ++typedef struct _cp_me_ram_raddr_t { ++ unsigned long me_ram_raddr : 8; ++ unsigned long : 24; ++ } cp_me_ram_raddr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_raddr_t f; ++} cp_me_ram_raddr_u; ++ ++typedef struct _cp_me_ram_datah_t { ++ unsigned long me_ram_datah : 6; ++ unsigned long : 26; ++ } cp_me_ram_datah_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_datah_t f; ++} cp_me_ram_datah_u; ++ ++typedef struct _cp_me_ram_datal_t { ++ unsigned long me_ram_datal : 32; ++ } cp_me_ram_datal_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_datal_t f; ++} cp_me_ram_datal_u; ++ ++typedef struct _cp_debug_t { ++ unsigned long cp_debug : 32; ++ } cp_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_debug_t f; ++} cp_debug_u; ++ ++typedef struct _scratch_reg0_t { ++ unsigned long scratch_reg0 : 32; ++ } scratch_reg0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg0_t f; ++} scratch_reg0_u; ++ ++typedef struct _scratch_reg1_t { ++ unsigned long scratch_reg1 : 32; ++ } scratch_reg1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg1_t f; ++} scratch_reg1_u; ++ ++typedef struct _scratch_reg2_t { ++ unsigned long scratch_reg2 : 32; ++ } scratch_reg2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg2_t f; ++} scratch_reg2_u; ++ ++typedef struct _scratch_reg3_t { ++ unsigned long scratch_reg3 : 32; ++ } scratch_reg3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg3_t f; ++} scratch_reg3_u; ++ ++typedef struct _scratch_reg4_t { ++ unsigned long scratch_reg4 : 32; ++ } scratch_reg4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg4_t f; ++} scratch_reg4_u; ++ ++typedef struct _scratch_reg5_t { ++ unsigned long scratch_reg5 : 32; ++ } scratch_reg5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg5_t f; ++} scratch_reg5_u; ++ ++typedef struct _scratch_umsk_t { ++ unsigned long scratch_umsk : 6; ++ unsigned long : 10; ++ unsigned long scratch_swap : 2; ++ unsigned long : 14; ++ } scratch_umsk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_umsk_t f; ++} scratch_umsk_u; ++ ++typedef struct _scratch_addr_t { ++ unsigned long : 5; ++ unsigned long scratch_addr : 27; ++ } scratch_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_addr_t f; ++} scratch_addr_u; ++ ++typedef struct _cp_csq_addr_t { ++ unsigned long : 2; ++ unsigned long csq_addr : 8; ++ unsigned long : 22; ++ } cp_csq_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_addr_t f; ++} cp_csq_addr_u; ++ ++typedef struct _cp_csq_data_t { ++ unsigned long csq_data : 32; ++ } cp_csq_data_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_data_t f; ++} cp_csq_data_u; ++ ++typedef struct _cp_csq_stat_t { ++ unsigned long csq_rptr_primary : 8; ++ unsigned long csq_wptr_primary : 8; ++ unsigned long csq_rptr_indirect : 8; ++ unsigned long csq_wptr_indirect : 8; ++ } cp_csq_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_stat_t f; ++} cp_csq_stat_u; ++ ++typedef struct _cp_stat_t { ++ unsigned long mru_busy : 1; ++ unsigned long mwu_busy : 1; ++ unsigned long rsiu_busy : 1; ++ unsigned long rciu_busy : 1; ++ unsigned long : 5; ++ unsigned long csf_primary_busy : 1; ++ unsigned long csf_indirect_busy : 1; ++ unsigned long csq_primary_busy : 1; ++ unsigned long csq_indirect_busy : 1; ++ unsigned long csi_busy : 1; ++ unsigned long : 14; ++ unsigned long guidma_busy : 1; ++ unsigned long viddma_busy : 1; ++ unsigned long cmdstrm_busy : 1; ++ unsigned long cp_busy : 1; ++ } cp_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_stat_t f; ++} cp_stat_u; ++ ++typedef struct _gen_int_cntl_t { ++ unsigned long crtc_vblank_mask : 1; ++ unsigned long crtc_vline_mask : 1; ++ unsigned long crtc_hwint1_mask : 1; ++ unsigned long crtc_hwint2_mask : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_mask : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_mask : 1; ++ unsigned long dvi_i2c_int_mask : 1; ++ unsigned long : 2; ++ } gen_int_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_cntl_t f; ++} gen_int_cntl_u; ++ ++typedef struct _gen_int_status_rd_t { ++ unsigned long crtc_vblank_stat : 1; ++ unsigned long crtc_vline_stat : 1; ++ unsigned long crtc_hwint1_stat : 1; ++ unsigned long crtc_hwint2_stat : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_stat : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_stat : 1; ++ unsigned long dvi_i2c_int_stat : 1; ++ unsigned long : 2; ++ } gen_int_status_rd_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_status_rd_t f; ++} gen_int_status_rd_u; ++ ++typedef struct _gen_int_status_wr_t { ++ unsigned long crtc_vblank_stat_ak : 1; ++ unsigned long crtc_vline_stat_ak : 1; ++ unsigned long crtc_hwint1_stat_ak : 1; ++ unsigned long crtc_hwint2_stat_ak : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_stat_ak : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_ak : 1; ++ unsigned long dvi_i2c_int_ak : 1; ++ unsigned long : 2; ++ } gen_int_status_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_status_wr_t f; ++} gen_int_status_wr_u; ++ ++typedef struct _lcd_format_t { ++ unsigned long lcd_type : 4; ++ unsigned long color_to_mono : 1; ++ unsigned long data_inv : 1; ++ unsigned long stn_fm : 2; ++ unsigned long tft_fm : 2; ++ unsigned long scan_lr_en : 1; ++ unsigned long scan_ud_en : 1; ++ unsigned long pol_inv : 1; ++ unsigned long rst_fm : 1; ++ unsigned long yuv_to_rgb : 1; ++ unsigned long hr_tft : 1; ++ unsigned long ulc_panel : 1; ++ unsigned long : 15; ++ } lcd_format_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcd_format_t f; ++} lcd_format_u; ++ ++typedef struct _graphic_ctrl_t { ++ unsigned long color_depth : 3; ++ unsigned long portrait_mode : 2; ++ unsigned long low_power_on : 1; ++ unsigned long req_freq : 4; ++ unsigned long en_crtc : 1; ++ unsigned long en_graphic_req : 1; ++ unsigned long en_graphic_crtc : 1; ++ unsigned long total_req_graphic : 9; ++ unsigned long lcd_pclk_on : 1; ++ unsigned long lcd_sclk_on : 1; ++ unsigned long pclk_running : 1; ++ unsigned long sclk_running : 1; ++ unsigned long : 6; ++ } graphic_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_ctrl_t f; ++} graphic_ctrl_u; ++ ++typedef struct _graphic_offset_t { ++ unsigned long graphic_offset : 24; ++ unsigned long : 8; ++ } graphic_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_offset_t f; ++} graphic_offset_u; ++ ++typedef struct _graphic_pitch_t { ++ unsigned long graphic_pitch : 11; ++ unsigned long : 21; ++ } graphic_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_pitch_t f; ++} graphic_pitch_u; ++ ++typedef struct _crtc_total_t { ++ unsigned long crtc_h_total : 10; ++ unsigned long : 6; ++ unsigned long crtc_v_total : 10; ++ unsigned long : 6; ++ } crtc_total_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_total_t f; ++} crtc_total_u; ++ ++typedef struct _active_h_disp_t { ++ unsigned long active_h_start : 10; ++ unsigned long : 6; ++ unsigned long active_h_end : 10; ++ unsigned long : 6; ++ } active_h_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ active_h_disp_t f; ++} active_h_disp_u; ++ ++typedef struct _active_v_disp_t { ++ unsigned long active_v_start : 10; ++ unsigned long : 6; ++ unsigned long active_v_end : 10; ++ unsigned long : 6; ++ } active_v_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ active_v_disp_t f; ++} active_v_disp_u; ++ ++typedef struct _graphic_h_disp_t { ++ unsigned long graphic_h_start : 10; ++ unsigned long : 6; ++ unsigned long graphic_h_end : 10; ++ unsigned long : 6; ++ } graphic_h_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_h_disp_t f; ++} graphic_h_disp_u; ++ ++typedef struct _graphic_v_disp_t { ++ unsigned long graphic_v_start : 10; ++ unsigned long : 6; ++ unsigned long graphic_v_end : 10; ++ unsigned long : 6; ++ } graphic_v_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_v_disp_t f; ++} graphic_v_disp_u; ++ ++typedef struct _video_ctrl_t { ++ unsigned long video_mode : 1; ++ unsigned long keyer_en : 1; ++ unsigned long en_video_req : 1; ++ unsigned long en_graphic_req_video : 1; ++ unsigned long en_video_crtc : 1; ++ unsigned long video_hor_exp : 2; ++ unsigned long video_ver_exp : 2; ++ unsigned long uv_combine : 1; ++ unsigned long total_req_video : 9; ++ unsigned long video_ch_sel : 1; ++ unsigned long video_portrait : 2; ++ unsigned long yuv2rgb_en : 1; ++ unsigned long yuv2rgb_option : 1; ++ unsigned long video_inv_hor : 1; ++ unsigned long video_inv_ver : 1; ++ unsigned long gamma_sel : 2; ++ unsigned long dis_limit : 1; ++ unsigned long en_uv_hblend : 1; ++ unsigned long rgb_gamma_sel : 2; ++ } video_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_ctrl_t f; ++} video_ctrl_u; ++ ++typedef struct _graphic_key_t { ++ unsigned long keyer_color : 16; ++ unsigned long keyer_mask : 16; ++ } graphic_key_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_key_t f; ++} graphic_key_u; ++ ++typedef struct _video_y_offset_t { ++ unsigned long y_offset : 24; ++ unsigned long : 8; ++ } video_y_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_y_offset_t f; ++} video_y_offset_u; ++ ++typedef struct _video_y_pitch_t { ++ unsigned long y_pitch : 11; ++ unsigned long : 21; ++ } video_y_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_y_pitch_t f; ++} video_y_pitch_u; ++ ++typedef struct _video_u_offset_t { ++ unsigned long u_offset : 24; ++ unsigned long : 8; ++ } video_u_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_u_offset_t f; ++} video_u_offset_u; ++ ++typedef struct _video_u_pitch_t { ++ unsigned long u_pitch : 11; ++ unsigned long : 21; ++ } video_u_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_u_pitch_t f; ++} video_u_pitch_u; ++ ++typedef struct _video_v_offset_t { ++ unsigned long v_offset : 24; ++ unsigned long : 8; ++ } video_v_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_offset_t f; ++} video_v_offset_u; ++ ++typedef struct _video_v_pitch_t { ++ unsigned long v_pitch : 11; ++ unsigned long : 21; ++ } video_v_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_pitch_t f; ++} video_v_pitch_u; ++ ++typedef struct _video_h_pos_t { ++ unsigned long video_h_start : 10; ++ unsigned long : 6; ++ unsigned long video_h_end : 10; ++ unsigned long : 6; ++ } video_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_h_pos_t f; ++} video_h_pos_u; ++ ++typedef struct _video_v_pos_t { ++ unsigned long video_v_start : 10; ++ unsigned long : 6; ++ unsigned long video_v_end : 10; ++ unsigned long : 6; ++ } video_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_pos_t f; ++} video_v_pos_u; ++ ++typedef struct _brightness_cntl_t { ++ unsigned long brightness : 7; ++ unsigned long : 25; ++ } brightness_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brightness_cntl_t f; ++} brightness_cntl_u; ++ ++typedef struct _cursor1_offset_t { ++ unsigned long cur1_offset : 24; ++ unsigned long cur1_x_offset : 4; ++ unsigned long cur1_y_offset : 4; ++ } cursor1_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_offset_t f; ++} cursor1_offset_u; ++ ++typedef struct _cursor1_h_pos_t { ++ unsigned long cur1_h_start : 10; ++ unsigned long : 6; ++ unsigned long cur1_h_end : 10; ++ unsigned long : 5; ++ unsigned long cur1_en : 1; ++ } cursor1_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_h_pos_t f; ++} cursor1_h_pos_u; ++ ++typedef struct _cursor1_v_pos_t { ++ unsigned long cur1_v_start : 10; ++ unsigned long : 6; ++ unsigned long cur1_v_end : 10; ++ unsigned long : 6; ++ } cursor1_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_v_pos_t f; ++} cursor1_v_pos_u; ++ ++typedef struct _cursor1_color0_t { ++ unsigned long cur1_color0_r : 8; ++ unsigned long cur1_color0_g : 8; ++ unsigned long cur1_color0_b : 8; ++ unsigned long : 8; ++ } cursor1_color0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_color0_t f; ++} cursor1_color0_u; ++ ++typedef struct _cursor1_color1_t { ++ unsigned long cur1_color1_r : 8; ++ unsigned long cur1_color1_g : 8; ++ unsigned long cur1_color1_b : 8; ++ unsigned long : 8; ++ } cursor1_color1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_color1_t f; ++} cursor1_color1_u; ++ ++typedef struct _cursor2_offset_t { ++ unsigned long cur2_offset : 24; ++ unsigned long cur2_x_offset : 4; ++ unsigned long cur2_y_offset : 4; ++ } cursor2_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_offset_t f; ++} cursor2_offset_u; ++ ++typedef struct _cursor2_h_pos_t { ++ unsigned long cur2_h_start : 10; ++ unsigned long : 6; ++ unsigned long cur2_h_end : 10; ++ unsigned long : 5; ++ unsigned long cur2_en : 1; ++ } cursor2_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_h_pos_t f; ++} cursor2_h_pos_u; ++ ++typedef struct _cursor2_v_pos_t { ++ unsigned long cur2_v_start : 10; ++ unsigned long : 6; ++ unsigned long cur2_v_end : 10; ++ unsigned long : 6; ++ } cursor2_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_v_pos_t f; ++} cursor2_v_pos_u; ++ ++typedef struct _cursor2_color0_t { ++ unsigned long cur2_color0_r : 8; ++ unsigned long cur2_color0_g : 8; ++ unsigned long cur2_color0_b : 8; ++ unsigned long : 8; ++ } cursor2_color0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_color0_t f; ++} cursor2_color0_u; ++ ++typedef struct _cursor2_color1_t { ++ unsigned long cur2_color1_r : 8; ++ unsigned long cur2_color1_g : 8; ++ unsigned long cur2_color1_b : 8; ++ unsigned long : 8; ++ } cursor2_color1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_color1_t f; ++} cursor2_color1_u; ++ ++typedef struct _disp_int_cntl_t { ++ unsigned long vline_int_pos : 10; ++ unsigned long : 6; ++ unsigned long hpos_int_pos : 10; ++ unsigned long : 4; ++ unsigned long vblank_int_pol : 1; ++ unsigned long frame_int_pol : 1; ++ } disp_int_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_int_cntl_t f; ++} disp_int_cntl_u; ++ ++typedef struct _crtc_ss_t { ++ unsigned long ss_start : 10; ++ unsigned long : 6; ++ unsigned long ss_end : 10; ++ unsigned long : 2; ++ unsigned long ss_align : 1; ++ unsigned long ss_pol : 1; ++ unsigned long ss_run_mode : 1; ++ unsigned long ss_en : 1; ++ } crtc_ss_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ss_t f; ++} crtc_ss_u; ++ ++typedef struct _crtc_ls_t { ++ unsigned long ls_start : 10; ++ unsigned long : 6; ++ unsigned long ls_end : 10; ++ unsigned long : 2; ++ unsigned long ls_align : 1; ++ unsigned long ls_pol : 1; ++ unsigned long ls_run_mode : 1; ++ unsigned long ls_en : 1; ++ } crtc_ls_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ls_t f; ++} crtc_ls_u; ++ ++typedef struct _crtc_rev_t { ++ unsigned long rev_pos : 10; ++ unsigned long : 6; ++ unsigned long rev_align : 1; ++ unsigned long rev_freq_nref : 5; ++ unsigned long rev_en : 1; ++ unsigned long : 9; ++ } crtc_rev_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_rev_t f; ++} crtc_rev_u; ++ ++typedef struct _crtc_dclk_t { ++ unsigned long dclk_start : 10; ++ unsigned long : 6; ++ unsigned long dclk_end : 10; ++ unsigned long : 1; ++ unsigned long dclk_run_mode : 2; ++ unsigned long dclk_pol : 1; ++ unsigned long dclk_align : 1; ++ unsigned long dclk_en : 1; ++ } crtc_dclk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_dclk_t f; ++} crtc_dclk_u; ++ ++typedef struct _crtc_gs_t { ++ unsigned long gs_start : 10; ++ unsigned long : 6; ++ unsigned long gs_end : 10; ++ unsigned long : 3; ++ unsigned long gs_align : 1; ++ unsigned long gs_pol : 1; ++ unsigned long gs_en : 1; ++ } crtc_gs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gs_t f; ++} crtc_gs_u; ++ ++typedef struct _crtc_vpos_gs_t { ++ unsigned long gs_vpos_start : 10; ++ unsigned long : 6; ++ unsigned long gs_vpos_end : 10; ++ unsigned long : 6; ++ } crtc_vpos_gs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_vpos_gs_t f; ++} crtc_vpos_gs_u; ++ ++typedef struct _crtc_gclk_t { ++ unsigned long gclk_start : 10; ++ unsigned long : 6; ++ unsigned long gclk_end : 10; ++ unsigned long : 3; ++ unsigned long gclk_align : 1; ++ unsigned long gclk_pol : 1; ++ unsigned long gclk_en : 1; ++ } crtc_gclk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gclk_t f; ++} crtc_gclk_u; ++ ++typedef struct _crtc_goe_t { ++ unsigned long goe_start : 10; ++ unsigned long : 6; ++ unsigned long goe_end : 10; ++ unsigned long : 3; ++ unsigned long goe_align : 1; ++ unsigned long goe_pol : 1; ++ unsigned long goe_en : 1; ++ } crtc_goe_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_goe_t f; ++} crtc_goe_u; ++ ++typedef struct _crtc_frame_t { ++ unsigned long crtc_fr_start : 10; ++ unsigned long : 6; ++ unsigned long crtc_fr_end : 10; ++ unsigned long : 4; ++ unsigned long crtc_frame_en : 1; ++ unsigned long crtc_frame_align : 1; ++ } crtc_frame_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_frame_t f; ++} crtc_frame_u; ++ ++typedef struct _crtc_frame_vpos_t { ++ unsigned long crtc_fr_vpos : 10; ++ unsigned long : 22; ++ } crtc_frame_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_frame_vpos_t f; ++} crtc_frame_vpos_u; ++ ++typedef struct _gpio_data_t { ++ unsigned long gio_out : 16; ++ unsigned long gio_in : 16; ++ } gpio_data_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_data_t f; ++} gpio_data_u; ++ ++typedef struct _gpio_cntl1_t { ++ unsigned long gio_pd : 16; ++ unsigned long gio_schmen : 16; ++ } gpio_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl1_t f; ++} gpio_cntl1_u; ++ ++typedef struct _gpio_cntl2_t { ++ unsigned long gio_oe : 16; ++ unsigned long gio_srp : 1; ++ unsigned long gio_srn : 1; ++ unsigned long gio_sp : 4; ++ unsigned long gio_sn : 4; ++ unsigned long : 6; ++ } gpio_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl2_t f; ++} gpio_cntl2_u; ++ ++typedef struct _lcdd_cntl1_t { ++ unsigned long lcdd_pd : 18; ++ unsigned long lcdd_srp : 1; ++ unsigned long lcdd_srn : 1; ++ unsigned long lcdd_sp : 4; ++ unsigned long lcdd_sn : 4; ++ unsigned long lcdd_align : 1; ++ unsigned long : 3; ++ } lcdd_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcdd_cntl1_t f; ++} lcdd_cntl1_u; ++ ++typedef struct _lcdd_cntl2_t { ++ unsigned long lcdd_oe : 18; ++ unsigned long : 14; ++ } lcdd_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcdd_cntl2_t f; ++} lcdd_cntl2_u; ++ ++typedef struct _genlcd_cntl1_t { ++ unsigned long dclk_oe : 1; ++ unsigned long dclk_pd : 1; ++ unsigned long dclk_srp : 1; ++ unsigned long dclk_srn : 1; ++ unsigned long dclk_sp : 4; ++ unsigned long dclk_sn : 4; ++ unsigned long ss_oe : 1; ++ unsigned long ss_pd : 1; ++ unsigned long ls_oe : 1; ++ unsigned long ls_pd : 1; ++ unsigned long gs_oe : 1; ++ unsigned long gs_pd : 1; ++ unsigned long goe_oe : 1; ++ unsigned long goe_pd : 1; ++ unsigned long rev_oe : 1; ++ unsigned long rev_pd : 1; ++ unsigned long frame_oe : 1; ++ unsigned long frame_pd : 1; ++ unsigned long : 8; ++ } genlcd_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl1_t f; ++} genlcd_cntl1_u; ++ ++typedef struct _genlcd_cntl2_t { ++ unsigned long gclk_oe : 1; ++ unsigned long gclk_pd : 1; ++ unsigned long gclk_srp : 1; ++ unsigned long gclk_srn : 1; ++ unsigned long gclk_sp : 4; ++ unsigned long gclk_sn : 4; ++ unsigned long genlcd_srp : 1; ++ unsigned long genlcd_srn : 1; ++ unsigned long genlcd_sp : 4; ++ unsigned long genlcd_sn : 4; ++ unsigned long : 10; ++ } genlcd_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl2_t f; ++} genlcd_cntl2_u; ++ ++typedef struct _disp_debug_t { ++ unsigned long disp_debug : 32; ++ } disp_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_debug_t f; ++} disp_debug_u; ++ ++typedef struct _disp_db_buf_cntl_rd_t { ++ unsigned long en_db_buf : 1; ++ unsigned long update_db_buf_done : 1; ++ unsigned long db_buf_cntl : 6; ++ unsigned long : 24; ++ } disp_db_buf_cntl_rd_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_db_buf_cntl_rd_t f; ++} disp_db_buf_cntl_rd_u; ++ ++typedef struct _disp_db_buf_cntl_wr_t { ++ unsigned long en_db_buf : 1; ++ unsigned long update_db_buf : 1; ++ unsigned long db_buf_cntl : 6; ++ unsigned long : 24; ++ } disp_db_buf_cntl_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_db_buf_cntl_wr_t f; ++} disp_db_buf_cntl_wr_u; ++ ++typedef struct _disp_crc_sig_t { ++ unsigned long crc_sig_r : 6; ++ unsigned long crc_sig_g : 6; ++ unsigned long crc_sig_b : 6; ++ unsigned long crc_cont_en : 1; ++ unsigned long crc_en : 1; ++ unsigned long crc_mask_en : 1; ++ unsigned long crc_sig_cntl : 6; ++ unsigned long : 5; ++ } disp_crc_sig_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_crc_sig_t f; ++} disp_crc_sig_u; ++ ++typedef struct _crtc_default_count_t { ++ unsigned long crtc_hcount_def : 10; ++ unsigned long : 6; ++ unsigned long crtc_vcount_def : 10; ++ unsigned long : 6; ++ } crtc_default_count_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_default_count_t f; ++} crtc_default_count_u; ++ ++typedef struct _lcd_background_color_t { ++ unsigned long lcd_bg_red : 8; ++ unsigned long lcd_bg_green : 8; ++ unsigned long lcd_bg_blue : 8; ++ unsigned long : 8; ++ } lcd_background_color_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcd_background_color_t f; ++} lcd_background_color_u; ++ ++typedef struct _crtc_ps2_t { ++ unsigned long ps2_start : 10; ++ unsigned long : 6; ++ unsigned long ps2_end : 10; ++ unsigned long : 4; ++ unsigned long ps2_pol : 1; ++ unsigned long ps2_en : 1; ++ } crtc_ps2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps2_t f; ++} crtc_ps2_u; ++ ++typedef struct _crtc_ps2_vpos_t { ++ unsigned long ps2_vpos_start : 10; ++ unsigned long : 6; ++ unsigned long ps2_vpos_end : 10; ++ unsigned long : 6; ++ } crtc_ps2_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps2_vpos_t f; ++} crtc_ps2_vpos_u; ++ ++typedef struct _crtc_ps1_active_t { ++ unsigned long ps1_h_start : 10; ++ unsigned long : 6; ++ unsigned long ps1_h_end : 10; ++ unsigned long : 3; ++ unsigned long ps1_pol : 1; ++ unsigned long ps1_en : 1; ++ unsigned long ps1_use_nactive : 1; ++ } crtc_ps1_active_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps1_active_t f; ++} crtc_ps1_active_u; ++ ++typedef struct _crtc_ps1_nactive_t { ++ unsigned long ps1_h_start_na : 10; ++ unsigned long : 6; ++ unsigned long ps1_h_end_na : 10; ++ unsigned long : 5; ++ unsigned long ps1_en_na : 1; ++ } crtc_ps1_nactive_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps1_nactive_t f; ++} crtc_ps1_nactive_u; ++ ++typedef struct _crtc_gclk_ext_t { ++ unsigned long gclk_alter_start : 10; ++ unsigned long : 6; ++ unsigned long gclk_alter_width : 2; ++ unsigned long gclk_en_alter : 1; ++ unsigned long gclk_db_width : 2; ++ unsigned long : 11; ++ } crtc_gclk_ext_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gclk_ext_t f; ++} crtc_gclk_ext_u; ++ ++typedef struct _crtc_alw_t { ++ unsigned long alw_hstart : 10; ++ unsigned long : 6; ++ unsigned long alw_hend : 10; ++ unsigned long : 4; ++ unsigned long alw_delay : 1; ++ unsigned long alw_en : 1; ++ } crtc_alw_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_alw_t f; ++} crtc_alw_u; ++ ++typedef struct _crtc_alw_vpos_t { ++ unsigned long alw_vstart : 10; ++ unsigned long : 6; ++ unsigned long alw_vend : 10; ++ unsigned long : 6; ++ } crtc_alw_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_alw_vpos_t f; ++} crtc_alw_vpos_u; ++ ++typedef struct _crtc_psk_t { ++ unsigned long psk_vstart : 10; ++ unsigned long : 6; ++ unsigned long psk_vend : 10; ++ unsigned long : 4; ++ unsigned long psk_pol : 1; ++ unsigned long psk_en : 1; ++ } crtc_psk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_psk_t f; ++} crtc_psk_u; ++ ++typedef struct _crtc_psk_hpos_t { ++ unsigned long psk_hstart : 10; ++ unsigned long : 6; ++ unsigned long psk_hend : 10; ++ unsigned long : 6; ++ } crtc_psk_hpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_psk_hpos_t f; ++} crtc_psk_hpos_u; ++ ++typedef struct _crtc_cv4_start_t { ++ unsigned long cv4_vstart : 10; ++ unsigned long : 20; ++ unsigned long cv4_pol : 1; ++ unsigned long cv4_en : 1; ++ } crtc_cv4_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_start_t f; ++} crtc_cv4_start_u; ++ ++typedef struct _crtc_cv4_end_t { ++ unsigned long cv4_vend1 : 10; ++ unsigned long : 6; ++ unsigned long cv4_vend2 : 10; ++ unsigned long : 6; ++ } crtc_cv4_end_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_end_t f; ++} crtc_cv4_end_u; ++ ++typedef struct _crtc_cv4_hpos_t { ++ unsigned long cv4_hstart : 10; ++ unsigned long : 6; ++ unsigned long cv4_hend : 10; ++ unsigned long : 6; ++ } crtc_cv4_hpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_hpos_t f; ++} crtc_cv4_hpos_u; ++ ++typedef struct _crtc_eck_t { ++ unsigned long eck_freq1 : 3; ++ unsigned long eck_en : 1; ++ unsigned long : 28; ++ } crtc_eck_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_eck_t f; ++} crtc_eck_u; ++ ++typedef struct _refresh_cntl_t { ++ unsigned long ref_frame : 3; ++ unsigned long nref_frame : 5; ++ unsigned long ref_cntl : 1; ++ unsigned long stop_sm_nref : 1; ++ unsigned long stop_req_nref : 1; ++ unsigned long : 21; ++ } refresh_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ refresh_cntl_t f; ++} refresh_cntl_u; ++ ++typedef struct _genlcd_cntl3_t { ++ unsigned long ps1_oe : 1; ++ unsigned long ps1_pd : 1; ++ unsigned long ps2_oe : 1; ++ unsigned long ps2_pd : 1; ++ unsigned long rev2_oe : 1; ++ unsigned long rev2_pd : 1; ++ unsigned long awl_oe : 1; ++ unsigned long awl_pd : 1; ++ unsigned long dinv_oe : 1; ++ unsigned long dinv_pd : 1; ++ unsigned long psk_out : 1; ++ unsigned long psd_out : 1; ++ unsigned long eck_out : 1; ++ unsigned long cv4_out : 1; ++ unsigned long ps1_out : 1; ++ unsigned long ps2_out : 1; ++ unsigned long rev_out : 1; ++ unsigned long rev2_out : 1; ++ unsigned long : 14; ++ } genlcd_cntl3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl3_t f; ++} genlcd_cntl3_u; ++ ++typedef struct _gpio_data2_t { ++ unsigned long gio2_out : 16; ++ unsigned long gio2_in : 16; ++ } gpio_data2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_data2_t f; ++} gpio_data2_u; ++ ++typedef struct _gpio_cntl3_t { ++ unsigned long gio2_pd : 16; ++ unsigned long gio2_schmen : 16; ++ } gpio_cntl3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl3_t f; ++} gpio_cntl3_u; ++ ++typedef struct _gpio_cntl4_t { ++ unsigned long gio2_oe : 16; ++ unsigned long : 16; ++ } gpio_cntl4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl4_t f; ++} gpio_cntl4_u; ++ ++typedef struct _chip_strap_t { ++ unsigned long config_strap : 8; ++ unsigned long pkg_strap : 1; ++ unsigned long : 23; ++ } chip_strap_t; ++ ++typedef union { ++ unsigned long val : 32; ++ chip_strap_t f; ++} chip_strap_u; ++ ++typedef struct _disp_debug2_t { ++ unsigned long disp_debug2 : 32; ++ } disp_debug2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_debug2_t f; ++} disp_debug2_u; ++ ++typedef struct _debug_bus_cntl_t { ++ unsigned long debug_testmux : 4; ++ unsigned long debug_testsel : 4; ++ unsigned long debug_gioa_sel : 2; ++ unsigned long debug_giob_sel : 2; ++ unsigned long debug_clk_sel : 1; ++ unsigned long debug_clk_inv : 1; ++ unsigned long : 2; ++ unsigned long debug_bus : 16; ++ } debug_bus_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug_bus_cntl_t f; ++} debug_bus_cntl_u; ++ ++typedef struct _gamma_value1_t { ++ unsigned long gamma1 : 8; ++ unsigned long gamma2 : 8; ++ unsigned long gamma3 : 8; ++ unsigned long gamma4 : 8; ++ } gamma_value1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_value1_t f; ++} gamma_value1_u; ++ ++typedef struct _gamma_value2_t { ++ unsigned long gamma5 : 8; ++ unsigned long gamma6 : 8; ++ unsigned long gamma7 : 8; ++ unsigned long gamma8 : 8; ++ } gamma_value2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_value2_t f; ++} gamma_value2_u; ++ ++typedef struct _gamma_slope_t { ++ unsigned long slope1 : 3; ++ unsigned long slope2 : 3; ++ unsigned long slope3 : 3; ++ unsigned long slope4 : 3; ++ unsigned long slope5 : 3; ++ unsigned long slope6 : 3; ++ unsigned long slope7 : 3; ++ unsigned long slope8 : 3; ++ unsigned long : 8; ++ } gamma_slope_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_slope_t f; ++} gamma_slope_u; ++ ++typedef struct _gen_status_t { ++ unsigned long status : 16; ++ unsigned long : 16; ++ } gen_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_status_t f; ++} gen_status_u; ++ ++typedef struct _hw_int_t { ++ unsigned long hwint1_pos : 5; ++ unsigned long hwint2_pos : 5; ++ unsigned long hwint1_pol : 1; ++ unsigned long hwint2_pol : 1; ++ unsigned long hwint1_en_db : 1; ++ unsigned long hwint2_en_db : 1; ++ unsigned long : 18; ++ } hw_int_t; ++ ++typedef union { ++ unsigned long val : 32; ++ hw_int_t f; ++} hw_int_u; ++ ++typedef struct _dst_offset_t { ++ unsigned long dst_offset : 24; ++ unsigned long : 8; ++ } dst_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_offset_t f; ++} dst_offset_u; ++ ++typedef struct _dst_pitch_t { ++ unsigned long dst_pitch : 14; ++ unsigned long mc_dst_pitch_mul : 2; ++ unsigned long : 16; ++ } dst_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_pitch_t f; ++} dst_pitch_u; ++ ++typedef struct _dst_pitch_offset_t { ++ unsigned long dst_offset : 20; ++ unsigned long dst_pitch : 10; ++ unsigned long mc_dst_pitch_mul : 2; ++ } dst_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_pitch_offset_t f; ++} dst_pitch_offset_u; ++ ++typedef struct _dst_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 18; ++ } dst_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_x_t f; ++} dst_x_u; ++ ++typedef struct _dst_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 18; ++ } dst_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_y_t f; ++} dst_y_u; ++ ++typedef struct _dst_x_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ } dst_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_x_y_t f; ++} dst_x_y_u; ++ ++typedef struct _dst_y_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ } dst_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_y_x_t f; ++} dst_y_x_u; ++ ++typedef struct _dst_width_t { ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 18; ++ } dst_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_t f; ++} dst_width_u; ++ ++typedef struct _dst_height_t { ++ unsigned long dst_height : 14; ++ unsigned long : 18; ++ } dst_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_t f; ++} dst_height_u; ++ ++typedef struct _dst_width_height_t { ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_height_t f; ++} dst_width_height_u; ++ ++typedef struct _dst_height_width_t { ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ } dst_height_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_width_t f; ++} dst_height_width_u; ++ ++typedef struct _dst_height_width_8_t { ++ unsigned long : 16; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_height : 8; ++ } dst_height_width_8_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_width_8_t f; ++} dst_height_width_8_u; ++ ++typedef struct _dst_height_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ } dst_height_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_y_t f; ++} dst_height_y_u; ++ ++typedef struct _dst_width_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_x_t f; ++} dst_width_x_u; ++ ++typedef struct _dst_width_x_incy_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_x_incy_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_x_incy_t f; ++} dst_width_x_incy_u; ++ ++typedef struct _dst_line_start_t { ++ unsigned long dst_start_x : 14; ++ unsigned long : 2; ++ unsigned long dst_start_y : 14; ++ unsigned long : 2; ++ } dst_line_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_line_start_t f; ++} dst_line_start_u; ++ ++typedef struct _dst_line_end_t { ++ unsigned long dst_end_x : 14; ++ unsigned long : 2; ++ unsigned long dst_end_y_b0 : 8; ++ unsigned long dst_end_y_b1 : 6; ++ unsigned long : 2; ++ } dst_line_end_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_line_end_t f; ++} dst_line_end_u; ++ ++typedef struct _brush_offset_t { ++ unsigned long brush_offset : 24; ++ unsigned long : 8; ++ } brush_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brush_offset_t f; ++} brush_offset_u; ++ ++typedef struct _brush_y_x_t { ++ unsigned long brush_x : 5; ++ unsigned long : 3; ++ unsigned long brush_y : 3; ++ unsigned long : 21; ++ } brush_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brush_y_x_t f; ++} brush_y_x_u; ++ ++typedef struct _dp_brush_frgd_clr_t { ++ unsigned long dp_brush_frgd_clr : 32; ++ } dp_brush_frgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_brush_frgd_clr_t f; ++} dp_brush_frgd_clr_u; ++ ++typedef struct _dp_brush_bkgd_clr_t { ++ unsigned long dp_brush_bkgd_clr : 32; ++ } dp_brush_bkgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_brush_bkgd_clr_t f; ++} dp_brush_bkgd_clr_u; ++ ++typedef struct _src2_offset_t { ++ unsigned long src2_offset : 24; ++ unsigned long : 8; ++ } src2_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_offset_t f; ++} src2_offset_u; ++ ++typedef struct _src2_pitch_t { ++ unsigned long src2_pitch : 14; ++ unsigned long src2_pitch_mul : 2; ++ unsigned long : 16; ++ } src2_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_pitch_t f; ++} src2_pitch_u; ++ ++typedef struct _src2_pitch_offset_t { ++ unsigned long src2_offset : 20; ++ unsigned long : 2; ++ unsigned long src2_pitch : 8; ++ unsigned long src2_pitch_mul : 2; ++ } src2_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_pitch_offset_t f; ++} src2_pitch_offset_u; ++ ++typedef struct _src2_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 18; ++ } src2_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_x_t f; ++} src2_x_u; ++ ++typedef struct _src2_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 18; ++ } src2_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_y_t f; ++} src2_y_u; ++ ++typedef struct _src2_x_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ } src2_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_x_y_t f; ++} src2_x_y_u; ++ ++typedef struct _src2_width_t { ++ unsigned long src2_width : 14; ++ unsigned long : 18; ++ } src2_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_width_t f; ++} src2_width_u; ++ ++typedef struct _src2_height_t { ++ unsigned long src2_height : 14; ++ unsigned long : 18; ++ } src2_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_height_t f; ++} src2_height_u; ++ ++typedef struct _src2_inc_t { ++ unsigned long src2_xinc : 6; ++ unsigned long : 2; ++ unsigned long src2_yinc : 6; ++ unsigned long : 18; ++ } src2_inc_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_inc_t f; ++} src2_inc_u; ++ ++typedef struct _src_offset_t { ++ unsigned long src_offset : 24; ++ unsigned long : 8; ++ } src_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_offset_t f; ++} src_offset_u; ++ ++typedef struct _src_pitch_t { ++ unsigned long src_pitch : 14; ++ unsigned long src_pitch_mul : 2; ++ unsigned long : 16; ++ } src_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_pitch_t f; ++} src_pitch_u; ++ ++typedef struct _src_pitch_offset_t { ++ unsigned long src_offset : 20; ++ unsigned long src_pitch : 10; ++ unsigned long src_pitch_mul : 2; ++ } src_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_pitch_offset_t f; ++} src_pitch_offset_u; ++ ++typedef struct _src_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 18; ++ } src_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_x_t f; ++} src_x_u; ++ ++typedef struct _src_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 18; ++ } src_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_y_t f; ++} src_y_u; ++ ++typedef struct _src_x_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ } src_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_x_y_t f; ++} src_x_y_u; ++ ++typedef struct _src_y_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ } src_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_y_x_t f; ++} src_y_x_u; ++ ++typedef struct _src_width_t { ++ unsigned long src_width : 14; ++ unsigned long : 18; ++ } src_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_width_t f; ++} src_width_u; ++ ++typedef struct _src_height_t { ++ unsigned long src_height : 14; ++ unsigned long : 18; ++ } src_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_height_t f; ++} src_height_u; ++ ++typedef struct _src_inc_t { ++ unsigned long src_xinc : 6; ++ unsigned long : 2; ++ unsigned long src_yinc : 6; ++ unsigned long : 18; ++ } src_inc_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_inc_t f; ++} src_inc_u; ++ ++typedef struct _host_data0_t { ++ unsigned long host_data : 32; ++ } host_data0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data0_t f; ++} host_data0_u; ++ ++typedef struct _host_data1_t { ++ unsigned long host_data : 32; ++ } host_data1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data1_t f; ++} host_data1_u; ++ ++typedef struct _host_data2_t { ++ unsigned long host_data : 32; ++ } host_data2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data2_t f; ++} host_data2_u; ++ ++typedef struct _host_data3_t { ++ unsigned long host_data : 32; ++ } host_data3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data3_t f; ++} host_data3_u; ++ ++typedef struct _host_data4_t { ++ unsigned long host_data : 32; ++ } host_data4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data4_t f; ++} host_data4_u; ++ ++typedef struct _host_data5_t { ++ unsigned long host_data : 32; ++ } host_data5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data5_t f; ++} host_data5_u; ++ ++typedef struct _host_data6_t { ++ unsigned long host_data : 32; ++ } host_data6_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data6_t f; ++} host_data6_u; ++ ++typedef struct _host_data7_t { ++ unsigned long host_data : 32; ++ } host_data7_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data7_t f; ++} host_data7_u; ++ ++typedef struct _host_data_last_t { ++ unsigned long host_data_last : 32; ++ } host_data_last_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data_last_t f; ++} host_data_last_u; ++ ++typedef struct _dp_src_frgd_clr_t { ++ unsigned long dp_src_frgd_clr : 32; ++ } dp_src_frgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_src_frgd_clr_t f; ++} dp_src_frgd_clr_u; ++ ++typedef struct _dp_src_bkgd_clr_t { ++ unsigned long dp_src_bkgd_clr : 32; ++ } dp_src_bkgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_src_bkgd_clr_t f; ++} dp_src_bkgd_clr_u; ++ ++typedef struct _sc_left_t { ++ unsigned long sc_left : 14; ++ unsigned long : 18; ++ } sc_left_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_left_t f; ++} sc_left_u; ++ ++typedef struct _sc_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 18; ++ } sc_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_right_t f; ++} sc_right_u; ++ ++typedef struct _sc_top_t { ++ unsigned long sc_top : 14; ++ unsigned long : 18; ++ } sc_top_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_top_t f; ++} sc_top_u; ++ ++typedef struct _sc_bottom_t { ++ unsigned long sc_bottom : 14; ++ unsigned long : 18; ++ } sc_bottom_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_bottom_t f; ++} sc_bottom_u; ++ ++typedef struct _src_sc_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 18; ++ } src_sc_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_right_t f; ++} src_sc_right_u; ++ ++typedef struct _src_sc_bottom_t { ++ unsigned long sc_bottom : 14; ++ unsigned long : 18; ++ } src_sc_bottom_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_bottom_t f; ++} src_sc_bottom_u; ++ ++typedef struct _dp_cntl_t { ++ unsigned long dst_x_dir : 1; ++ unsigned long dst_y_dir : 1; ++ unsigned long src_x_dir : 1; ++ unsigned long src_y_dir : 1; ++ unsigned long dst_major_x : 1; ++ unsigned long src_major_x : 1; ++ unsigned long : 26; ++ } dp_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_cntl_t f; ++} dp_cntl_u; ++ ++typedef struct _dp_cntl_dst_dir_t { ++ unsigned long : 15; ++ unsigned long dst_y_dir : 1; ++ unsigned long : 15; ++ unsigned long dst_x_dir : 1; ++ } dp_cntl_dst_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_cntl_dst_dir_t f; ++} dp_cntl_dst_dir_u; ++ ++typedef struct _dp_datatype_t { ++ unsigned long dp_dst_datatype : 4; ++ unsigned long : 4; ++ unsigned long dp_brush_datatype : 4; ++ unsigned long dp_src2_type : 1; ++ unsigned long dp_src2_datatype : 3; ++ unsigned long dp_src_datatype : 3; ++ unsigned long : 11; ++ unsigned long dp_byte_pix_order : 1; ++ unsigned long : 1; ++ } dp_datatype_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_datatype_t f; ++} dp_datatype_u; ++ ++typedef struct _dp_mix_t { ++ unsigned long : 8; ++ unsigned long dp_src_source : 3; ++ unsigned long dp_src2_source : 3; ++ unsigned long : 2; ++ unsigned long dp_rop3 : 8; ++ unsigned long dp_op : 1; ++ unsigned long : 7; ++ } dp_mix_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_mix_t f; ++} dp_mix_u; ++ ++typedef struct _dp_write_msk_t { ++ unsigned long dp_write_msk : 32; ++ } dp_write_msk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_write_msk_t f; ++} dp_write_msk_u; ++ ++typedef struct _clr_cmp_clr_src_t { ++ unsigned long clr_cmp_clr_src : 32; ++ } clr_cmp_clr_src_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_clr_src_t f; ++} clr_cmp_clr_src_u; ++ ++typedef struct _clr_cmp_clr_dst_t { ++ unsigned long clr_cmp_clr_dst : 32; ++ } clr_cmp_clr_dst_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_clr_dst_t f; ++} clr_cmp_clr_dst_u; ++ ++typedef struct _clr_cmp_cntl_t { ++ unsigned long clr_cmp_fcn_src : 3; ++ unsigned long : 5; ++ unsigned long clr_cmp_fcn_dst : 3; ++ unsigned long : 13; ++ unsigned long clr_cmp_src : 2; ++ unsigned long : 6; ++ } clr_cmp_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_cntl_t f; ++} clr_cmp_cntl_u; ++ ++typedef struct _clr_cmp_msk_t { ++ unsigned long clr_cmp_msk : 32; ++ } clr_cmp_msk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_msk_t f; ++} clr_cmp_msk_u; ++ ++typedef struct _default_pitch_offset_t { ++ unsigned long default_offset : 20; ++ unsigned long default_pitch : 10; ++ unsigned long : 2; ++ } default_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default_pitch_offset_t f; ++} default_pitch_offset_u; ++ ++typedef struct _default_sc_bottom_right_t { ++ unsigned long default_sc_right : 14; ++ unsigned long : 2; ++ unsigned long default_sc_bottom : 14; ++ unsigned long : 2; ++ } default_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default_sc_bottom_right_t f; ++} default_sc_bottom_right_u; ++ ++typedef struct _default2_sc_bottom_right_t { ++ unsigned long default_sc_right : 14; ++ unsigned long : 2; ++ unsigned long default_sc_bottom : 14; ++ unsigned long : 2; ++ } default2_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default2_sc_bottom_right_t f; ++} default2_sc_bottom_right_u; ++ ++typedef struct _ref1_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref1_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref1_pitch_offset_t f; ++} ref1_pitch_offset_u; ++ ++typedef struct _ref2_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref2_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref2_pitch_offset_t f; ++} ref2_pitch_offset_u; ++ ++typedef struct _ref3_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref3_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref3_pitch_offset_t f; ++} ref3_pitch_offset_u; ++ ++typedef struct _ref4_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref4_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref4_pitch_offset_t f; ++} ref4_pitch_offset_u; ++ ++typedef struct _ref5_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref5_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref5_pitch_offset_t f; ++} ref5_pitch_offset_u; ++ ++typedef struct _ref6_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref6_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref6_pitch_offset_t f; ++} ref6_pitch_offset_u; ++ ++typedef struct _dp_gui_master_cntl_t { ++ unsigned long gmc_src_pitch_offset_cntl : 1; ++ unsigned long gmc_dst_pitch_offset_cntl : 1; ++ unsigned long gmc_src_clipping : 1; ++ unsigned long gmc_dst_clipping : 1; ++ unsigned long gmc_brush_datatype : 4; ++ unsigned long gmc_dst_datatype : 4; ++ unsigned long gmc_src_datatype : 3; ++ unsigned long gmc_byte_pix_order : 1; ++ unsigned long gmc_default_sel : 1; ++ unsigned long gmc_rop3 : 8; ++ unsigned long gmc_dp_src_source : 3; ++ unsigned long gmc_clr_cmp_fcn_dis : 1; ++ unsigned long : 1; ++ unsigned long gmc_wr_msk_dis : 1; ++ unsigned long gmc_dp_op : 1; ++ } dp_gui_master_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_gui_master_cntl_t f; ++} dp_gui_master_cntl_u; ++ ++typedef struct _sc_top_left_t { ++ unsigned long sc_left : 14; ++ unsigned long : 2; ++ unsigned long sc_top : 14; ++ unsigned long : 2; ++ } sc_top_left_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_top_left_t f; ++} sc_top_left_u; ++ ++typedef struct _sc_bottom_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 2; ++ unsigned long sc_bottom : 14; ++ unsigned long : 2; ++ } sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_bottom_right_t f; ++} sc_bottom_right_u; ++ ++typedef struct _src_sc_bottom_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 2; ++ unsigned long sc_bottom : 14; ++ unsigned long : 2; ++ } src_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_bottom_right_t f; ++} src_sc_bottom_right_u; ++ ++typedef struct _global_alpha_t { ++ unsigned long alpha_r : 8; ++ unsigned long alpha_g : 8; ++ unsigned long alpha_b : 8; ++ unsigned long alpha_a : 8; ++ } global_alpha_t; ++ ++typedef union { ++ unsigned long val : 32; ++ global_alpha_t f; ++} global_alpha_u; ++ ++typedef struct _filter_coef_t { ++ unsigned long c_4 : 4; ++ unsigned long c_3 : 4; ++ unsigned long c_2 : 4; ++ unsigned long c_1 : 4; ++ unsigned long c1 : 4; ++ unsigned long c2 : 4; ++ unsigned long c3 : 4; ++ unsigned long c4 : 4; ++ } filter_coef_t; ++ ++typedef union { ++ unsigned long val : 32; ++ filter_coef_t f; ++} filter_coef_u; ++ ++typedef struct _mvc_cntl_start_t { ++ unsigned long mc_cntl_src_1_index : 4; ++ unsigned long mc_cntl_dst_offset : 20; ++ unsigned long mc_dst_pitch_mul : 2; ++ unsigned long mc_cntl_src_2_index : 3; ++ unsigned long mc_cntl_width_height_sel : 3; ++ } mvc_cntl_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mvc_cntl_start_t f; ++} mvc_cntl_start_u; ++ ++typedef struct _e2_arithmetic_cntl_t { ++ unsigned long opcode : 5; ++ unsigned long shiftright : 4; ++ unsigned long clamp : 1; ++ unsigned long rounding : 2; ++ unsigned long filter_n : 3; ++ unsigned long : 1; ++ unsigned long srcblend_inv : 1; ++ unsigned long srcblend : 4; ++ unsigned long : 3; ++ unsigned long dstblend_inv : 1; ++ unsigned long dstblend : 4; ++ unsigned long dst_signed : 1; ++ unsigned long autoinc : 1; ++ unsigned long : 1; ++ } e2_arithmetic_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ e2_arithmetic_cntl_t f; ++} e2_arithmetic_cntl_u; ++ ++typedef struct _debug0_t { ++ unsigned long debug0_r : 8; ++ unsigned long : 8; ++ unsigned long debug0_rw : 8; ++ unsigned long : 8; ++ } debug0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug0_t f; ++} debug0_u; ++ ++typedef struct _debug1_t { ++ unsigned long debug1_r : 8; ++ unsigned long : 8; ++ unsigned long debug1_rw : 8; ++ unsigned long : 8; ++ } debug1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug1_t f; ++} debug1_u; ++ ++typedef struct _debug2_t { ++ unsigned long debug2_r : 8; ++ unsigned long : 8; ++ unsigned long debug2_rw : 8; ++ unsigned long : 8; ++ } debug2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug2_t f; ++} debug2_u; ++ ++typedef struct _debug3_t { ++ unsigned long : 32; ++ } debug3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug3_t f; ++} debug3_u; ++ ++typedef struct _debug4_t { ++ unsigned long : 32; ++ } debug4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug4_t f; ++} debug4_u; ++ ++typedef struct _debug5_t { ++ unsigned long : 32; ++ } debug5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug5_t f; ++} debug5_u; ++ ++typedef struct _debug6_t { ++ unsigned long : 32; ++ } debug6_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug6_t f; ++} debug6_u; ++ ++typedef struct _debug7_t { ++ unsigned long : 32; ++ } debug7_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug7_t f; ++} debug7_u; ++ ++typedef struct _debug8_t { ++ unsigned long : 32; ++ } debug8_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug8_t f; ++} debug8_u; ++ ++typedef struct _debug9_t { ++ unsigned long : 32; ++ } debug9_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug9_t f; ++} debug9_u; ++ ++typedef struct _debug10_t { ++ unsigned long : 32; ++ } debug10_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug10_t f; ++} debug10_u; ++ ++typedef struct _debug11_t { ++ unsigned long : 32; ++ } debug11_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug11_t f; ++} debug11_u; ++ ++typedef struct _debug12_t { ++ unsigned long : 32; ++ } debug12_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug12_t f; ++} debug12_u; ++ ++typedef struct _debug13_t { ++ unsigned long : 32; ++ } debug13_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug13_t f; ++} debug13_u; ++ ++typedef struct _debug14_t { ++ unsigned long : 32; ++ } debug14_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug14_t f; ++} debug14_u; ++ ++typedef struct _debug15_t { ++ unsigned long : 32; ++ } debug15_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug15_t f; ++} debug15_u; ++ ++typedef struct _eng_cntl_t { ++ unsigned long erc_reg_rd_ws : 1; ++ unsigned long erc_reg_wr_ws : 1; ++ unsigned long erc_idle_reg_wr : 1; ++ unsigned long dis_engine_triggers : 1; ++ unsigned long dis_rop_src_uses_dst_w_h : 1; ++ unsigned long dis_src_uses_dst_dirmaj : 1; ++ unsigned long : 6; ++ unsigned long force_3dclk_when_2dclk : 1; ++ unsigned long : 19; ++ } eng_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ eng_cntl_t f; ++} eng_cntl_u; ++ ++typedef struct _eng_perf_cnt_t { ++ unsigned long perf_cnt : 20; ++ unsigned long perf_sel : 4; ++ unsigned long perf_en : 1; ++ unsigned long : 3; ++ unsigned long perf_clr : 1; ++ unsigned long : 3; ++ } eng_perf_cnt_t; ++ ++typedef union { ++ unsigned long val : 32; ++ eng_perf_cnt_t f; ++} eng_perf_cnt_u; ++ ++typedef struct _idct_runs_t { ++ unsigned long idct_runs_3 : 8; ++ unsigned long idct_runs_2 : 8; ++ unsigned long idct_runs_1 : 8; ++ unsigned long idct_runs_0 : 8; ++ } idct_runs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_runs_t f; ++} idct_runs_u; ++ ++typedef struct _idct_levels_t { ++ unsigned long idct_level_hi : 16; ++ unsigned long idct_level_lo : 16; ++ } idct_levels_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_levels_t f; ++} idct_levels_u; ++ ++typedef struct _idct_control_t { ++ unsigned long idct_ctl_luma_rd_format : 2; ++ unsigned long idct_ctl_chroma_rd_format : 2; ++ unsigned long idct_ctl_scan_pattern : 1; ++ unsigned long idct_ctl_intra : 1; ++ unsigned long idct_ctl_flush : 1; ++ unsigned long idct_ctl_passthru : 1; ++ unsigned long idct_ctl_sw_reset : 1; ++ unsigned long idct_ctl_constreq : 1; ++ unsigned long idct_ctl_scramble : 1; ++ unsigned long idct_ctl_alt_scan : 1; ++ unsigned long : 20; ++ } idct_control_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_control_t f; ++} idct_control_u; ++ ++typedef struct _idct_auth_control_t { ++ unsigned long control_bits : 32; ++ } idct_auth_control_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_auth_control_t f; ++} idct_auth_control_u; ++ ++typedef struct _idct_auth_t { ++ unsigned long auth : 32; ++ } idct_auth_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_auth_t f; ++} idct_auth_u; ++ ++typedef struct _mem_cntl_t { ++ unsigned long : 1; ++ unsigned long en_mem_ch1 : 1; ++ unsigned long en_mem_ch2 : 1; ++ unsigned long int_mem_mapping : 1; ++ unsigned long : 28; ++ } mem_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_cntl_t f; ++} mem_cntl_u; ++ ++typedef struct _mem_arb_t { ++ unsigned long disp_time_slot : 4; ++ unsigned long disp_timer : 4; ++ unsigned long arb_option : 1; ++ unsigned long : 23; ++ } mem_arb_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_arb_t f; ++} mem_arb_u; ++ ++typedef struct _mc_fb_location_t { ++ unsigned long mc_fb_start : 16; ++ unsigned long mc_fb_top : 16; ++ } mc_fb_location_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_fb_location_t f; ++} mc_fb_location_u; ++ ++typedef struct _mem_ext_cntl_t { ++ unsigned long mem_ext_enable : 1; ++ unsigned long mem_ap_enable : 1; ++ unsigned long mem_addr_mapping : 2; ++ unsigned long mem_wdoe_cntl : 2; ++ unsigned long mem_wdoe_extend : 1; ++ unsigned long : 1; ++ unsigned long mem_page_timer : 8; ++ unsigned long mem_dynamic_cke : 1; ++ unsigned long mem_sdram_tri_en : 1; ++ unsigned long mem_self_refresh_en : 1; ++ unsigned long mem_power_down : 1; ++ unsigned long mem_hw_power_down_en : 1; ++ unsigned long mem_power_down_stat : 1; ++ unsigned long : 3; ++ unsigned long mem_pd_mck : 1; ++ unsigned long mem_pd_ma : 1; ++ unsigned long mem_pd_mdq : 1; ++ unsigned long mem_tristate_mck : 1; ++ unsigned long mem_tristate_ma : 1; ++ unsigned long mem_tristate_mcke : 1; ++ unsigned long mem_invert_mck : 1; ++ } mem_ext_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_ext_cntl_t f; ++} mem_ext_cntl_u; ++ ++typedef struct _mc_ext_mem_location_t { ++ unsigned long mc_ext_mem_start : 16; ++ unsigned long mc_ext_mem_top : 16; ++ } mc_ext_mem_location_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_ext_mem_location_t f; ++} mc_ext_mem_location_u; ++ ++typedef struct _mem_ext_timing_cntl_t { ++ unsigned long mem_trp : 2; ++ unsigned long mem_trcd : 2; ++ unsigned long mem_tras : 3; ++ unsigned long : 1; ++ unsigned long mem_trrd : 2; ++ unsigned long mem_tr2w : 2; ++ unsigned long mem_twr : 2; ++ unsigned long : 4; ++ unsigned long mem_twr_mode : 1; ++ unsigned long : 1; ++ unsigned long mem_refresh_dis : 1; ++ unsigned long : 3; ++ unsigned long mem_refresh_rate : 8; ++ } mem_ext_timing_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_ext_timing_cntl_t f; ++} mem_ext_timing_cntl_u; ++ ++typedef struct _mem_sdram_mode_reg_t { ++ unsigned long mem_mode_reg : 14; ++ unsigned long : 2; ++ unsigned long mem_read_latency : 2; ++ unsigned long mem_schmen_latency : 2; ++ unsigned long mem_cas_latency : 2; ++ unsigned long mem_schmen_extend : 1; ++ unsigned long : 8; ++ unsigned long mem_sdram_reset : 1; ++ } mem_sdram_mode_reg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_sdram_mode_reg_t f; ++} mem_sdram_mode_reg_u; ++ ++typedef struct _mem_io_cntl_t { ++ unsigned long mem_sn_mck : 4; ++ unsigned long mem_sn_ma : 4; ++ unsigned long mem_sn_mdq : 4; ++ unsigned long mem_srn_mck : 1; ++ unsigned long mem_srn_ma : 1; ++ unsigned long mem_srn_mdq : 1; ++ unsigned long : 1; ++ unsigned long mem_sp_mck : 4; ++ unsigned long mem_sp_ma : 4; ++ unsigned long mem_sp_mdq : 4; ++ unsigned long mem_srp_mck : 1; ++ unsigned long mem_srp_ma : 1; ++ unsigned long mem_srp_mdq : 1; ++ unsigned long : 1; ++ } mem_io_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_io_cntl_t f; ++} mem_io_cntl_u; ++ ++typedef struct _mc_debug_t { ++ unsigned long mc_debug : 32; ++ } mc_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_debug_t f; ++} mc_debug_u; ++ ++typedef struct _mc_bist_ctrl_t { ++ unsigned long mc_bist_ctrl : 32; ++ } mc_bist_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_bist_ctrl_t f; ++} mc_bist_ctrl_u; ++ ++typedef struct _mc_bist_collar_read_t { ++ unsigned long mc_bist_collar_read : 32; ++ } mc_bist_collar_read_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_bist_collar_read_t f; ++} mc_bist_collar_read_u; ++ ++typedef struct _tc_mismatch_t { ++ unsigned long tc_mismatch : 24; ++ unsigned long : 8; ++ } tc_mismatch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ tc_mismatch_t f; ++} tc_mismatch_u; ++ ++typedef struct _mc_perf_mon_cntl_t { ++ unsigned long clr_perf : 1; ++ unsigned long en_perf : 1; ++ unsigned long : 2; ++ unsigned long perf_op_a : 2; ++ unsigned long perf_op_b : 2; ++ unsigned long : 8; ++ unsigned long monitor_period : 8; ++ unsigned long perf_count_a_overflow : 1; ++ unsigned long perf_count_b_overflow : 1; ++ unsigned long : 6; ++ } mc_perf_mon_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_perf_mon_cntl_t f; ++} mc_perf_mon_cntl_u; ++ ++typedef struct _mc_perf_counters_t { ++ unsigned long mc_perf_counter_a : 16; ++ unsigned long mc_perf_counter_b : 16; ++ } mc_perf_counters_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_perf_counters_t f; ++} mc_perf_counters_u; ++ ++typedef struct _wait_until_t { ++ unsigned long wait_crtc_pflip : 1; ++ unsigned long wait_re_crtc_vline : 1; ++ unsigned long wait_fe_crtc_vline : 1; ++ unsigned long wait_crtc_vline : 1; ++ unsigned long wait_dma_viph0_idle : 1; ++ unsigned long wait_dma_viph1_idle : 1; ++ unsigned long wait_dma_viph2_idle : 1; ++ unsigned long wait_dma_viph3_idle : 1; ++ unsigned long wait_dma_vid_idle : 1; ++ unsigned long wait_dma_gui_idle : 1; ++ unsigned long wait_cmdfifo : 1; ++ unsigned long wait_ov0_flip : 1; ++ unsigned long wait_ov0_slicedone : 1; ++ unsigned long : 1; ++ unsigned long wait_2d_idle : 1; ++ unsigned long wait_3d_idle : 1; ++ unsigned long wait_2d_idleclean : 1; ++ unsigned long wait_3d_idleclean : 1; ++ unsigned long wait_host_idleclean : 1; ++ unsigned long wait_extern_sig : 1; ++ unsigned long cmdfifo_entries : 7; ++ unsigned long : 3; ++ unsigned long wait_both_crtc_pflip : 1; ++ unsigned long eng_display_select : 1; ++ } wait_until_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wait_until_t f; ++} wait_until_u; ++ ++typedef struct _isync_cntl_t { ++ unsigned long isync_any2d_idle3d : 1; ++ unsigned long isync_any3d_idle2d : 1; ++ unsigned long isync_trig2d_idle3d : 1; ++ unsigned long isync_trig3d_idle2d : 1; ++ unsigned long isync_wait_idlegui : 1; ++ unsigned long isync_cpscratch_idlegui : 1; ++ unsigned long : 26; ++ } isync_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ isync_cntl_t f; ++} isync_cntl_u; ++ ++typedef struct _rbbm_guicntl_t { ++ unsigned long host_data_swap : 2; ++ unsigned long : 30; ++ } rbbm_guicntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_guicntl_t f; ++} rbbm_guicntl_u; ++ ++typedef struct _rbbm_status_t { ++ unsigned long cmdfifo_avail : 7; ++ unsigned long : 1; ++ unsigned long hirq_on_rbb : 1; ++ unsigned long cprq_on_rbb : 1; ++ unsigned long cfrq_on_rbb : 1; ++ unsigned long hirq_in_rtbuf : 1; ++ unsigned long cprq_in_rtbuf : 1; ++ unsigned long cfrq_in_rtbuf : 1; ++ unsigned long cf_pipe_busy : 1; ++ unsigned long eng_ev_busy : 1; ++ unsigned long cp_cmdstrm_busy : 1; ++ unsigned long e2_busy : 1; ++ unsigned long rb2d_busy : 1; ++ unsigned long rb3d_busy : 1; ++ unsigned long se_busy : 1; ++ unsigned long re_busy : 1; ++ unsigned long tam_busy : 1; ++ unsigned long tdm_busy : 1; ++ unsigned long pb_busy : 1; ++ unsigned long : 6; ++ unsigned long gui_active : 1; ++ } rbbm_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_status_t f; ++} rbbm_status_u; ++ ++typedef struct _rbbm_cntl_t { ++ unsigned long rb_settle : 4; ++ unsigned long abortclks_hi : 3; ++ unsigned long : 1; ++ unsigned long abortclks_cp : 3; ++ unsigned long : 1; ++ unsigned long abortclks_cfifo : 3; ++ unsigned long : 2; ++ unsigned long cpq_data_swap : 1; ++ unsigned long : 3; ++ unsigned long no_abort_idct : 1; ++ unsigned long no_abort_bios : 1; ++ unsigned long no_abort_fb : 1; ++ unsigned long no_abort_cp : 1; ++ unsigned long no_abort_hi : 1; ++ unsigned long no_abort_hdp : 1; ++ unsigned long no_abort_mc : 1; ++ unsigned long no_abort_aic : 1; ++ unsigned long no_abort_vip : 1; ++ unsigned long no_abort_disp : 1; ++ unsigned long no_abort_cg : 1; ++ } rbbm_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cntl_t f; ++} rbbm_cntl_u; ++ ++typedef struct _rbbm_soft_reset_t { ++ unsigned long soft_reset_cp : 1; ++ unsigned long soft_reset_hi : 1; ++ unsigned long reserved3 : 3; ++ unsigned long soft_reset_e2 : 1; ++ unsigned long reserved2 : 2; ++ unsigned long soft_reset_mc : 1; ++ unsigned long reserved1 : 2; ++ unsigned long soft_reset_disp : 1; ++ unsigned long soft_reset_cg : 1; ++ unsigned long : 19; ++ } rbbm_soft_reset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_soft_reset_t f; ++} rbbm_soft_reset_u; ++ ++typedef struct _nqwait_until_t { ++ unsigned long wait_gui_idle : 1; ++ unsigned long : 31; ++ } nqwait_until_t; ++ ++typedef union { ++ unsigned long val : 32; ++ nqwait_until_t f; ++} nqwait_until_u; ++ ++typedef struct _rbbm_debug_t { ++ unsigned long rbbm_debug : 32; ++ } rbbm_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_debug_t f; ++} rbbm_debug_u; ++ ++typedef struct _rbbm_cmdfifo_addr_t { ++ unsigned long cmdfifo_addr : 6; ++ unsigned long : 26; ++ } rbbm_cmdfifo_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_addr_t f; ++} rbbm_cmdfifo_addr_u; ++ ++typedef struct _rbbm_cmdfifo_datal_t { ++ unsigned long cmdfifo_datal : 32; ++ } rbbm_cmdfifo_datal_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_datal_t f; ++} rbbm_cmdfifo_datal_u; ++ ++typedef struct _rbbm_cmdfifo_datah_t { ++ unsigned long cmdfifo_datah : 12; ++ unsigned long : 20; ++ } rbbm_cmdfifo_datah_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_datah_t f; ++} rbbm_cmdfifo_datah_u; ++ ++typedef struct _rbbm_cmdfifo_stat_t { ++ unsigned long cmdfifo_rptr : 6; ++ unsigned long : 2; ++ unsigned long cmdfifo_wptr : 6; ++ unsigned long : 18; ++ } rbbm_cmdfifo_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_stat_t f; ++} rbbm_cmdfifo_stat_u; ++ ++typedef struct _clk_pin_cntl_t { ++ unsigned long osc_en : 1; ++ unsigned long osc_gain : 5; ++ unsigned long dont_use_xtalin : 1; ++ unsigned long xtalin_pm_en : 1; ++ unsigned long xtalin_dbl_en : 1; ++ unsigned long : 7; ++ unsigned long cg_debug : 16; ++ } clk_pin_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clk_pin_cntl_t f; ++} clk_pin_cntl_u; ++ ++typedef struct _pll_ref_fb_div_t { ++ unsigned long pll_ref_div : 4; ++ unsigned long : 4; ++ unsigned long pll_fb_div_int : 6; ++ unsigned long : 2; ++ unsigned long pll_fb_div_frac : 3; ++ unsigned long : 1; ++ unsigned long pll_reset_time : 4; ++ unsigned long pll_lock_time : 8; ++ } pll_ref_fb_div_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pll_ref_fb_div_t f; ++} pll_ref_fb_div_u; ++ ++typedef struct _pll_cntl_t { ++ unsigned long pll_pwdn : 1; ++ unsigned long pll_reset : 1; ++ unsigned long pll_pm_en : 1; ++ unsigned long pll_mode : 1; ++ unsigned long pll_refclk_sel : 1; ++ unsigned long pll_fbclk_sel : 1; ++ unsigned long pll_tcpoff : 1; ++ unsigned long pll_pcp : 3; ++ unsigned long pll_pvg : 3; ++ unsigned long pll_vcofr : 1; ++ unsigned long pll_ioffset : 2; ++ unsigned long pll_pecc_mode : 2; ++ unsigned long pll_pecc_scon : 2; ++ unsigned long pll_dactal : 4; ++ unsigned long pll_cp_clip : 2; ++ unsigned long pll_conf : 3; ++ unsigned long pll_mbctrl : 2; ++ unsigned long pll_ring_off : 1; ++ } pll_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pll_cntl_t f; ++} pll_cntl_u; ++ ++typedef struct _sclk_cntl_t { ++ unsigned long sclk_src_sel : 2; ++ unsigned long : 2; ++ unsigned long sclk_post_div_fast : 4; ++ unsigned long sclk_clkon_hys : 3; ++ unsigned long sclk_post_div_slow : 4; ++ unsigned long disp_cg_ok2switch_en : 1; ++ unsigned long sclk_force_reg : 1; ++ unsigned long sclk_force_disp : 1; ++ unsigned long sclk_force_mc : 1; ++ unsigned long sclk_force_extmc : 1; ++ unsigned long sclk_force_cp : 1; ++ unsigned long sclk_force_e2 : 1; ++ unsigned long sclk_force_e3 : 1; ++ unsigned long sclk_force_idct : 1; ++ unsigned long sclk_force_bist : 1; ++ unsigned long busy_extend_cp : 1; ++ unsigned long busy_extend_e2 : 1; ++ unsigned long busy_extend_e3 : 1; ++ unsigned long busy_extend_idct : 1; ++ unsigned long : 3; ++ } sclk_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sclk_cntl_t f; ++} sclk_cntl_u; ++ ++typedef struct _pclk_cntl_t { ++ unsigned long pclk_src_sel : 2; ++ unsigned long : 2; ++ unsigned long pclk_post_div : 4; ++ unsigned long : 8; ++ unsigned long pclk_force_disp : 1; ++ unsigned long : 15; ++ } pclk_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pclk_cntl_t f; ++} pclk_cntl_u; ++ ++typedef struct _clk_test_cntl_t { ++ unsigned long testclk_sel : 4; ++ unsigned long : 3; ++ unsigned long start_check_freq : 1; ++ unsigned long tstcount_rst : 1; ++ unsigned long : 15; ++ unsigned long test_count : 8; ++ } clk_test_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clk_test_cntl_t f; ++} clk_test_cntl_u; ++ ++typedef struct _pwrmgt_cntl_t { ++ unsigned long pwm_enable : 1; ++ unsigned long : 1; ++ unsigned long pwm_mode_req : 2; ++ unsigned long pwm_wakeup_cond : 2; ++ unsigned long pwm_fast_noml_hw_en : 1; ++ unsigned long pwm_noml_fast_hw_en : 1; ++ unsigned long pwm_fast_noml_cond : 4; ++ unsigned long pwm_noml_fast_cond : 4; ++ unsigned long pwm_idle_timer : 8; ++ unsigned long pwm_busy_timer : 8; ++ } pwrmgt_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pwrmgt_cntl_t f; ++} pwrmgt_cntl_u; ++ ++typedef struct _pwrmgt_status_t { ++ unsigned long pwm_mode : 2; ++ unsigned long : 30; ++ } pwrmgt_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pwrmgt_status_t f; ++} pwrmgt_status_u; ++ ++typedef struct _cursor_offset_t { ++ unsigned long cur_offset : 24; ++ unsigned long cur_x_offset : 4; ++ unsigned long cur_y_offset : 4; ++} cursor_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor_offset_t f; ++} cursor_offset_u; ++ ++typedef struct _cursor_h_pos_t { ++ unsigned long cur_h_start : 10; ++ unsigned long : 6; ++ unsigned long cur_h_end : 10; ++ unsigned long : 5; ++ unsigned long cur_en : 1; ++} cursor_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor_h_pos_t f; ++} cursor_h_pos_u; ++ ++typedef struct _cursor_v_pos_t { ++ unsigned long cur_v_start : 10; ++ unsigned long : 6; ++ unsigned long cur_v_end : 10; ++ unsigned long : 6; ++} cursor_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor_v_pos_t f; ++} cursor_v_pos_u; ++ ++typedef struct _cursor_color_t { ++ unsigned long cur_color_r : 8; ++ unsigned long cur_color_g : 8; ++ unsigned long cur_color_b : 8; ++ unsigned long : 8; ++} cursor_color_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor_color_t f; ++} cursor_color_u; ++ ++#endif +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_stub.c +@@ -0,0 +1,95 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++#include "imageon.h" ++#include "imageon_regs.h" ++#include "klinux.h" ++ ++extern struct pci_id_entry w100_pci_ids[]; ++ ++static Bool ++FindW100(CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr * attr) ++{ ++ CARD8 *mmio; ++ CARD32 chip_id; ++ Bool found = FALSE; ++ ++ mmio = KdMapDevice(W100_REG_BASE, W100_REG_SIZE); ++ KdSetMappedMode((CARD32) mmio, W100_REG_SIZE, ++ KD_MAPPED_MODE_REGISTERS); ++ ++ chip_id = (*(VOL32 *)(mmio + mmCHIP_ID)); ++ if ((vendor | (device << 16)) == chip_id) { ++ ErrorF("Found W100 Chip ID: %08x\n\n", chip_id); ++ attr->deviceID = device; ++ attr->vendorID = vendor; ++ found = TRUE; ++ } ++ KdUnmapDevice(mmio, W100_REG_SIZE); ++ return found; ++} ++ ++ ++void ++InitCard(char *name) ++{ ++ struct pci_id_entry *id; ++ KdCardAttr attr; ++ ++ for (id = w100_pci_ids; id->name != NULL; id++) { ++ int j = 0; ++ if (FindW100(id->vendor, id->device, j++, &attr)) { ++ KdCardInfoAdd(&W100Funcs, &attr, 0); ++ break; ++ } ++ } ++} ++ ++void ++InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) ++{ ++ KdInitOutput(pScreenInfo, argc, argv); ++} ++ ++void ++InitInput(int argc, char **argv) ++{ ++ KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs); ++#ifdef TOUCHSCREEN ++ KdAddMouseDriver(&TsFuncs); ++#endif ++} ++ ++void ++ddxUseMsg(void) ++{ ++ KdUseMsg(); ++} ++ ++int ++ddxProcessArgument(int argc, char **argv, int i) ++{ ++ return KdProcessArgument(argc, argv, i); ++} +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_support.c +@@ -0,0 +1,1306 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++ ++#include <sys/time.h> ++ ++#include "imageon.h" ++#include "imageon_regs.h" ++#include "imageon_const.h" ++ ++CARD8 W100SolidRop[16] = { ++ /* GXclear */ 0x00, /* 0 */ ++ /* GXand */ 0xa0, /* src AND dst */ ++ /* GXandReverse */ 0x50, /* src AND NOT dst */ ++ /* GXcopy */ 0xf0, /* src */ ++ /* GXandInverted */ 0x0a, /* NOT src AND dst */ ++ /* GXnoop */ 0xaa, /* dst */ ++ /* GXxor */ 0x5a, /* src XOR dst */ ++ /* GXor */ 0xfa, /* src OR dst */ ++ /* GXnor */ 0x05, /* NOT src AND NOT dst */ ++ /* GXequiv */ 0xa5, /* NOT src XOR dst */ ++ /* GXinvert */ 0x55, /* NOT dst */ ++ /* GXorReverse */ 0xf5, /* src OR NOT dst */ ++ /* GXcopyInverted */ 0x0f, /* NOT src */ ++ /* GXorInverted */ 0xaf, /* NOT src OR dst */ ++ /* GXnand */ 0x5f, /* NOT src OR NOT dst */ ++ /* GXset */ 0xff, /* 1 */ ++}; ++ ++CARD8 W100BltRop[16] = { ++ /* GXclear */ 0x00, /* 0 */ ++ /* GXand */ 0x88, /* src AND dst */ ++ /* GXandReverse */ 0x44, /* src AND NOT dst */ ++ /* GXcopy */ 0xcc, /* src */ ++ /* GXandInverted */ 0x22, /* NOT src AND dst */ ++ /* GXnoop */ 0xaa, /* dst */ ++ /* GXxor */ 0x66, /* src XOR dst */ ++ /* GXor */ 0xee, /* src OR dst */ ++ /* GXnor */ 0x11, /* NOT src AND NOT dst */ ++ /* GXequiv */ 0x99, /* NOT src XOR dst */ ++ /* GXinvert */ 0x55, /* NOT dst */ ++ /* GXorReverse */ 0xdd, /* src OR NOT dst */ ++ /* GXcopyInverted */ 0x33, /* NOT src */ ++ /* GXorInverted */ 0xbb, /* NOT src OR dst */ ++ /* GXnand */ 0x77, /* NOT src OR NOT dst */ ++ /* GXset */ 0xff, /* 1 */ ++}; ++ ++void W100DisableDisplayUpdate(W100CardInfo *w100c) ++{ ++ disp_db_buf_cntl_wr_u disp_db_buf_cntl; ++ ++ disp_db_buf_cntl.f.db_buf_cntl = 30; ++ disp_db_buf_cntl.f.en_db_buf = 0; ++ disp_db_buf_cntl.f.update_db_buf = 0; ++ MMIO_OUT32(mmDISP_DB_BUF_CNTL, disp_db_buf_cntl.val); ++} ++ ++void W100EnableDisplayUpdate(W100CardInfo *w100c) ++{ ++ disp_db_buf_cntl_wr_u disp_db_buf_cntl; ++ ++ disp_db_buf_cntl.f.db_buf_cntl = 30; ++ disp_db_buf_cntl.f.en_db_buf = 1; ++ disp_db_buf_cntl.f.update_db_buf = 1; ++ MMIO_OUT32(mmDISP_DB_BUF_CNTL, disp_db_buf_cntl.val); ++} ++ ++void W100SetupGraphicEngine(W100CardInfo *w100c) ++{ ++ eng_cntl_u eng_cntl; ++ sc_bottom_right_u bottomright; ++ rbbm_cntl_u rbbm_cntl; ++ dst_pitch_u dpitch; ++ dst_offset_u doffset; ++ src_pitch_u spitch; ++ src_offset_u soffset; ++ sc_top_left_u tl; ++ sc_bottom_right_u br; ++ src_sc_bottom_right_u srcbr; ++ dp_gui_master_cntl_u gmc; ++ dp_mix_u dp_mix; ++ dp_cntl_u dp_cntl; ++ dp_datatype_u dp_datatype; ++ ++ DBG_IMAGEON(("W100SetupGraphicEngine(offset:%p, pitch:%d)\n", ++ w100c->hwScreen.offset, ++ w100c->hwScreen.width)); ++ ++ eng_cntl.val = MMIO_IN32(mmENG_CNTL); ++ eng_cntl.f.erc_reg_wr_ws = 0; ++ MMIO_OUT32(mmENG_CNTL, eng_cntl.val); ++ ++ rbbm_cntl.val = 0; ++ rbbm_cntl.f.abortclks_hi = 4; ++ rbbm_cntl.f.abortclks_cp = 4; ++ rbbm_cntl.f.abortclks_cfifo = 2; ++ MMIO_OUT32(mmRBBM_CNTL, rbbm_cntl.val); ++ ++ bottomright.val = 0; ++ bottomright.f.sc_bottom = 0x1fff; ++ bottomright.f.sc_right = 0x1fff; ++ MMIO_OUT32(mmDEFAULT_SC_BOTTOM_RIGHT, bottomright.val); ++ ++ dpitch.val = 0; ++ dpitch.f.dst_pitch = w100c->hwScreen.width; ++ MMIO_OUT32(mmDST_PITCH, dpitch.val); ++ ++ doffset.val = 0; ++ doffset.f.dst_offset = (CARD32) w100c->hwScreen.offset; ++ MMIO_OUT32(mmDST_OFFSET, doffset.val); ++ ++ spitch.val = 0; ++ spitch.f.src_pitch = w100c->hwScreen.width; ++ MMIO_OUT32(mmSRC_PITCH, spitch.val); ++ soffset.val = 0; ++ soffset.f.src_offset = (CARD32) w100c->hwScreen.offset; ++ MMIO_OUT32(mmSRC_OFFSET, soffset.val); ++ ++ tl.f.sc_left = tl.f.sc_top = 0; ++ br.f.sc_right = br.f.sc_bottom = 0x1fff; ++ MMIO_OUT32(mmSC_TOP_LEFT, tl.val); ++ MMIO_OUT32(mmSC_BOTTOM_RIGHT, br.val); ++ ++ srcbr.f.sc_right = srcbr.f.sc_bottom = 0x1fff; ++ MMIO_OUT32(mmSRC_SC_BOTTOM_RIGHT, br.val); ++ ++ gmc.val = dp_datatype.val = dp_mix.val = dp_cntl.val = 0; ++ ++ dp_cntl.f.dst_x_dir = 1; ++ dp_cntl.f.dst_y_dir = 1; ++ dp_cntl.f.src_x_dir = 1; ++ dp_cntl.f.src_y_dir = 1; ++ dp_cntl.f.dst_major_x = 1; ++ dp_cntl.f.src_major_x = 1; ++ MMIO_OUT32(mmDP_CNTL, dp_cntl.val); ++ ++ gmc.f.gmc_src_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_src_clipping = 1; ++ gmc.f.gmc_dst_clipping = 1; ++ gmc.f.gmc_brush_datatype = DP_BRUSH_SOLIDCOLOR; ++ gmc.f.gmc_dst_datatype = DP_DST_16BPP_1555; ++ gmc.f.gmc_src_datatype = DP_SRC_SOLID_COLOR_BLT; ++ gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ gmc.f.gmc_default_sel = 0; ++ gmc.f.gmc_rop3 = W100SolidRop[GXcopy]; ++ gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ gmc.f.gmc_wr_msk_dis = 1; ++ gmc.f.gmc_dp_op = DP_OP_ROP; ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, gmc.val); ++ ++ dp_datatype.f.dp_dst_datatype = gmc.f.gmc_dst_datatype; ++ dp_datatype.f.dp_brush_datatype = gmc.f.gmc_brush_datatype; ++ dp_datatype.f.dp_src2_type = 0; ++ dp_datatype.f.dp_src2_datatype = gmc.f.gmc_src_datatype; ++ dp_datatype.f.dp_src_datatype = gmc.f.gmc_src_datatype; ++ dp_datatype.f.dp_byte_pix_order = gmc.f.gmc_byte_pix_order; ++ MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val); ++ ++ dp_mix.f.dp_src_source = gmc.f.gmc_dp_src_source; ++ dp_mix.f.dp_src2_source = gmc.f.gmc_dp_src_source; ++ dp_mix.f.dp_rop3 = gmc.f.gmc_rop3; ++ dp_mix.f.dp_op = gmc.f.gmc_dp_op; ++ MMIO_OUT32(mmDP_MIX, dp_mix.val); ++} ++ ++void W100ResetGraphicEngine(W100CardInfo *w100c) ++{ ++ rbbm_soft_reset_u sreset; ++ sclk_cntl_u sclk_cntl; ++ CARD32 restore_sclk; ++ ++ ErrorF("->W100ResetGraphicEngine\n"); ++ sclk_cntl.val = restore_sclk = MMIO_IN32(mmSCLK_CNTL); ++ ++ sclk_cntl.f.sclk_force_e2 = 1; ++ sclk_cntl.f.sclk_force_e3 = 1; ++ sclk_cntl.f.sclk_force_idct = 1; ++ MMIO_OUT32(mmSCLK_CNTL, sclk_cntl.val); ++ ++ sreset.val = 0; ++ sreset.f.soft_reset_e2 = 1; ++ MMIO_OUT32(mmRBBM_SOFT_RESET, sreset.val); ++ sreset.f.soft_reset_e2 = 0; ++ MMIO_OUT32(mmRBBM_SOFT_RESET, 0); ++ ++ MMIO_OUT32(mmSCLK_CNTL, restore_sclk); ++ ErrorF("<-W100ResetGraphicEngine\n"); ++} ++ ++void W100SetupGraphicWindow(W100CardInfo *w100c) ++{ ++ CARD32 offset = 0; ++ graphic_ctrl_u gc; ++ graphic_pitch_u gp; ++ graphic_offset_u go; ++ pclk_cntl_u pclk_cntl; ++ ++ DBG_IMAGEON(("W100SetupGraphicWindow(offset:%p, x:%d, y:%d, " ++ "width:%d, height:%d, randr:%d)\n", ++ w100c->hwScreen.offset, ++ w100c->hwScreen.x, ++ w100c->hwScreen.y, ++ w100c->hwScreen.width, ++ w100c->hwScreen.height, ++ w100c->hwScreen.randr)); ++ ++ gc.val = 0; ++ gc.f.color_depth = COLOR_DEPTH_A555; ++ gc.f.en_crtc = 1; ++ gc.f.en_graphic_crtc = 1; ++ gc.f.en_graphic_req = 1; ++ gc.f.lcd_pclk_on = 1; ++ gc.f.lcd_sclk_on = 1; ++ gc.f.low_power_on = 0; ++ ++ pclk_cntl.val = 0; ++ ++ switch (w100c->hwScreen.width) { ++ case 240: ++ case 320: ++ gc.f.total_req_graphic = 0xa0; ++ gc.f.req_freq = 0; ++ pclk_cntl.f.pclk_post_div = 1; ++ pclk_cntl.f.pclk_src_sel = W100_CLK_SRC_XTAL; ++ break; ++ case 480: ++ case 640: ++ pclk_cntl.f.pclk_src_sel = W100_CLK_SRC_PLL; ++ gc.f.total_req_graphic = 0xf0; ++ if (w100c->hwScreen.randr & (RR_Rotate_0 | RR_Rotate_180)) { ++ gc.f.low_power_on = 1; ++ gc.f.req_freq = 5; ++ pclk_cntl.f.pclk_post_div = 2; ++ } else { ++ gc.f.req_freq = 4; ++ pclk_cntl.f.pclk_post_div = 6; ++ } ++ break; ++ } ++ ++ gp.val = 0; ++ gp.f.graphic_pitch = w100c->hwScreen.width * w100c->hwScreen.bpp / 8; ++ ++ go.val = 0; ++ go.f.graphic_offset = (CARD32) w100c->hwScreen.offset; ++ ++ switch(w100c->hwScreen.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ gc.f.portrait_mode = 0; ++ offset = 0; ++ break; ++ case RR_Rotate_90: ++ gc.f.portrait_mode = 1; ++ offset = w100c->hwScreen.width * (w100c->hwScreen.height - 1); ++ break; ++ case RR_Rotate_180: ++ gc.f.portrait_mode = 3; ++ offset = w100c->hwScreen.width * w100c->hwScreen.height - 1; ++ break; ++ case RR_Rotate_270: ++ gc.f.portrait_mode = 2; ++ offset = w100c->hwScreen.width - 1; ++ break; ++ } ++ offset = (offset * w100c->hwScreen.bpp / 8) & ~0x03; ++ go.f.graphic_offset += offset; ++ ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmPCLK_CNTL, pclk_cntl.val); ++ MMIO_OUT32(mmGRAPHIC_CTRL, gc.val); ++ MMIO_OUT32(mmGRAPHIC_OFFSET, go.val); ++ MMIO_OUT32(mmGRAPHIC_PITCH, gp.val); ++ W100EnableDisplayUpdate(w100c); ++} ++ ++void W100EnableGraphicWindow(W100CardInfo *w100c) ++{ ++ graphic_ctrl_u gc; ++ ++ gc.val = MMIO_IN32(mmGRAPHIC_CTRL); ++ gc.f.en_graphic_crtc = 1; ++ gc.f.en_graphic_req = 1; ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmGRAPHIC_CTRL, gc.val); ++ W100EnableDisplayUpdate(w100c); ++} ++ ++void W100DisableGraphicWindow(W100CardInfo *w100c) ++{ ++ graphic_ctrl_u gc; ++ ++ gc.val = MMIO_IN32(mmGRAPHIC_CTRL); ++ gc.f.en_graphic_crtc = 0; ++ gc.f.en_graphic_req = 0; ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmGRAPHIC_CTRL, gc.val); ++ W100EnableDisplayUpdate(w100c); ++} ++ ++inline Bool W100WaitCmdFifoEntries(W100CardInfo *w100c, int entries) ++{ ++ rbbm_status_u rbbmStatus; ++ TIMEOUT_LOCALS; ++ ++ if (entries > W100_CMDFIFO_SIZE) ++ return FALSE; ++ ++ if (entries <= w100c->cmdfifo_entries) { ++ w100c->cmdfifo_entries -= entries; ++ return TRUE; ++ } ++ ++ WHILE_NOT_TIMEOUT(.2) { ++ rbbmStatus.val = MMIO_IN32(mmRBBM_STATUS); ++ w100c->cmdfifo_entries = rbbmStatus.f.cmdfifo_avail; ++ if (w100c->cmdfifo_entries >= entries) { ++ break; ++ } ++ } ++ if (TIMEDOUT()) { ++ ErrorF("Not enough CMDFIFO entries: %d (%d needed)\n", ++ w100c->cmdfifo_entries, entries); ++ return FALSE; ++ } ++ w100c->cmdfifo_entries -= entries; ++ return TRUE; ++} ++ ++Bool W100WaitIdle(W100CardInfo *w100c) ++{ ++ rbbm_status_u rbbm_status; ++ TIMEOUT_LOCALS; ++ ++ DBG_IMAGEON(("W100WaitIdle\n")); ++ if (!W100WaitCmdFifoEntries(w100c, W100_CMDFIFO_SIZE)) { ++ return FALSE; ++ } ++ ++ WHILE_NOT_TIMEOUT(.2) { ++ rbbm_status.val = MMIO_IN32(mmRBBM_STATUS); ++ if (rbbm_status.f.gui_active == 0) { ++ break; ++ } ++ } ++ if (TIMEDOUT()) { ++ ErrorF("Timeout waiting for idle. rbbm_status: 0x%08x\n" ++ " .cmdfifo_avail : %d\n" ++ " .cf_pipe_busy : %d\n" ++ " .eng_ev_busy : %d\n" ++ " .cp_cmdstrm_busy : %d\n" ++ " .e2_busy : %d\n" ++ " .rb2d_busy : %d\n" ++ " .rb3d_busy : %d\n" ++ " .se_busy : %d\n" ++ " .re_busy : %d\n" ++ " .tam_busy : %d\n" ++ " .tdm_busy : %d\n" ++ " .pb_busy : %d\n" ++ " .gui_active : %d\n", ++ rbbm_status.val, ++ rbbm_status.f.cmdfifo_avail, ++ rbbm_status.f.cf_pipe_busy, ++ rbbm_status.f.eng_ev_busy, ++ rbbm_status.f.cp_cmdstrm_busy, ++ rbbm_status.f.e2_busy, ++ rbbm_status.f.rb2d_busy, ++ rbbm_status.f.rb3d_busy, ++ rbbm_status.f.se_busy, ++ rbbm_status.f.re_busy, ++ rbbm_status.f.tam_busy, ++ rbbm_status.f.tdm_busy, ++ rbbm_status.f.pb_busy, ++ rbbm_status.f.gui_active); ++ ErrorF("Last context: src(datatype:%d,pitch:%d,offset:0x%08x)\n" ++ " dst(datatype:%d,pitch:%d,offset:0x%08x)\n" ++ " xform(dx:%d,dy:%d)\n" ++ " mask(pm:0x%08x,enable:%d)\n", ++ w100c->ctx.src.datatype, ++ w100c->ctx.src.pitch, ++ w100c->ctx.src.offset, ++ w100c->ctx.dst.datatype, ++ w100c->ctx.dst.pitch, ++ w100c->ctx.dst.offset, ++ w100c->ctx.xform.dx, ++ w100c->ctx.xform.dy, ++ w100c->ctx.mask.pm, ++ w100c->ctx.mask.enable); ++ ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++void W100ResetContext(W100CardInfo *w100c) ++{ ++ w100c->ctx.dst.datatype = DP_DST_16BPP_1555; ++ w100c->ctx.dst.pitch = 0; ++ w100c->ctx.dst.offset = 0; ++ w100c->ctx.dst.videomem = 0; ++ ++ w100c->ctx.src.datatype = DP_SRC_COLOR_SAME_AS_DST; ++ w100c->ctx.src.pitch = 0; ++ w100c->ctx.src.offset = 0; ++ w100c->ctx.src.videomem = 0; ++ ++ w100c->ctx.xform.dx = 0; ++ w100c->ctx.xform.dy = 0; ++ w100c->ctx.xform.randr = 0; ++ w100c->ctx.xform.mirror = FALSE; ++ w100c->ctx.xform.dataPath = 0x0000003f; ++ ++ w100c->ctx.mask.pm = 0; ++ w100c->ctx.mask.enable = FALSE; ++} ++ ++CARD32 W100ComputeSolidGmc(W100CardInfo *w100c, CARD8 alu) ++{ ++ dp_gui_master_cntl_u gmc; ++ ++ gmc.val = 0; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_clipping = 0; ++ gmc.f.gmc_brush_datatype = DP_BRUSH_SOLIDCOLOR; ++ gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype; ++ gmc.f.gmc_dp_op = DP_OP_ROP; ++ gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ gmc.f.gmc_rop3 = W100SolidRop[alu]; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ if (w100c->ctx.mask.enable) { ++ gmc.f.gmc_wr_msk_dis = 0; ++ } else { ++ gmc.f.gmc_wr_msk_dis = 1; ++ } ++ return gmc.val; ++} ++ ++CARD32 W100ComputeCopyGmc(W100CardInfo *w100c, CARD8 alu) ++{ ++ dp_gui_master_cntl_u gmc; ++ ++ gmc.val = 0; ++ gmc.f.gmc_src_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_clipping = 0; ++ gmc.f.gmc_src_clipping = 0; ++ gmc.f.gmc_src_datatype = w100c->ctx.src.datatype; ++ gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ gmc.f.gmc_brush_datatype = DP_BRUSH_NONE; ++ gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype; ++ gmc.f.gmc_dp_op = DP_OP_ROP; ++ gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ gmc.f.gmc_rop3 = W100BltRop[alu]; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ if (w100c->ctx.mask.enable) { ++ gmc.f.gmc_wr_msk_dis = 0; ++ } else { ++ gmc.f.gmc_wr_msk_dis = 1; ++ } ++ return gmc.val; ++} ++ ++CARD32 W100ComputeAritGmc(W100CardInfo *w100c, CARD8 alu) ++{ ++ dp_gui_master_cntl_u gmc; ++ ++ gmc.val = 0; ++ gmc.f.gmc_src_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_clipping = 0; ++ gmc.f.gmc_src_clipping = 0; ++ gmc.f.gmc_src_datatype = w100c->ctx.src.datatype; ++ gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype; ++ gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ gmc.f.gmc_brush_datatype = DP_BRUSH_NONE; ++ gmc.f.gmc_dp_op = DP_OP_ARITHMETIC; ++ gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ gmc.f.gmc_rop3 = W100BltRop[alu]; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ if (w100c->ctx.mask.enable) { ++ gmc.f.gmc_wr_msk_dis = 0; ++ } else { ++ gmc.f.gmc_wr_msk_dis = 1; ++ } ++ return gmc.val; ++} ++ ++void W100SetXForm(W100CardInfo *w100c, int dx, int dy) ++{ ++ dp_cntl_u dp_cntl; ++ ++ w100c->ctx.xform.dx = dx; ++ w100c->ctx.xform.dy = dy; ++ ++ dp_cntl.val = 0; ++ dp_cntl.f.src_x_dir = 1; ++ dp_cntl.f.src_y_dir = 1; ++ dp_cntl.f.src_major_x = 1; ++ dp_cntl.f.dst_major_x = 1; ++ ++ if (dx >= 0) { ++ dp_cntl.f.dst_x_dir = 1; ++ } else { ++ dp_cntl.f.dst_x_dir = 0; ++ } ++ if (dy >= 0) { ++ dp_cntl.f.dst_y_dir = 1; ++ } else { ++ dp_cntl.f.dst_y_dir = 0; ++ } ++ w100c->ctx.xform.dataPath = dp_cntl.val; ++} ++ ++void W100SetRotation(W100CardInfo *w100c, ++ int randr, ++ Bool mirror) ++{ ++ dp_cntl_u dp_cntl; ++ w100c->ctx.xform.randr = randr; ++ w100c->ctx.xform.mirror = mirror; ++ dp_cntl.val = 0; ++ dp_cntl.f.src_x_dir = 1; ++ dp_cntl.f.src_y_dir = 1; ++ dp_cntl.f.src_major_x = 1; ++ ++ ++ switch (randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ dp_cntl.f.dst_x_dir = mirror ? 0 : 1; ++ dp_cntl.f.dst_y_dir = 1; ++ dp_cntl.f.dst_major_x = 1; ++ break; ++ case RR_Rotate_90: ++ dp_cntl.f.dst_x_dir = 0; ++ dp_cntl.f.dst_y_dir = mirror ? 0 : 1; ++ dp_cntl.f.dst_major_x = 0; ++ break; ++ case RR_Rotate_180: ++ dp_cntl.f.dst_x_dir = mirror ? 1 : 0; ++ dp_cntl.f.dst_y_dir = 0; ++ dp_cntl.f.dst_major_x = 1; ++ break; ++ case RR_Rotate_270: ++ dp_cntl.f.dst_x_dir = 1; ++ dp_cntl.f.dst_y_dir = mirror ? 1 : 0; ++ dp_cntl.f.dst_major_x = 0; ++ break; ++ } ++ w100c->ctx.xform.dataPath = dp_cntl.val; ++} ++ ++void W100SetPixelMask(W100CardInfo *w100c, Pixel mask) ++{ ++ if (mask != 0xffffffff) { ++ w100c->ctx.mask.enable = TRUE; ++ w100c->ctx.mask.pm = mask; ++ } else { ++ w100c->ctx.mask.enable = FALSE; ++ } ++ ++} ++ ++Bool W100SetSource(KdScreenInfo *screen, ++ CARD32 srcPitch, ++ CARD32 srcOffset, ++ CARD8 bpp) ++{ ++ W100CardInfo(screen); ++ int i; ++ w100c->ctx.src.pitch = srcPitch * 8 / bpp; ++ switch (bpp) { ++ case 1: ++ w100c->ctx.src.datatype = DP_SRC_1BPP_OPA; ++ break; ++ case 4: ++ w100c->ctx.src.datatype = DP_SRC_4BPP; ++ break; ++ case 12: ++ w100c->ctx.src.datatype = DP_SRC_12BPP_PACKED; ++ break; ++ case 8: ++ case 16: ++ w100c->ctx.src.datatype = DP_SRC_COLOR_SAME_AS_DST; ++ break; ++ default: ++ return FALSE; ++ } ++ ++ for (i = 0; i < screen->num_videomem_areas; i++) { ++ KdVideoMemArea *vidmem = screen->videomem_areas[i]; ++ if ((((CARD8*)srcOffset) >= vidmem->base) && ++ (((CARD8*)srcOffset) <= (vidmem->base + vidmem->size))) { ++ w100c->ctx.src.offset = (CARD32) W100_HOST2CARD(srcOffset); ++ if (w100c->last_src_videomem != i) { ++ W100WaitIdle(w100c); ++ } ++ w100c->last_src_videomem = i; ++ DBG_IMAGEON(("Setting src(pitch:%d,offset:0x%08x,type:%d)\n", ++ w100c->ctx.src.pitch, ++ w100c->ctx.src.offset, ++ w100c->ctx.src.datatype)); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++Bool W100SetDestination(KdScreenInfo *screen, ++ CARD32 dstPitch, ++ CARD32 dstOffset, ++ CARD8 bpp) ++{ ++ W100CardInfo(screen); ++ int i; ++ w100c->ctx.dst.pitch = dstPitch * 8 / bpp; ++ switch (bpp) { ++ case 8: ++ w100c->ctx.dst.datatype = DP_DST_8BPP; ++ break; ++ case 16: ++ w100c->ctx.dst.datatype = DP_DST_16BPP_1555; ++ break; ++ default: ++ return FALSE; ++ } ++ ++ for (i = 0; i < screen->num_videomem_areas; i++) { ++ KdVideoMemArea *vidmem = screen->videomem_areas[i]; ++ if ((((CARD8*)dstOffset) >= vidmem->base) && ++ (((CARD8*)dstOffset) <= (vidmem->base + vidmem->size))) { ++ w100c->ctx.dst.offset = (CARD32) W100_HOST2CARD(dstOffset); ++ if (w100c->last_dst_videomem != i) { ++ W100WaitIdle(w100c); ++ } ++ w100c->last_dst_videomem = i; ++ DBG_IMAGEON(("Setting dst(pitch:%d,offset:0x%08x,type:%d)\n", ++ w100c->ctx.dst.pitch, ++ w100c->ctx.dst.offset, ++ w100c->ctx.dst.datatype)); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++Bool W100SetSourcePixmap(PixmapPtr pPix) ++{ ++ KdScreenPriv(pPix->drawable.pScreen); ++ ++ return W100SetSource(pScreenPriv->screen, ++ pPix->devKind, ++ (CARD32) pPix->devPrivate.ptr, ++ pPix->drawable.bitsPerPixel); ++} ++ ++Bool W100SetDestinationPixmap(PixmapPtr pPix) ++{ ++ KdScreenPriv(pPix->drawable.pScreen); ++ ++ return W100SetDestination(pScreenPriv->screen, ++ pPix->devKind, ++ (CARD32) pPix->devPrivate.ptr, ++ pPix->drawable.bitsPerPixel); ++} ++ ++CARD16 W100MapToHWX(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 tx; ++ switch (w100c->hwScreen.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ tx = x; ++ break; ++ case RR_Rotate_90: ++ tx = w100c->hwScreen.height - (y + w - 1); ++ break; ++ case RR_Rotate_180: ++ tx = w100c->hwScreen.width - (x + w); ++ break; ++ case RR_Rotate_270: ++ tx = y; ++ break; ++ default: ++ tx = x; ++ } ++ return tx; ++} ++ ++CARD16 W100MapToHWY(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 ty; ++ switch (w100c->hwScreen.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ ty = y; ++ break; ++ case RR_Rotate_90: ++ ty = x; ++ break; ++ case RR_Rotate_180: ++ ty = w100c->hwScreen.height - (y + h - 1); ++ break; ++ case RR_Rotate_270: ++ ty = w100c->hwScreen.width - (x + w); ++ break; ++ default: ++ ty = y; ++ } ++ return ty; ++} ++ ++CARD16 W100XformX(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 tx; ++ switch (w100c->ctx.xform.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ if (w100c->ctx.xform.mirror) { ++ tx = x + w - 1; ++ } else { ++ tx = x; ++ } ++ break; ++ case RR_Rotate_90: ++ tx = x + h - 1; ++ break; ++ case RR_Rotate_180: ++ if (w100c->ctx.xform.mirror) { ++ tx = x; ++ } else { ++ tx = x + w - 1; ++ } ++ break; ++ case RR_Rotate_270: ++ default: ++ tx = x; ++ break; ++ } ++ return tx; ++} ++ ++CARD16 W100XformY(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 ty; ++ switch (w100c->ctx.xform.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ ty = y; ++ break; ++ case RR_Rotate_90: ++ if (w100c->ctx.xform.mirror) { ++ ty = y + w - 1; ++ } else { ++ ty = y; ++ } ++ break; ++ case RR_Rotate_180: ++ ty = y + h - 1; ++ break; ++ case RR_Rotate_270: ++ default: ++ if (w100c->ctx.xform.mirror) { ++ ty = y; ++ } else { ++ ty = y + w - 1; ++ } ++ break; ++ } ++ return ty; ++} ++ ++CARD16 W100XformW(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 tw; ++ ++ switch (w100c->ctx.xform.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ case RR_Rotate_180: ++ default: ++ tw = w; ++ break; ++ case RR_Rotate_90: ++ case RR_Rotate_270: ++ tw = h; ++ break; ++ } ++ return tw; ++} ++ ++CARD16 W100XformH(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h) ++{ ++ CARD16 th; ++ ++ switch (w100c->ctx.xform.randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ case RR_Rotate_180: ++ default: ++ th = h; ++ break; ++ case RR_Rotate_90: ++ case RR_Rotate_270: ++ th = w; ++ break; ++ } ++ return th; ++} ++ ++CARD8 W100GetScaler(CARD16 dstsize, CARD16 srcsize) ++{ ++ return W100_MAX(1, W100_MIN(31, ((16 * srcsize) + dstsize - 1) / dstsize)); ++ ++} ++ ++CARD16 W100ApplyScaler(CARD16 srcsize, CARD8 scaler) ++{ ++ return ((srcsize * 16) + (scaler - 1)) / scaler; ++} ++ ++ ++static void W100Blt(KdScreenInfo *screen, ++ int randr, ++ int bpp, ++ CARD32 srcOffset, ++ CARD16 srcW, ++ CARD16 srcH, ++ CARD16 srcPitch, ++ CARD32 dstOffset, ++ CARD16 dstPitch, ++ CARD16 dstX, ++ CARD16 dstY) ++{ ++ ScreenPtr pScreen = screen->pScreen; ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ CARD16 x, y, w, h; ++ int fifoEntries = 9; ++ Bool hasXForm = FALSE; ++ eng_cntl_u eng_cntl; ++ src_x_y_u src_x_y; ++ dst_x_y_u dst_x_y; ++ src_width_u src_width; ++ src_height_u src_height; ++ dst_width_height_u dst_width_height; ++ ++ DBG_IMAGEON(("W100Blt(randr:%d,bpp:%d,srcOffset:0x%08x," ++ "srcW:%d,srcH:%d,srcPitch:%d,dstOffset:0x%08x," ++ "dstPitch:%d,dstX:%d,dstY:%d)\n", ++ randr, bpp, srcOffset, srcW, srcH, ++ srcPitch, dstOffset, dstPitch, dstX, dstY)); ++ ++ if (randr & (RR_Rotate_90|RR_Rotate_270)) { ++ hasXForm = TRUE; ++ eng_cntl.val = w100c->regs.ENG_CNTL; ++ eng_cntl.f.dis_rop_src_uses_dst_w_h = 1; ++ eng_cntl.f.dis_src_uses_dst_dirmaj = 1; ++ fifoEntries += 4; ++ } ++ ++ W100ResetContext(w100c); ++ W100SetRotation(w100c, randr, FALSE); ++ W100SetSource(screen, srcPitch, srcOffset, bpp); ++ W100SetDestination(screen, dstPitch, dstOffset, bpp); ++ ++ x = W100XformX(w100c, dstX, dstY, srcW, srcH); ++ y = W100XformY(w100c, dstX, dstY, srcW, srcH); ++ w = W100XformW(w100c, dstX, dstY, srcW, srcH); ++ h = W100XformH(w100c, dstX, dstY, srcW, srcH); ++ ++ src_x_y.f.src_y = 0; ++ src_x_y.f.src_x = 0; ++ dst_x_y.f.dst_x = x; ++ dst_x_y.f.dst_y = y; ++ src_width.f.src_width = srcW; ++ src_height.f.src_height = srcH; ++ dst_width_height.f.dst_height = h; ++ dst_width_height.f.dst_width_b0 = w & 0xff; ++ dst_width_height.f.dst_width_b1 = (w >> 8) & 0x3f; ++ ++ if (W100WaitCmdFifoEntries(w100c, fifoEntries)) { ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ MMIO_OUT32(mmSRC_PITCH, w100c->ctx.src.pitch); ++ MMIO_OUT32(mmSRC_OFFSET, w100c->ctx.src.offset); ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeCopyGmc(w100c, GXcopy)); ++ MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath); ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, eng_cntl.val); ++ MMIO_OUT32(mmSRC_WIDTH, src_width.val); ++ MMIO_OUT32(mmSRC_HEIGHT, src_height.val); ++ } ++ MMIO_OUT32(mmSRC_X_Y, src_x_y.val); ++ MMIO_OUT32(mmDST_X_Y, dst_x_y.val); ++ MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val); ++ /* Restore state */ ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL); ++ } ++ } else { ++ ErrorF("Unable to perform Blitting\n"); ++ } ++} ++ ++static void W100StretchBlt(KdScreenInfo *screen, ++ int randr, ++ int bpp, ++ CARD32 srcOffset, ++ CARD16 srcW, ++ CARD16 srcH, ++ CARD16 srcPitch, ++ CARD32 dstOffset, ++ CARD16 dstPitch, ++ CARD16 dstX, ++ CARD16 dstY, ++ CARD8 xscaler, ++ CARD8 yscaler) ++{ ++ ScreenPtr pScreen = screen->pScreen; ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ CARD16 x, y, w, h, sw, sh; ++ Bool hasXForm = FALSE; ++ dp_datatype_u dp_datatype; ++ dp_mix_u dp_mix; ++ eng_cntl_u eng_cntl; ++ e2_arithmetic_cntl_u e2; ++ src_inc_u src_inc; ++ src_x_y_u src_x_y; ++ dst_x_y_u dst_x_y; ++ src_width_u src_width; ++ src_height_u src_height; ++ dst_width_height_u dst_width_height; ++ int firstStage = 10; ++ int secondStage = 10; ++ ++ DBG_IMAGEON(("W100StretchBlt(randr:%d,bpp:%d,srcOffset:0x%08x," ++ "srcW:%d,srcH:%d,srcPitch:%d,dstOffset:0x%08x," ++ "dstPitch:%d,dstX:%d,dstY:%d,xscaler:%d,yscaler:%d)\n", ++ randr, bpp, srcOffset, srcW, srcH, ++ srcPitch, dstOffset, dstPitch, ++ dstX, dstY, xscaler, yscaler)); ++ ++ if (randr & (RR_Rotate_90|RR_Rotate_270)) { ++ hasXForm = TRUE; ++ eng_cntl.val = w100c->regs.ENG_CNTL; ++ eng_cntl.f.dis_rop_src_uses_dst_w_h = 1; ++ eng_cntl.f.dis_src_uses_dst_dirmaj = 1; ++ ++firstStage; ++ ++secondStage; ++ } ++ ++ W100ResetContext(w100c); ++ W100SetRotation(w100c, randr, FALSE); ++ W100SetSource(screen, srcPitch, srcOffset, bpp); ++ W100SetDestination(screen, dstPitch, dstOffset, bpp); ++ ++ src_inc.val = 0; ++ src_inc.f.src_xinc = xscaler; ++ src_inc.f.src_yinc = yscaler; ++ ++ dp_datatype.val = 0; ++ dp_datatype.f.dp_brush_datatype = DP_BRUSH_SOLIDCOLOR; ++ dp_datatype.f.dp_dst_datatype = w100c->ctx.dst.datatype; ++ dp_datatype.f.dp_src_datatype = w100c->ctx.src.datatype; ++ dp_datatype.f.dp_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ ++ dp_mix.val = 0; ++ dp_mix.f.dp_op = DP_OP_ARITHMETIC; ++ dp_mix.f.dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ dp_mix.f.dp_rop3 = W100BltRop[GXcopy]; ++ ++ e2.val = 0; ++ e2.f.opcode = E2_OPC_STRETCH_SRC2; ++ e2.f.srcblend = E2_SRCBLEND_ZERO; ++ e2.f.dstblend = E2_DSTBLEND_ZERO; ++ ++ sw = W100ApplyScaler(srcW, xscaler); ++ sh = W100ApplyScaler(srcH, yscaler); ++ ++ x = W100XformX(w100c, dstX, dstY, sw, sh); ++ y = W100XformY(w100c, dstX, dstY, sw, sh); ++ w = W100XformW(w100c, dstX, dstY, sw, sh); ++ h = W100XformH(w100c, dstX, dstY, sw, sh); ++ ++ src_x_y.f.src_y = 0; ++ src_x_y.f.src_x = 0; ++ dst_x_y.f.dst_x = x; ++ dst_x_y.f.dst_y = y; ++ src_width.f.src_width = sw + 1; ++ src_height.f.src_height = sh; ++ dst_width_height.f.dst_height = h; ++ dst_width_height.f.dst_width_b0 = w & 0xff; ++ dst_width_height.f.dst_width_b1 = (w >> 8) & 0x3f; ++ ++ ++ if (W100WaitCmdFifoEntries(w100c, firstStage)) { ++ /* Set Source */ ++ MMIO_OUT32(mmSRC_PITCH, w100c->ctx.src.pitch); ++ MMIO_OUT32(mmSRC_OFFSET, w100c->ctx.src.offset); ++ ++ /* Set Destination */ ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ ++ /* Prepare for Stretch Operation */ ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeAritGmc(w100c, GXcopy)); ++ MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val); ++ MMIO_OUT32(mmDP_MIX, dp_mix.val); ++ MMIO_OUT32(mmE2_ARITHMETIC_CNTL, e2.val); ++ ++ /* Set Data Trajectory */ ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, eng_cntl.val); ++ } ++ MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath); ++ } else { ++ ErrorF("Error preparing for Stretch operation\n"); ++ return; ++ } ++ ++ if (W100WaitCmdFifoEntries(w100c, secondStage)) { ++ /* Perform blitting */ ++ MMIO_OUT32(mmSRC_X_Y, src_x_y.val); ++ MMIO_OUT32(mmDST_X_Y, dst_x_y.val); ++ MMIO_OUT32(mmSRC_WIDTH, src_width.val); ++ MMIO_OUT32(mmSRC_HEIGHT, src_height.val); ++ MMIO_OUT32(mmSRC_INC, src_inc.val); ++ MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val); ++ /* Restore state */ ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL); ++ } ++ } else { ++ ErrorF("Error performing Stretch operation\n"); ++ } ++} ++ ++static void W100ScaledBlt(KdScreenInfo *screen, ++ int randr, ++ int bpp, ++ CARD32 srcOffset, ++ CARD16 srcW, ++ CARD16 srcH, ++ CARD16 srcPitch, ++ CARD32 dstOffset, ++ CARD16 dstPitch, ++ CARD16 dstX, ++ CARD16 dstY, ++ CARD8 xscaler, ++ CARD8 yscaler) ++{ ++ ScreenPtr pScreen = screen->pScreen; ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ CARD16 x, y, w, h, sw, sh; ++ Bool hasXForm = FALSE; ++ dp_datatype_u dp_datatype; ++ dp_mix_u dp_mix; ++ eng_cntl_u eng_cntl; ++ e2_arithmetic_cntl_u e2; ++ src_inc_u src_inc; ++ src_x_y_u src_x_y; ++ src2_x_y_u src2_x_y; ++ dst_x_y_u dst_x_y; ++ src_width_u src_width; ++ src_height_u src_height; ++ dst_width_height_u dst_width_height; ++ int firstStage = 11; ++ int secondStage = 11; ++ ++ DBG_IMAGEON(("W100ScaledBlt(randr:%d,bpp:%d,srcOffset:0x%08x," ++ "srcW:%d,srcH:%d,srcPitch:%d,dstOffset:0x%08x," ++ "dstPitch:%d,dstX:%d,dstY:%d,xscaler:%d,yscaler:%d)\n", ++ randr, bpp, srcOffset, srcW, srcH, ++ srcPitch, dstOffset, dstPitch, ++ dstX, dstY, xscaler, yscaler)); ++ ++ if (randr & (RR_Rotate_90|RR_Rotate_270)) { ++ hasXForm = TRUE; ++ eng_cntl.val = w100c->regs.ENG_CNTL; ++ eng_cntl.f.dis_rop_src_uses_dst_w_h = 1; ++ eng_cntl.f.dis_src_uses_dst_dirmaj = 1; ++ ++firstStage; ++ ++secondStage; ++ } ++ ++ W100ResetContext(w100c); ++ W100SetRotation(w100c, randr, FALSE); ++ W100SetSource(screen, srcPitch, srcOffset, bpp); ++ W100SetDestination(screen, dstPitch, dstOffset, bpp); ++ ++ src_inc.val = 0; ++ src_inc.f.src_xinc = xscaler; ++ src_inc.f.src_yinc = yscaler; ++ ++ dp_datatype.val = 0; ++ dp_datatype.f.dp_brush_datatype = DP_BRUSH_SOLIDCOLOR; ++ dp_datatype.f.dp_src2_type = 1; ++ dp_datatype.f.dp_dst_datatype = w100c->ctx.dst.datatype; ++ dp_datatype.f.dp_src2_datatype = w100c->ctx.src.datatype; ++ dp_datatype.f.dp_src_datatype = w100c->ctx.src.datatype; ++ dp_datatype.f.dp_byte_pix_order = DP_PIX_ORDER_LSB2MSB; ++ ++ dp_mix.val = 0; ++ dp_mix.f.dp_op = DP_OP_ARITHMETIC; ++ dp_mix.f.dp_src_source = DP_SRC_MEM_RECTANGULAR; ++ dp_mix.f.dp_src2_source = DP_SRC_MEM_RECTANGULAR; ++ dp_mix.f.dp_rop3 = W100BltRop[GXcopy]; ++ ++ e2.val = 0; ++ e2.f.opcode = E2_OPC_SCALE_SRC2; ++ e2.f.srcblend = E2_SRCBLEND_ZERO; ++ e2.f.dstblend = E2_DSTBLEND_ZERO; ++ ++ sw = W100ApplyScaler(srcW, xscaler); ++ sh = W100ApplyScaler(srcH, yscaler); ++ ++ x = W100XformX(w100c, dstX, dstY, sw, sh); ++ y = W100XformY(w100c, dstX, dstY, sw, sh); ++ w = W100XformW(w100c, dstX, dstY, sw, sh); ++ h = W100XformH(w100c, dstX, dstY, sw, sh); ++ ++ src_x_y.f.src_y = 0; ++ src_x_y.f.src_x = 0; ++ src2_x_y.f.src_y = 0 + 4; ++ src2_x_y.f.src_x = 0; ++ dst_x_y.f.dst_x = x; ++ dst_x_y.f.dst_y = y; ++ src_width.f.src_width = sw + 1; ++ src_height.f.src_height = sh; ++ dst_width_height.f.dst_height = h; ++ dst_width_height.f.dst_width_b0 = w & 0xff; ++ dst_width_height.f.dst_width_b1 = (w >> 8) & 0x3f; ++ ++ if (W100WaitCmdFifoEntries(w100c, firstStage)) { ++ /* Set Source */ ++ MMIO_OUT32(mmSRC_PITCH, w100c->ctx.src.pitch); ++ MMIO_OUT32(mmSRC_OFFSET, w100c->ctx.src.offset); ++ ++ /* Set Destination */ ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ /* Set second source */ ++ MMIO_OUT32(mmSRC2_PITCH, w100c->ctx.src.pitch); ++ MMIO_OUT32(mmSRC2_OFFSET, w100c->ctx.src.offset); ++ ++ /* Prepare for Stretch Operation */ ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeAritGmc(w100c, GXcopy)); ++ MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val); ++ MMIO_OUT32(mmDP_MIX, dp_mix.val); ++ MMIO_OUT32(mmE2_ARITHMETIC_CNTL, e2.val); ++ /* Set Data Trajectory */ ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, eng_cntl.val); ++ } ++ MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath); ++ } else { ++ ErrorF("Unable to prepare for Scaled Blitting\n"); ++ return; ++ } ++ if (W100WaitCmdFifoEntries(w100c, secondStage)) { ++ /* Perform blitting */ ++ MMIO_OUT32(mmSRC_X_Y, src_x_y.val); ++ MMIO_OUT32(mmSRC2_X_Y, src2_x_y.val); ++ MMIO_OUT32(mmSRC2_WIDTH, src_width.val); ++ MMIO_OUT32(mmSRC2_HEIGHT, src_height.val); ++ MMIO_OUT32(mmSRC_INC, src_inc.val); ++ MMIO_OUT32(mmSRC2_INC, src_inc.val); ++ MMIO_OUT32(mmDST_X_Y, dst_x_y.val); ++ MMIO_OUT32(mmSRC_WIDTH, src_width.val); ++ MMIO_OUT32(mmSRC_HEIGHT, src_height.val); ++ MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val); ++ /* Restore state */ ++ if (hasXForm) { ++ MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL); ++ } ++ /* Without this, solid blitting is no longer working correctly */ ++ dp_datatype.f.dp_src2_type = 0; ++ MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val); ++ } else { ++ ErrorF("Unable to perform Scaled Blitting\n"); ++ } ++} ++ ++void W100PlanarBlt(KdScreenInfo *screen, ++ int planes, ++ int bpp, ++ int randr, ++ KdOffscreenArea *src, ++ int srcW, ++ int srcPitch, ++ int srcH, ++ KdOffscreenArea *dst, ++ int planeOffsets[], ++ int dstW, ++ int dstPitch, ++ int dstH, ++ int dstX, ++ int dstY) ++{ ++ ScreenPtr pScreen = screen->pScreen; ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ CARD8 *srcOffset, *dstBase, *dstOffset; ++ int xoffs, yoffs; ++ unsigned int subsampling[] = {0, 1, 1}; ++ int plane; ++ int stretch = ((srcW != dstW) || (srcH != dstH)); ++ CARD8 xscaler, yscaler; ++ ++ DBG_IMAGEON(("W100PlanarBlt(planes:%d,bpp:%d,randr:%d," ++ "src(w:%d,pitch:%d,h:%d)," ++ "dst(w:%d,pitch:%d,h:%d,x:%d,y:%d)\n", ++ planes, bpp, randr, ++ srcW, srcPitch, srcH, ++ dstW, dstPitch, dstH, dstX, dstY)); ++ ++ if (stretch) { ++ xscaler = W100GetScaler(dstW, srcW); ++ yscaler = W100GetScaler(dstH, srcH); ++ xoffs = yoffs = 0; ++ if (xscaler != 16 || yscaler != 16) { ++ xoffs = (dstW - W100ApplyScaler(srcW, xscaler)) / 2; ++ yoffs = (dstH - W100ApplyScaler(srcH, yscaler)) / 2; ++ DBG_IMAGEON(("Stretching with xscaler:%d,yscaler:%d," ++ "xoffs:%d,yoffs:%d\n", ++ xscaler, yscaler, xoffs, yoffs)); ++ } else { ++ xoffs = yoffs = 0; ++ stretch = FALSE; ++ } ++ } ++ ++ srcOffset = src->vidmem->base + src->offset; ++ dstBase = dst->vidmem->base + dst->offset; ++ for (plane = 0; plane < planes; plane++) { ++ dstOffset = dstBase + planeOffsets[plane]; ++ if (stretch) { ++ W100ScaledBlt(screen, randr, bpp, ++ (CARD32) srcOffset, ++ srcW >> subsampling[plane], ++ srcH >> subsampling[plane], ++ srcPitch >> subsampling[plane], ++ (CARD32) dstOffset, ++ dstPitch >> subsampling[plane], ++ (dstX + xoffs) >> subsampling[plane], ++ (dstY + yoffs) >> subsampling[plane], ++ xscaler, yscaler); ++ } else { ++ W100Blt(screen, randr, bpp, ++ (CARD32) srcOffset, ++ srcW >> subsampling[plane], ++ srcH >> subsampling[plane], ++ srcPitch >> subsampling[plane], ++ (CARD32) dstOffset, ++ dstPitch >> subsampling[plane], ++ dstX >> subsampling[plane], ++ dstY >> subsampling[plane]); ++ } ++ srcOffset += (srcPitch * srcH) >> (subsampling[plane] * 2); ++ } ++} ++ ++void W100SetBrightness(W100CardInfo *w100c, CARD8 value) ++{ ++ brightness_cntl_u brightness; ++ brightness.val = 0; ++ brightness.f.brightness = value; ++ MMIO_OUT32(mmBRIGHTNESS_CNTL, brightness.val); ++} ++ ++CARD8 W100GetBrightness(W100CardInfo *w100c) ++{ ++ brightness_cntl_u brightness; ++ brightness.val = MMIO_IN32(mmBRIGHTNESS_CNTL); ++ return brightness.f.brightness; ++} ++ +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_video.c +@@ -0,0 +1,1056 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++#include "imageon.h" ++#include "imageon_regs.h" ++#include "imageon_support.h" ++#include "imageon_const.h" ++#include "kaa.h" ++ ++#include <X11/extensions/Xv.h> ++#include "fourcc.h" ++ ++static Atom xvBrightness; ++static Atom xvMaxOverlaySize; ++static Atom xvColorKey; ++ ++#define IMAGE_MAX_WIDTH 720 ++#define IMAGE_MAX_HEIGHT 576 ++ ++#define W_ALIGN 0 ++#define H_ALIGN 0 ++ ++#define OVL_W_ALIGN 16 ++#define OVL_H_ALIGN 16 ++ ++#define OVL_MAX_SIZE 196608 ++ ++static KdVideoEncodingRec DummyEncoding[1] = { ++ {0, "XV_IMAGE", IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT, {1, 1}} ++}; ++ ++#define NUM_IMAGES (4) ++static KdImageRec Images[NUM_IMAGES] = { ++ XVIMAGE_YUY2, ++ XVIMAGE_YV12, ++ XVIMAGE_I420, ++ XVIMAGE_UYVY ++}; ++ ++#define NUM_FORMATS (3) ++static KdVideoFormatRec Formats[NUM_FORMATS] = { ++ {15, TrueColor}, ++ {16, TrueColor}, ++ {24, TrueColor} ++}; ++ ++#define NUM_ATTRIBUTES (3) ++static KdAttributeRec Attributes[NUM_ATTRIBUTES] = { ++ {XvSettable | XvGettable, 0, (1 << 16) - 1, "XV_COLORKEY"}, ++ {XvSettable | XvGettable, 0, 127, "XV_BRIGHTNESS"}, ++ {XvSettable | XvGettable, 0, 392960, "XV_MAXOVERLAYSIZE"} ++}; ++ ++#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) ++ ++#define NUM_OVL_RESIZERS (10) ++static struct { ++ CARD8 xfactor; ++ CARD8 yfactor; ++} ovlResizers[10] = { ++ { 0, 0 }, ++ { 1, 0 }, ++ { 0, 1 }, ++ { 1, 1 }, ++ { 2, 1 }, ++ { 1, 2 }, ++ { 2, 2 }, ++ { 3, 2 }, ++ { 2, 3 }, ++ { 3, 3 } ++}; ++ ++static void W100ClearSurface(KdScreenInfo *screen, ++ KdOffscreenArea *area, ++ CARD16 x, ++ CARD16 y, ++ CARD16 pitch, ++ CARD16 width, ++ CARD16 height, ++ int id) ++{ ++ W100CardInfo(screen); ++ int nplanes; ++ unsigned int subsampling[] = {0, 1, 1}; ++ unsigned int zero[] = {0, 0x80, 0x80}; ++ int bpp; ++ int plane; ++ CARD8 *dstOffset = area->vidmem->base + area->offset; ++ ++ switch (id) { ++ case FOURCC_UYVY: ++ case FOURCC_YUY2: ++ nplanes = 1; ++ bpp = 16; ++ break; ++ case FOURCC_YV12: ++ case FOURCC_I420: ++ nplanes = 3; ++ bpp = 8; ++ } ++ ++ DBG_IMAGEON(("Clearing surface with planes:%d, bpp:%d, pitch:%d, height:%d\n", ++ nplanes, bpp, pitch, height)); ++ ++ W100ResetContext(w100c); ++ for (plane = 0; plane < nplanes; plane++) { ++ W100SetDestination(screen, ++ pitch >> subsampling[plane], ++ (CARD32) dstOffset, ++ bpp); ++ if (W100WaitCmdFifoEntries(w100c, 6)) { ++ MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch); ++ MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset); ++ MMIO_OUT32(mmDP_GUI_MASTER_CNTL, ++ W100ComputeSolidGmc(w100c, GXcopy)); ++ MMIO_OUT32(mmDP_BRUSH_FRGD_CLR, zero[plane]); ++ MMIO_OUT32(mmDST_Y_X, 0); ++ MMIO_OUT32(mmDST_HEIGHT_WIDTH, (height << 16) | width); ++ } else { ++ ErrorF("Error clearing surface\n"); ++ break; ++ } ++ dstOffset += (pitch * height) >> (subsampling[plane] * 2); ++ } ++} ++ ++static void W100OverlaySetup(KdScreenInfo *screen) ++{ ++ W100ScreenInfo *w100s = screen->driver; ++ W100CardInfo(screen); ++ W100PortPrivPtr pPortPriv = w100s->pAdaptor->pPortPrivates[0].ptr; ++ ++ CARD32 disp_debug = 0; ++ video_ctrl_u video_ctrl; ++ video_y_offset_u video_y_offset; ++ video_y_pitch_u video_y_pitch; ++ video_u_offset_u video_u_offset; ++ video_u_pitch_u video_u_pitch; ++ video_v_offset_u video_v_offset; ++ video_v_pitch_u video_v_pitch; ++ graphic_key_u graphic_key; ++ video_h_pos_u video_hpos; ++ video_v_pos_u video_vpos; ++ graphic_h_disp_u graphic_h_disp; ++ graphic_v_disp_u graphic_v_disp; ++ ++ CARD16 w, h; ++ ++ DBG_IMAGEON(("W100OverlaySetup(ovlX:%d,ovlY:%d,ovlWidth:%d,ovlHeight:%d," ++ "videoHorExp:%d,videoVerExp:%d,YPlane:0x%08x,UPlane:0x%08x," ++ "VPlane:0x%08x\n", ++ pPortPriv->ovlX, pPortPriv->ovlY, ++ pPortPriv->ovlWidth, pPortPriv->ovlHeight, ++ pPortPriv->videoHorExp, pPortPriv->videoVerExp, ++ pPortPriv->YPlaneOffset, pPortPriv->UPlaneOffset, ++ pPortPriv->VPlaneOffset)); ++ ++ if (pPortPriv->videoStatus & W100_OVERLAY_CONFIGURED) { ++ return; ++ } ++ ++ w = pPortPriv->ovlWidth * (pPortPriv->videoHorExp + 1); ++ h = pPortPriv->ovlHeight * (pPortPriv->videoVerExp + 1); ++ ++ video_ctrl.val = w100c->regs.VIDEO_CTRL; ++ ++ video_ctrl.f.video_inv_hor = 0; ++ video_ctrl.f.video_inv_ver = 0; ++ video_ctrl.f.yuv2rgb_option = 0; ++ video_ctrl.f.video_hor_exp = pPortPriv->videoHorExp; ++ video_ctrl.f.video_ver_exp = pPortPriv->videoVerExp; ++ video_ctrl.f.video_ch_sel = 0; ++ ++ video_ctrl.f.yuv2rgb_en = 1; ++ //Only support this, by the moment ++ video_ctrl.f.video_mode = OVLFORMAT_YUV420; ++ ++ video_y_pitch.f.y_pitch = pPortPriv->ovlWidth; ++ video_u_pitch.f.u_pitch = pPortPriv->ovlWidth >> 1; ++ video_v_pitch.f.v_pitch = pPortPriv->ovlWidth >> 1; ++ ++ /* ++ video_y_offset.f.y_offset = pPortPriv->YPlaneOffset + ++ video_y_pitch.f.y_pitch * pPortPriv->ovlY + pPortPriv->ovlX; ++ video_u_offset.f.u_offset = pPortPriv->UPlaneOffset + ++ video_u_pitch.f.u_pitch * pPortPriv->ovlY + (pPortPriv->ovlX / 2); ++ video_v_offset.f.v_offset = pPortPriv->VPlaneOffset + ++ video_v_pitch.f.v_pitch * pPortPriv->ovlY + (pPortPriv->ovlX / 2); ++ */ ++ ++ video_y_offset.f.y_offset = pPortPriv->YPlaneOffset; ++ video_u_offset.f.u_offset = pPortPriv->UPlaneOffset; ++ video_v_offset.f.v_offset = pPortPriv->VPlaneOffset; ++ ++ graphic_key.val = 0; ++ graphic_key.f.keyer_color = pPortPriv->colorKey; ++ graphic_key.f.keyer_mask = 0xffffUL; ++ video_ctrl.f.keyer_en = 1; ++ ++ graphic_h_disp.val = w100c->regs.GRAPHIC_H_DISP; ++ graphic_v_disp.val = w100c->regs.GRAPHIC_V_DISP; ++ ++ video_hpos.f.video_h_start = graphic_h_disp.f.graphic_h_start ++ + W100MapToHWX(w100c, ++ pPortPriv->ovlX, pPortPriv->ovlY, w, h); ++ video_hpos.f.video_h_end = video_hpos.f.video_h_start + w; ++ video_vpos.f.video_v_start = graphic_v_disp.f.graphic_v_start ++ + W100MapToHWY(w100c, ++ pPortPriv->ovlX, pPortPriv->ovlY, w, h); ++ video_vpos.f.video_v_end = video_vpos.f.video_v_start + h; ++ if (video_hpos.f.video_h_end > graphic_h_disp.f.graphic_h_end) { ++ w = graphic_h_disp.f.graphic_h_end - video_hpos.f.video_h_start; ++ } ++ ++ //This is possibly not valid for non planar modes ++ video_ctrl.f.total_req_video = (w + 3) / 4; ++ ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmGRAPHIC_KEY, graphic_key.val); ++ MMIO_OUT32(mmVIDEO_Y_OFFSET, video_y_offset.val); ++ MMIO_OUT32(mmVIDEO_Y_PITCH, video_y_pitch.val); ++ MMIO_OUT32(mmVIDEO_U_OFFSET, video_u_offset.val); ++ MMIO_OUT32(mmVIDEO_U_PITCH, video_u_pitch.val); ++ MMIO_OUT32(mmVIDEO_V_OFFSET, video_v_offset.val); ++ MMIO_OUT32(mmVIDEO_V_PITCH, video_v_pitch.val); ++ MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val); ++ MMIO_OUT32(mmVIDEO_H_POS, video_hpos.val); ++ MMIO_OUT32(mmVIDEO_V_POS, video_vpos.val); ++ W100EnableDisplayUpdate(w100c); ++ ++ pPortPriv->videoCtrl = video_ctrl.val; ++ pPortPriv->videoStatus |= W100_OVERLAY_CONFIGURED; ++} ++ ++static void W100OverlayEnable(KdScreenInfo *screen) ++{ ++ W100ScreenInfo *w100s = screen->driver; ++ W100CardInfo(screen); ++ W100PortPrivPtr pPortPriv = w100s->pAdaptor->pPortPrivates[0].ptr; ++ video_ctrl_u video_ctrl; ++ ++ DBG_IMAGEON(("W100OverlayEnable()\n")); ++ ++ if (!(pPortPriv->videoStatus & W100_OVERLAY_CONFIGURED)) { ++ W100OverlaySetup(screen); ++ } ++ ++ video_ctrl.val = pPortPriv->videoCtrl; ++ video_ctrl.f.en_video_req = 1; ++ video_ctrl.f.en_video_crtc = 1; ++ video_ctrl.f.en_graphic_req_video = 1; ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val); ++ W100EnableDisplayUpdate(w100c); ++ pPortPriv->videoCtrl = video_ctrl.val; ++ pPortPriv->videoStatus |= W100_OVERLAY_ON; ++} ++ ++static void W100OverlayDisable(KdScreenInfo *screen) ++{ ++ DBG_IMAGEON(("W100OverlayDisable()\n")); ++ W100ScreenInfo *w100s = screen->driver; ++ W100CardInfo(screen); ++ W100PortPrivPtr pPortPriv = w100s->pAdaptor->pPortPrivates[0].ptr; ++ ++ video_ctrl_u video_ctrl; ++ ++ video_ctrl.val = pPortPriv->videoCtrl; ++ video_ctrl.f.en_video_req = 0; ++ video_ctrl.f.en_video_crtc = 0; ++ video_ctrl.f.en_graphic_req_video = 0; ++ W100DisableDisplayUpdate(w100c); ++ MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val); ++ W100EnableDisplayUpdate(w100c); ++ pPortPriv->videoCtrl = video_ctrl.val; ++ pPortPriv->videoStatus &= ~W100_OVERLAY_ON; ++} ++ ++static void W100VideoSave(ScreenPtr pScreen, KdOffscreenArea *area) ++{ ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100PortPrivPtr pPortPriv = w100s->pAdaptor->pPortPrivates[0].ptr; ++ ++ if (pPortPriv->offSurface == area) { ++ pPortPriv->offSurface = NULL; ++ pPortPriv->offSize = 0; ++ } ++ if (pPortPriv->ovlSurface == area) { ++ pPortPriv->ovlSurface = NULL; ++ pPortPriv->ovlSize = 0; ++ } ++} ++ ++static void W100HostPlanarData(KdScreenInfo *screen, ++ int id, ++ CARD8 *src, ++ KdOffscreenArea *dst, ++ CARD32 srcPitch, CARD32 srcHeight, ++ CARD32 dstPitch, CARD32 dstHeight, ++ CARD16 srcX, CARD16 srcY, ++ CARD16 dstX, CARD16 dstY, ++ CARD16 w, CARD16 h) ++{ ++ CARD8 *dstBase = dst->vidmem->base + dst->offset; ++ CARD8 *dstPtr; ++ CARD8 *srcPtr; ++ int i; ++ ++ srcPtr = src + (srcY * srcPitch) + srcX; ++ dstPtr = dstBase + (dstY * dstPitch) + dstX; ++ ++ DBG_IMAGEON(("W100HostPlanarData(src(pitch:%d,offset:0x%08x,x:%d,y:%d)," ++ "dst(pitch:%d,offset:0x%08x,x:%d,y:%d), w:%d,h:%d)\n", ++ srcPitch, srcPtr, srcX, srcY, ++ dstPitch, dstPtr, dstX, dstY, ++ w, h)); ++ ++ /* Copy Y plane */ ++ for (i = 0; i < h; i++) { ++ memcpy(dstPtr, srcPtr, w); ++ dstPtr += dstPitch; ++ srcPtr += srcPitch; ++ } ++ /* Copy U plane */ ++ dstPtr = dstBase + (dstHeight * dstPitch) //Start of U Plane ++ + (dstX >> 1) //X Offset ++ + ((dstY * dstPitch) >> 2); //Y Offset ++ if (id == FOURCC_I420) { ++ srcPtr = src + (srcHeight * srcPitch) //Start of U Plane ++ + (srcX >> 1) //X Offset ++ + ((srcY * srcPitch) >> 2); //Y Offset ++ } else { ++ srcPtr = src + ((5 * srcHeight * srcPitch) / 4) //Start of U Plane ++ + (srcX >> 1) //X Offset ++ + ((srcY * srcPitch) >> 2); //Y Offset ++ } ++ for (i = 0; i < (h >> 1); i++) { ++ memcpy(dstPtr, srcPtr, w >> 1); //U Plane scanline ++ srcPtr += srcPitch >> 1; ++ dstPtr += dstPitch >> 1; ++ } ++ ++ /* Copy V plane */ ++ dstPtr = dstBase + ((5 * dstHeight * dstPitch) / 4) //Start of V Plane ++ + (dstX >> 1) //X Offset ++ + ((dstY * dstPitch) >> 2); //Y Offset ++ if (id == FOURCC_I420) { ++ srcPtr = src + ((5 * srcHeight * srcPitch) / 4) //Start of V Plane ++ + (srcX >> 1) //X Offset ++ + ((srcY * srcPitch) >> 2); //Y Offset ++ } else { ++ srcPtr = src + (srcHeight * srcPitch) //Start of V Plane ++ + (srcX >> 1) //X Offset ++ + ((srcY * srcPitch) >> 2); //Y Offset ++ } ++ for (i = 0; i < (h >> 1); i++) { ++ memcpy(dstPtr, srcPtr, w >> 1); //V Plane scanline ++ srcPtr += srcPitch >> 1; ++ dstPtr += dstPitch >> 1; ++ } ++} ++ ++static void W100HostPackedData(KdScreenInfo *screen, ++ int id, ++ CARD8 *src, ++ KdOffscreenArea *dst, ++ CARD32 srcPitch, ++ CARD32 dstPitch, ++ CARD16 srcX, CARD16 srcY, ++ CARD16 dstX, CARD16 dstY, ++ CARD16 w, CARD16 h) ++{ ++ CARD8 *dstBase = dst->vidmem->base + dst->offset; ++ CARD8 *dstPtr = dstBase + (dstY * dstPitch) + (dstX << 1); ++ CARD8 *srcPtr = src + (srcY + srcPitch) + (srcX << 1); ++ ++ DBG_IMAGEON(("W100HostPackedData(src(pitch:%d,offset:0x%08x,x:%d,y:%d)," ++ "dst(pitch:%d,offset:0x%08x,x:%d,y:%d), w:%d,h:%d)\n", ++ srcPitch, srcPtr, srcX, srcY, ++ dstPitch, dstPtr, dstX, dstY, ++ w, h)); ++ while(h--) { ++ memcpy(dstPtr, srcPtr, (w << 1)); /* 16bpp assumed */ ++ srcPtr += srcPitch; ++ dstPtr += dstPitch; ++ } ++} ++ ++ ++static void W100StopVideo(KdScreenInfo *screen, pointer data, Bool exit) ++{ ++ W100CardInfo(screen); ++ W100PortPrivPtr pPriv = (W100PortPrivPtr)data; ++ ++ DBG_IMAGEON(("W100StopVideo(exit:%d)\n", exit)); ++ ++ REGION_EMPTY(screen->pScreen, &pPriv->clip); ++ ++ if (exit) { ++ if (pPriv->videoStatus & W100_OVERLAY_ON) { ++ W100OverlayDisable(screen); ++ } ++ if (pPriv->offSurface) { ++ KdOffscreenFree(screen->pScreen, pPriv->offSurface); ++ pPriv->offSurface = NULL; ++ pPriv->offSize = 0; ++ } ++ if (pPriv->ovlSurface) { ++ KdOffscreenFree(screen->pScreen, pPriv->ovlSurface); ++ pPriv->ovlSurface = NULL; ++ pPriv->ovlSize = 0; ++ } ++ pPriv->videoStatus &= ~W100_OVERLAY_ON; ++ } else { ++ if (pPriv->videoStatus & W100_OVERLAY_ON) { ++ W100OverlayDisable(screen); ++ pPriv->videoStatus &= ~W100_OVERLAY_ON; ++ } ++ } ++} ++ ++static int W100SetPortAttribute(KdScreenInfo *screen, ++ Atom attribute, ++ int value, ++ pointer data) ++{ ++ W100CardInfo(screen); ++ W100PortPrivPtr pPriv = (W100PortPrivPtr)data; ++ ++ if (attribute == xvBrightness) { ++ DBG_IMAGEON(("Setting Brightness attribute to %d\n", value)); ++ W100SetBrightness(w100c, value); ++ pPriv->brightness = value; ++ } else if (attribute == xvMaxOverlaySize) { ++ DBG_IMAGEON(("Setting MaxOverlaySize to %d\n", value)); ++ pPriv->maxOverlaySize = value; ++ } else if (attribute == xvColorKey) { ++ DBG_IMAGEON(("Setting ColorKey attribute to %d\n", value)); ++ pPriv->colorKey = value; ++ } ++ return Success; ++} ++ ++static int W100GetPortAttribute(KdScreenInfo *screen, ++ Atom attribute, ++ int *value, ++ pointer data) ++{ ++ W100CardInfo(screen); ++ W100PortPrivPtr pPriv = (W100PortPrivPtr)data; ++ ++ if (attribute == xvBrightness) { ++ DBG_IMAGEON(("Getting Brightness attribute\n")); ++ *value = pPriv->brightness; ++ } else if (attribute == xvMaxOverlaySize) { ++ *value = pPriv->maxOverlaySize; ++ DBG_IMAGEON(("Getting Contrast attribute\n")); ++ } else if (attribute == xvColorKey) { ++ DBG_IMAGEON(("Getting ColorKey attribute\n")); ++ *value = pPriv->colorKey; ++ } ++ return Success; ++} ++ ++static void W100QueryBestSize(KdScreenInfo *screen, ++ Bool motion, ++ short vid_w, short vid_h, /*Video dimensions */ ++ short drw_w, short drw_h, /*Drawable dimensions */ ++ unsigned int *p_w, unsigned int *p_h, ++ pointer data) ++{ ++ DBG_IMAGEON(("W100QueryBestSize(vid_w:%d,vid_h:%d,drw_w:%d,drw_h:%d)\n", ++ vid_w, vid_h, drw_w, drw_h)); ++ int xscaler = W100GetScaler(drw_w, vid_w); ++ int yscaler = W100GetScaler(drw_h, vid_h); ++ *p_w = W100ApplyScaler(vid_w, xscaler); ++ *p_h = W100ApplyScaler(vid_h, yscaler); ++} ++ ++static int W100QueryImageAttributes(KdScreenInfo *screen, ++ int id, ++ unsigned short *w, unsigned short *h, ++ int *pitches, int *offsets) ++{ ++ int size, tmp; ++ ++ if (*w > IMAGE_MAX_WIDTH) { ++ *w = IMAGE_MAX_WIDTH; ++ } ++ if (*h > IMAGE_MAX_HEIGHT) { ++ *h = IMAGE_MAX_HEIGHT; ++ } ++ ++ if (W_ALIGN) { ++ *w = (*w + (W_ALIGN - 1)) & ~(W_ALIGN - 1); ++ } ++ if (H_ALIGN) { ++ *h = (*h + (H_ALIGN - 1)) & ~(H_ALIGN - 1); ++ } ++ ++ if (offsets) { ++ offsets[0] = 0; ++ } ++ ++ switch (id) { ++ /* Planar formats */ ++ case FOURCC_YV12: ++ case FOURCC_I420: ++ *h = (*h + 1) & ~1; ++ size = (*w + 3) & ~3; ++ if (pitches) pitches[0] = size; ++ size *= *h; ++ if (offsets) offsets[1] = size; ++ tmp = ((*w >> 1) + 3) & ~3; ++ if (pitches) pitches[1] = pitches[2] = tmp; ++ tmp *= (*h >> 1); ++ size += tmp; ++ if(offsets) offsets[2] = size; ++ size += tmp; ++ break; ++ /* Packed Formats */ ++ case FOURCC_UYVY: ++ case FOURCC_YUY2: ++ default: ++ size = *w << 1; ++ if (pitches) pitches[0] = size; ++ size *= *h; ++ break; ++ } ++ return size; ++} ++ ++ ++static void W100ClipVideo(BoxPtr dst, ++ INT32 *x1, ++ INT32 *x2, ++ INT32 *y1, ++ INT32 *y2, ++ BoxPtr extents, ++ INT32 width, ++ INT32 height) ++{ ++ INT32 vscale, hscale, delta; ++ int diff; ++ ++ hscale = ((*x2 - *x1) << 16) / (dst->x2 - dst->x1); ++ vscale = ((*y2 - *y1) << 16) / (dst->y2 - dst->y1); ++ ++ *x1 <<= 16; *x2 <<= 16; ++ *y1 <<= 16; *y2 <<= 16; ++ ++ diff = extents->x1 - dst->x1; ++ if(diff > 0) { ++ dst->x1 = extents->x1; ++ *x1 += diff * hscale; ++ } ++ diff = dst->x2 - extents->x2; ++ if(diff > 0) { ++ dst->x2 = extents->x2; ++ *x2 -= diff * hscale; ++ } ++ diff = extents->y1 - dst->y1; ++ if(diff > 0) { ++ dst->y1 = extents->y1; ++ *y1 += diff * vscale; ++ } ++ diff = dst->y2 - extents->y2; ++ if(diff > 0) { ++ dst->y2 = extents->y2; ++ *y2 -= diff * vscale; ++ } ++ ++ if(*x1 < 0) { ++ diff = (- *x1 + hscale - 1)/ hscale; ++ dst->x1 += diff; ++ *x1 += diff * hscale; ++ } ++ delta = *x2 - (width << 16); ++ if(delta > 0) { ++ diff = (delta + hscale - 1)/ hscale; ++ dst->x2 -= diff; ++ *x2 -= diff * hscale; ++ } ++ if(*y1 < 0) { ++ diff = (- *y1 + vscale - 1)/ vscale; ++ dst->y1 += diff; ++ *y1 += diff * vscale; ++ } ++ delta = *y2 - (height << 16); ++ if(delta > 0) { ++ diff = (delta + vscale - 1)/ vscale; ++ dst->y2 -= diff; ++ *y2 -= diff * vscale; ++ } ++} ++ ++static int W100PutImage(KdScreenInfo *screen, ++ DrawablePtr pDraw, /* Destination drawable */ ++ short src_x, short src_y, /* Source coordinates */ ++ short drw_x, short drw_y, /* Destination coordinates */ ++ short src_w, short src_h, /* Source rectangle to put */ ++ short drw_w, short drw_h, /* Destination size */ ++ int id, /* FOURCC id */ ++ unsigned char *buf, /* Source data */ ++ short width, /* Source width */ ++ short height, /* Source height */ ++ Bool sync, /* Sync before returning */ ++ RegionPtr clipBoxes, ++ pointer data) ++{ ++ ScreenPtr pScreen = screen->pScreen; ++ KdScreenPriv(pScreen); ++ W100CardInfo(pScreenPriv); ++ W100ScreenInfo(pScreenPriv); ++ W100PortPrivPtr pPortPriv = (W100PortPrivPtr)data; ++ CARD32 baseAddr; ++ int randr = w100c->hwScreen.randr; ++ int offWidth, offHeight; ++ int ovlWidth, ovlHeight; ++ int ovlX, ovlY; ++ int dstX, dstY; ++ int offSize; ++ int ovlSize; ++ int planes; ++ int bpp; ++ int i; ++ INT32 x1, x2, y1, y2; ++ BoxRec dstBox; ++ int planeOffsets[3]; ++ ++ ++ DBG_IMAGEON(("W100PutImage(src(x:%d,y:%d,w:%d,h:%d)," ++ "drw(x:%d,y:%d,w:%d,h:%d)," ++ "width:%d,height:%d)\n", ++ src_x,src_y,src_w,src_h, ++ drw_x,drw_y,drw_w,drw_h, ++ width, height)); ++ ++ /* Clip */ ++ x1 = src_x; ++ x2 = src_x + src_w; ++ y1 = src_y; ++ y2 = src_y + src_h; ++ ++ dstBox.x1 = drw_x; ++ dstBox.x2 = drw_x + drw_w; ++ dstBox.y1 = drw_y; ++ dstBox.y2 = drw_y + drw_h; ++ ++ W100ClipVideo(&dstBox, &x1, &x2, &y1, &y2, ++ REGION_EXTENTS(pScreen, clipBoxes), ++ width, height); ++ ++ if ((x1 >= x2) || (y1 >= y2)) { ++ return Success; ++ } ++ ++ src_w = (x2 - x1) >> 16; ++ src_h = (y2 - y1) >> 16; ++ drw_w = dstBox.x2 - dstBox.x1; ++ drw_h = dstBox.y2 - dstBox.y1; ++ drw_x = dstBox.x1; ++ drw_y = dstBox.y1; ++ src_x = x1 >> 16; ++ src_y = y1 >> 16; ++ ++ /* Calculate dimensions for offscren and overlay surfaces */ ++ offWidth = src_w; ++ offHeight = src_h; ++ ++ ovlX = drw_x; ++ ovlY = drw_y; ++ ++ for (i = 0; i < NUM_OVL_RESIZERS; i++) { ++ CARD16 candidate_w; ++ CARD16 candidate_h; ++ ++ pPortPriv->videoHorExp = ovlResizers[i].xfactor; ++ pPortPriv->videoVerExp = ovlResizers[i].yfactor; ++ ++ candidate_w = drw_w >> ovlResizers[i].xfactor; ++ candidate_h = drw_h >> ovlResizers[i].yfactor; ++ ++ switch (randr & RR_Rotate_All) { ++ case RR_Rotate_0: ++ ovlWidth = (candidate_w + OVL_W_ALIGN - 1) & ~(OVL_W_ALIGN - 1); ++ ovlHeight = (candidate_h + OVL_H_ALIGN - 1) & ~(OVL_H_ALIGN - 1); ++ dstX = 0; ++ dstY = 0; ++ pPortPriv->videoHorExp = ovlResizers[i].xfactor; ++ pPortPriv->videoVerExp = ovlResizers[i].yfactor; ++ break; ++ case RR_Rotate_180: ++ ovlWidth = (candidate_w + OVL_W_ALIGN - 1) & ~(OVL_W_ALIGN - 1); ++ ovlHeight = (candidate_h + OVL_H_ALIGN - 1) & ~(OVL_H_ALIGN - 1); ++ dstX = ovlWidth - candidate_w; ++ dstY = ovlHeight - candidate_h; ++ pPortPriv->videoHorExp = ovlResizers[i].xfactor; ++ pPortPriv->videoVerExp = ovlResizers[i].yfactor; ++ break; ++ case RR_Rotate_90: ++ ovlWidth = (candidate_h + OVL_W_ALIGN - 1) & ~(OVL_W_ALIGN - 1); ++ ovlHeight = (candidate_w + OVL_H_ALIGN - 1) & ~(OVL_H_ALIGN - 1); ++ dstX = ovlWidth - candidate_h; ++ dstY = 0; ++ pPortPriv->videoHorExp = ovlResizers[i].yfactor; ++ pPortPriv->videoVerExp = ovlResizers[i].xfactor; ++ break; ++ case RR_Rotate_270: ++ ovlWidth = (candidate_h + OVL_W_ALIGN - 1) & ~(OVL_W_ALIGN - 1); ++ ovlHeight = (candidate_w + OVL_H_ALIGN - 1) & ~(OVL_H_ALIGN - 1); ++ dstX = 0; ++ dstY = ovlHeight - candidate_w; ++ pPortPriv->videoHorExp = ovlResizers[i].yfactor; ++ pPortPriv->videoVerExp = ovlResizers[i].xfactor; ++ break; ++ } ++ ++ /* Calculate sizes for the surfaces */ ++ switch (id) { ++ case FOURCC_YV12: ++ case FOURCC_I420: ++ offSize = (3 * offWidth * offHeight) / 2; ++ ovlSize = (3 * ovlWidth * ovlHeight) / 2; ++ planes = 3; ++ planeOffsets[0] = 0; ++ planeOffsets[1] = ovlWidth * ovlHeight; ++ planeOffsets[2] = (5 * (ovlWidth * ovlHeight)) / 4; ++ bpp = 8; ++ break; ++ case FOURCC_UYVY: ++ case FOURCC_YUY2: ++ offSize = offWidth * offHeight * 2; ++ ovlSize = ovlWidth * ovlHeight * 2; ++ planes = 1; ++ planeOffsets[0] = 0; ++ bpp = 16; ++ break; ++ } ++ if (ovlSize <= pPortPriv->maxOverlaySize) { ++ DBG_IMAGEON(("Using %dx%d overlay surface (%d bytes). " ++ "Resizer(xfactor:%d,yfactor:%d)\n", ++ ovlWidth, ovlHeight, ovlSize, ++ ovlResizers[i].xfactor, ovlResizers[i].yfactor)); ++ drw_w = candidate_w; ++ drw_h = candidate_h; ++ break; ++ } ++ } ++ ++ /* Reallocate the surfaces, if existing ones are not valid. ++ * If overlay surface is not valid, dump both ones, to give ++ * ovlSurface more chances to get internal memory ++ */ ++ if (pPortPriv->ovlSurface && ovlSize != pPortPriv->ovlSize) { ++ DBG_IMAGEON(("Freeing overlay and offscreen surfaces\n")); ++ KdOffscreenFree(screen->pScreen, pPortPriv->ovlSurface); ++ KdOffscreenFree(screen->pScreen, pPortPriv->offSurface); ++ pPortPriv->ovlSurface = NULL; ++ pPortPriv->offSurface = NULL; ++ } ++ ++ if (pPortPriv->offSurface && offSize != pPortPriv->offSize) { ++ DBG_IMAGEON(("Freeing offscreen surface\n")); ++ KdOffscreenFree(screen->pScreen, pPortPriv->offSurface); ++ pPortPriv->offSurface = NULL; ++ } ++ ++ if (!pPortPriv->ovlSurface) { ++ pPortPriv->ovlSurface = KdOffscreenAllocPrio(screen->pScreen, ++ ovlSize, 0, TRUE, ++ W100VideoSave, ++ pPortPriv, ++ KD_VIDMEM_MAXPRIO, ++ KD_VIDMEM_MAXPRIO, ++ TRUE); ++ if (!pPortPriv->ovlSurface) { ++ ErrorF("Using non internal memory to overlay. " ++ "Expected bad performance\n"); ++ pPortPriv->ovlSurface = KdOffscreenAlloc(screen->pScreen, ++ ovlSize, 0, TRUE, ++ W100VideoSave, ++ pPortPriv); ++ } ++ if (!pPortPriv->ovlSurface) { ++ ErrorF("Unable to allocate %d bytes for overlay surface\n", ++ ovlSize); ++ return BadAlloc; ++ } ++ ++ pPortPriv->ovlSize = ovlSize; ++ W100ClearSurface(screen, pPortPriv->ovlSurface, ++ 0, 0, (ovlWidth * bpp / 8), ++ ovlWidth, ovlHeight, id); ++ } ++ ++ if (!pPortPriv->offSurface) { ++ pPortPriv->offSurface = KdOffscreenAlloc(screen->pScreen, ++ offSize, 0, TRUE, ++ W100VideoSave, ++ pPortPriv); ++ if (!pPortPriv->offSurface) { ++ ErrorF("Unable to allocate %d bytes for offscreen surface\n", ++ offSize); ++ return BadAlloc; ++ } ++ pPortPriv->offSize = offSize; ++ } ++ ++ /* Copy the data into the offscreen surface */ ++ W100WaitIdle(w100c); ++ ++ switch (id) { ++ case FOURCC_YV12: ++ case FOURCC_I420: ++ W100HostPlanarData(screen, //screen ++ id, //id ++ buf, //src ++ pPortPriv->offSurface, //dst ++ width, //srcPitch ++ height, //srcHeight ++ offWidth, //dstPitch ++ offHeight, //dstHeight ++ src_x, //srcX ++ src_y, //srcY ++ 0, //dstX ++ 0, //dstY ++ src_w, //w ++ src_h); //h ++ break; ++ case FOURCC_UYVY: ++ case FOURCC_YUY2: ++ W100HostPackedData(screen, //screen ++ id, //id ++ buf, //src ++ pPortPriv->offSurface, //dst ++ width << 1, //srcPitch ++ offWidth << 1, //dstPitch ++ src_x, //srcX ++ src_y, //srcY ++ 0, //dstX ++ 0, //dstY ++ src_w, //w ++ src_h); //h ++ break; ++ } ++ ++ /* Update cliplist */ ++ if(!REGION_EQUAL(screen->pScreen, &pPortPriv->clip, clipBoxes)) { ++ REGION_COPY(screen->pScreen, &pPortPriv->clip, clipBoxes); ++ KXVPaintRegion(pDraw, &pPortPriv->clip, pPortPriv->colorKey); ++ } ++ ++ /* Calculate the incard offsets for the different planes */ ++ baseAddr = (CARD32) W100_HOST2CARD(pPortPriv->ovlSurface->vidmem->base + ++ pPortPriv->ovlSurface->offset); ++ switch (id) { ++ case FOURCC_YV12: ++ case FOURCC_I420: ++ pPortPriv->YPlaneOffset = baseAddr + planeOffsets[0]; ++ pPortPriv->UPlaneOffset = baseAddr + planeOffsets[1]; ++ pPortPriv->VPlaneOffset = baseAddr + planeOffsets[2]; ++ break; ++ case FOURCC_UYVY: ++ case FOURCC_YUY2: ++ pPortPriv->YPlaneOffset = baseAddr + planeOffsets[0]; ++ pPortPriv->UPlaneOffset = 0; ++ pPortPriv->VPlaneOffset = 0; ++ } ++ ++ DBG_IMAGEON(("Offsets(Y:0x%08x,U:0x%08x,V:0x%08x)\n", ++ pPortPriv->YPlaneOffset, ++ pPortPriv->UPlaneOffset, ++ pPortPriv->VPlaneOffset)); ++ ++ ++ /* Blit from offSurface to ovlSurface taking into account ++ * the randr needed transformation ++ */ ++ W100DisableDisplayUpdate(w100c); ++ W100PlanarBlt(screen, planes, bpp, randr, ++ pPortPriv->offSurface, ++ src_w, offWidth * bpp / 8, src_h, ++ pPortPriv->ovlSurface, planeOffsets, ++ drw_w, ovlWidth * bpp / 8, drw_h, ++ dstX, dstY); ++ W100EnableDisplayUpdate(w100c); ++ ++ ++ if ((pPortPriv->ovlWidth != ovlWidth) || ++ (pPortPriv->ovlHeight != ovlHeight) || ++ (pPortPriv->ovlX != ovlX) || ++ (pPortPriv->ovlY != ovlY) || ++ (pPortPriv->id != id)) { ++ pPortPriv->videoStatus &= ~W100_OVERLAY_CONFIGURED; ++ W100OverlayDisable(screen); ++ } ++ /* Enable overlay */ ++ pPortPriv->ovlWidth = ovlWidth; ++ pPortPriv->ovlHeight = ovlHeight; ++ pPortPriv->ovlX = ovlX; ++ pPortPriv->ovlY = ovlY; ++ pPortPriv->id = id; ++ W100OverlayEnable(screen); ++ ++ return Success; ++} ++ ++static KdVideoAdaptorPtr ++W100SetupImageVideo(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100CardInfo(pScreenPriv); ++ KdVideoAdaptorPtr adaptor; ++ W100PortPrivPtr pPortPriv; ++ ++ adaptor = xcalloc(1, sizeof(KdVideoAdaptorRec) ++ + sizeof(W100PortPrivRec) ++ + sizeof(DevUnion)); ++ if (adaptor == NULL) { ++ return NULL; ++ } ++ ++ adaptor->type = XvWindowMask | XvInputMask | XvImageMask; ++ adaptor->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT; ++ adaptor->name = "ATI (C) Imageon Video Overlay"; ++ adaptor->nEncodings = 1; ++ adaptor->pEncodings = DummyEncoding; ++ adaptor->nFormats = NUM_FORMATS; ++ adaptor->pFormats = Formats; ++ adaptor->nPorts = 1; ++ adaptor->pPortPrivates = (DevUnion*)(&adaptor[1]); ++ ++ pPortPriv = (W100PortPrivPtr)(&adaptor->pPortPrivates[1]); ++ ++ adaptor->pPortPrivates[0].ptr = (pointer)(pPortPriv); ++ ++ adaptor->nAttributes = NUM_ATTRIBUTES; ++ adaptor->pAttributes = Attributes; ++ adaptor->pImages = Images; ++ adaptor->nImages = NUM_IMAGES; ++ adaptor->PutVideo = NULL; ++ adaptor->PutStill = NULL; ++ adaptor->GetVideo = NULL; ++ adaptor->GetStill = NULL; ++ adaptor->StopVideo = W100StopVideo; ++ adaptor->SetPortAttribute = W100SetPortAttribute; ++ adaptor->GetPortAttribute = W100GetPortAttribute; ++ adaptor->QueryBestSize = W100QueryBestSize; ++ adaptor->PutImage = W100PutImage; ++ adaptor->ReputImage = NULL; ++ adaptor->QueryImageAttributes = W100QueryImageAttributes; ++ ++ REGION_INIT(pScreen, &pPortPriv->clip, NullBox, 0); ++ ++ w100s->pAdaptor = adaptor; ++ ++ xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); ++ xvColorKey = MAKE_ATOM("XV_COLORKEY"); ++ xvMaxOverlaySize = MAKE_ATOM("XV_MAXOVERLAYSIZE"); ++ ++ pPortPriv->maxOverlaySize = OVL_MAX_SIZE; ++ pPortPriv->colorKey = 0xff00; ++ pPortPriv->brightness = W100GetBrightness(w100c); ++ return adaptor; ++} ++ ++Bool W100InitVideo(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ W100CardInfo(pScreenPriv); ++ KdScreenInfo *screen = pScreenPriv->screen; ++ KdVideoAdaptorPtr *adaptors, *newAdaptors = NULL; ++ KdVideoAdaptorPtr newAdaptor = NULL; ++ int num_adaptors; ++ ++ w100s->pAdaptor = NULL; ++ ++ if (w100c->reg_base == NULL) ++ return FALSE; ++ ++ num_adaptors = KdXVListGenericAdaptors(screen, &adaptors); ++ ++ newAdaptor = W100SetupImageVideo(pScreen); ++ ++ if (newAdaptor) { ++ if (!num_adaptors) { ++ num_adaptors = 1; ++ adaptors = &newAdaptor; ++ } else { ++ newAdaptors = xalloc((num_adaptors + 1) * ++ sizeof(KdVideoAdaptorPtr *)); ++ if (newAdaptors) { ++ memcpy(newAdaptors, adaptors, num_adaptors * ++ sizeof(KdVideoAdaptorPtr)); ++ newAdaptors[num_adaptors] = newAdaptor; ++ adaptors = newAdaptors; ++ num_adaptors++; ++ } ++ } ++ } ++ ++ if (num_adaptors) ++ KdXVScreenInit(pScreen, adaptors, num_adaptors); ++ ++ if (newAdaptors) ++ xfree(newAdaptors); ++ ++ return TRUE; ++} ++ ++void ++W100FiniVideo(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ W100ScreenInfo(pScreenPriv); ++ KdVideoAdaptorPtr adaptor = w100s->pAdaptor; ++ W100PortPrivPtr pPortPriv; ++ int i; ++ ++ if (!adaptor) ++ return; ++ ++ pPortPriv = (W100PortPrivPtr)(&adaptor->pPortPrivates[0].ptr); ++ REGION_UNINIT(pScreen, &pPortPriv->clip); ++ ++ xfree(adaptor); ++ w100s->pAdaptor = NULL; ++} ++ +--- /dev/null ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/imageon/imageon_support.h +@@ -0,0 +1,87 @@ ++/* ++ * Copyright © 2007 Manuel Teira ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Manuel Teira not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Manuel Teira makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef _IMAGEON_SUPPORT_H_ ++#define _IMAGEON_SUPPORT_H ++ ++#include "imageon.h" ++ ++extern CARD8 W100SolidRop[16]; ++extern CARD8 W100BltRop[16]; ++ ++void W100DisableDisplayUpdate(W100CardInfo *w100c); ++void W100EnableDisplayUpdate(W100CardInfo *w100c); ++void W100SetupGraphicEngine(W100CardInfo *w100c); ++void W100ResetGraphicEngine(W100CardInfo *w100c); ++void W100SetupGraphicWindow(W100CardInfo *w100c); ++void W100EnableGraphicWindow(W100CardInfo *w100c); ++void W100DisableGraphicWindow(W100CardInfo *w100c); ++inline Bool W100WaitCmdFifoEntries(W100CardInfo *w100c, int entries); ++Bool W100WaitIdle(W100CardInfo *w100c); ++void W100ResetContext(W100CardInfo *w100c); ++CARD32 W100ComputeSolidGmc(W100CardInfo *w100c, CARD8 alu); ++CARD32 W100ComputeCopyGmc(W100CardInfo *w100c, CARD8 alu); ++CARD32 W100ComputeAritGmc(W100CardInfo *w100c, CARD8 alu); ++void W100SetXForm(W100CardInfo *w100c, int dx, int dy); ++void W100SetRotation(W100CardInfo *w100c, int randr, Bool mirror); ++void W100SetPixelMask(W100CardInfo *w100c, Pixel mask); ++Bool W100SetSource(KdScreenInfo *screen, CARD32 srcPitch, ++ CARD32 srcOffset, CARD8 bpp); ++Bool W100SetDestination(KdScreenInfo *screen, CARD32 dstPitch, ++ CARD32 dstOffset, CARD8 bpp); ++Bool W100SetSourcePixmap(PixmapPtr pPix); ++Bool W100SetDestinationPixmap(PixmapPtr pPix); ++CARD16 W100MapToHWX(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD16 W100MapToHWY(W100CardInfo *w100c, ++ CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD16 W100XformX(W100CardInfo *w100c, CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD16 W100XformY(W100CardInfo *w100c, CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD16 W100XformW(W100CardInfo *w100c, CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD16 W100XformH(W100CardInfo *w100c, CARD16 x, CARD16 y, CARD16 w, CARD16 h); ++CARD8 W100GetScaler(CARD16 dstsize, CARD16 srcsize); ++CARD16 W100ApplyScaler(CARD16 srcsize, CARD8 scaler); ++static void W100Blt(KdScreenInfo *screen, int randr, int bpp, ++ CARD32 srcOffset, CARD16 srcW, CARD16 srcH, CARD16 srcPitch, ++ CARD32 dstOffset, CARD16 dstPitch, ++ CARD16 dstX, CARD16 dstY); ++static void W100StretchBlt(KdScreenInfo *screen, int randr, int bpp, ++ CARD32 srcOffset, CARD16 srcW, CARD16 srcH, ++ CARD16 srcPitch, ++ CARD32 dstOffset, CARD16 dstPitch, ++ CARD16 dstX, CARD16 dstY, ++ CARD8 xscaler, CARD8 yscaler); ++static void W100ScaledBlt(KdScreenInfo *screen, int randr, int bpp, ++ CARD32 srcOffset, CARD16 srcW, CARD16 srcH, ++ CARD16 srcPitch, ++ CARD32 dstOffset, CARD16 dstPitch, ++ CARD16 dstX, CARD16 dstY, ++ CARD8 xscaler, CARD8 yscaler); ++void W100PlanarBlt(KdScreenInfo *screen, int planes, int bpp, int randr, ++ KdOffscreenArea *src, int srcW, int srcPitch, int srcH, ++ KdOffscreenArea *dst, int planeOffsets[], ++ int dstW, int dstPitch, int dstH, ++ int dstX, int dstY); ++CARD8 W100GetBrightness(W100CardInfo *w100c); ++void W100SetBrightness(W100CardInfo *w100c, CARD8 value); ++ ++#endif diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-vidmemarea.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-vidmemarea.patch new file mode 100644 index 0000000000..ed5b6f05cb --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-vidmemarea.patch @@ -0,0 +1,756 @@ + +# Author : Manuel Teira <manuel.teira@telefonica.net> (sirfred in #oe) +# Description: Support for multiple memory video zones in kdrive. Make offscreen +# areas aware of the memory video zone it belongs to. Change the fbdev driver to +# honour this new model. + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c~kdrive-vidmemarea ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c +@@ -908,9 +908,10 @@ + ret = (*pScreen->CloseScreen) (index, pScreen); + else + ret = TRUE; +- +- if (screen->off_screen_base < screen->memory_size) +- KdOffscreenFini (pScreen); ++ ++ if (KdHasOffscreen(screen)) { ++ KdOffscreenFini(pScreen); ++ } + + if (pScreenPriv->dpmsState != KD_DPMS_NORMAL) + (*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL); +@@ -1219,8 +1220,9 @@ + if (!(*card->cfuncs->initAccel) (pScreen)) + screen->dumb = TRUE; + +- if (screen->off_screen_base < screen->memory_size) +- KdOffscreenInit (pScreen); ++ if (KdHasOffscreen(screen)) { ++ KdOffscreenInit(pScreen); ++ } + + #ifdef PSEUDO8 + (void) p8Init (pScreen, PSEUDO8_USE_DEFAULT); +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.h~kdrive-vidmemarea ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.h +@@ -63,6 +63,9 @@ + #define KD_MAX_CARD_ADDRESS 8 + #endif + ++#define KD_VIDMEM_MINPRIO 0 ++#define KD_VIDMEM_MAXPRIO 255 ++ + /* + * Configuration information per video card + */ +@@ -115,6 +118,13 @@ + + typedef void (*KdOffscreenSaveProc) (ScreenPtr pScreen, KdOffscreenArea *area); + ++typedef struct _KdVideoMemArea { ++ CARD8 priority; ++ CARD8 *base; ++ CARD32 size; ++ CARD32 available_offset; ++} KdVideoMemArea; ++ + typedef enum _KdOffscreenState { + KdOffscreenAvail, + KdOffscreenRemovable, +@@ -127,7 +137,8 @@ + int size; + int score; + pointer privData; +- ++ KdVideoMemArea *vidmem; ++ int pool; + KdOffscreenSaveProc save; + + KdOffscreenState state; +@@ -138,6 +149,7 @@ + #define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) + #define RR_Reflect_All (RR_Reflect_X|RR_Reflect_Y) + ++ + typedef struct _KdScreenInfo { + struct _KdScreenInfo *next; + KdCardInfo *card; +@@ -155,9 +167,8 @@ + int mynum; + DDXPointRec origin; + KdFrameBuffer fb[KD_MAX_FB]; +- CARD8 *memory_base; +- unsigned long memory_size; +- unsigned long off_screen_base; ++ KdVideoMemArea **videomem_areas; ++ int num_videomem_areas; + } KdScreenInfo; + + typedef struct _KdCardFuncs { +@@ -187,7 +198,6 @@ + + void (*getColors) (ScreenPtr, int, int, xColorItem *); + void (*putColors) (ScreenPtr, int, int, xColorItem *); +- + } KdCardFuncs; + + #define KD_MAX_PSEUDO_DEPTH 8 +@@ -203,7 +213,8 @@ + + int dpmsState; + +- KdOffscreenArea *off_screen_areas; ++ KdOffscreenArea **offscreen_pools; ++ int num_offscreen_pools; + + ColormapPtr pInstalledmap[KD_MAX_FB]; /* current colormap */ + xColorItem systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */ +@@ -881,6 +892,15 @@ + KdOffscreenInit (ScreenPtr pScreen); + + KdOffscreenArea * ++KdOffscreenAllocPrio (ScreenPtr pScreen, int size, int align, ++ Bool locked, ++ KdOffscreenSaveProc save, ++ pointer privData, ++ int minPriority, ++ int maxPriority, ++ Bool allowEviction); ++ ++KdOffscreenArea * + KdOffscreenAlloc (ScreenPtr pScreen, int size, int align, + Bool locked, + KdOffscreenSaveProc save, +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kaa.c~kdrive-vidmemarea ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kaa.c +@@ -160,7 +160,7 @@ + pPixmap->drawable.width, + pPixmap->drawable.height)); + pPixmap->devKind = pitch; +- pPixmap->devPrivate.ptr = (pointer) ((CARD8 *) pScreenPriv->screen->memory_base + pKaaPixmap->area->offset); ++ pPixmap->devPrivate.ptr = (pointer) ((CARD8 *) pKaaPixmap->area->vidmem->base + pKaaPixmap->area->offset); + pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; + return TRUE; + } +@@ -198,7 +198,7 @@ + + dst = pPixmap->devPrivate.ptr; + dst_pitch = pPixmap->devKind; +- ++ + bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch; + + kaaWaitSync (pPixmap->drawable.pScreen); +@@ -336,10 +336,16 @@ + { + ScreenPtr pScreen = p->drawable.pScreen; + KdScreenPriv(pScreen); ++ int index; + +- return ((unsigned long) ((CARD8 *) p->devPrivate.ptr - +- (CARD8 *) pScreenPriv->screen->memory_base) < +- pScreenPriv->screen->memory_size); ++ for (index = 0; index < pScreenPriv->screen->num_videomem_areas; index++) { ++ KdVideoMemArea *vidmem = pScreenPriv->screen->videomem_areas[index]; ++ if ((((CARD8 *)p->devPrivate.ptr) >= vidmem->base) && ++ (((CARD8 *)p->devPrivate.ptr) <= (vidmem->base + vidmem->size))) { ++ return TRUE; ++ } ++ } ++ return FALSE; + } + + PixmapPtr +@@ -1060,6 +1066,7 @@ + KdCheckPaintWindow (pWin, pRegion, what); + } + ++ + Bool + kaaDrawInit (ScreenPtr pScreen, + KaaScreenInfoPtr pScreenInfo) +@@ -1109,7 +1116,7 @@ + * Hookup offscreen pixmaps + */ + if ((pKaaScr->info->flags & KAA_OFFSCREEN_PIXMAPS) && +- screen->off_screen_base < screen->memory_size) ++ KdHasOffscreen(screen)) + { + if (!AllocatePixmapPrivate(pScreen, kaaPixmapPrivateIndex, + sizeof (KaaPixmapPrivRec))) +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/koffscreen.c~kdrive-vidmemarea ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/koffscreen.c +@@ -41,16 +41,20 @@ + { + KdScreenPriv (pScreen); + KdOffscreenArea *prev = 0, *area; +- +- assert (pScreenPriv->screen->off_screen_areas->area.offset == 0); +- for (area = pScreenPriv->off_screen_areas; area; area = area->next) +- { +- if (prev) +- assert (prev->offset + prev->size == area->offset); ++ int index; ++ ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ area = pScreenPriv->offscreen_pools[index]; ++ assert (area->vidmem->available_offset - area.offset == 0); ++ while(area) { ++ if (prev) ++ assert (prev->offset + prev->size == area->offset); + +- prev = area; ++ prev = area; ++ area = area->next; ++ } ++ assert (prev->offset + prev->size == prev->vidmem->size); + } +- assert (prev->offset + prev->size == pScreenPriv->screen->memory_size); + } + #else + #define KdOffscreenValidate(s) +@@ -65,101 +69,133 @@ + } + + KdOffscreenArea * +-KdOffscreenAlloc (ScreenPtr pScreen, int size, int align, +- Bool locked, +- KdOffscreenSaveProc save, +- pointer privData) ++KdOffscreenAllocPrio (ScreenPtr pScreen, int size, int align, ++ Bool locked, ++ KdOffscreenSaveProc save, ++ pointer privData, ++ int minPriority, ++ int maxPriority, ++ Bool allowEviction) + { + KdOffscreenArea *area, *begin, *best; + KdScreenPriv (pScreen); + int tmp, real_size = 0, best_score; ++ int index; ++ Bool canFit = FALSE; + +- KdOffscreenValidate (pScreen); + if (!align) + align = 1; + + if (!size) + { +- DBG_OFFSCREEN (("Alloc 0x%x -> EMPTY\n", size)); ++ DBG_OFFSCREEN(("Alloc 0x%x -> EMPTY\n", size)); + return NULL; + } + + /* throw out requests that cannot fit */ +- if (size > (pScreenPriv->screen->memory_size - pScreenPriv->screen->off_screen_base)) +- { +- DBG_OFFSCREEN (("Alloc 0x%x -> TOBIG\n", size)); +- return NULL; ++ for (index = 0; index < pScreenPriv->screen->num_videomem_areas; index++) { ++ KdVideoMemArea *vidmem = pScreenPriv->screen->videomem_areas[index]; ++ if ((vidmem->priority <= maxPriority) && ++ (vidmem->priority >= minPriority)) { ++ if (size <= (vidmem->size - vidmem->available_offset)) { ++ canFit = TRUE; ++ break; ++ } ++ } + } +- +- /* Try to find a free space that'll fit. */ +- for (area = pScreenPriv->off_screen_areas; area; area = area->next) ++ if (!canFit) + { +- /* skip allocated areas */ +- if (area->state != KdOffscreenAvail) +- continue; ++ DBG_OFFSCREEN(("Alloc 0x%x -> TOOBIG\n", size)); ++ return NULL; ++ } + +- /* adjust size to match alignment requirement */ +- real_size = size; +- tmp = area->offset % align; +- if (tmp) +- real_size += (align - tmp); +- +- /* does it fit? */ +- if (real_size <= area->size) +- break; ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ /* Look just in the head, as all the areas of the pool have ++ the same vidmem */ ++ area = pScreenPriv->offscreen_pools[index]; ++ if ((area->vidmem->priority > maxPriority) || ++ (area->vidmem->priority < minPriority)) ++ continue; ++ ++ /* Try to find a free space that'll fit. */ ++ for (area = pScreenPriv->offscreen_pools[index]; area; ++ area = area->next) { ++ /* skip allocated areas */ ++ if (area->state != KdOffscreenAvail) ++ continue; ++ ++ /* adjust size to match alignment requirement */ ++ real_size = size; ++ tmp = area->offset % align; ++ if (tmp) ++ real_size += (align - tmp); ++ ++ /* does it fit? */ ++ if (real_size <= area->size) ++ break; ++ } ++ if (area) ++ break; + } +- +- if (!area) +- { ++ ++ if (!area && allowEviction) { + /* + * Kick out existing users to make space. + * + * First, locate a region which can hold the desired object. + */ ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ if ((area->vidmem->priority > maxPriority) || ++ (area->vidmem->priority < minPriority)) ++ continue; + +- /* prev points at the first object to boot */ +- best = NULL; +- best_score = MAXINT; +- for (begin = pScreenPriv->off_screen_areas; begin != NULL; +- begin = begin->next) +- { +- int avail, score; +- KdOffscreenArea *scan; ++ /* prev points at the first object to boot */ ++ best = NULL; ++ best_score = MAXINT; + +- if (begin->state == KdOffscreenLocked) +- continue; ++ for (begin = pScreenPriv->offscreen_pools[index]; begin != NULL; ++ begin = begin->next) { ++ int avail, score; ++ KdOffscreenArea *scan; + +- /* adjust size to match alignment requirement */ +- real_size = size; +- tmp = begin->offset % align; +- if (tmp) +- real_size += (align - tmp); ++ if (begin->state == KdOffscreenLocked) ++ continue; ++ ++ /* adjust size to match alignment requirement */ ++ real_size = size; ++ tmp = begin->offset % align; ++ if (tmp) ++ real_size += (align - tmp); + +- avail = 0; +- score = 0; +- /* now see if we can make room here, and how "costly" it'll be. */ +- for (scan = begin; scan != NULL; scan = scan->next) +- { +- if (scan->state == KdOffscreenLocked) { +- /* Can't make room here, start after this locked area. */ +- begin = scan->next; +- break; +- } +- /* Score should only be non-zero for KdOffscreenRemovable */ +- score += scan->score; +- avail += scan->size; +- if (avail >= real_size) +- break; +- } +- /* Is it the best option we've found so far? */ +- if (avail >= real_size && score < best_score) { +- best = begin; +- best_score = score; +- } +- } +- area = best; +- if (!area) +- { ++ avail = 0; ++ score = 0; ++ /* now see if we can make room here, ++ and how "costly" it'll be. */ ++ for (scan = begin; scan != NULL; scan = scan->next) { ++ if (scan->state == KdOffscreenLocked) { ++ /* Can't make room here, ++ start after this locked area. */ ++ begin = scan->next; ++ break; ++ } ++ /* Score should only be non-zero for KdOffscreenRemovable */ ++ score += scan->score; ++ avail += scan->size; ++ if (avail >= real_size) ++ break; ++ } ++ /* Is it the best option we've found so far? */ ++ if (avail >= real_size && score < best_score) { ++ best = begin; ++ best_score = score; ++ } ++ } ++ area = best; ++ if (area) ++ break; ++ } ++ ++ if (!area) { + DBG_OFFSCREEN (("Alloc 0x%x -> NOSPACE\n", size)); + /* Could not allocate memory */ + KdOffscreenValidate (pScreen); +@@ -180,16 +216,14 @@ + /* + * Now get the system to merge the other needed areas together + */ +- while (area->size < real_size) +- { +- assert (area->next && area->next->state == KdOffscreenRemovable); ++ while (area->size < real_size) { ++ assert (area->next && area->next->state == KdOffscreenRemovable); + (void) KdOffscreenKickOut (pScreen, area->next); + } + } +- ++ + /* save extra space in new area */ +- if (real_size < area->size) +- { ++ if (real_size < area->size) { + KdOffscreenArea *new_area = xalloc (sizeof (KdOffscreenArea)); + if (!new_area) + return NULL; +@@ -198,9 +232,14 @@ + new_area->state = KdOffscreenAvail; + new_area->save = 0; + new_area->score = 0; ++ new_area->vidmem = area->vidmem; ++ new_area->pool = area->pool; + new_area->next = area->next; + area->next = new_area; + area->size = real_size; ++ DBG_OFFSCREEN (("New OffscreenArea at %p (offset:0x%08x, size:0x%08x, pool:%d\n", area, area->offset, area->size, area->pool)); ++ ++ + } + /* + * Mark this area as in use +@@ -212,42 +251,80 @@ + area->privData = privData; + area->save = save; + area->score = 0; +- ++ + area->save_offset = area->offset; + { + int tmp = area->offset % align; + if (tmp) + area->offset += (align - tmp); + } +- ++ + KdOffscreenValidate (pScreen); + + DBG_OFFSCREEN (("Alloc 0x%x -> 0x%x\n", size, area->offset)); + return area; + } + ++Bool ++KdHasOffscreen(KdScreenInfo *screen) ++{ ++ int index; ++ DBG_OFFSCREEN (("KdHasOffscreen\n")); ++ ++ for (index = 0; index < screen->num_videomem_areas; index++) { ++ KdVideoMemArea *vidmem = screen->videomem_areas[index]; ++ if (vidmem->available_offset < vidmem->size) { ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++KdOffscreenArea * ++KdOffscreenAlloc (ScreenPtr pScreen, int size, int align, ++ Bool locked, ++ KdOffscreenSaveProc save, ++ pointer privData) ++{ ++ DBG_OFFSCREEN (("KdOffscreenAlloc(size:%d, align:%d, locked:%d)\n", ++ size, align, locked)); ++ return KdOffscreenAllocPrio(pScreen, size, align, ++ locked, ++ save, ++ privData, ++ KD_VIDMEM_MINPRIO, ++ KD_VIDMEM_MAXPRIO, ++ TRUE); ++} ++ + void + KdOffscreenSwapOut (ScreenPtr pScreen) + { + KdScreenPriv (pScreen); ++ int index; ++ ++ DBG_OFFSCREEN (("KdOffscreenSwapOut\n")); + + KdOffscreenValidate (pScreen); +- /* loop until a single free area spans the space */ +- for (;;) +- { +- KdOffscreenArea *area = pScreenPriv->off_screen_areas; ++ ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ /* loop until a single free area spans the space */ ++ for (;;) ++ { ++ KdOffscreenArea *area = pScreenPriv->offscreen_pools[index]; + +- if (!area) +- break; +- if (area->state == KdOffscreenAvail) +- { +- area = area->next; +- if (!area) +- break; +- } +- assert (area->state != KdOffscreenAvail); +- (void) KdOffscreenKickOut (pScreen, area); +- KdOffscreenValidate (pScreen); ++ if (!area) ++ break; ++ if (area->state == KdOffscreenAvail) ++ { ++ area = area->next; ++ if (!area) ++ break; ++ } ++ assert (area->state != KdOffscreenAvail); ++ (void) KdOffscreenKickOut (pScreen, area); ++ KdOffscreenValidate (pScreen); ++ } + } + KdOffscreenValidate (pScreen); + KdOffscreenFini (pScreen); +@@ -256,6 +333,8 @@ + void + KdOffscreenSwapIn (ScreenPtr pScreen) + { ++ KdScreenPriv (pScreen); ++ DBG_OFFSCREEN (("KdOffscreenSwapIn\n")); + KdOffscreenInit (pScreen); + } + +@@ -264,7 +343,7 @@ + KdOffscreenMerge (KdOffscreenArea *area) + { + KdOffscreenArea *next = area->next; +- ++ //DBG_OFFSCREEN (("KdOffscreenMerge %p\n", area)); + /* account for space */ + area->size += next->size; + /* frob pointer */ +@@ -278,8 +357,9 @@ + KdScreenPriv(pScreen); + KdOffscreenArea *next = area->next; + KdOffscreenArea *prev; +- +- DBG_OFFSCREEN (("Free 0x%x -> 0x%x\n", area->size, area->offset)); ++ ++ DBG_OFFSCREEN (("KdOffscreenFree 0x%x -> 0x%x\n", ++ area->size, area->offset)); + KdOffscreenValidate (pScreen); + + area->state = KdOffscreenAvail; +@@ -290,10 +370,11 @@ + /* + * Find previous area + */ +- if (area == pScreenPriv->off_screen_areas) ++ if (area == pScreenPriv->offscreen_pools[area->pool]) + prev = 0; + else +- for (prev = pScreenPriv->off_screen_areas; prev; prev = prev->next) ++ for (prev = pScreenPriv->offscreen_pools[area->pool]; ++ prev; prev = prev->next) + if (prev->next == area) + break; + +@@ -317,21 +398,30 @@ + { + KaaPixmapPriv (pPixmap); + KdScreenPriv (pPixmap->drawable.pScreen); ++ int index; + static int iter = 0; + ++ + if (!pKaaPixmap->area) + return; + ++ /* ++ DBG_OFFSCREEN(("KdOffscreenMarkUsed(offset:0x%08x, pool:%d)\n", ++ pKaaPixmap->area->offset, ++ pKaaPixmap->area->pool)); ++ */ + /* The numbers here are arbitrary. We may want to tune these. */ + pKaaPixmap->area->score += 100; + if (++iter == 10) { + KdOffscreenArea *area; +- for (area = pScreenPriv->off_screen_areas; area != NULL; +- area = area->next) +- { +- if (area->state == KdOffscreenRemovable) +- area->score = (area->score * 7) / 8; +- } ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ for (area = pScreenPriv->offscreen_pools[index]; area != NULL; ++ area = area->next) ++ { ++ if (area->state == KdOffscreenRemovable) ++ area->score = (area->score * 7) / 8; ++ } ++ } + } + } + +@@ -340,23 +430,41 @@ + { + KdScreenPriv (pScreen); + KdOffscreenArea *area; ++ KdVideoMemArea *vidmem; ++ int index, num_offscreen; + +- /* Allocate a big free area */ +- area = xalloc (sizeof (KdOffscreenArea)); ++ DBG_OFFSCREEN (("KdOffscreenInit\n")); ++ num_offscreen = 0; ++ pScreenPriv->num_offscreen_pools = 0; ++ pScreenPriv->offscreen_pools = NULL; + +- if (!area) +- return FALSE; ++ for (index = 0; index < pScreenPriv->screen->num_videomem_areas; index++) { ++ vidmem = pScreenPriv->screen->videomem_areas[index]; ++ DBG_OFFSCREEN (("Searching vidmemarea base:0x%p, size:0x%08x, available_offset:0x%08x\n", vidmem->base, vidmem->size, vidmem->available_offset)); ++ if (vidmem->available_offset < vidmem->size) { ++ pScreenPriv->offscreen_pools = xrealloc(pScreenPriv->offscreen_pools, ++ sizeof(KdOffscreenArea*) * (pScreenPriv->num_offscreen_pools + 1)); ++ if (!pScreenPriv->offscreen_pools) { ++ return FALSE; ++ } ++ pScreenPriv->offscreen_pools[pScreenPriv->num_offscreen_pools] = ++ area = xcalloc(sizeof(KdOffscreenArea), 1); ++ if (!area) ++ return FALSE; ++ ++ area->state = KdOffscreenAvail; ++ area->vidmem = vidmem; ++ area->offset = vidmem->available_offset; ++ area->size = vidmem->size - vidmem->available_offset; ++ area->save = 0; ++ area->pool = pScreenPriv->num_offscreen_pools; ++ area->next = NULL; ++ area->score = 0; ++ pScreenPriv->num_offscreen_pools++; ++ DBG_OFFSCREEN (("New OffscreenArea at %p (offset:0x%08x, size:0x%08x, pool:%d)\n", area, area->offset, area->size, area->pool)); ++ } ++ } + +- area->state = KdOffscreenAvail; +- area->offset = pScreenPriv->screen->off_screen_base; +- area->size = pScreenPriv->screen->memory_size - area->offset; +- area->save = 0; +- area->next = NULL; +- area->score = 0; +- +- /* Add it to the free areas */ +- pScreenPriv->off_screen_areas = area; +- + KdOffscreenValidate (pScreen); + + return TRUE; +@@ -367,11 +475,17 @@ + { + KdScreenPriv (pScreen); + KdOffscreenArea *area; +- +- /* just free all of the area records */ +- while ((area = pScreenPriv->off_screen_areas)) +- { +- pScreenPriv->off_screen_areas = area->next; +- xfree (area); ++ int index; ++ ++ DBG_OFFSCREEN (("KdOffscreenFini\n")); ++ for (index = 0; index < pScreenPriv->num_offscreen_pools; index++) { ++ /* just free all of the area records */ ++ while ((area = pScreenPriv->offscreen_pools[index])) { ++ pScreenPriv->offscreen_pools[index] = area->next; ++ xfree (area); ++ } + } ++ xfree(pScreenPriv->offscreen_pools); ++ pScreenPriv->offscreen_pools = NULL; ++ pScreenPriv->num_offscreen_pools = 0; + } +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c~kdrive-vidmemarea ++++ xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c +@@ -330,6 +330,7 @@ + FbdevScrPriv *scrpriv = screen->driver; + KdMouseMatrix m; + FbdevPriv *priv = screen->card->driver; ++ KdVideoMemArea *vidmem; + + if (scrpriv->randr != RR_Rotate_0) + scrpriv->shadow = TRUE; +@@ -342,15 +343,20 @@ + + screen->width = priv->var.xres; + screen->height = priv->var.yres; +- screen->memory_base = (CARD8 *) (priv->fb); +- screen->memory_size = priv->fix.smem_len; ++ screen->videomem_areas = xcalloc(sizeof(KdVideoMemArea*), 1); ++ screen->videomem_areas[0] = vidmem = xcalloc(sizeof(KdVideoMemArea), 1); ++ screen->num_videomem_areas = 1; ++ ++ vidmem->priority = KD_VIDMEM_MINPRIO; ++ vidmem->base = (CARD8 *) (priv->fb); ++ vidmem->size = priv->fix.smem_len; + + if (scrpriv->shadow) + { + if (!KdShadowFbAlloc (screen, 0, + scrpriv->randr & (RR_Rotate_90|RR_Rotate_270))) + return FALSE; +- screen->off_screen_base = screen->memory_size; ++ vidmem->available_offset = vidmem->size; + } + else + { +@@ -358,7 +364,7 @@ + screen->fb[0].pixelStride = (priv->fix.line_length * 8 / + priv->var.bits_per_pixel); + screen->fb[0].frameBuffer = (CARD8 *) (priv->fb); +- screen->off_screen_base = screen->fb[0].byteStride * screen->height; ++ vidmem->available_offset = screen->fb[0].byteStride * screen->height; + } + + return TRUE; 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 c563c48f29..64a49aed68 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 @@ -52,7 +52,9 @@ PACKAGE_ARCH_poodle = "poodle" S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" -inherit autotools pkgconfig +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 48f5212806..0fc9ec1997 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -54,7 +54,7 @@ PACKAGE_ARCH_poodle = "poodle" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index d1b5f7ff0f..3fc071ec28 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -15,39 +15,39 @@ do_configure() { #general config echo "#define BuildServersOnly YES" > config/cf/host.def echo "#define ProjectRoot /usr" >> config/cf/host.def - + # do not build these XServers echo "#define XnestServer NO" >> config/cf/host.def echo "#define XdmxServer NO" >> config/cf/host.def - + # build commands echo "#define CcCmd ${CC}" >> config/cf/host.def echo "#define CplusplusCmd ${CXX}" >> config/cf/host.def echo "#define LdCmd ${LD}" >> config/cf/host.def - + # Qt defines echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def echo "#define QtDir ${QTDIR}" >> config/cf/host.def echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX QtCmnDefs" >> config/cf/host.def - + # Build these XServers echo "#define XqtXServer YES" >> config/cf/host.def echo "#define XF86Server NO" >> config/cf/host.def echo "#define TinyXServer YES" >> config/cf/host.def echo "#define KDriveXServer YES" >> config/cf/host.def echo "#define KdriveServerExtraDefines -DDDXOSFATALERROR -DDDXOSVERRORF" >> config/cf/host.def - + # General Config echo "#define SystemUsrIncDir ${STAGING_INCDIR}" >> config/cf/host.def echo "#define IncRoot ${STAGING_INCDIR}" >> config/cf/host.def echo "#define LdPostLib -L${STAGING_LIBDIR}" >> config/cf/host.def - + echo "#undef BuildRandR " >> config/cf/host.def echo "#define BuildRandR YES" >> config/cf/host.def echo "#define BuildLBX YES" >> config/cf/host.def - + # change standard defines if [ ${TARGET_ARCH} == "arm" ]; then echo "#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE" >> config/cf/host.def @@ -72,12 +72,12 @@ do_compile() { do_install() { make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install - + install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics/Xqt - + install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics/Xqt - install -m 0644 IPKG/Xqt.desktop ${D}${palmtopdir}/apps/Applications + install -m 0644 IPKG/Xqt.desktop ${D}${palmtopdir}/apps/Applications } do_stage() { diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index ec6c6a176b..7f49cccb17 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -31,39 +31,39 @@ do_configure() { #general config echo "#define BuildServersOnly YES" > config/cf/host.def echo "#define ProjectRoot /usr" >> config/cf/host.def - + # do not build these XServers echo "#define XnestServer NO" >> config/cf/host.def echo "#define XdmxServer NO" >> config/cf/host.def - + # build commands echo "#define CcCmd ${CC}" >> config/cf/host.def echo "#define CplusplusCmd ${CXX}" >> config/cf/host.def echo "#define LdCmd ${LD}" >> config/cf/host.def - + # Qt defines echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def echo "#define QtDir ${QTDIR}" >> config/cf/host.def echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX QtCmnDefs" >> config/cf/host.def - + # Build these XServers echo "#define XqtXServer YES" >> config/cf/host.def echo "#define XF86Server NO" >> config/cf/host.def echo "#define TinyXServer YES" >> config/cf/host.def echo "#define KDriveXServer YES" >> config/cf/host.def echo "#define KdriveServerExtraDefines -DDDXOSFATALERROR -DDDXOSVERRORF" >> config/cf/host.def - + # General Config echo "#define SystemUsrIncDir ${STAGING_INCDIR}" >> config/cf/host.def echo "#define IncRoot ${STAGING_INCDIR}" >> config/cf/host.def echo "#define LdPostLib -L${STAGING_LIBDIR}" >> config/cf/host.def - + echo "#undef BuildRandR " >> config/cf/host.def echo "#define BuildRandR YES" >> config/cf/host.def echo "#define BuildLBX YES" >> config/cf/host.def - + # change standard defines if [ ${TARGET_ARCH} == "arm" ]; then echo "#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE" >> config/cf/host.def diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb index e007029b9b..9b424461ba 100644 --- a/packages/xscreensaver/xscreensaver_4.16.bb +++ b/packages/xscreensaver/xscreensaver_4.16.bb @@ -26,7 +26,7 @@ inherit autotools export INTLTOOL_PERL="/usr/bin/env perl" EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \ - --with-jpeg --with-xpm" + --with-jpeg --with-xpm" PACKAGES =+ " xscreensaver-demo xscreensaver-extra" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index d3b8e20022..3b951fdeeb 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -23,7 +23,7 @@ inherit autotools export INTLTOOL_PERL="/usr/bin/env perl" EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \ - --with-jpeg --with-xpm" + --with-jpeg --with-xpm" PACKAGES =+ " xscreensaver-demo xscreensaver-extra" diff --git a/packages/xscrnsaverh/xscrnsaverh_1.0.bb b/packages/xscrnsaverh/xscrnsaverh_1.0.bb index 77be70e9b1..7fc7e6e15a 100644 --- a/packages/xscrnsaverh/xscrnsaverh_1.0.bb +++ b/packages/xscrnsaverh/xscrnsaverh_1.0.bb @@ -8,6 +8,6 @@ DESCRIPTION = "missing header" SRC_URI = "file://scrnsaver.h" -do_stage() { - install -m 0644 ${WORKDIR}/scrnsaver.h ${STAGING_INCDIR}/X11/extensions/ +do_stage() { + install -m 0644 ${WORKDIR}/scrnsaver.h ${STAGING_INCDIR}/X11/extensions/ } diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb new file mode 100644 index 0000000000..d14cad725b --- /dev/null +++ b/packages/xserver-common/xserver-common_1.13.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb index eb3e23df8b..7e0d11cc98 100644 --- a/packages/xstroke/xstroke_0.6.bb +++ b/packages/xstroke/xstroke_0.6.bb @@ -8,4 +8,4 @@ PR = "r2" SRC_URI = "http://www.oesources.org/source/current/xstroke-0.6.tar.gz \ file://auto-disable.patch;patch=1;pnum=0" -inherit autotools pkgconfig +inherit autotools pkgconfig diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb index 75f565816b..063873db83 100644 --- a/packages/zauralign/zauralign_1.0.2.bb +++ b/packages/zauralign/zauralign_1.0.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Zauralign - a game for one player. The player has to align pieces to remove them from the \ -board fighting against new pieces which appear after each move." +board fighting against new pieces which appear after each move." SECTION = "opie/games" PRIORITY = "optional" LICENSE = "GPL" diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index f650126c58..d536122eca 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -10,8 +10,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ file://add-poodle.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ - file://zaurus-hinge.matchbox-landscape" - + file://zaurus-hinge.matchbox-landscape" + S = "${WORKDIR}/${PN}" @@ -25,7 +25,7 @@ do_install_append() { install -d "${D}/etc/zaurusd/hinge-landscape.d" install -d "${D}/etc/zaurusd/hinge-portrait.d" install -d "${D}/etc/zaurusd/hinge-close.d" - + install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape" install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait" } diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb index 7214671de0..4755f01538 100644 --- a/packages/zd1211/zd1211_r77.bb +++ b/packages/zd1211/zd1211_r77.bb @@ -7,7 +7,7 @@ RDEPENDS = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1 \ - " + " SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile-unslung.patch;patch=1 \ @@ -26,10 +26,10 @@ do_compile () { 'KDIR=${STAGING_KERNEL_DIR}' \ 'KERNEL_VERSION=${KERNEL_VERSION}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net } diff --git a/packages/zip/zip-native_2.31.bb b/packages/zip/zip-native_2.31.bb deleted file mode 100644 index fde61efcb7..0000000000 --- a/packages/zip/zip-native_2.31.bb +++ /dev/null @@ -1,9 +0,0 @@ -SECTION = "console/utils" -inherit native -require zip_${PV}.bb -S = "${WORKDIR}/zip-${PV}" - -do_stage() { - install -d ${STAGING_BINDIR} - install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} -} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb deleted file mode 100644 index b8c4ae9da0..0000000000 --- a/packages/zip/zip_2.31.bb +++ /dev/null @@ -1,2 +0,0 @@ -require zip.inc -PR="r0" diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb index 2df5c32d08..5b9161cfce 100644 --- a/packages/zroadmap/zroadmap_1.0.12.bb +++ b/packages/zroadmap/zroadmap_1.0.12.bb @@ -46,7 +46,7 @@ do_install() { install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/ + install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb index a9a8bd87f8..fd9cc5e95f 100644 --- a/packages/zroadmap/zroadmap_cvs.bb +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -47,7 +47,7 @@ do_install() { install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/ + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb index 61b92e2c1c..154ea8c313 100644 --- a/packages/zshopi/zshopi_0.2.bb +++ b/packages/zshopi/zshopi_0.2.bb @@ -31,12 +31,12 @@ do_configure_prepend() { do_install() { - cd "${WORKDIR}/${PN}_${PV}/zshopi" + cd "${WORKDIR}/${PN}_${PV}/zshopi" opie-lrelease zshopi.de.ts - - install -d ${D}${palmtopdir}/i18n/de + + install -d ${D}${palmtopdir}/i18n/de install -d ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/zshopi.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/zshopi.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/${PN}_${PV}/zshopi/zshopi.de.qm ${D}${palmtopdir}/i18n/de/zshopi.qm } diff --git a/removal.txt b/removal.txt index 79af0cc809..17b7639586 100644 --- a/removal.txt +++ b/removal.txt @@ -3,6 +3,8 @@ Packages to be removed from OpenEmbedded if no one will fix them. Dropping stuff from metadata is not best way so this file will be filled with informations about which parts of metadata will be removed. +Please sort by removal date + Package Name: recipe, directory or subsystem name Removal Date: YYYY-MM-DD Maintainer: Surname Name + e-mail @@ -12,45 +14,15 @@ Proposed by: person which want entry to be removed ----------------------------------------------------------------------------- Package Name: Maemo -Removal Date: 2006-12-12 +Removal Date: 2006-12-15 Maintainer: none Reason: Unfetchable, obsoleted by IT2006 release. Proposed by: Marcin 'Hrw' Juszkiewicz Package Name: task-bootstrap* -Removal Date: 2006-12-12 +Removal Date: 2006-12-22 Maintainer: None Reason: Obsoleted by task-base Proposed by: Koen Kooi +Note: Moved to packages/obsolete/tasks on 2006-12-22 -Package Name: bluez*2.* -Removal Date: 2007-01-15 -Maintainer: None -Reason: Obsolete by, and conflicts with bluez 3.7 -Proposed by: Koen Kooi -Will fix: Paul Sokolovsky -Reason: Still known to be used by OPIE, so extra time needed to upgrade it. - -Package Name: mono -Removal Date: 2006-12-12 -Maintainer: None -Reason: Obsolete version - 1.2 is current, 1.0 is not fetchable -Proposed by: Marcin 'Hrw' Juszkiewicz - -Package Name: ipac-ng -Removal Date: 2006-12-12 -Maintainer: None -Reason: Depends on libgd-perl which is not in metada -Proposed by: Marcin 'Hrw' Juszkiewicz - -Package Name: nsqld -Removal Date: 2006-12-12 -Maintainer: None -Reason: Never used -Proposed by: Florian Boor - -Package Name: gpe-mileage -Removal Date: 2006-12-12 -Maintainer: None -Reason: Unfinished, no development progress -Proposed by: Florian Boor diff --git a/site/arm-common b/site/arm-common new file mode 100644 index 0000000000..7bad23f1c7 --- /dev/null +++ b/site/arm-common @@ -0,0 +1,232 @@ +ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} +ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} +ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} +ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} +ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} +ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} +ac_cv_sctp=${ac_cv_sctp=no} + +# apache +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +apr_cv_process_shared_works=${apr_cv_process_shared_works=no} +ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} +apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} + +# bash +ac_cv_c_long_double=${ac_cv_c_long_double=yes} +bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} +bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} +bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} +bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} +bash_cv_dup2_broken=${bash_cv_dup2_broken=no} +bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} +bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} +bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} +bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} +bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} +bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} +bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} +bash_cv_job_control_missing=${bash_cv_job_control_missing=present} +bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} +bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} + +# coreutils +utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} + +# cvs +cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} + +# db (sleepycat) +db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} +db_cv_sprintf_count=${db_cv_sprintf_count=yes} +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} +db_cv_align_t=${db_cv_align_t='unsigned long long'} +db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} +db_cv_mutex=${db_cv_mutex=no} +db_cv_posixmutexes=${db_cv_posixmutexes=no} +db_cv_uimutexes=${db_cv_uimutexes=no} + +# D-BUS +ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} + +# edb +db_cv_spinlocks=${db_cv_spinlocks=no} + +# ettercap +ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} + +# fget +compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} +compat_cv_func_basename_works=${compat_cv_func_basename_works=no} +compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no} + +# fnmatch +ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} + +# gettext +am_cv_func_working_getline=${am_cv_func_working_getline=yes} + +# glib +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_stack_grows=${glib_cv_stack_grows=no} +glib_cv_uscore=${glib_cv_uscore=no} +glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} +glib_cv_has__inline=${glib_cv_has__inline=yes} +glib_cv_has__inline__=${glib_cv_has__inline__=yes} +glib_cv_hasinline=${glib_cv_hasinline=yes} +glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_uscore=${glib_cv_uscore=no} +glib_cv_va_copy=${glib_cv_va_copy=no} +glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} +glib_cv___va_copy=${glib_cv___va_copy=yes} +glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} +ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} +glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} +glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} +glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} + +# glib-2.0 +glib_cv_long_long_format=${glib_cv_long_long_format=ll} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} +glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} +glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} +glib_cv_strlcpy=${glib_cv_strlcpy=no} + +# httppc +ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# jikes +ac_cv_sizeof_wchar_t=4 + +# lftp +ac_cv_need_trio=${ac_cv_need_trio=no} +lftp_cv_va_copy=${lftp_cv_va_copy=no} +lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} +lftp_cv___va_copy=${lftp_cv___va_copy=yes} + +# libesmtp +acx_working_snprintf=${acx_working_snprintf=yes} + +# libidl +libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} + +# libnet +ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} + +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + +# libxfce4util +with_broken_putenv=${with_broken_putenv=no} + +# links +ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} + +# mono +cv_mono_sizeof_sunpath=108 + +# mysql +mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} +mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} +ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} + +# nano +ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} +nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} + +# ORBit2 +ac_cv_alignof_CORBA_boolean=1 +ac_cv_alignof_CORBA_char=1 +ac_cv_alignof_CORBA_double=4 +ac_cv_alignof_CORBA_float=4 +ac_cv_alignof_CORBA_long=4 +ac_cv_alignof_CORBA_long_double=4 +ac_cv_alignof_CORBA_long_long=4 +ac_cv_alignof_CORBA_octet=1 +ac_cv_alignof_CORBA_pointer=4 +ac_cv_alignof_CORBA_short=2 +ac_cv_alignof_CORBA_struct=4 +ac_cv_alignof_CORBA_wchar=2 +ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} + +# php +ac_cv_pread=${ac_cv_pread=no} +ac_cv_pwrite=${ac_cv_pwrite=no} +php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} + +# rsync +rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} +rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} +rsync_cv_HAVE_LONGLONG=${rsync_cv_HAVE_LONGLONG=yes} +rsync_cv_HAVE_OFF64_T=${rsync_cv_HAVE_OFF64_T=no} +rsync_cv_HAVE_SHORT_INO_T=${rsync_cv_HAVE_SHORT_INO_T=no} +rsync_cv_HAVE_UNSIGNED_CHAR=${rsync_cv_HAVE_UNSIGNED_CHAR=no} +rsync_cv_HAVE_BROKEN_READDIR=${rsync_cv_HAVE_BROKEN_READDIR=no} +rsync_cv_HAVE_GETTIMEOFDAY_TZ=${rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes} +rsync_cv_HAVE_C99_VSNPRINTF=${rsync_cv_HAVE_C99_VSNPRINTF=yes} +rsync_cv_HAVE_SECURE_MKSTEMP=${rsync_cv_HAVE_SECURE_MKSTEMP=yes} +rsync_cv_REPLACE_INET_NTOA=${rsync_cv_REPLACE_INET_NTOA=no} +rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no} + +# screen +screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} +screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} +screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} +screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} +screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} +screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} +screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} +screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} +screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} + +# 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} +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} + +# socat +ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} +sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} + +# ssh +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} + +# startup-notification +lf_cv_sane_realloc=yes + +# sudo +sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} + +# xffm +jm_cv_func_working_readdir=yes + diff --git a/site/arm-linux b/site/arm-linux index 32b5c5403f..934522e488 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -37,266 +37,119 @@ ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} - mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - -# libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} - -ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} -ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} -ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} -ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} - -# socat -ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} -sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} - -# links -ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} - # samba +samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes} +samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=${samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no} +samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no} +samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no} +samba_cv_HAVE_BROKEN_LINUX_SENDFILE=${samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes} +samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=yes} +samba_cv_HAVE_BROKEN_READDIR_NAME=${samba_cv_HAVE_BROKEN_READDIR_NAME=no} +samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes} +samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no} +samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes} +samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes} +samba_cv_HAVE_DQB_FSOFTLIMIT=${samba_cv_HAVE_DQB_FSOFTLIMIT=no} +samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes} +samba_cv_HAVE_FAM_H=${samba_cv_HAVE_FAM_H=no} +samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} +samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes} +samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes} samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} +samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} +samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no} +samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no} +samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no} +samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} +samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no} +samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes} +samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes} +samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes} +samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes} +samba_cv_HAVE_NATIVE_ICONV=${samba_cv_HAVE_NATIVE_ICONV=yes} +samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no} +samba_cv_HAVE_ROOT=${samba_cv_HAVE_ROOT=yes} +samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no} +samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes} +samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=yes} +samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes} +samba_cv_HAVE_SOCK_SIN_LEN=${samba_cv_HAVE_SOCK_SIN_LEN=no} +samba_cv_HAVE_STAT_ST_BLKSIZE=${samba_cv_HAVE_STAT_ST_BLKSIZE=yes} +samba_cv_HAVE_STAT_ST_BLOCKS=${samba_cv_HAVE_STAT_ST_BLOCKS=yes} +samba_cv_HAVE_STRUCT_DIR64=${samba_cv_HAVE_STRUCT_DIR64=no} +samba_cv_HAVE_STRUCT_DIRENT64=${samba_cv_HAVE_STRUCT_DIRENT64=yes} +samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes} +samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no} +samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no} +samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no} +samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=yes} +samba_cv_HAVE_UTIMBUF=${samba_cv_HAVE_UTIMBUF=yes} +samba_cv_HAVE_UT_UT_ADDR=${samba_cv_HAVE_UT_UT_ADDR=yes} +samba_cv_HAVE_UT_UT_EXIT=${samba_cv_HAVE_UT_UT_EXIT=yes} +samba_cv_HAVE_UT_UT_HOST=${samba_cv_HAVE_UT_UT_HOST=yes} +samba_cv_HAVE_UT_UT_ID=${samba_cv_HAVE_UT_UT_ID=yes} +samba_cv_HAVE_UT_UT_NAME=${samba_cv_HAVE_UT_UT_NAME=yes} +samba_cv_HAVE_UT_UT_PID=${samba_cv_HAVE_UT_UT_PID=yes} +samba_cv_HAVE_UT_UT_TIME=${samba_cv_HAVE_UT_UT_TIME=yes} +samba_cv_HAVE_UT_UT_TV=${samba_cv_HAVE_UT_UT_TV=yes} +samba_cv_HAVE_UT_UT_TYPE=${samba_cv_HAVE_UT_UT_TYPE=yes} +samba_cv_HAVE_UT_UT_USER=${samba_cv_HAVE_UT_UT_USER=yes} +samba_cv_HAVE_UX_UT_SYSLEN=${samba_cv_HAVE_UX_UT_SYSLEN=no} +samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes} +samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=yes} +samba_cv_HAVE_Werror=${samba_cv_HAVE_Werror=yes} +samba_cv_PUTUTLINE_RETURNS_UTMP=${samba_cv_PUTUTLINE_RETURNS_UTMP=yes} +samba_cv_QUOTA_WORKS=${samba_cv_QUOTA_WORKS=yes} +samba_cv_REALPATH_TAKES_NULL=${samba_cv_REALPATH_TAKES_NULL=yes} +samba_cv_REPLACE_GETPASS=${samba_cv_REPLACE_GETPASS=yes} +samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no} +samba_cv_REPLACE_READDIR=${samba_cv_REPLACE_READDIR=no} +samba_cv_RUN_QUOTA_TESTS=${samba_cv_RUN_QUOTA_TESTS=yes} +samba_cv_SEEKDIR_RETURNS_VOID=${samba_cv_SEEKDIR_RETURNS_VOID=yes} +samba_cv_SIZEOF_DEV_T=${samba_cv_SIZEOF_DEV_T=yes} +samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes} +samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes} +samba_cv_SYSCONF_SC_NGROUPS_MAX=${samba_cv_SYSCONF_SC_NGROUPS_MAX=yes} +samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes} +samba_cv_SYSCONF_SC_NPROC_ONLN=${samba_cv_SYSCONF_SC_NPROC_ONLN=no} +samba_cv_SYSCONF_SC_PAGESIZE=${samba_cv_SYSCONF_SC_PAGESIZE=yes} +samba_cv_SYSQUOTA_FOUND=${samba_cv_SYSQUOTA_FOUND=yes} +samba_cv_SYSQUOTA_WORKS=${samba_cv_SYSQUOTA_WORKS=yes} +samba_cv_SYSQUOTA_WORKS_XFS=${samba_cv_SYSQUOTA_WORKS_XFS=yes} +samba_cv_TRY_QUOTAS=${samba_cv_TRY_QUOTAS=no} +samba_cv_TRY_SYS_QUOTAS=${samba_cv_TRY_SYS_QUOTAS=yes} +samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} +samba_cv_WE_USE_SYS_QUOTAS=${samba_cv_WE_USE_SYS_QUOTAS=yes} +samba_cv_WITH_AFS=${samba_cv_WITH_AFS=no} +samba_cv_WITH_FAKE_KASERVER=${samba_cv_WITH_FAKE_KASERVER=no} +samba_cv_WITH_QUOTAS=${samba_cv_WITH_QUOTAS=auto} +samba_cv_WITH_SYS_QUOTAS=${samba_cv_WITH_SYS_QUOTAS=auto} +samba_cv_WITH_VFS_AFSACL=${samba_cv_WITH_VFS_AFSACL=no} +samba_cv_compiler_supports_ll=${samba_cv_compiler_supports_ll=yes} +samba_cv_found_xfs_header=${samba_cv_found_xfs_header=yes} +samba_cv_have_longlong=${samba_cv_have_longlong=yes} +samba_cv_have_setresgid=${samba_cv_have_setresgid=yes} +samba_cv_have_setresuid=${samba_cv_have_setresuid=yes} +samba_cv_immediate_structures=${samba_cv_immediate_structures=yes} +samba_cv_optimize_out_funcation_calls=${samba_cv_optimize_out_funcation_calls=yes} +samba_cv_sig_atomic_t=${samba_cv_sig_atomic_t=yes} +samba_cv_socklen_t=${samba_cv_socklen_t=yes} +samba_cv_struct_timespec=${samba_cv_struct_timespec=yes} +samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_linux.c} +samba_cv_unixsocket=${samba_cv_unixsocket=yes} +samba_cv_volatile=${samba_cv_volatile=yes} + +#older sambe defines samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes} -samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes} -samba_cv_have_setresgid=${samba_cv_have_setresgid=yes} -samba_cv_have_setresuid=${samba_cv_have_setresuid=yes} -samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=yes} -samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes} -samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes} -samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes} -samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes} -samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} -samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes} samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes} - -# sleepycat db -db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_align_t=${db_cv_align_t='unsigned long long'} -db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} - -# php -ac_cv_pread=${ac_cv_pread=no} -ac_cv_pwrite=${ac_cv_pwrite=no} -php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} - -# glib -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_stack_grows=${glib_cv_stack_grows=no} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} -glib_cv_has__inline=${glib_cv_has__inline=yes} -glib_cv_has__inline__=${glib_cv_has__inline__=yes} -glib_cv_hasinline=${glib_cv_hasinline=yes} -glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_va_copy=${glib_cv_va_copy=no} -glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} -glib_cv___va_copy=${glib_cv___va_copy=yes} -glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} -glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} -glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} -glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} - -# ettercap -ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} - -# libesmtp -acx_working_snprintf=${acx_working_snprintf=yes} - -# D-BUS -ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} - -# glib 2.0 -glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} -glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} - -glib_cv_strlcpy=${glib_cv_strlcpy=no} - -# httppc -ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} - -# jikes -ac_cv_sizeof_wchar_t=4 - -# lftp -ac_cv_file___dev_ptc_=yes -ac_cv_need_trio=${ac_cv_need_trio=no} -lftp_cv_va_copy=${lftp_cv_va_copy=no} -lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} -lftp_cv___va_copy=${lftp_cv___va_copy=yes} - -# edb -db_cv_spinlocks=${db_cv_spinlocks=no} - -# fget -compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} -compat_cv_func_basename_works=${compat_cv_func_basename_works=no} -compat_cv_func_dirname_works=${compat_cv_func_dirname_works=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} -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 - -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=4 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=4 -ac_cv_alignof_CORBA_long_long=4 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=4 -ac_cv_alignof_CORBA_wchar=2 -ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} - -# cvs -cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} - -# bash -ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} -bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} - -# mono -cv_mono_sizeof_sunpath=108 - -# mysql -mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} -mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} - -# gettext -am_cv_func_working_getline=${am_cv_func_working_getline=yes} - -# fnmatch -ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} - -# rsync -rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} -rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} -rsync_cv_HAVE_LONGLONG=${rsync_cv_HAVE_LONGLONG=yes} -rsync_cv_HAVE_OFF64_T=${rsync_cv_HAVE_OFF64_T=no} -rsync_cv_HAVE_SHORT_INO_T=${rsync_cv_HAVE_SHORT_INO_T=no} -rsync_cv_HAVE_UNSIGNED_CHAR=${rsync_cv_HAVE_UNSIGNED_CHAR=no} -rsync_cv_HAVE_BROKEN_READDIR=${rsync_cv_HAVE_BROKEN_READDIR=no} -rsync_cv_HAVE_GETTIMEOFDAY_TZ=${rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes} -rsync_cv_HAVE_C99_VSNPRINTF=${rsync_cv_HAVE_C99_VSNPRINTF=yes} -rsync_cv_HAVE_SECURE_MKSTEMP=${rsync_cv_HAVE_SECURE_MKSTEMP=yes} -rsync_cv_REPLACE_INET_NTOA=${rsync_cv_REPLACE_INET_NTOA=no} -rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no} - -# sudo -sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} - -# ipsec-tools -ac_cv_va_copy=${ac_cv_va_copy=no} -ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} -ac_cv___va_copy=${ac_cv___va_copy=yes} -racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} - -# libxfce4util -with_broken_putenv=${with_broken_putenv=no} - -# xffm -jm_cv_func_working_readdir=yes - # dpkg dpkg_cv_va_copy=${ac_cv_va_copy=no} dpkg_cv___va_copy=${ac_cv___va_copy=yes} @@ -310,8 +163,9 @@ clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes} ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} -#dbus +# dbus ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no} -#apache -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} +# lftp +ac_cv_file___dev_ptc_=yes + diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc index ae50b743e3..3ebf6f4d6c 100644 --- a/site/arm-linux-uclibc +++ b/site/arm-linux-uclibc @@ -27,59 +27,6 @@ mr_cv_target_elf=${mr_cv_target_elf=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - -# libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} - -ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} -ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} -ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} -ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} - -# socat -ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} -sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} - -# links -ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} - # samba samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes} samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=${samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no} @@ -170,178 +117,3 @@ samba_cv_socklen_t=${samba_cv_socklen_t=yes} samba_cv_unixsocket=${samba_cv_unixsocket=yes} samba_cv_volatile=${samba_cv_volatile=yes} -# sleepycat db -db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_align_t=${db_cv_align_t='unsigned long long'} -db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} - -# php -ac_cv_pread=${ac_cv_pread=no} -ac_cv_pwrite=${ac_cv_pwrite=no} -php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} - -# glib -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_stack_grows=${glib_cv_stack_grows=no} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} -glib_cv_has__inline=${glib_cv_has__inline=yes} -glib_cv_has__inline__=${glib_cv_has__inline__=yes} -glib_cv_hasinline=${glib_cv_hasinline=yes} -glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_va_copy=${glib_cv_va_copy=no} -glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} -glib_cv___va_copy=${glib_cv___va_copy=yes} -glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} -glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} -glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} -glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} - -# ettercap -ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} - -# libesmtp -acx_working_snprintf=${acx_working_snprintf=yes} - -# D-BUS -ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} - -# glib 2.0 -glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} -glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} - -glib_cv_strlcpy=${glib_cv_strlcpy=no} - -# httppc -ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} - -# lftp -ac_cv_need_trio=${ac_cv_need_trio=no} -lftp_cv_va_copy=${lftp_cv_va_copy=no} -lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} -lftp_cv___va_copy=${lftp_cv___va_copy=yes} - -# edb -db_cv_spinlocks=${db_cv_spinlocks=no} - -# fget -compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} -compat_cv_func_basename_works=${compat_cv_func_basename_works=no} -compat_cv_func_dirname_works=${compat_cv_func_dirname_works=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} -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 - -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=4 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=4 -ac_cv_alignof_CORBA_long_long=4 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=4 -ac_cv_alignof_CORBA_wchar=2 -ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} - -# cvs -cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} - -# bash -ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} -bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} - -# mysql -mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} -mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} - -# gettext -am_cv_func_working_getline=${am_cv_func_working_getline=yes} - -# fnmatch -ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} - -# rsync -rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} -rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} -rsync_cv_HAVE_LONGLONG=${rsync_cv_HAVE_LONGLONG=yes} -rsync_cv_HAVE_OFF64_T=${rsync_cv_HAVE_OFF64_T=no} -rsync_cv_HAVE_SHORT_INO_T=${rsync_cv_HAVE_SHORT_INO_T=no} -rsync_cv_HAVE_UNSIGNED_CHAR=${rsync_cv_HAVE_UNSIGNED_CHAR=no} -rsync_cv_HAVE_BROKEN_READDIR=${rsync_cv_HAVE_BROKEN_READDIR=no} -rsync_cv_HAVE_GETTIMEOFDAY_TZ=${rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes} -rsync_cv_HAVE_C99_VSNPRINTF=${rsync_cv_HAVE_C99_VSNPRINTF=yes} -rsync_cv_HAVE_SECURE_MKSTEMP=${rsync_cv_HAVE_SECURE_MKSTEMP=yes} -rsync_cv_REPLACE_INET_NTOA=${rsync_cv_REPLACE_INET_NTOA=no} -rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no} - -# sudo -sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} - -# ipsec-tools -ac_cv_va_copy=${ac_cv_va_copy=no} -ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} -ac_cv___va_copy=${ac_cv___va_copy=yes} -racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} - -# libxfce4util -with_broken_putenv=${with_broken_putenv=no} - -# xffm -jm_cv_func_working_readdir=yes - diff --git a/site/armeb-linux b/site/armeb-linux index 6631ee0cfb..fd3d2b18d3 100644 --- a/site/armeb-linux +++ b/site/armeb-linux @@ -30,59 +30,6 @@ mr_cv_target_elf=${mr_cv_target_elf=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - -# libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} - -ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} -ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} -ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} -ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} - -# socat -ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} -sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} - -# links -ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} - # samba samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} @@ -106,179 +53,3 @@ samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes} samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes} samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes} - -# sleepycat db -db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_align_t=${db_cv_align_t='unsigned long long'} -db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} - -# php -ac_cv_pread=${ac_cv_pread=no} -ac_cv_pwrite=${ac_cv_pwrite=no} -php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} - -# glib -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_stack_grows=${glib_cv_stack_grows=no} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} -glib_cv_has__inline=${glib_cv_has__inline=yes} -glib_cv_has__inline__=${glib_cv_has__inline__=yes} -glib_cv_hasinline=${glib_cv_hasinline=yes} -glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_va_copy=${glib_cv_va_copy=no} -glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} -glib_cv___va_copy=${glib_cv___va_copy=yes} -glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} -glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} -glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} -glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} - -# ettercap -ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} - -# libesmtp -acx_working_snprintf=${acx_working_snprintf=yes} - -# D-BUS -ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} - -# glib 2.0 -glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} -glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} - -glib_cv_strlcpy=${glib_cv_strlcpy=no} - -# httppc -ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} - -# lftp -ac_cv_need_trio=${ac_cv_need_trio=no} -lftp_cv_va_copy=${lftp_cv_va_copy=no} -lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} -lftp_cv___va_copy=${lftp_cv___va_copy=yes} - -# edb -db_cv_spinlocks=${db_cv_spinlocks=no} - -# fget -compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} -compat_cv_func_basename_works=${compat_cv_func_basename_works=no} -compat_cv_func_dirname_works=${compat_cv_func_dirname_works=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} -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 - -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=4 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=4 -ac_cv_alignof_CORBA_long_long=4 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=4 -ac_cv_alignof_CORBA_wchar=2 -ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} - -# cvs -cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} - -# bash -ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} -bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} - -# mysql -mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} -mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} - -# gettext -am_cv_func_working_getline=${am_cv_func_working_getline=yes} - -# fnmatch -ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} - -# rsync -rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} -rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} -rsync_cv_HAVE_LONGLONG=${rsync_cv_HAVE_LONGLONG=yes} -rsync_cv_HAVE_OFF64_T=${rsync_cv_HAVE_OFF64_T=no} -rsync_cv_HAVE_SHORT_INO_T=${rsync_cv_HAVE_SHORT_INO_T=no} -rsync_cv_HAVE_UNSIGNED_CHAR=${rsync_cv_HAVE_UNSIGNED_CHAR=no} -rsync_cv_HAVE_BROKEN_READDIR=${rsync_cv_HAVE_BROKEN_READDIR=no} -rsync_cv_HAVE_GETTIMEOFDAY_TZ=${rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes} -rsync_cv_HAVE_C99_VSNPRINTF=${rsync_cv_HAVE_C99_VSNPRINTF=yes} -rsync_cv_HAVE_SECURE_MKSTEMP=${rsync_cv_HAVE_SECURE_MKSTEMP=yes} -rsync_cv_REPLACE_INET_NTOA=${rsync_cv_REPLACE_INET_NTOA=no} -rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no} - -# sudo -sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} - -# ipsec-tools -ac_cv_va_copy=${ac_cv_va_copy=no} -ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} -ac_cv___va_copy=${ac_cv___va_copy=yes} -racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} - -# libxfce4util -with_broken_putenv=${with_broken_putenv=no} - -# xffm -jm_cv_func_working_readdir=yes - diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc index f4e5e4faab..3b2bc6b0e5 100644 --- a/site/armeb-linux-uclibc +++ b/site/armeb-linux-uclibc @@ -30,59 +30,6 @@ mr_cv_target_elf=${mr_cv_target_elf=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - -# libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} - -ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} -ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} -ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} -ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} - -# socat -ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} -sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} - -# links -ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} - # samba samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} @@ -100,179 +47,3 @@ samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes} samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes} samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes} - -# sleepycat db -db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_align_t=${db_cv_align_t='unsigned long long'} -db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} - -# php -ac_cv_pread=${ac_cv_pread=no} -ac_cv_pwrite=${ac_cv_pwrite=no} -php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} - -# glib -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_stack_grows=${glib_cv_stack_grows=no} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} -glib_cv_has__inline=${glib_cv_has__inline=yes} -glib_cv_has__inline__=${glib_cv_has__inline__=yes} -glib_cv_hasinline=${glib_cv_hasinline=yes} -glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_uscore=${glib_cv_uscore=no} -glib_cv_va_copy=${glib_cv_va_copy=no} -glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} -glib_cv___va_copy=${glib_cv___va_copy=yes} -glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} -glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} -glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} -glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} - -# ettercap -ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} - -# libesmtp -acx_working_snprintf=${acx_working_snprintf=yes} - -# D-BUS -ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} - -# glib 2.0 -glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} -glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} - -glib_cv_strlcpy=${glib_cv_strlcpy=no} - -# httppc -ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} - -# lftp -ac_cv_need_trio=${ac_cv_need_trio=no} -lftp_cv_va_copy=${lftp_cv_va_copy=no} -lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} -lftp_cv___va_copy=${lftp_cv___va_copy=yes} - -# edb -db_cv_spinlocks=${db_cv_spinlocks=no} - -# fget -compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} -compat_cv_func_basename_works=${compat_cv_func_basename_works=no} -compat_cv_func_dirname_works=${compat_cv_func_dirname_works=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} -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 - -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=4 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=4 -ac_cv_alignof_CORBA_long_long=4 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=4 -ac_cv_alignof_CORBA_wchar=2 -ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} - -# cvs -cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} - -# bash -ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} -bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} - -# mysql -mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} -mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} - -# gettext -am_cv_func_working_getline=${am_cv_func_working_getline=yes} - -# fnmatch -ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} - -# rsync -rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} -rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} -rsync_cv_HAVE_LONGLONG=${rsync_cv_HAVE_LONGLONG=yes} -rsync_cv_HAVE_OFF64_T=${rsync_cv_HAVE_OFF64_T=no} -rsync_cv_HAVE_SHORT_INO_T=${rsync_cv_HAVE_SHORT_INO_T=no} -rsync_cv_HAVE_UNSIGNED_CHAR=${rsync_cv_HAVE_UNSIGNED_CHAR=no} -rsync_cv_HAVE_BROKEN_READDIR=${rsync_cv_HAVE_BROKEN_READDIR=no} -rsync_cv_HAVE_GETTIMEOFDAY_TZ=${rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes} -rsync_cv_HAVE_C99_VSNPRINTF=${rsync_cv_HAVE_C99_VSNPRINTF=yes} -rsync_cv_HAVE_SECURE_MKSTEMP=${rsync_cv_HAVE_SECURE_MKSTEMP=yes} -rsync_cv_REPLACE_INET_NTOA=${rsync_cv_REPLACE_INET_NTOA=no} -rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no} - -# sudo -sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} - -# ipsec-tools -ac_cv_va_copy=${ac_cv_va_copy=no} -ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} -ac_cv___va_copy=${ac_cv___va_copy=yes} -racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} - -# libxfce4util -with_broken_putenv=${with_broken_putenv=no} - -# xffm -jm_cv_func_working_readdir=yes - diff --git a/packages/tslib/tslib/tosa/.mtn2git_empty b/site/common index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/tosa/.mtn2git_empty +++ b/site/common diff --git a/site/common-glibc b/site/common-glibc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/site/common-glibc diff --git a/site/common-uclibc b/site/common-uclibc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/site/common-uclibc diff --git a/site/endian-big b/site/endian-big index baa7161476..29edc8d94d 100644 --- a/site/endian-big +++ b/site/endian-big @@ -1,2 +1,5 @@ ac_cv_c_littleendian=${ac_cv_c_littleendian=no} ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} + +# libnet +ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} diff --git a/site/endian-little b/site/endian-little index c66db59f31..9fcf31b8b1 100644 --- a/site/endian-little +++ b/site/endian-little @@ -1,2 +1,6 @@ ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} ac_cv_c_bigendian=${ac_cv_c_bigendian=no} + +# libnet +ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} + diff --git a/site/powerpc-linux b/site/powerpc-linux index 6e749d4640..127c85ae0b 100644 --- a/site/powerpc-linux +++ b/site/powerpc-linux @@ -65,7 +65,6 @@ ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} # libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} # screen @@ -267,3 +266,49 @@ ac_cv_type_int=${ac_cv_type_int=yes} ac_cv_type_uintptr_t=${ac_cv_type_uintptr_t=yes} liberty_cv_uint64=${liberty_cv_uint64=uint64_t} +#samba +ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} +fu_cv_sys_stat_statvfs64=${fu_cv_sys_stat_statvfs64=yes} +samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no} +samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no} +samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=yes} +samba_cv_HAVE_BROKEN_READDIR_NAME=${samba_cv_HAVE_BROKEN_READDIR_NAME=no} +samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes} +samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no} +samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes} +samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes} +samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} +samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes} +samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} +samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} +samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} +samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} +samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no} +samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} +samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes} +samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes} +samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes} +samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes} +samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no} +samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes} +samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes} +samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=yes} +samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes} +samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no} +samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=yes} +samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=yes} +samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes} +samba_cv_REALPATH_TAKES_NULL=${samba_cv_REALPATH_TAKES_NULL=yes} +samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no} +samba_cv_REPLACE_READDIR=${samba_cv_REPLACE_READDIR=no} +samba_cv_SIZEOF_DEV_T=${samba_cv_SIZEOF_DEV_T=yes} +samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes} +samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes} +samba_cv_STAT_STATVFS64=${samba_cv_STAT_STATVFS64=yes} +samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes} +samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} +samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} +samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes} +samba_cv_have_longlong=${samba_cv_have_longlong=yes} +samba_cv_have_setresgid=${samba_cv_have_setresgid=yes} +samba_cv_have_setresuid=${samba_cv_have_setresuid=yes} diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc new file mode 100644 index 0000000000..005d43412b --- /dev/null +++ b/site/powerpc-linux-uclibc @@ -0,0 +1,195 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_malloc_works=yes +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_setvbuf_reversed=no +ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} + +ac_cv_sys_restartable_syscalls=yes +ac_cv_type___int64=${ac_cv_type___int64=no} +ac_cv_type_size_t=${ac_cv_type_size_t=yes} +ac_cv_type_void_p=${ac_cv_type_void_p=yes} +ac_cv_uchar=${ac_cv_uchar=no} +ac_cv_uint=${ac_cv_uint=yes} +ac_cv_ulong=${ac_cv_ulong=yes} +ac_cv_ushort=${ac_cv_ushort=yes} + +mr_cv_target_elf=${mr_cv_target_elf=yes} + +ac_cv_c_littleendian=${ac_cv_c_littleendian=no} +ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} +cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} + + +# apache +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +apr_cv_process_shared_works=${apr_cv_process_shared_works=no} +ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} + +ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} +ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} +ac_cv_sctp=${ac_cv_sctp=no} + +# ssh +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} + +# coreutils +utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} + +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + +# nano +ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} +nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} + +# socat +ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} +sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} + +# links +ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} + +# sleepycat db +db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} +db_cv_sprintf_count=${db_cv_sprintf_count=yes} +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} +db_cv_align_t=${db_cv_align_t='unsigned long long'} +db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} +db_cv_mutex=${db_cv_mutex=no} +db_cv_posixmutexes=${db_cv_posixmutexes=no} +db_cv_uimutexes=${db_cv_uimutexes=no} + +# php +ac_cv_pread=${ac_cv_pread=no} +ac_cv_pwrite=${ac_cv_pwrite=no} +php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} + + +# ettercap +ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} + +# libesmtp +acx_working_snprintf=${acx_working_snprintf=yes} + +# D-BUS +ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} + +# glib 2.0 +glib_cv_long_long_format=${glib_cv_long_long_format=ll} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} +glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} +glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} + +glib_cv_strlcpy=${glib_cv_strlcpy=no} + +# httppc +ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} + +# lftp +ac_cv_need_trio=${ac_cv_need_trio=no} +lftp_cv_va_copy=${lftp_cv_va_copy=no} +lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} +lftp_cv___va_copy=${lftp_cv___va_copy=yes} + +# edb +db_cv_spinlocks=${db_cv_spinlocks=no} + +# fget +compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} +compat_cv_func_basename_works=${compat_cv_func_basename_works=no} +compat_cv_func_dirname_works=${compat_cv_func_dirname_works=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} +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 + +# libidl +libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} + +# ORBit2 +ac_cv_alignof_CORBA_boolean=1 +ac_cv_alignof_CORBA_char=1 +ac_cv_alignof_CORBA_double=4 +ac_cv_alignof_CORBA_float=4 +ac_cv_alignof_CORBA_long=4 +ac_cv_alignof_CORBA_long_double=4 +ac_cv_alignof_CORBA_long_long=4 +ac_cv_alignof_CORBA_octet=1 +ac_cv_alignof_CORBA_pointer=4 +ac_cv_alignof_CORBA_short=2 +ac_cv_alignof_CORBA_struct=4 +ac_cv_alignof_CORBA_wchar=2 +ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} + +# cvs +cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} + +# bash +ac_cv_c_long_double=${ac_cv_c_long_double=yes} +bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} +bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} +bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} +bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} +bash_cv_dup2_broken=${bash_cv_dup2_broken=no} +bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} +bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} +bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} +bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} +bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} +bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} +bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} +bash_cv_job_control_missing=${bash_cv_job_control_missing=present} +bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} +bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} + +# openssh +ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'} +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent='no'} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf='no'} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug='yes'} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr='no'} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr='yes'} + +# vim +ac_cv_sizeof_int=${ac_cv_sizeof_int='4'} diff --git a/site/sh-common b/site/sh-common index da34d36015..57afea2ee7 100644 --- a/site/sh-common +++ b/site/sh-common @@ -296,4 +296,3 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} # libnet ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} diff --git a/site/x86_64-linux b/site/x86_64-linux index 1453a86b76..848844b1c4 100644 --- a/site/x86_64-linux +++ b/site/x86_64-linux @@ -9,7 +9,6 @@ ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes} ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no} ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} ac_cv_linux_vers=${ac_cv_linux_vers=2} ac_cv_need_trio=${ac_cv_need_trio=no} diff --git a/site/x86_64-linux-uclibc b/site/x86_64-linux-uclibc index 4e391b2c2e..e88ed24ffb 100644 --- a/site/x86_64-linux-uclibc +++ b/site/x86_64-linux-uclibc @@ -9,7 +9,6 @@ ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes} ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no} ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} ac_cv_linux_vers=${ac_cv_linux_vers=2} ac_cv_need_trio=${ac_cv_need_trio=no} |