diff options
337 files changed, 6531 insertions, 3847 deletions
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/conf/bitbake.conf b/conf/bitbake.conf index dcdc18c322..36e1287d03 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -422,7 +422,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.conf b/conf/distro/angstrom-2007.1.conf index a6f50c1842..11c4ce7dca 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 = "24" +DISTRO_REVISION = "28" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -69,7 +69,8 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20061029" -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 +93,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.8" +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 +146,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" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 0bcdac1db5..2904db1108 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 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/openslug.conf b/conf/distro/openslug.conf index dec16d8cd7..8634d091f0 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 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/a780.conf b/conf/machine/a780.conf index a369eab0a3..fe3cdbc481 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" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 08104624ca..37f61433c7 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -4,17 +4,21 @@ 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" +# Empty modules list for now +HANDHELD_MODULES = "" +# Some extra configuration +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" +SERIAL_CONSOLE = "115200 ttySAC2 vt100" +USE_VT = "0" 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..dd079c244b 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/htcblueangel.conf 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/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/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..17e34efceb --- /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/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 838ad249c0..d4ce272558 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,9 +1,14 @@ #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 = "" 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/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index 2c9008c6f0..c73eb8023c 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -3,7 +3,7 @@ SECTION = "libs" DEPENDS = "apr expat gdbm" LICENSE = "Apache License, Version 2.0" -PR = "r1" +PR = "r2" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz" @@ -21,5 +21,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR} + autotools_stage_all } 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/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/gbluezconf/.mtn2git_empty b/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gbluezconf/.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_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..2e61a3c7b2 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 \ @@ -44,87 +11,3 @@ SRC_URI = \ 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..49bacac9c5 --- /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/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..1a8061ce07 100644 --- a/packages/btsco/btsco_0.42.bb +++ b/packages/btsco/btsco_0.42.bb @@ -1,16 +1,4 @@ -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() { 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..76c487be04 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 @@ -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..49766ef243 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 @@ -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..a4157082e8 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" -PR = "r1" +require busybox.inc -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" +PR = "r1" -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 @@ -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..9205b57d6f 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" +require busybox.inc -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" +PR = "r10" -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://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 @@ -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..5206d60ccc 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 @@ -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/cairo/cairo_1.3.8.bb b/packages/cairo/cairo.inc index d9454fadcd..e405257dfb 100644 --- a/packages/cairo/cairo_1.3.8.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_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/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/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/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..84fa38cef2 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..40b9fe4744 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..2277ae6bc7 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 \ diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb index fa05a83781..6c2289b8f7 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 \ 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_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/disable_orbit.patch b/packages/eds/eds-dbus/disable_orbit.patch new file mode 100644 index 0000000000..8757666e9d --- /dev/null +++ b/packages/eds/eds-dbus/disable_orbit.patch @@ -0,0 +1,13 @@ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in 2006-01-20 02:08:42.555073776 +0000 ++++ trunk/configure.in 2006-01-20 10:19:13.631870024 +0000 +@@ -1114,7 +1114,7 @@ + AC_MSG_RESULT($with_bug_buddy) + + if test "x${with_dbus}" = "xno"; then +- AM_PATH_ORBIT2(2.9.8) ++dnl AM_PATH_ORBIT2(2.9.8) + + AC_MSG_CHECKING(for CORBA include paths) + IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0` 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_svn.bb b/packages/eds/eds-dbus_svn.bb index 38a6e0a083..b97ed984bc 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -8,9 +8,10 @@ PV = "1.4.0+svn${SRCDATE}" 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://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 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/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/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..1f43ac8859 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 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..2d5809cd00 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/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.1/gcc-4.1.1-pr13685-1.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch index a56b1307df..c1e1dec408 100644 --- 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 @@ -1,26 +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);
+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/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb index 8ab16527ac..f3e480042a 100644 --- a/packages/gdb/gdb-cross_6.1.bb +++ b/packages/gdb/gdb-cross_6.1.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.2.1.bb index 32076b529e..0aba890eef 100644 --- a/packages/gdb/gdb-cross_6.2.1.bb +++ b/packages/gdb/gdb-cross_6.2.1.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.2.bb b/packages/gdb/gdb-cross_6.2.bb index 8ab16527ac..f3e480042a 100644 --- a/packages/gdb/gdb-cross_6.2.bb +++ b/packages/gdb/gdb-cross_6.2.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses-native" inherit autotools sdk 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.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 index 797148f262..6191061d16 100644 --- a/packages/gdb/gdb_6.1.bb +++ b/packages/gdb/gdb_6.1.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" PACKAGES =+ 'gdbserver ' diff --git a/packages/gdb/gdb_6.2.1.bb b/packages/gdb/gdb_6.2.1.bb index d8aa548d8f..641cd927b1 100644 --- a/packages/gdb/gdb_6.2.1.bb +++ b/packages/gdb/gdb_6.2.1.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" PACKAGES =+ 'gdbserver ' diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb index 809c90173f..75a08972a5 100644 --- a/packages/gdb/gdb_6.2.bb +++ b/packages/gdb/gdb_6.2.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + PR = "r1" DEPENDS = "ncurses readline" 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/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/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/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..aae16bf2f5 --- /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_2.5.bb b/packages/glibc/glibc_2.5.bb index d3c6ab02ec..23230392e9 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,7 @@ require glibc.inc +ARM_INSTRUCTION_SET = "arm" + PR = "r4" # the -isystem in bitbake.conf screws up glibc do_stage 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..42a216f1db 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/ipac-ng/.mtn2git_empty b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipac-ng/.mtn2git_empty +++ b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty diff --git a/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 ++++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 +@@ -154,7 +154,7 @@ + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + + if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) ++ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) + fi + + AM_GCONF_SOURCE_2 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..a0180fdbb2 --- /dev/null +++ b/packages/gnome/gnome-vfs_2.16.3.bb @@ -0,0 +1,36 @@ +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 = "r0" + +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" + +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/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/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/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/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/ipac-ng/ipac-ng-1.30/.mtn2git_empty b/packages/icecc-create-env/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipac-ng/ipac-ng-1.30/.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/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/openprotium-image.bb b/packages/images/openprotium-image.bb index ba25af373a..5efb401386 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 \ @@ -101,11 +108,8 @@ IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk 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/slugos-image.bb b/packages/images/slugos-image.bb index 82cd6f2b73..0e034005e7 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" @@ -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/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..31f25ce230 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.) 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.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/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/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/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/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/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/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/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/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/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/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb index 470fabc6c7..a06403c5f4 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19.bb @@ -6,7 +6,7 @@ # 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 = "644" # # The directory containing the patches to be applied is # specified below 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/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/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-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index eba9f5ef01..f2579db66f 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 \ @@ -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-r0.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 \ diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb index 097eaf8470..2248f88ae0 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 @@ -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-r0.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 \ diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb index f5af2ae05e..e8393c398f 100644 --- a/packages/linux/linux-rp_2.6.19+git.bb +++ b/packages/linux/linux-rp_2.6.19+git.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -35,6 +35,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git; ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-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 \ diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb index 3f0472ecdd..96307e0f92 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 = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -36,6 +36,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/xscale_cache_workaround-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 \ 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/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/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/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb index 080c97c18e..00bb761433 100644 --- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb +++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb @@ -3,7 +3,7 @@ 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 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-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..9123b0ffca 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.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" PR = "r1" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index 3a46009a4c..390ecf53ad 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.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" PR = "r2" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 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/kismet/kismet-2004-04-R1/.mtn2git_empty b/packages/mediatomb/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/.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/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb index ec4261f352..47f0cfe39f 100644 --- a/packages/meta/openprotium-packages.bb +++ b/packages/meta/openprotium-packages.bb @@ -5,7 +5,7 @@ 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" @@ -34,15 +34,28 @@ ALLOW_EMPTY = "1" # wakelan \ # wireless-tools \ # wpa-supplicant \ +# bluez-utils-nodbus \ +# libxml2 \ # 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 +64,6 @@ OPENIOM_PACKAGES = "\ bind \ binutils \ bison \ - bluez-utils-nodbus \ bridge-utils \ bzip2 \ ccxstream \ @@ -68,7 +80,6 @@ OPENIOM_PACKAGES = "\ dnsmasq \ e2fsprogs \ e2fsprogs-libs \ - eciadsl \ expat \ ez-ipupdate \ fetchmail \ @@ -76,7 +87,7 @@ OPENIOM_PACKAGES = "\ findutils \ flex \ flite \ - ftpd-topfield \ + gallery \ gawk \ gcc \ gdbm \ @@ -95,7 +106,6 @@ OPENIOM_PACKAGES = "\ 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 \ 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/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/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/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/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/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/kismet/kismet-2004-04-R1/mtx-1/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/mtx-1/.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/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty b/packages/openprotium-init/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty +++ b/packages/openprotium-init/.mtn2git_empty diff --git a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty b/packages/openprotium-init/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty +++ b/packages/openprotium-init/files/.mtn2git_empty diff --git a/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty b/packages/openprotium-init/files/boot/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/mtx-1/.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/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty b/packages/openprotium-init/files/initscripts/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2005-01-R1/mtx-2/.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..5ec63b1dfd --- /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/liblockfile/liblockfile-1.05/.mtn2git_empty b/packages/openswan/openswan-2.4.7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/liblockfile/liblockfile-1.05/.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/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/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.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/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.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/mono/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mono/.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/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..af89c52d3b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.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 + # 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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb index 009bf45be2..5939b10005 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. diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb index 9ea0c51450..4cc77a9634 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb index 33d015aafc..4fc41c15d1 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb index 3712f3239b..a3808d38d8 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb index d547c979d4..cc0bedd545 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb index e5a19514a9..9a32e497f4 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb index c95f942189..1f32dc3f4b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb index 583c7825fe..190002cb7b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb index 4c4ab65d99..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb @@ -1,7 +1,5 @@ -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" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.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-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.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-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.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-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb index 0ff030a8e4..dae4ee5bb3 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 \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb index 0ff030a8e4..dae4ee5bb3 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 \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb index 0ff030a8e4..dae4ee5bb3 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 \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb index c6e8c6d1c5..298c529924 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 \ 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/mono/files/.mtn2git_empty b/packages/python/python-2.4.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mono/files/.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_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/python/python-2.4.3/.mtn2git_empty b/packages/sapwood/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.3/.mtn2git_empty +++ b/packages/sapwood/.mtn2git_empty diff --git a/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty b/packages/sapwood/sapwood/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ssmtp/ssmtp-2.60.9/.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..11a26319de --- /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/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..4b9235e0f9 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 \ 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/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/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-self-hosting.bb b/packages/tasks/task-self-hosting.bb new file mode 100644 index 0000000000..566e0956a0 --- /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/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/stunnel/stunnel-4.05/.mtn2git_empty b/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/stunnel/stunnel-4.05/.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/uclibc/uclibc-cvs/efika/.mtn2git_empty b/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ 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..10855e6749 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -23,9 +23,10 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNA #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..053da707c4 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 \ diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 29709c6209..436cd6fe80 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 \ diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index dd956668ed..d44dd9c6a2 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 \ diff --git a/packages/unrar/.mtn2git_empty b/packages/unrar/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ 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/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ 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.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/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-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index c563c48f29..38172cc425 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 @@ -54,6 +54,8 @@ S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" inherit autotools pkgconfig +ARM_INSTRUCTION_SET = "arm" + W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" 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/removal.txt b/removal.txt index 543db8bff2..0ebb51d433 100644 --- a/removal.txt +++ b/removal.txt @@ -19,40 +19,15 @@ Maintainer: none Reason: Unfetchable, obsoleted by IT2006 release. Proposed by: Marcin 'Hrw' Juszkiewicz -Package Name: mono -Removal Date: 2006-12-15 -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-15 -Maintainer: None -Reason: Depends on libgd-perl which is not in metada -Proposed by: Marcin 'Hrw' Juszkiewicz - -Package Name: nsqld -Removal Date: 2006-12-15 -Maintainer: None -Reason: Never used -Proposed by: Florian Boor - -Package Name: gpe-mileage -Removal Date: 2006-12-15 -Maintainer: None -Reason: Unfinished, no development progress -Proposed by: Florian Boor - Package Name: task-bootstrap* 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: gst* 0.8.x Removal Date: 2006-12-29 Maintainer: None Reason: Conflicting namespace with gstreamer 0.10 at build time Proposed by: Koen Kooi - - diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc new file mode 100644 index 0000000000..aa9fd6bba3 --- /dev/null +++ b/site/powerpc-linux-uclibc @@ -0,0 +1,200 @@ +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} + +# libnet +ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} + + + +# 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'} |