diff options
88 files changed, 338 insertions, 116 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index c11cf0b4de..6324dbf522 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -21,7 +21,8 @@ DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2 # 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} " +EXTRA_QMAKEVARS_POST += " DESTDIR=${S} " +EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' " # Opie standard TAG value TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf new file mode 100644 index 0000000000..a909a0f43c --- /dev/null +++ b/conf/machine/fsg3be.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Freecom FSG-3 (big-endian) +#@DESCRIPTION: Machine configuration for an FSG3 in big-endian mode + +TARGET_ARCH = "armeb" + +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" + +MACHINE_ARCH = "ixp4xxbe" + +OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +# Match the vendor's latest kernel +PREFERRED_PROVIDER_virtual/kernel ?= "fsg3-kernel" +PREFERRED_VERSION_fsg3-kernel = "2.6.18" +KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4" +PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3" + +require conf/machine/include/ixp4xx.conf + +# No room for jffs2 - the rootfs needs to be installed directly to disk +IMAGE_FSTYPES = "tar.gz" diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb index 9e2b6fd912..fee3691c3c 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" PR = "r2" -COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" +COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)" SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ file://config-nslu2.h \ diff --git a/packages/db/db3_3.2.9.bb b/packages/db/db3_3.2.9.bb index 335d83c173..a130d89bd5 100644 --- a/packages/db/db3_3.2.9.bb +++ b/packages/db/db3_3.2.9.bb @@ -11,7 +11,7 @@ CONFLICTS = "db" # a build to select the desired one. PROVIDES += "${VIRTUAL_NAME}" -SRC_URI = "ftp://sleepycat1.inetu.net/releases/db-${PV}.tar.gz \ +SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \ file://autofoo.patch;patch=1" S = "${WORKDIR}/db-${PV}/dist" B = "${WORKDIR}/db-${PV}/build_unix" diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb new file mode 100644 index 0000000000..4b7e7b715c --- /dev/null +++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb @@ -0,0 +1,25 @@ +# This kernel compiler is required by the Freecom FSG-3 machine +# Please talk to Rod Whitby before considering removing this file. + +DEFAULT_PREFERENCE = "-1" + +SECTION = "devel" +# cut-down gcc for kernel builds +# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. + +require gcc-cross-initial_${PV}.bb + +PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" + +SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1" + +do_install () { + : +} + +do_stage () { + cd gcc + oe_runmake install-common install-headers install-libgcc + install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV} +} + diff --git a/packages/glibc/files/etc/ld.so.conf b/packages/glibc/files/etc/ld.so.conf index fb1aab516d..dfa65edb85 100644 --- a/packages/glibc/files/etc/ld.so.conf +++ b/packages/glibc/files/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib /usr/X11R6/lib diff --git a/packages/glibc/glibc-2.2.5/etc/ld.so.conf b/packages/glibc/glibc-2.2.5/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.2.5/etc/ld.so.conf +++ b/packages/glibc/glibc-2.2.5/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-2.3.2/etc/ld.so.conf b/packages/glibc/glibc-2.3.2/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.3.2/etc/ld.so.conf +++ b/packages/glibc/glibc-2.3.2/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-2.4/etc/ld.so.conf b/packages/glibc/glibc-2.4/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.4/etc/ld.so.conf +++ b/packages/glibc/glibc-2.4/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-cvs/etc/ld.so.conf b/packages/glibc/glibc-cvs/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-cvs/etc/ld.so.conf +++ b/packages/glibc/glibc-cvs/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h b/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h index 1c3d1ff473..2229619a27 100644 --- a/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h +++ b/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h @@ -51,11 +51,11 @@ // #define IX_NPEDL_NPEIMAGE_NPEC_DMA // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL -#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH +// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL +#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL #include <stdio.h> diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb index 5b8af8f254..9db83352c4 100644 --- a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb +++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Firmware converter for the IXP4xx line of devices" LICENSE = "Intel Public Licence" -PR = "r0" +PR = "r1" SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip" SRC_URI += "file://IxNpeMicrocode.h" diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb index 3a13074240..b5b1665735 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "NPE firmware for the IXP4xx line of devices" LICENSE = "Intel Public Licence" -PR = "r0" +PR = "r1" DEPENDS = "ixp4xx-npe-native" # You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from: @@ -13,7 +13,7 @@ S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" -FILES_${PN} = "${base_libdir}/firmware/NPE-B" +FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C" do_compile() { ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be @@ -24,10 +24,14 @@ do_install() { rm ${S}/NPE-B mv ${S}/NPE-B.* ${S}/NPE-B install ${S}/NPE-B ${D}/${base_libdir}/firmware/ + rm ${S}/NPE-C + mv ${S}/NPE-C.* ${S}/NPE-C + install ${S}/NPE-C ${D}/${base_libdir}/firmware/ } do_populate_staging() { install -d ${STAGING_FIRMWARE_DIR} install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/ + install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/ } diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc index cb845397bd..5a50be3de7 100644 --- a/packages/kdepimpi/kdepimpi-base.inc +++ b/packages/kdepimpi/kdepimpi-base.inc @@ -110,7 +110,7 @@ do_stage() { } do_install() { - install -d ${D}${palmtopdir}/bin \ + install -d ${D}${bindir} \ ${D}${palmtopdir}/lib \ ${D}${palmtopdir}/apps/1Pim \ ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \ @@ -136,10 +136,10 @@ do_install() { oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib done - install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi - install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi + install -m 0755 ${S}/dest/kopi ${D}${bindir}/kopi + install -m 0755 ${S}/dest/kapi ${D}${bindir}/kapi - install -d ${D}${bindir} ${D}${libdir} + install -d ${D}${libdir} install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir} @@ -152,11 +152,11 @@ do_install() { PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" -FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " -FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" +FILES_kopi = "${bindir}/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " +FILES_kapi = "${bindir}/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png" -FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*" -FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*" -FILES_libmicrokdelibs = "${palmtopdir}/lib/*" +FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc.so.*" +FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal.so.*" +FILES_libmicrokdelibs = "${palmtopdir}/lib/*.so.*" FILES_kammu = "${bindir}/kammu" FILES_libmicrokammu = "${libdir}/libmicrokammu*" diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index ca4d5c0786..7252d0a6f1 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -4,4 +4,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ require kdepimpi-base.inc -PR = "r1" +PR = "r2" diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc index c737d40e83..3866b70977 100644 --- a/packages/kdepimpi/pwmpi.inc +++ b/packages/kdepimpi/pwmpi.inc @@ -23,7 +23,7 @@ do_unstage() { } do_install() { - install -d ${D}${palmtopdir}/bin \ + install -d ${D}${bindir} \ ${D}${palmtopdir}/apps/Applications \ ${D}${palmtopdir}/pics/kdepim/pwmanager/icons16 \ ${D}${palmtopdir}/pics/kdepim/pwmanager/icons22 @@ -33,8 +33,8 @@ do_install() { install -m 0644 ${S}/bin/kdepim/pwmanager/icons22/*.png ${D}${palmtopdir}/pics/kdepim/pwmanager/icons22 install -m 0644 pwmanager/pwmanager/pwmanager.desktop ${D}${palmtopdir}/apps/Applications/pwmanager.desktop - install -m 0755 ${S}/dest/pwmpi ${D}${palmtopdir}/bin/ + install -m 0755 ${S}/dest/pwmpi ${D}${bindir} } |