diff options
96 files changed, 666 insertions, 620 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 53139e19fa..880295fc30 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -10,6 +10,64 @@ def base_path_join(a, *p): path += '/' + b return path +# for MD5/SHA handling +def base_chk_load_parser(config_path): + import ConfigParser, os, bb + parser = ConfigParser.ConfigParser() + if not len(parser.read(config_path)) == 1: + bb.note("Can not open the '%s' ini file" % config_path) + raise Exception("Can not open the '%s'" % config_path) + + return parser + +def base_chk_file(parser, pn, pv, src_uri, localpath): + import os, bb + # Try PN-PV-SRC_URI first and then try PN-SRC_URI + # we rely on the get method to create errors + pn_pv_src = "%s-%s-%s" % (pn,pv,src_uri) + pn_src = "%s-%s" % (pn,src_uri) + if parser.has_section(pn_pv_src): + md5 = parser.get(pn_pv_src, "md5") + sha256 = parser.get(pn_pv_src, "sha256") + elif parser.has_section(pn_src): + md5 = parser.get(pn_src, "md5") + sha256 = parser.get(pn_src, "sha256") + else: + return False + #raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) + + # md5 and sha256 should be valid now + if not os.path.exists(localpath): + bb.note("The locapath does not exist '%s'" % localpath) + raise Exception("The path does not exist '%s'" % localpath) + + + # call md5(sum) and shasum + try: + md5pipe = os.popen('md5sum ' + localpath) + md5data = (md5pipe.readline().split() or [ "" ])[0] + md5pipe.close() + except OSError: + raise Exception("Executing md5sum failed") + + try: + shapipe = os.popen('shasum -a256 -p ' + localpath) + shadata = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError: + raise Exception("Executing shasum failed") + + if not md5 == md5data: + bb.note("The MD5Sums did not match. Wanted: '%s' and Got: '%s'" % (md5,md5data)) + raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (md5, md5data)) + + if not sha256 == shadata: + bb.note("The SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256,shadata)) + raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256, shadata)) + + return True + + def base_dep_prepend(d): import bb; # @@ -402,6 +460,40 @@ python base_do_fetch() { except bb.fetch.FetchError: (type, value, traceback) = sys.exc_info() raise bb.build.FuncFailed("Fetch failed: %s" % value) + except bb.fetch.MD5SumError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("MD5 failed: %s" % value) + except: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Unknown fetch Error: %s" % value) + + + # Verify the SHA and MD5 sums we have in OE and check what do + # in + check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini") + if not check_sum: + bb.note("No conf/checksums.ini found, not checking checksums") + return + + try: + parser = base_chk_load_parser(check_sum) + except: + bb.note("Creating the CheckSum parser failed") + return + + pv = bb.data.getVar('PV', d, True) + pn = bb.data.getVar('PN', d, True) + + # Check each URI + for url in src_uri.split(): + localpath = bb.fetch.localpath(url,localdata) + (type,host,path,_,_,_) = bb.decodeurl(url) + uri = "%s://%s%s" % (type,host,path) + try: + if not base_chk_file(parser, pn, pv,uri, localpath): + bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + except Exception: + raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } addtask fetchall after do_fetch diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass index bb150c7e15..cb13222d64 100644 --- a/classes/lsppchd-image.bbclass +++ b/classes/lsppchd-image.bbclass @@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG lsppchd_pack_image() { : } + +IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; " diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass index 9ad0801fe3..553414224d 100644 --- a/classes/lsppchg-image.bbclass +++ b/classes/lsppchg-image.bbclass @@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG lsppchg_pack_image() { : } + +IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; " diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass index 393efae7e1..bc6c12e1fb 100644 --- a/classes/n2100-image.bbclass +++ b/classes/n2100-image.bbclass @@ -28,3 +28,5 @@ n2100_pack_image() { rm -f $PADFILE ls -l $OUTPUT } + +IMAGE_POSTPROCESS_COMMAND += "n2100_pack_image; " diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 92cde5487b..915de890cf 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -19,10 +19,6 @@ OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" -FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ - ${palmtopdir}/bin/.debug \ - ${palmtopdir}/plugins/*/.debug " - # to be consistent, put all targets into workdir # NOTE: leave one space at the end, other files are expecting that EXTRA_QMAKEVARS_POST += "DESTDIR=${S} " diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index b4bd21ab25..39b9bd2b60 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -17,4 +17,9 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" -FILES_${PN} = "${palmtopdir}" +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" +FILES_${PN} = " ${palmtopdir} " +FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so " +FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ + ${palmtopdir}/bin/.debug \ + ${palmtopdir}/plugins/*/.debug " diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 0a7b94cffc..07d18470f7 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -3,10 +3,20 @@ def patch_init(d): import os, sys + class NotFoundError(Exception): + def __init__(self, path): + self.path = path + def __str__(self): + return "Error: %s not found." % self.path + def md5sum(fname): import md5, sys - f = file(fname, 'rb') + try: + f = file(fname, 'rb') + except IOError: + raise NotFoundError(fname) + m = md5.new() while True: d = f.read(8096) @@ -24,11 +34,6 @@ def patch_init(d): def __str__(self): return "Command Error: exit status: %d Output:\n%s" % (self.status, self.output) - class NotFoundError(Exception): - def __init__(self, path): - self.path = path - def __str__(self): - return "Error: %s not found." % self.path def runcmd(args, dir = None): import commands @@ -482,7 +487,7 @@ python patch_do_patch() { bb.note("Applying patch '%s'" % pname) try: patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True) - except NotFoundError: + except: import sys raise bb.build.FuncFailed(str(sys.exc_value)) resolver.Resolve() diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass index e61ffc825b..5a0768c687 100644 --- a/classes/turbostation-image.bbclass +++ b/classes/turbostation-image.bbclass @@ -28,3 +28,5 @@ turbostation_pack_image() { rm -f $PADFILE ls -l $OUTPUT } + +IMAGE_POSTPROCESS_COMMAND += "turbostation_pack_image; " diff --git a/conf/checksums.ini b/conf/checksums.ini new file mode 100644 index 0000000000..81b92ad069 --- /dev/null +++ b/conf/checksums.ini @@ -0,0 +1,3 @@ +[file-native-4.20-ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] +md5=402bdb26356791bd5d277099adacc006 +sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 37d2f1b9df..9322bb97d8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -88,6 +88,8 @@ FEED_URIS += " \ #PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh5" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh5" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 7608e298ab..becad95786 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,64 +1,63 @@ -# -# FooNAS distribution - a NAS-centric distribution -# based on openprotium -# - +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: foonas <http://www.foonas.org> +#@DESCRIPTION: A nas-centric distribution +#@MAINTAINER: Øyvind Repvik <repvik@foonas.org> +#@-------------------------------------------------------------------- + +FOONAS_MODE ?= "glibc" +ANGSTROM_MODE = ${FOONAS_MODE} +require conf/distro/angstrom-2007.1.conf + +DISTRO = "foonas" DISTRO_NAME = "foonas" +DISTRO_VERSION = "1.0-dev" +DISTRO_REVISION = "1" +DISTRO_TYPE = "debug" -# This is only changed for a release -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -DISTRO_TYPE = "alpha" -# These should be merged once the bogofeed change has been committed. -FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/kernel" +DISTRO_FEATURES = "uboot redboot" +DISTRO_FEATURES_n2100 += "raid" +DISTRO_FEATURES_storcenter += "raid" +DISTRO_FEATURES_lsppchd += "raid" +DISTRO_FEATURES_lsppchg += "raid" +ENABLE_BINARY_LOCALE_GENERATION = "0" HOTPLUG = "udev" -# Various defines for Thecus N2100 -FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" -FOONAS_SUPPORT_n2100 += "fis" -BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +# No room for debug apps on an NSLU2. +DEBUG_APPS = "" + +FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/" 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;" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*" +IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;" +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" - -# Various defines for QNAP Turbostation -FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" -FOONAS_SUPPORT_turbostation += "uboot-utils" -BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" - -# Various defines for Linkstations -FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" -FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" -FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} -IMAGE_FSTYPES_lsppchd = "tar.gz" -IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} - -FOONAS_KERNEL_storcenter = "kernel-module-dummy \ - kernel-module-af-packet " -FOONAS_SUPPORT_storcenter = "uboot-utils" - -IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' +require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" -# -# Naming schemes -# -INHERIT += "debian" +# Various defines for QNAP Turbostation +#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ +# kernel-module-usb-storage" +#FOONAS_SUPPORT_turbostation += "uboot-utils" +#BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" # -# Packaging and output format +# Various defines for Linkstations +#FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ +# kernel-module-raid0 kernel-module-raid456 \ +# kernel-module-multipath" +#FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +#FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +#FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} # +#FOONAS_KERNEL_storcenter = "kernel-module-dummy \ +# kernel-module-af-packet " -INHERIT += "package_ipk" -IMAGE_BASENAME = "foonas" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/foonas.inc diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc deleted file mode 100644 index 7ad71bf503..0000000000 --- a/conf/distro/include/foonas-glibc.inc +++ /dev/null @@ -1,23 +0,0 @@ -# glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF = "--with-tls" - diff --git a/conf/distro/include/foonas-uclibc.inc b/conf/distro/include/foonas-uclibc.inc deleted file mode 100644 index 8315341b7e..0000000000 --- a/conf/distro/include/foonas-uclibc.inc +++ /dev/null @@ -1,22 +0,0 @@ -# uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" - -USE_NLS ?= "no" - -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" -CXXFLAGS += "-fvisibility-inlines-hidden" - -SRCDATE_uclibc ?= "20070320" -PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" -PREFERRED_VERSION_uclibc-initial ?= "0.9.28+svn${SRCDATE_uclibc}" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" -#PREFERRED_VERSION_linux-libc-headers_powerpc = "2.6.15.99"
\ No newline at end of file diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc deleted file mode 100644 index ad020b8501..0000000000 --- a/conf/distro/include/foonas.inc +++ /dev/null @@ -1,54 +0,0 @@ -# -# binutils and compilers -# -# Can be "glibc" and "uclibc" -FOONAS_MODE ?= "glibc" - -#DEPLOY_DIR = "${TMPDIR}/deploy/${FOONAS_MODE}" -require conf/distro/include/foonas-${FOONAS_MODE}.inc - -INHERIT += "package_ipk debian sanity devshell" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "0" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" - -# not used yet -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" - -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" -#conflict between this and the last below. -#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" - -PREFERRED_PROVIDER_virtual/libx11 = "libx11" - -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" - -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" - -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" - -PREFERRED_VERSION_openlink = "svn" -PREFERRED_VERSION_dtc = "20070216" -PREFERRED_VERSION_dtc-native = "20070216" diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf index b5dba1ffed..42ae98fab1 100644 --- a/conf/distro/openzaurus-3.5.5.conf +++ b/conf/distro/openzaurus-3.5.5.conf @@ -140,6 +140,8 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.7" PREFERRED_VERSION_hostap-utils ?= "0.4.7" PREFERRED_VERSION_hostap-modules ?= "0.4.7" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" + # # We do not use qte-mt to keep compatibility with older OZ # diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/lsppc.conf index 620a6931eb..ad94a0f029 100644 --- a/conf/machine/include/linkstationppc.conf +++ b/conf/machine/include/lsppc.conf @@ -5,13 +5,13 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" TARGET_FPU = "hard" +MACHINE_TASK_PROVIDER = "task-base" USE_DEVFS = "0" BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" -FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/" PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc" #don't try to access tty1 @@ -20,7 +20,7 @@ USE_VT = "0" HOTPLUG = "udev" udevdir = "/dev" -IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_FSTYPES = "tar.gz" #tune for the MPC5200B cpu require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 51d0186dbe..bf59929b02 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD - UBOOT_MACHINE = "linkstation_HDLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 516a3aaa98..6040010176 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG - UBOOT_MACHINE = "linkstation_HGLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index c84bf352da..2acfe812b0 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,11 +3,13 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +INHERIT += "n2100-image" + SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index bb7c8f1bef..ea59349c07 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -2,14 +2,15 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "storcenter-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index ffa44207cd..2c1a9d70b5 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -2,14 +2,18 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "turbostation-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +UBOOT_MACHINE = "qnap_config" +PREFERRED_VERSION_u-boot = "1.2.0" + PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" MACHINE_TASK_PROVIDER = "task-base" diff --git a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty b/contrib/qa/checksum/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty +++ b/contrib/qa/checksum/.mtn2git_empty diff --git a/contrib/qa/checksum/checksum.py b/contrib/qa/checksum/checksum.py new file mode 100644 index 0000000000..6880f045d3 --- /dev/null +++ b/contrib/qa/checksum/checksum.py @@ -0,0 +1,74 @@ +# +# Helper utilitiy to verify checksums of SRC_URI's +# +# To ease parsing I will use INI files to contain the +# checksums, at least they will force some kind of structure. This allows +# to easily add and replace new sums +# +# +# Example: +# [PN-PV-filename] +# md5=THESUM +# sha256=OTHERSUM +# +# [PN-filename] +# md5=THESUM +# sha256=OTHERSUM + + +def verify_file(config_path, pn, pv, src_uri, localpath): + """ + Verify using the INI file at config_path and check that + the localpath matches the one specified by the PN-PV-SRCURI + inside the ini file + """ + import ConfigParser, os + parser = ConfigParser.ConfigParser() + if not len(parser.read(config_path)) == 1: + raise Exception("Can not open the '%s'" % config_path) + + # Try PN-PV-SRC_URI first and then try PN-SRC_URI + # we rely on the get method to create errors + pn_pv_src = "%s-%s-%s" % (pn,pv,src_uri) + pn_src = "%s-%s" % (pn,src_uri) + if parser.has_section(pn_pv_src): + md5 = parser.get(pn_pv_src, "md5") + sha256 = parser.get(pn_pv_src, "sha256") + elif parser.has_section(pn_src): + md5 = parser.get(pn_src, "md5") + sha256 = parser.get(pn_src, "sha256") + else: + raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) + + # md5 and sha256 should be valid now + if not os.path.exists(localpath): + raise Exception("The path does not exist '%s'" % localpath) + + + # call md5(sum) and shasum + try: + md5pipe = os.popen('md5sum ' + localpath) + md5data = (md5pipe.readline().split() or [ "" ])[0] + md5pipe.close() + except OSError: + raise Exception("Executing md5sum failed") + + try: + shapipe = os.popen('shasum -a256 -p ' + localpath) + shadata = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError: + raise Exception("Executing shasum failed") + + if not md5 == md5data: + raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (md5, md5data)) + + if not sha256 == shadata: + raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256, shadata)) + + + return True + + +# Test it +verify_file("sample.conf", "qtopia-core", "4.3.0", "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.2.3.tar.gz", "test.file") diff --git a/contrib/qa/checksum/sample.conf b/contrib/qa/checksum/sample.conf new file mode 100644 index 0000000000..478a9a05f9 --- /dev/null +++ b/contrib/qa/checksum/sample.conf @@ -0,0 +1,9 @@ +[qtopia-core-4.3-ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.3.0beta.tar.gz] +md5=123 +sha256=1000 + +[qtopia-core-ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.2.3.tar.gz] +md5=d41d8cd98f00b204e9800998ecf8427e +sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + +# Test commets and such diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty b/contrib/qa/checksum/test.file index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty +++ b/contrib/qa/checksum/test.file diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb index 37a8b5f9dd..e806604616 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -23,24 +23,20 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -WIP_DATE = "20070323" - -PV = "1.1.1+wip-${WIP_DATE}" -PR = "r0" +SVN_REV = "25" +PR = "r1" ###################################################################################### PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN} = "${MACHINE}" PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" - -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" -S = "${WORKDIR}/${TAG}/" +S = "${WORKDIR}/trunk/" ###################################################################################### @@ -48,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -55,27 +54,48 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc install -m 0644 ${S}/altbootctl.conf ${D}/etc install -m 0755 ${S}/init.altboot ${D}/sbin install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi } ###################################################################################### @@ -88,12 +108,16 @@ do_configure() { ###################################################################################### pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + update-alternatives --install /sbin/init init /sbin/init.altboot 55 } ###################################################################################### pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + update-alternatives --remove init /sbin/init.altboot } diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index d31c5160a2..18f73dd6ae 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -24,13 +24,13 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### PV = "1.1.1+wip-${SRCDATE}" -PR = "r0" +PR = "r1" ###################################################################################### PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN} = "${MACHINE}" PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" @@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -51,29 +54,48 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc install -m 0644 ${S}/altbootctl.conf ${D}/etc install -m 0755 ${S}/init.altboot ${D}/sbin install -m 0755 ${S}/altbootctl ${D}/sbin ln -s /sbin/init.altboot ${D}/sbin/altboot - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi } ###################################################################################### @@ -86,12 +108,16 @@ do_configure() { ###################################################################################### pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + update-alternatives --install /sbin/init init /sbin/init.altboot 55 } ###################################################################################### pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + update-alternatives --remove init /sbin/init.altboot } diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index fb71361a1d..72583cb7e9 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -PR="r1" +PR="r2" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" @@ -55,8 +55,8 @@ pkg_postinst_avahi-daemon () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + grep "^avahi:" /etc/group > /dev/null || addgroup avahi + grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi DBUSPID=`pidof dbus-daemon` @@ -70,8 +70,8 @@ pkg_postinst_avahi-autoipd () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi-autoipd /etc/group || addgroup avahi-autoipd - grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" + grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd + grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" } pkg_postrm_avahi-daemon () { diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb deleted file mode 100644 index 8e219880d0..0000000000 --- a/packages/dri/drm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/base" -LICENSE = "MIT" -SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" - -PV = "0.0+cvs${SRCDATE}" -PR = "r3" - -S = "${WORKDIR}/drm" - -inherit autotools pkgconfig - -do_compile() { - oe_runmake -C libdrm -} - -do_stage() { - autotools_stage_all -} diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 2b8c43644a..4e878ab204 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -1,5 +1,5 @@ require edje_${PV}.bb -PR = "r3" +PR = "r4" inherit native @@ -13,7 +13,7 @@ do_configure_prepend() { } do_install_append() { - edje_data_dir=`edje-config --datadir` + edje_data_dir=`${S}/edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include install -m 0644 data/include/edje.inc $edje_data_dir/include diff --git a/packages/foonas-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab deleted file mode 100644 index 67116a12fd..0000000000 --- a/packages/foonas-init/files/initscripts/fixfstab +++ /dev/null @@ -1,91 +0,0 @@ -#!/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/foonas-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh deleted file mode 100644 index c5d44d1067..0000000000 --- a/packages/foonas-init/files/initscripts/loadmodules.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. /etc/default/modulefunctions # Load module loading logic - -loadnetmods - -loaddiskmods - -loadmiscmods - -exit 0 diff --git a/packages/foonas-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery deleted file mode 100644 index eec822b154..0000000000 --- a/packages/foonas-init/files/initscripts/rmrecovery +++ /dev/null @@ -1,4 +0,0 @@ -#!/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/foonas-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup deleted file mode 100644 index a4f9074d9c..0000000000 --- a/packages/foonas-init/files/initscripts/sysconfsetup +++ /dev/null @@ -1,46 +0,0 @@ -#!/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/foonas-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer deleted file mode 100644 index 9285c02946..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.buffer +++ /dev/null @@ -1,23 +0,0 @@ -#!/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/foonas-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file deleted file mode 100644 index 80ee5f0174..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.file +++ /dev/null @@ -1,23 +0,0 @@ -#!/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/foonas-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network deleted file mode 100644 index 3d7f4ab8e6..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.network +++ /dev/null @@ -1,28 +0,0 @@ -#!/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/foonas-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh deleted file mode 100644 index b590ae68b5..0000000000 --- a/packages/foonas-init/files/initscripts/umountinitrd.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/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/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/gammu/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty +++ b/packages/gammu/files/.mtn2git_empty diff --git a/packages/gammu/files/ldflags-again.patch b/packages/gammu/files/ldflags-again.patch new file mode 100644 index 0000000000..90311e5f39 --- /dev/null +++ b/packages/gammu/files/ldflags-again.patch @@ -0,0 +1,13 @@ +Index: gammu-1.10.0/cfg/Makefile.glo +=================================================================== +--- gammu-1.10.0.orig/cfg/Makefile.glo 2007-03-30 17:55:18.000000000 +0200 ++++ gammu-1.10.0/cfg/Makefile.glo 2007-03-30 17:55:46.000000000 +0200 +@@ -152,7 +152,7 @@ + + $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) + @echo Linking gammu-shared +- @$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared ++ @$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared + + shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared + diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.10.0.bb index 49a2f21399..9e3f611697 100644 --- a/packages/gammu/gammu_1.07.00.bb +++ b/packages/gammu/gammu_1.10.0.bb @@ -2,24 +2,26 @@ DESCRIPTION = "GNU All Mobile Managment Utilities" SECTION = "console/network" DEPENDS = "bluez-libs" LICENSE = "GPL" -HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html" -AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>" +HOMEPAGE = "http://www.gammu.org/" -SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz " +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ + file://ldflags-again.patch;patch=1" -EXTRA_OECONF = "--disable-mysql" +EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" + +EXTRA_LDFLAGS = "-lbluetooth2" inherit autotools do_compile () { - oe_runmake shared + oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' } do_stage() { install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \ + ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ @@ -39,7 +41,7 @@ do_stage() { install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku + install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch new file mode 100644 index 0000000000..2fb8854b49 --- /dev/null +++ b/packages/glibc/glibc-2.4/ldd-unbash.patch @@ -0,0 +1,11 @@ +--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000 ++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000 +@@ -110,7 +110,7 @@ + # environments where the executed program might not have permissions + # to write to the console/tty. But only bash 3.x supports the pipefail + # option, and we don't bother to handle the case for older bash versions. +-if set -o pipefail 2> /dev/null; then ++if false; then + try_trace() { + eval $add_env '"$@"' | cat + } diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index ee137541bb..8cd4c2ecd1 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ # file://glibc-2.4-openat-3.patch;patch=1 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb deleted file mode 100644 index 8dc2370b5e..0000000000 --- a/packages/images/foonas-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Foonas image" -LICENSE = "GPL" -PR = "r0" - -inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image - -DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" - -EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -RDEPENDS = " \ - base-files base-passwd netbase \ - busybox initscripts foonas-init \ - update-modules sysvinit tinylogin \ - module-init-tools-depmod modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - libgcc1 diffutils cpio findutils\ - dropbear e2fsprogs-blkid \ - mdadm hdparm mtd-utils udev \ - ${FOONAS_SUPPORT} \ - ${FOONAS_KERNEL} " - -PACKAGE_INSTALL = "${RDEPENDS}" - diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb new file mode 100644 index 0000000000..94471a26fc --- /dev/null +++ b/packages/liboil/liboil_0.3.11.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." +HOMEPAGE = "http://liboil.freedesktop.org/" +LICENSE = "various" + +SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 1e0d4f1b9a..17cc4be40d 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -78,22 +78,22 @@ do_install() { done } -PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2" +PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 " DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library" -FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*" +FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*" DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library" -FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*" +FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*" DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library" -FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*" +FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*" DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library" -FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*" +FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*" DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library" -FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*" +FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*" DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library" -FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*" +FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*" DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library" -FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*" +FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*" DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library" -FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*" +FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*" diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 1bef43c329..8409e4c523 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 4a3d3c28c5..39376a84fc 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb new file mode 100644 index 0000000000..042ea757e9 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -0,0 +1,2 @@ +require libsexy.inc +PR = "r0" diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 3a0d50e096..49111f9b48 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -148,15 +148,14 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_H4700=y CONFIG_HX4700_NAVPOINT=y CONFIG_HX4700_CORE=y -CONFIG_HX4700_TS=y +# CONFIG_HX4700_TS is not set CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y -CONFIG_HX4700_BATTERY=m -CONFIG_HX4700_POWER=y +CONFIG_HX4700_BATTERY=y +# CONFIG_HX4700_POWER is not set CONFIG_HX4700_UDC=y -CONFIG_HX4700_SERIAL=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -167,6 +166,7 @@ CONFIG_HX4700_SERIAL=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set @@ -911,7 +911,20 @@ CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_NAVPOINT=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -951,6 +964,7 @@ CONFIG_SERIAL_PXA_COUNT=4 # CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_RS232_SERIAL=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -1047,14 +1061,14 @@ CONFIG_I2C_PXA=m # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # # 1-wire Bus Masters # # CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set -# CONFIG_W1_DS1WM is not set +CONFIG_W1_DS1WM=y # # 1-wire Slaves @@ -1062,7 +1076,7 @@ CONFIG_W1=m # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=m +CONFIG_W1_DS2760=y # # Hardware Monitoring support @@ -1111,8 +1125,8 @@ CONFIG_HWMON=y # Hardware Monitoring - Battery # CONFIG_BATTERY_MONITOR=y -CONFIG_DS2760_BATTERY=m -CONFIG_ADC_BATTERY=m +CONFIG_DS2760_BATTERY=y +CONFIG_ADC_BATTERY=y CONFIG_APM_POWER=y # @@ -1143,6 +1157,7 @@ CONFIG_HTC_ASIC3_DS1WM=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC=y CONFIG_ADC_ADS7846_SSP=y # CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set @@ -1163,7 +1178,7 @@ CONFIG_LEDS_ASIC3=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_HWTIMER=y # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y @@ -1398,7 +1413,6 @@ CONFIG_USB_STORAGE=m # USB Input Devices # CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y diff --git a/packages/linux/linux-linkstationppc/defconfig b/packages/linux/linux-linkstationppc/defconfig index b47010f1c7..385f7826f0 100644 --- a/packages/linux/linux-linkstationppc/defconfig +++ b/packages/linux/linux-linkstationppc/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-rc1 -# Wed Feb 21 22:29:14 2007 +# Linux kernel version: 2.6.21-rc4 +# Sun Mar 25 15:52:14 2007 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y # CONFIG_GENERIC_TBSYNC is not set CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y -# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_DEFAULT_UIMAGE=y # # Processor support @@ -73,6 +73,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -700,7 +701,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -1574,6 +1574,7 @@ CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1639,7 +1640,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set CONFIG_RTC_DRV_RS5C372=y # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_TEST is not set diff --git a/packages/mplayer/files/powerpc-is-ppc.diff b/packages/mplayer/files/powerpc-is-ppc.diff new file mode 100644 index 0000000000..f8143c460e --- /dev/null +++ b/packages/mplayer/files/powerpc-is-ppc.diff @@ -0,0 +1,11 @@ +--- /tmp/configure 2007-03-30 19:40:34.000000000 +0200 ++++ MPlayer-1.0rc1/configure 2007-03-30 19:40:58.795251000 +0200 +@@ -1213,7 +1213,7 @@ + _optimizing='' + ;; + +- ppc) ++ ppc|powerpc) + _def_arch='#define ARCH_POWERPC 1' + _def_dcbzl='#define NO_DCBZL 1' + _target_arch='TARGET_ARCH_POWERPC = yes' diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 3a388d21e3..2910cbd0a4 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1 \ + file://powerpc-is-ppc.diff;patch=1 \ file://pxa_configure.patch;patch=1 \ file://pxa-video_out.patch;patch=1 " @@ -33,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r11" +PR = "r12" PARALLEL_MAKE = "" diff --git a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty +++ b/packages/openmoko-apps/files/.mtn2git_empty diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch new file mode 100644 index 0000000000..c8d3413c0b --- /dev/null +++ b/packages/openmoko-apps/files/unbreak-messages.patch @@ -0,0 +1,29 @@ +Index: sms-membership-window.c +=================================================================== +--- sms-membership-window.c (wersja 1565) ++++ openmoko-messages/src/sms-membership-window.c (kopia robocza) +@@ -36,9 +36,6 @@ + #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate))
+
+ typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate;
+-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
+- GtkTreeIter *iter,
+- gpointer data);
+
+ struct _SmsMembershipWindowPrivate
+ {
+Index: main.c +=================================================================== +--- main.c (wersja 1565) ++++ openmoko-messages/src/main.c (kopia robocza) +@@ -41,10 +41,6 @@ + + #include <gtk/gtk.h> + +-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); +- + gboolean init_dbus (MessengerData* d) + { + DBusError error; diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 4411b860a1..1547c49d9a 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" PV = "0.0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko +SRC_URI += "file://unbreak-messages.patch;patch=1" diff --git a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty b/packages/opie-init/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty +++ b/packages/opie-init/.mtn2git_empty diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc new file mode 100644 index 0000000000..d8003925f6 --- /dev/null +++ b/packages/opie-init/opie-init.inc @@ -0,0 +1,43 @@ +DESCRIPTION = "Opie Startup scripts and config" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +#APPNAME = "qpe" + +#S = "${WORKDIR}/launcher" + +#inherit opie +inherit update-rc.d + +INITSCRIPT_NAME = "opie" +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." + +do_install() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/profile.d + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/etc/skel + + install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie + install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ + + install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ + + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ + fi + + case ${MACHINE} in + c7x0) + install -d ${D}${sysconfdir}/apm/event.d/ + install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh + ;; + *) + ;; + esac +} + +FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty b/packages/opie-init/opie-init/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty +++ b/packages/opie-init/opie-init/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty b/packages/opie-init/opie-init/akita/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty +++ b/packages/opie-init/opie-init/akita/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-init/opie-init/akita/qpe.conf index e9922e4d86..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-init/opie-init/akita/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/locale.conf b/packages/opie-init/opie-init/c7x0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/locale.conf +++ b/packages/opie-init/opie-init/c7x0/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie index 84f3b3e673..84f3b3e673 100755 --- a/packages/opie-taskbar/opie-taskbar/c7x0/opie +++ b/packages/opie-init/opie-init/c7x0/opie diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume index be37519512..be37519512 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume +++ b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-init/opie-init/c7x0/qpe.conf index e9922e4d86..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-init/opie-init/c7x0/qpe.conf diff --git a/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty b/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-init/opie-init/htcuniversal/qpe.conf index e9922e4d86..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf +++ b/packages/opie-init/opie-init/htcuniversal/qpe.conf diff --git a/packages/opie-init/opie-init/locale.conf b/packages/opie-init/opie-init/locale.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/locale.conf diff --git a/packages/opie-init/opie-init/mnci/.mtn2git_empty b/packages/opie-init/opie-init/mnci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/mnci/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-init/opie-init/mnci/opie index d5e2955b10..d5e2955b10 100755 --- a/packages/opie-taskbar/opie-taskbar/mnci/opie +++ b/packages/opie-init/opie-init/mnci/opie diff --git a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-init/opie-init/mnci/qpe.conf index 8efe771ad0..8efe771ad0 100644 --- a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf +++ b/packages/opie-init/opie-init/mnci/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-init/opie-init/opie index 3fe4d0cdf8..3fe4d0cdf8 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-init/opie-init/opie diff --git a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles b/packages/opie-init/opie-init/opie-reorgfiles index 96b3e29da4..96b3e29da4 100755 --- a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles +++ b/packages/opie-init/opie-init/opie-reorgfiles diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-init/opie-init/opie_defaults index 7de76e4276..7de76e4276 100644 --- a/packages/opie-taskbar/opie-taskbar/opie_defaults +++ b/packages/opie-init/opie-init/opie_defaults diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-init/opie-init/qpe.conf index 59bb20c762..59bb20c762 100644 --- a/packages/opie-taskbar/opie-taskbar/qpe.conf +++ b/packages/opie-init/opie-init/qpe.conf diff --git a/packages/opie-init/opie-init/simpad/.mtn2git_empty b/packages/opie-init/opie-init/simpad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/simpad/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-init/opie-init/simpad/qpe.conf index b10d90b94e..b10d90b94e 100644 --- a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf +++ b/packages/opie-init/opie-init/simpad/qpe.conf diff --git a/packages/opie-init/opie-init/spitz/.mtn2git_empty b/packages/opie-init/opie-init/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/spitz/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-init/opie-init/spitz/qpe.conf index e9922e4d86..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-init/opie-init/spitz/qpe.conf diff --git a/packages/opie-init/opie-init/tosa/.mtn2git_empty b/packages/opie-init/opie-init/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-init/opie-init/tosa/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-init/opie-init/tosa/qpe.conf index e9922e4d86..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-init/opie-init/tosa/qpe.conf diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb new file mode 100644 index 0000000000..271ff62e51 --- /dev/null +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -0,0 +1,10 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 4c357f54b6..8dae3b2484 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -27,10 +27,7 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -inherit opie update-rc.d - -INITSCRIPT_NAME = "opie" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." +inherit opie do_configure_prepend() { ln -s ${WORKDIR}/calibrate ${S}/calibrate @@ -56,16 +53,13 @@ do_install() { install -d ${D}${palmtopdir}/pics/launcher install -d ${D}${palmtopdir}/pics/logo install -d ${D}${palmtopdir}/pics/RoH/star/ - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/profile.d install -d ${D}${palmtopdir}/etc/colors install -d ${D}${palmtopdir}/etc/skel + install -d ${D}${sysconfdir} install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe - install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ - install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ for p in ${PICS} do @@ -80,33 +74,8 @@ do_install() { install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ - install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie - install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ - - if [ -s ${WORKDIR}/locale.conf ]; then - install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ - fi - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ - - case ${MACHINE} in - c7x0) - install -d ${D}${sysconfdir}/apm/event.d/ - install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh - ;; - *) - ;; - esac -} - -updatercd_postinst_mnci() { -if test "x$D" != "x"; then - D="-r $D" -else - D="" # do not autostart at installation time -fi -update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index c6151d2327..497bff0953 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 41119484c1..6ff5a5ef66 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -11,10 +11,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 56f3c7242a..8f8c68d7b7 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 = "r80" +PR = "r82" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb new file mode 100644 index 0000000000..25d445f6ee --- /dev/null +++ b/packages/starling/starling_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Starling audio player for GPE" +SECTION = "gpe/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" +RDEPENDS = "esd \ + gst-plugin-audioconvert \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-modplug \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +PV = "0.1+svn${SRCDATE}" + + +inherit gpe autotools + +SRC_URI = "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/${PN}" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4d16501d6b..17fc9a30f5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r21" +PR = "r20" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # irda # pci # pcmcia +# redboot +# uboot # usbgadget # usbhost + DISTRO_CORE_PACKAGE ?= "task-base-core-default" # @@ -62,9 +65,12 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" @@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " +task-base-uboot-rdepends = "\ + uboot-utils" + +task-base-redboot-rdepends = "\ + fis" + task-distro-ppp-rdepends = "\ ppp \ ppp-dialin" @@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\ kernel-module-lockd \ kernel-module-sunrpc" +task-distro-raid-rdepends = "\ + " # Tosort # kernel-module-ipv6 diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ece303d62a..7f8b03ce33 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r32" +PR = "r33" PACKAGES = "\ task-openmoko-linux \ @@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ - matchbox-panel-hacks \ matchbox-themes-extra \ matchbox-themes-gtk \ - matchbox-applet-inputmanager \ - matchbox-applet-startup-monitor \ openmoko-panel-battery \ openmoko-panel-clock \ openmoko-panel-demo \ diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 616968ea36..c4f493b80d 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r5" +PR = "r6" PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -27,7 +27,7 @@ PACKAGES += "task-opie-everything" # # Dependencies to get the launcher up and running # -RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ +RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ opie-pics opie-sounds opie-freetype ttf-dejavu-sans \ ttf-dejavu-sans-mono" diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config deleted file mode 100644 index 97ce8a87d4..0000000000 --- a/packages/uboot-utils/files/turbostation/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size - -# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, -# you should be *very* sure about what you're doing if you don't have a serial -# cable attached! -# /dev/mtd4 0x00000 0x20000 0x20000 - -# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily -# render your turbostation unbootable! - -/dev/mtd5 0x00000 0x20000 0x20000
\ No newline at end of file diff --git a/packages/uboot/uboot-utils_1.1.2.bb b/packages/uboot/uboot-utils_1.1.2.bb new file mode 100644 index 0000000000..8a5d7dce3c --- /dev/null +++ b/packages/uboot/uboot-utils_1.1.2.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "mtd-utils" +PR = "r5" + +SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ + file://fw_env.c.patch;patch=1 \ + file://tools-Makefile.patch;patch=1 \ + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" + +S = "${WORKDIR}/u-boot-${PV}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +UBOOT_MACHINE ?= "${MACHINE}_config" + +inherit base + +do_configure() { + : +} + +do_compile () { + oe_runmake Sandpoint8240_config + oe_runmake tools +} + +# install mkimage for the kernel makefile +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + install -d ${D}/sbin + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv +} diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb new file mode 100644 index 0000000000..62825e5a0f --- /dev/null +++ b/packages/xorg-app/xdpyinfo_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display information utility" +LICENSE = "MIT" + +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb new file mode 100644 index 0000000000..12a58b5a0a --- /dev/null +++ b/packages/xorg-proto/xproto-native_7.0.10.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2" +S = "${WORKDIR}/xproto-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb new file mode 100644 index 0000000000..64e0550571 --- /dev/null +++ b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" + +SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ + file://unbreak_cross_compile.patch;patch=1 " + +S = "${WORKDIR}/util-macros-1.1.5" + +inherit native autotools pkgconfig + diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index fcfec6d4f7..634d6eb835 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -8,7 +8,7 @@ PROVIDES = "virtual/xserver" MESA_VER ?= "6.5" DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ -xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ |