From 2aa5af152990465ef1c20b4b0363dfcc04fdcd58 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Oct 2012 20:38:41 +0200 Subject: removed *~ backup files from git repo --- conf/machine/colibri-t30.conf~ | 61 ------------------- recipes-bsp/u-boot/u-boot_git.bbappend~ | 68 ---------------------- recipes-lxde/lxlauncher/lxlauncher_0.2.2.bb~ | 17 ------ recipes-lxde/lxrandr/lxrandr_0.1.2.bb~ | 14 ----- recipes/joe/joe_3.1.bb~ | 15 ----- recipes/stress/stress_1.0.4.bb~ | 15 ----- recipes/tegrastats-gtk/tegrastats-gtk.bb~ | 16 ----- recipes/trdx-oak-sensors/trdx-oak-sensors_0082.bb~ | 15 ----- 8 files changed, 221 deletions(-) delete mode 100644 conf/machine/colibri-t30.conf~ delete mode 100644 recipes-bsp/u-boot/u-boot_git.bbappend~ delete mode 100644 recipes-lxde/lxlauncher/lxlauncher_0.2.2.bb~ delete mode 100644 recipes-lxde/lxrandr/lxrandr_0.1.2.bb~ delete mode 100644 recipes/joe/joe_3.1.bb~ delete mode 100644 recipes/stress/stress_1.0.4.bb~ delete mode 100644 recipes/tegrastats-gtk/tegrastats-gtk.bb~ delete mode 100644 recipes/trdx-oak-sensors/trdx-oak-sensors_0082.bb~ diff --git a/conf/machine/colibri-t30.conf~ b/conf/machine/colibri-t30.conf~ deleted file mode 100644 index 7a1f7ad..0000000 --- a/conf/machine/colibri-t30.conf~ +++ /dev/null @@ -1,61 +0,0 @@ -#@TYPE: Machine -#@NAME: colibri_t30 -#@DESCRIPTION: Toradex Colibri T30 - -TARGET_ARCH = "arm" - -PREFERRED_PROVIDER_virtual/kernel = "linux-colibri-t30" -#PREFERRED_VERSION_linux = "" - -KERNEL_IMAGETYPE = "uImage" -#UBOOT_MACHINE = "harmony_config" -#UBOOT_MACHINE = "waluigi_config" -#UBOOT_MACHINE = "cardhu_config" -UBOOT_MACHINE = "colibri_t30_config" -UBOOT_ENTRYPOINT = 0x00008000 -#PREFERRED_VERSION_u-boot = "2010.06" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-fbdev \ - xf86-input-keyboard" -# Only has DVI connector for external screen, name is changing to MACHINE_GUI_CLASS -GUI_MACHINE_CLASS = "bigscreen" -MACHINE_GUI_CLASS = "bigscreen" - -PREFERRED_PROVIDER_lxde-icon-theme_colibri-t30 = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_colibri-t30 = "lxsession" -PREFERRED_PROVIDER_gdbserver_colibri-t30 = "gdbserver" -PREFERRED_PROVIDER_libgobject-2.0_colibri-t30 = "glib-2.0" -PREFERRED_PROVIDER_libgmodule-2.0_colibri-t30 = "glib-2.0" -PREFERRED_PROVIDER_libgthread-2.0_colibri-t30 = "glib-2.0" -PREFERRED_PROVIDER_libgio-2.0_colibri-t30 = "glib-2.0" -PREFERRED_VERSION_libgobject-2.0_colibri-t30 = "2.30.1" -PREFERRED_VERSION_libgmodule-2.0_colibri-t30 = "2.30.1" -PREFERRED_VERSION_libgthread-2.0_colibri-t30 = "2.30.1" -PREFERRED_VERSION_libgio-2.0_colibri-t30 = "2.30.1" - -PREFERRED_VERSION_samba_colibri-t30 = "3.6.1" -PREFERRED_VERSION_glib-2.0_colibri-t30 = "2.30.1" -PREFERRED_VERSION_glib-2.0-native_colibri-t30 = "2.30.1" -PREFERRED_VERSION_gtk+_colibri-t30 = "2.24.8" -PREFERRED_VERSION_gtk+-native_colibri-t30 = "2.24.8" -PREFERRED_VERSION_pango_colibri-t30 = "1.29.4" -PREFERRED_VERSION_pango-native_colibri-t30 = "1.29.4" - -#ANGSTROM_GCC_VERSION_colibri-t30 = "4.4.4" - -#fix for csl 4.4.1 toolchain not beeing recent enough -#PREFERRED_VERSION_eglibc ?= "2.10" -#PREFERRED_VERSION_eglibc-initial ?= "2.10" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat ext2 alsa" -EXTRA_IMAGEDEPENDS += "u-boot" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" -#IMAGE_FSTYPES ?= "yaffs2" - -require conf/machine/include/tune-cortexa9tegra.inc diff --git a/recipes-bsp/u-boot/u-boot_git.bbappend~ b/recipes-bsp/u-boot/u-boot_git.bbappend~ deleted file mode 100644 index ad1be2f..0000000 --- a/recipes-bsp/u-boot/u-boot_git.bbappend~ +++ /dev/null @@ -1,68 +0,0 @@ -# Extends the core U-Boot GIT recipe -# to take the u-boot sources including the colibri stuff from our git repository -PR ="r1" -DEPENDS += "dtc-native" - -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-git:" - -# Also overwries the license checksum to suit the updated text file in our U-Boot snapshot. -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" - -COMPATIBLE_MACHINE_colibri-t20 = "colibri-t20" -COMPATIBLE_MACHINE_colibri-t30 = "colibri-t30" - -DEFAULT_PREFERENCE_colibri-t20 = "1" -DEFAULT_PREFERENCE_colibri-t30 = "1" - -UBOOT_MACHINE_colibri-t20 = "colibri_t20_config" -UBOOT_MACHINE_colibri-t30 = "colibri_t30_config" - -#gitorious git -FILESPATHPKG =. "git:" -S="${WORKDIR}/git" -SRC_URI_COLIBRI = "git://gitorious.org/colibri-t20-embedded-linux-bsp/colibri_t20-u-boot.git;protocol=git;branch=master \ - file://u-boot-warning.patch \ -" -# file://remove-unused.patch \ -# file://u-boot_ap20warning.patch \ -# file://colibri_t30.patch \ -# file://bootaddr.patch \ -#" -SRCREV_colibri-t20 = "63c37d9e1d3ea97391576384d237728c44b5e33b" -SRCREV_colibri-t30 = "63c37d9e1d3ea97391576384d237728c44b5e33b" - -PV_colibri-t20 = "${PR}+gitr${SRCREV}" -PV_colibri-t30 = "${PR}+gitr${SRCREV}" - -#internal SVN -#S = "${WORKDIR}/bootloader/u-boot" -#SVN_REV = 218 -#SRC_URI_COLIBRI = "svn://tegradev:tegra123!@mammut.toradex.int:8090/colibri_tegra_linux/trunk;module=bootloader/u-boot;rev=${SVN_REV};proto=http \ -# file://remove-unused.patch " - -SRC_URI_colibri-t20 = "${SRC_URI_COLIBRI} " -SRC_URI_colibri-t30 = "${SRC_URI_COLIBRI} " - -#compile with -O2 not -Os as with gcc 4.5 the code does not work -do_configure_append() { - # sed -i -e 's/-Os/-O2 -fno-ipa-sra -fno-caller-saves -fno-schedule-insns/' ${S}/config.mk - sed -i -e 's/-Os/-O2 -fno-ipa-sra -fno-caller-saves -fno-schedule-insns -mno-unaligned-access/' ${S}/config.mk -} - - -#build additionally a u-boot binary which uses/stores its environment on an T20 external sd or mmc card -do_compile_append_colibri-t20() { - mv u-boot.bin u-boot-nand.bin - oe_runmake colibri_t20_sdboot_config - oe_runmake all - mv u-boot.bin u-boot-hsmmc.bin - mv u-boot-nand.bin u-boot.bin -} - -UBOOT_IMAGE ?= "u-boot-hsmmc-${MACHINE}-${PV}-${PR}.bin" -do_deploy_append_colibri-t20 () { - install ${S}/u-boot-hsmmc.bin ${DEPLOY_DIR_IMAGE}/u-boot-hsmmc-${MACHINE}-${PV}-${PR}.bin - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/u-boot-hsmmc-${MACHINE}-${PV}-${PR}.bin - ln -sf u-boot-hsmmc-${MACHINE}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/u-boot-hsmmc.bin - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/u-boot-hsmmc.bin -} diff --git a/recipes-lxde/lxlauncher/lxlauncher_0.2.2.bb~ b/recipes-lxde/lxlauncher/lxlauncher_0.2.2.bb~ deleted file mode 100644 index 2bc07ab..0000000 --- a/recipes-lxde/lxlauncher/lxlauncher_0.2.2.bb~ +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "LXDE Launcher" -HOMEPAGE = "http://lxde.org/" -SECTION = "x11" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183" - -DEPENDS = "menu-cache gtk+" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "16df627447838b170a72cc3a9ee21497" -SRC_URI[sha256sum] = "ad586e3a2668f98bbf0217ec1be1f8f1be4ff876b180a407c7db2fe354303cbc" - -FILE_${pn} += "${datadir}/desktop-directories/*" - -inherit autotools gettext pkgconfig - diff --git a/recipes-lxde/lxrandr/lxrandr_0.1.2.bb~ b/recipes-lxde/lxrandr/lxrandr_0.1.2.bb~ deleted file mode 100644 index 9ac3d35..0000000 --- a/recipes-lxde/lxrandr/lxrandr_0.1.2.bb~ +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "LXDE Randr graphical frontend" -HOMEPAGE = "http://lxde.org/" -SECTION = "x11" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "xrandr gtk+" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8a7391581541bba58839ac11dbf5b575" -SRC_URI[sha256sum] = "fb8139478f6cfeac6a2d8adb4e55e8cad099bfe2da7c82253c935ba719f9cf19" - -inherit autotools gettext pkgconfig diff --git a/recipes/joe/joe_3.1.bb~ b/recipes/joe/joe_3.1.bb~ deleted file mode 100644 index 75eb049..0000000 --- a/recipes/joe/joe_3.1.bb~ +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters." -HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE ="GPLv1" -RDEPENDS_${PN} = "ncurses-terminfo" - -SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" -LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6" - -PR = "r3" - -inherit autotools - -SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0" -SRC_URI[sha256sum] = "252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946" diff --git a/recipes/stress/stress_1.0.4.bb~ b/recipes/stress/stress_1.0.4.bb~ deleted file mode 100644 index 5c2da31..0000000 --- a/recipes/stress/stress_1.0.4.bb~ +++ /dev/null @@ -1,15 +0,0 @@ -# stress .bb build file -# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) - -HOMEPAGE="http://weather.ou.edu/~apw/projects/stress/" -DESCRIPTION = "a simple tool that imposes certain types of compute stress on UNIX-like operating systems." -LICENSE = "GPL" - -inherit autotools - -SRC_URI="http://weather.ou.edu/~apw/projects/stress/stress-${PV}.tar.gz" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd6c0b07c871f890801cda80e9ab8e4a" - -SRC_URI[md5sum] = "a607afa695a511765b40993a64c6e2f4" -SRC_URI[sha256sum] = "369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0" \ No newline at end of file diff --git a/recipes/tegrastats-gtk/tegrastats-gtk.bb~ b/recipes/tegrastats-gtk/tegrastats-gtk.bb~ deleted file mode 100644 index 00746d2..0000000 --- a/recipes/tegrastats-gtk/tegrastats-gtk.bb~ +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "NVIDIAS tegrastats output in a gtk title bar" -LICENSE = "NVIDIA Propriatry" - -PR = "r1" - -S = "${WORKDIR}" - -SRC_URI="file://stats.c file://main.c file://Makefile" -LIC_FILES_CHKSUM = "file://main.c;endline=9;md5=yyyy " - -do_install () { - install -d ${D}${bindir}/ - install -m 0755 ${S}/tegrastats-gtk ${D}${bindir}/ -} - -FILES_${PN} = "${bindir}/tegrastats-gtk" \ No newline at end of file diff --git a/recipes/trdx-oak-sensors/trdx-oak-sensors_0082.bb~ b/recipes/trdx-oak-sensors/trdx-oak-sensors_0082.bb~ deleted file mode 100644 index 2f83bba..0000000 --- a/recipes/trdx-oak-sensors/trdx-oak-sensors_0082.bb~ +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "sample code to access the toradex oak sensors" -LICENSE = "PublicDomain" - -S="${WORKDIR}/OakLinux_${PV}" - -SRC_URI = "http://files.toradex.com/Oak/Linux/OakLinux_${PV}.tar.bz2" - -SRC_URI[md5sum] = "cedc87c056f961c15751ee899fb719d5" -SRC_URI[sha256sum] = "69836dfa746422a64f6518cc9e785a7a64ca67d82f5fae0421515a59f4394929" -LIC_FILES_CHKSUM = "file://COPYING;md5="1c3a7fb45253c11c74434676d84fe7dd" - -inherit autotools - -FILES_${PN} += "" - -- cgit v1.2.3