diff options
Diffstat (limited to 'recipes')
25 files changed, 271 insertions, 109 deletions
diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb index 52e78bc0d7..4a9126e75c 100644 --- a/recipes/freesmartphone/fso-abyss_git.bb +++ b/recipes/freesmartphone/fso-abyss_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib libgsm0710mux" LICENSE = "GPL" -PV = "0.3.6+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCREV}" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index a0a57c2f7a..9a2c8a264c 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -3,17 +3,12 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console" LICENSE = "GPLv2" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCREV}" PR = "r0" -SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" -S = "${WORKDIR}/git" +SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" +S = "${WORKDIR}/git/tools/apm2" -do_install() { - install -d ${D}${bindir} - install -m 0755 fso-apm/apm ${D}${bindir} -} +inherit autotools -PACKAGE_ARCH_${PN} = "all" -RDEPENDS_${PN} = "python-dbus frameworkd" RCONFLICTS_${PN} = "apm" diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb index b1dddcd40d..78050c40f5 100644 --- a/recipes/freesmartphone/libgsm0710_git.bb +++ b/recipes/freesmartphone/libgsm0710_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A GSM 07.10 Protocol Engine" LICENSE = "GPL" SECTION = "devel" -PV = "1.1.1+gitr${SRCREV}" +PV = "1.2.0+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb index 3a1110a605..69446879c3 100644 --- a/recipes/freesmartphone/libgsm0710mux_git.bb +++ b/recipes/freesmartphone/libgsm0710mux_git.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPL" SECTION = "devel" DEPENDS = "glib-2.0 libgsm0710 libfsotransport" -PV = "0.3.6+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCREV}" PR = "r0" SRC_URI = "\ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 2eaa133f97..911d2d964e 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -INC_PR = "r20" +INC_PR = "r21" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index 1627a96e38..1501c7e618 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index 5afd08ba7c..4638ddcdf1 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r7" +INC_PR = "r8" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 5802492d58..4a3cb49496 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index a6bfbcc216..90cda07e07 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index a5b9d918e4..2759ab9799 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r1" +INC_PR = "r2" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc index fa1f47f51a..6c4f9bb5ec 100644 --- a/recipes/gcc/gcc-package-cross.inc +++ b/recipes/gcc/gcc-package-cross.inc @@ -29,7 +29,9 @@ do_install () { elif [ -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir} else - mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true + # Look for .../${TARGET_SYS}/lib/libgcc_s* + # (or /lib64/, on x86_64) + mv -f ${D}${prefix}/*/${target_base_libdir}/libgcc_s.so* ${D}${target_base_libdir} || true fi @@ -45,10 +47,11 @@ do_install () { mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true else - mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true - mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true - mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true - mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true + # Look for .../${TARGET_SYS}/lib/lib* (or /lib64/ on x86_64) + mv -f ${D}${prefix}/*/${target_base_libdir}/libstdc++.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libg2c.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libgfortran*.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libssp*.so* ${D}${target_libdir} || true fi diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 2da68185c5..0127646f43 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -36,11 +36,11 @@ INSANE_SKIP_glibc-dbg = True libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '/sbin/ldconfig', '', d)}" +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "${base_libdir}/libSegFault*" FILES_glibc-extra-nss = "${base_libdir}/libnss*" -FILES_sln = "/sbin/sln" +FILES_sln = "${base_sbindir}/sln" FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" FILES_glibc-utils = "${bindir}/* ${sbindir}/*" @@ -66,6 +66,7 @@ def get_glibc_fpu_setting(bb, d): return "" EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" +EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc index 4efff7842e..6e5ca68404 100644 --- a/recipes/glibc/glibc.inc +++ b/recipes/glibc/glibc.inc @@ -11,7 +11,7 @@ PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" # INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc -INC_PR = "r33" +INC_PR = "r34" inherit autotools diff --git a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb index a1cb41b846..db13279c5e 100644 --- a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb +++ b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb @@ -1,6 +1,10 @@ SECTION = "unknown" LICENSE = "GPL" -inherit gnome +inherit autotools gtk-icon-cache + +# Override RDEPENDS = hicolor-icon-theme from gtk-icon-cache +RDEPENDS = "" +RDEPENDS_${PN} = "" SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz" diff --git a/recipes/krb/krb5_1.6.3.bb b/recipes/krb/krb5_1.6.3.bb index f11bdb2192..9afef6bf1b 100644 --- a/recipes/krb/krb5_1.6.3.bb +++ b/recipes/krb/krb5_1.6.3.bb @@ -10,10 +10,11 @@ inherit autotools binconfig SRC_URI = "http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.3-signed.tar \ file://fix-uclibc-ruserpass-collision.patch \ file://copyperms.patch" + S = "${WORKDIR}/${PN}-${PV}/src/" # Will clean this up... -EXTRA_OECONF += " krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ +EXTRA_OECONF += " --without-tcl krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no --with-system-et" CFLAGS_append += "-DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 442bf3c651..62c6d16f6b 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -557,7 +557,7 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set @@ -615,7 +615,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set -CONFIG_ATA=y +CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set @@ -633,7 +633,7 @@ CONFIG_ATA=y # CONFIG_SATA_VIA is not set # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_OX810=y +CONFIG_SATA_OX810=m # CONFIG_SATA_HIPOX_SINGLE_SATA is not set # CONFIG_SATA_HIPOX_DISK_LIGHT is not set # CONFIG_PATA_ALI is not set diff --git a/recipes/linux/linux-2.6.24/hipox/hipox-sata-module.patch b/recipes/linux/linux-2.6.24/hipox/hipox-sata-module.patch new file mode 100644 index 0000000000..f7c47690c8 --- /dev/null +++ b/recipes/linux/linux-2.6.24/hipox/hipox-sata-module.patch @@ -0,0 +1,198 @@ +diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/dma.c linux-2.6.24/arch/arm/mach-hipox/dma.c +--- linux-2.6.24.orig//arch/arm/mach-hipox/dma.c 2009-08-20 08:10:53.000000000 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/dma.c 2009-08-20 08:17:17.000000000 +0200 +@@ -2847,3 +2847,8 @@ + EXPORT_SYMBOL(hipox_sata_dma_settings); + EXPORT_SYMBOL(hipox_dpe_rx_dma_settings); + EXPORT_SYMBOL(hipox_dpe_tx_dma_settings); ++ ++EXPORT_SYMBOL(hipox_dma_device_set_sg); ++EXPORT_SYMBOL(hipox_dma_alloc_sg_entries); ++EXPORT_SYMBOL(hipox_dma_device_set_prd); ++EXPORT_SYMBOL(hipox_dma_free_sg_entries); +diff -Nurd linux-2.6.24.orig//drivers/ata/Kconfig linux-2.6.24/drivers/ata/Kconfig +--- linux-2.6.24.orig//drivers/ata/Kconfig 2009-08-20 08:10:53.000000000 +0200 ++++ linux-2.6.24/drivers/ata/Kconfig 2009-08-20 08:17:17.000000000 +0200 +@@ -190,7 +190,7 @@ + This option enables support for the 924 based sata core + + config SATA_OX810 +- bool "Oxford Semiconductor OX810 SATA support" ++ tristate "Oxford Semiconductor OX810 SATA support" + depends on ARCH_HIPOX && HIPOX_VERSION_0X810 + default n + help +diff -Nurd linux-2.6.24.orig//drivers/ata/ox810sata.c linux-2.6.24/drivers/ata/ox810sata.c +--- linux-2.6.24.orig//drivers/ata/ox810sata.c 2009-08-20 08:10:53.000000000 +0200 ++++ linux-2.6.24/drivers/ata/ox810sata.c 2009-08-20 08:17:17.000000000 +0200 +@@ -52,7 +52,7 @@ + //#define SATA_DUMP_REGS + //#define SATA_TF_DUMP + //#define DEBUG_EOT_FAILURE +-#define ERROR_INJECTION ++//#define ERROR_INJECTION + + #define CRAZY_DUMP_DEBUG + #if 0 +@@ -192,6 +192,7 @@ + .error_inject = 0, + .hw_raid_active = 0, + .active_port = 0, ++ .spot_the_end_q = NULL, + }; + + /** If we were writing this in C++ then we would be deriving a subclass of +@@ -274,7 +275,7 @@ + + /**************************************************************************/ + MODULE_LICENSE("GPL"); +-MODULE_VERSION(1.0); ++MODULE_VERSION("1.0"); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESC); + +@@ -386,7 +387,11 @@ + } + + /* initialise a work queue to spot the end of transfers */ ++ if(!ox810sata_driver.spot_the_end_q) ++ { + ox810sata_driver.spot_the_end_q = create_singlethread_workqueue("sata-endQ"); ++ } ++ + if (!ox810sata_driver.spot_the_end_q) { + printk(KERN_ERR DRIVER_NAME " Couldn't create a work queue.\n"); + return -1; +@@ -416,6 +421,7 @@ + if (!host) { + printk(KERN_ERR DRIVER_NAME " Couldn't create an ata host.\n"); + destroy_workqueue(ox810sata_driver.spot_the_end_q); ++ ox810sata_driver.spot_the_end_q = NULL; + } + + /* set to base of ata core */ +@@ -447,10 +453,19 @@ + + // Disable the clock to the SATA block + writel(1UL << SYS_CTRL_CKEN_SATA_BIT, SYS_CTRL_CKEN_CLR_CTRL); ++ ++ if(ox810sata_driver.spot_the_end_q) ++ { ++ destroy_workqueue(ox810sata_driver.spot_the_end_q); ++ ox810sata_driver.spot_the_end_q = NULL; ++ } + + return 0; + } + ++static int ox810sata_device_init(void); ++static void ox810sata_device_exit(void); ++ + /** + * module initialisation + * @return success +@@ -461,6 +476,9 @@ + + ret = platform_driver_register( &ox810sata_driver.driver ); + DPRINTK(" %i\n", ret); ++ ++ if(ret) ++ return ret; + + #ifdef ERROR_INJECTION + { +@@ -473,6 +491,9 @@ + //create_proc_read_entry("ox810sata_errorinject", 0, NULL, ox810sata_error_inject_show, NULL); + } + #endif ++ ++ ret = ox810sata_device_init(); ++ + return ret; + } + +@@ -481,6 +502,8 @@ + */ + static void __exit ox810sata_exit( void ) + { ++ ox810sata_device_exit(); ++ + platform_driver_unregister( &ox810sata_driver.driver ); + } + +@@ -1578,6 +1601,13 @@ + pd->sg_entries = 0; + } + ++ if(ap->prd) ++ { ++ struct device* pdev = ap->host->dev; ++ ++ dma_free_coherent(pdev, ATA_PRD_TBL_SZ, ap->prd, ap->prd_dma); ++ } ++ + kfree(pd); + } + +@@ -2233,6 +2263,10 @@ + }, + }; + ++static void ox810_device_release(struct device *dev) ++{ ++} ++ + static struct platform_device ox810sata_dev0 = + { + .name = DRIVER_NAME, +@@ -2240,6 +2274,7 @@ + .num_resources = 2, + .resource = ox810sata_port0_resources, + .dev.coherent_dma_mask = 0xffffffff, ++ .dev.release = ox810_device_release, + }; + + static struct platform_device ox810sata_dev1 = +@@ -2249,13 +2284,14 @@ + .num_resources = 2, + .resource = ox810sata_port1_resources, + .dev.coherent_dma_mask = 0xffffffff, ++ .dev.release = ox810_device_release, + }; + + /** + * module initialisation + * @return success is 0 + */ +-static int __init ox810sata_device_init( void ) ++static int ox810sata_device_init( void ) + { + int ret; + +@@ -2282,10 +2318,12 @@ + /** + * module cleanup + */ +-static void __exit ox810sata_device_exit(void) ++static void ox810sata_device_exit(void) + { +- platform_device_unregister( &ox810sata_dev0 ); ++#ifndef CONFIG_OX810SATA_SINGLE_SATA + platform_device_unregister( &ox810sata_dev1 ); ++#endif /* CONFIG_OX810_SINGLE_SATA */ ++ platform_device_unregister( &ox810sata_dev0 ); + } + + /** +@@ -2413,11 +2451,3 @@ + } + + #endif /* ERROR_INJECTION */ +- +- +- +-/** +- * macros to register intiialisation and exit functions with kernal +- */ +-module_init(ox810sata_device_init); +-module_exit(ox810sata_device_exit); diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index c0278bf250..bfcfb89f7e 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE_oxnas = "1" DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" -PR = "r31" +PR = "r33" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://squashfs-lzma-2.6.24.patch;patch=1 \ @@ -102,6 +102,7 @@ SRC_URI_append_hipox = " \ file://hipox-nand.patch;patch=1 \ file://hipox-ubifs.patch;patch=1 \ file://hipox-kconfig.patch;patch=1 \ + file://hipox-sata-module.patch;patch=1 \ " CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc index 2d98a3046d..76a8ff0c3c 100644 --- a/recipes/ncurses/ncurses.inc +++ b/recipes/ncurses/ncurses.inc @@ -12,6 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DI EXTRA_OECONF = "\ --with-shared \ + --with-libtool \ --without-profile \ --without-debug \ --disable-rpath \ diff --git a/recipes/quagga/quagga_0.99.14.bb b/recipes/quagga/quagga_0.99.14.bb new file mode 100644 index 0000000000..e745560a34 --- /dev/null +++ b/recipes/quagga/quagga_0.99.14.bb @@ -0,0 +1,3 @@ +require quagga.inc + +QUAGGASUBDIR = "" diff --git a/recipes/tar/tar-native_1.13.93.bb b/recipes/tar/tar-native_1.13.93.bb index 4a7aae3282..ea9c328877 100644 --- a/recipes/tar/tar-native_1.13.93.bb +++ b/recipes/tar/tar-native_1.13.93.bb @@ -1,7 +1,5 @@ -SECTION = "base" require tar_${PV}.bb inherit native -S = "${WORKDIR}/tar-${PV}" do_stage() { install -m 755 src/tar ${STAGING_BINDIR} diff --git a/recipes/tar/tar.inc b/recipes/tar/tar.inc new file mode 100644 index 0000000000..8fbc2f81f7 --- /dev/null +++ b/recipes/tar/tar.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "GNU tar saves many files together into a single tape \ +or disk archive, and can restore individual files from the archive." +SECTION = "base" +LICENSE = "GPLv3" + +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" + +inherit autotools gettext + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} + mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 + update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove tar tar.${PN} + update-alternatives --remove rmt rmt.${PN} +} diff --git a/recipes/tar/tar_1.13.93.bb b/recipes/tar/tar_1.13.93.bb index 6c7139595f..ea56c0d372 100644 --- a/recipes/tar/tar_1.13.93.bb +++ b/recipes/tar/tar_1.13.93.bb @@ -1,28 +1,8 @@ -SECTION = "base" -DESCRIPTION = "GNU tar saves many files together into a single tape \ -or disk archive, and can restore individual files from the archive." -LICENSE = "GPL" +require tar.inc + +LICENSE = "GPLv2" PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" - -inherit autotools - -do_install () { - autotools_do_install - install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} - mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 - update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove tar tar.${PN} - update-alternatives --remove rmt rmt.${PN} -} + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" diff --git a/recipes/tar/tar_1.18.bb b/recipes/tar/tar_1.18.bb index 701c0b77bf..25163acdad 100644 --- a/recipes/tar/tar_1.18.bb +++ b/recipes/tar/tar_1.18.bb @@ -1,25 +1 @@ -DESCRIPTION = "GNU tar saves many files together into a single tape \ -or disk archive, and can restore individual files from the archive." -SECTION = "base" -LICENSE = "GPLv3" - -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" - -inherit autotools - -do_install () { - autotools_do_install - install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} - mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 - update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove tar tar.${PN} - update-alternatives --remove rmt rmt.${PN} -} +require tar.inc diff --git a/recipes/tar/tar_1.20.bb b/recipes/tar/tar_1.20.bb index 701c0b77bf..25163acdad 100644 --- a/recipes/tar/tar_1.20.bb +++ b/recipes/tar/tar_1.20.bb @@ -1,25 +1 @@ -DESCRIPTION = "GNU tar saves many files together into a single tape \ -or disk archive, and can restore individual files from the archive." -SECTION = "base" -LICENSE = "GPLv3" - -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" - -inherit autotools - -do_install () { - autotools_do_install - install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} - mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 - update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove tar tar.${PN} - update-alternatives --remove rmt rmt.${PN} -} +require tar.inc |