From a05f06d13822343ba6d71db2fccca181ca5474b7 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Wed, 12 May 2010 14:10:50 -0500 Subject: recipes/multitech: remove git dev recipes that use SRCPV --- recipes/multitech/helloworld-autotools_git.bb | 15 ------- recipes/multitech/mts-io_git.bb | 60 --------------------------- recipes/multitech/sms-utils_git.bb | 16 ------- recipes/multitech/u-boot-linux-utils_git.bb | 17 -------- recipes/multitech/upgrade-reboot_git.bb | 15 ------- recipes/multitech/venus-gps_git.bb | 15 ------- 6 files changed, 138 deletions(-) delete mode 100644 recipes/multitech/helloworld-autotools_git.bb delete mode 100644 recipes/multitech/mts-io_git.bb delete mode 100644 recipes/multitech/sms-utils_git.bb delete mode 100644 recipes/multitech/u-boot-linux-utils_git.bb delete mode 100644 recipes/multitech/upgrade-reboot_git.bb delete mode 100644 recipes/multitech/venus-gps_git.bb diff --git a/recipes/multitech/helloworld-autotools_git.bb b/recipes/multitech/helloworld-autotools_git.bb deleted file mode 100644 index 86af4007f3..0000000000 --- a/recipes/multitech/helloworld-autotools_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Hello World Recipe using autotools" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "${SRCPV}" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.multitech.net/helloworld-autotools.git;protocol=git;tag=master" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/recipes/multitech/mts-io_git.bb b/recipes/multitech/mts-io_git.bb deleted file mode 100644 index e56005f964..0000000000 --- a/recipes/multitech/mts-io_git.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "mts-io controller and sysfs wrapper" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/kernel" -RDEPENDS = "kernel (${KERNEL_VERSION})" -PV = "${SRCPV}" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = " \ - file://mts-io.init \ - git://git.multitech.net/cdp-io-controller.git;protocol=git;tag=master \ -" -S = "${WORKDIR}/git/io-module" - -inherit module-base -inherit update-rc.d - -PR = "r0" - -EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - M=${S} \ - modules \ - " - -do_configure () { - echo "Nothing to configure for mts-io" -} - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mts_io.ko" -FILES_${PN} += "${sysconfdir}/init.d/mts-io" -FILES_${PN} += "${libdir}/mts-io-sysfs*" -FILES_${PN} += "${sbindir}/mts-io-sysfs" - -INITSCRIPT_NAME = "mts-io" -INITSCRIPT_PARAMS = "start 90 S ." - -PARALLEL_MAKE = "" - -fakeroot do_install () { - install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - # use cp instead of install so the driver doesn't get stripped - cp ${S}/mts_io.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mts-io.init ${D}${sysconfdir}/init.d/mts-io - - install -m 0755 -d ${D}${sbindir} - install -d ${D}${libdir}/mts-io-sysfs - install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs-inc.sh ${D}${libdir}/mts-io-sysfs - install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs ${D}${sbindir}/mts-io-sysfs -} diff --git a/recipes/multitech/sms-utils_git.bb b/recipes/multitech/sms-utils_git.bb deleted file mode 100644 index a0df010ccc..0000000000 --- a/recipes/multitech/sms-utils_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "SMS Utilities" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libesmtp libyaml" -PV = "${SRCPV}" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git;tag=master" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/recipes/multitech/u-boot-linux-utils_git.bb b/recipes/multitech/u-boot-linux-utils_git.bb deleted file mode 100644 index 9c4c9cc801..0000000000 --- a/recipes/multitech/u-boot-linux-utils_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "U-Boot Linux Utilities" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "${SRCPV}" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -DEPENDS = "mtd-utils" - -SRC_URI = "git://git.multitech.net/u-boot-linux-utils.git;protocol=git;tag=master" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/recipes/multitech/upgrade-reboot_git.bb b/recipes/multitech/upgrade-reboot_git.bb deleted file mode 100644 index c24456322f..0000000000 --- a/recipes/multitech/upgrade-reboot_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Reboot command to run after firmware upgrade" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "${SRCPV}" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.multitech.net/upgrade-reboot.git;protocol=git;tag=master" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/recipes/multitech/venus-gps_git.bb b/recipes/multitech/venus-gps_git.bb deleted file mode 100644 index 67cb22abab..0000000000 --- a/recipes/multitech/venus-gps_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "SkyTraq Venus GPS Example" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "${SRCPV}" -PR = "r0" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.multitech.net/venus-gps.git;protocol=git;tag=master" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" -- cgit v1.2.3 From 8157346c8214de6f94860853bc56b6ac681d2bdb Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Thu, 13 May 2010 11:00:28 -0500 Subject: CoreCDP version 1.0.0 --- conf/distro/corecdp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf index 470098125d..ef650e8836 100644 --- a/conf/distro/corecdp.conf +++ b/conf/distro/corecdp.conf @@ -11,7 +11,7 @@ require conf/amend-recipes.inc DISTRO_NAME = "CoreCDP" DISTRO = "corecdp" -DISTRO_VERSION = "2010.04" +DISTRO_VERSION = "1.0.0" DISTRO_TYPE = "release" TARGET_VENDOR = "-corecdp" BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" -- cgit v1.2.3 From f375cc461216fe51d993d2e1250f69126684b644 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Thu, 13 May 2010 13:58:44 -0500 Subject: uboot-setenv: remove MAC address, update hostname --- contrib/multitech/uboot-setenv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/multitech/uboot-setenv b/contrib/multitech/uboot-setenv index 9c7ee57e00..e0df5cd395 100644 --- a/contrib/multitech/uboot-setenv +++ b/contrib/multitech/uboot-setenv @@ -3,12 +3,11 @@ send setenv bootargs \'mem=64M console=ttyS0,115200 root=/dev/mtdbl send setenv bootcmd \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\' send setenv bootdelay 3 send setenv baudrate 115200 -send setenv ethaddr 00:D0:A0:02:0D:E1 send setenv serverip 192.168.2.2 send setenv ipaddr 192.168.2.1 send setenv netmask 255.255.255.0 send setenv loadaddr 0x21400000 -send setenv hostname AT91SAM9G20 +send setenv hostname MTCDP send setenv dnsip 192.168.2.3 send setenv stdin serial send setenv stdout serial -- cgit v1.2.3 From 65027fd1a65f5af81300cea82396e4a78c5c59a2 Mon Sep 17 00:00:00 2001 From: James Maki Date: Thu, 13 May 2010 14:15:12 -0500 Subject: patch was not suppoed to contain CROSS_COMPILE line --- recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch index 97dc2f193d..412837a545 100644 --- a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch +++ b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch @@ -3090,17 +3090,8 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9rlek.h u-boot-1.3.4/incl /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile --- u-boot-1.3.4-vanilla/Makefile 2008-08-12 09:08:38.000000000 -0500 -+++ u-boot-1.3.4/Makefile 2010-03-25 17:04:31.000000000 -0500 -@@ -21,6 +21,8 @@ - # MA 02111-1307 USA - # - -+export CROSS_COMPILE = /opt/timesys/toolchains/armv5l-linux/bin/armv5l-linux- -+ - VERSION = 1 - PATCHLEVEL = 3 - SUBLEVEL = 4 -@@ -2353,15 +2355,6 @@ shannon_config : unconfig ++++ u-boot-1.3.4/Makefile 2010-05-13 14:00:22.000000000 -0500 +@@ -2353,15 +2353,6 @@ shannon_config : unconfig at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 @@ -3116,7 +3107,7 @@ diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 -@@ -2384,8 +2377,175 @@ mp2usb_config : unconfig +@@ -2384,8 +2375,175 @@ mp2usb_config : unconfig at91cap9adk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9 -- cgit v1.2.3 From 9db3b8621a20c1be4a7b13fc87c690bbe0fd8032 Mon Sep 17 00:00:00 2001 From: James Maki Date: Tue, 18 May 2010 15:54:03 -0500 Subject: remove \r from uboot-setenv --- contrib/multitech/uboot-setenv | 120 ++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/contrib/multitech/uboot-setenv b/contrib/multitech/uboot-setenv index e0df5cd395..7f18490584 100644 --- a/contrib/multitech/uboot-setenv +++ b/contrib/multitech/uboot-setenv @@ -1,60 +1,60 @@ -print setting U-Boot variables... -send setenv bootargs \'mem=64M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2\' -send setenv bootcmd \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\' -send setenv bootdelay 3 -send setenv baudrate 115200 -send setenv serverip 192.168.2.2 -send setenv ipaddr 192.168.2.1 -send setenv netmask 255.255.255.0 -send setenv loadaddr 0x21400000 -send setenv hostname MTCDP -send setenv dnsip 192.168.2.3 -send setenv stdin serial -send setenv stdout serial -send setenv stderr serial -send setenv ethact macb0 -send setenv bootstrap_file oe_bootstrap.bin -send setenv uboot_file oe_u-boot.bin -send setenv uboot_env1_file oe_uboot_env1.bin -send setenv uboot_env2_file oe_uboot_env2.bin -send setenv kernel_file oe_uImage.bin -send setenv config_file oe_config.tar.gz -send setenv oem_file oe_oem.tar.gz -send setenv rootfs_file oe_rootfs.jffs2 -send setenv bootstrap_addr 0x00000000 -send setenv uboot_addr 0x00020000 -send setenv uboot_env1_addr 0x00060000 -send setenv uboot_env2_addr 0x00080000 -send setenv kernel_addr 0x000A0000 -send setenv config_addr 0x00800000 -send setenv oem_addr 0x01000000 -send setenv rootfs_addr 0x01800000 -send setenv bootstrap_size 0x00020000 -send setenv uboot_size 0x00040000 -send setenv uboot_env1_size 0x00020000 -send setenv uboot_env2_size 0x00020000 -send setenv kernel_size 0x00760000 -send setenv config_size 0x00800000 -send setenv oem_size 0x00800000 -send setenv erase_bootstrap \'nand erase ${bootstrap_addr} ${bootstrap_size}\' -send setenv erase_uboot \'nand erase ${uboot_addr} ${uboot_size}\' -send setenv erase_uboot_env1 \'nand erase ${uboot_env1_addr} ${uboot_env1_size}\' -send setenv erase_uboot_env2 \'nand erase ${uboot_env2_addr} ${uboot_env2_size}\' -send setenv erase_kernel \'nand erase ${kernel_addr} ${kernel_size}\' -send setenv erase_config \'nand erase ${config_addr} ${config_size}\' -send setenv erase_oem \'nand erase ${oem_addr} ${oem_size}\' -send setenv erase_rootfs \'nand erase ${rootfs_addr}\' -send setenv tftp_bootstrap \'tftp ${loadaddr} ${bootstrap_file}; run erase_bootstrap; nand write.jffs2 ${fileaddr} ${bootstrap_addr} ${filesize}\' -send setenv tftp_uboot \'tftp ${loadaddr} ${uboot_file}; run erase_uboot; nand write.jffs2 ${fileaddr} ${uboot_addr} ${filesize}\' -send setenv tftp_uboot_env1 \'tftp ${loadaddr} ${uboot_env1_file}; run erase_uboot_env1; nand write.jffs2 ${fileaddr} ${uboot_env1_addr} ${filesize}\' -send setenv tftp_uboot_env2 \'tftp ${loadaddr} ${uboot_env2_file}; run erase_uboot_env2; nand write.jffs2 ${fileaddr} ${uboot_env2_addr} ${filesize}\' -send setenv tftp_kernel \'tftp ${loadaddr} ${kernel_file}; run erase_kernel; nand write.jffs2 ${fileaddr} ${kernel_addr} ${filesize}\' -send setenv tftp_config \'tftp ${loadaddr} ${config_file}; run erase_config; nand write.jffs2 ${fileaddr} ${config_addr} ${filesize}\' -send setenv tftp_oem \'tftp ${loadaddr} ${oem_file}; run erase_oem; nand write.jffs2 ${fileaddr} ${oem_addr} ${filesize}\' -send setenv tftp_rootfs \'tftp ${loadaddr} ${rootfs_file}; run erase_rootfs; nand write.jffs2 ${fileaddr} ${rootfs_addr} ${filesize}\' -send setenv krb \'run tftp_kernel; run tftp_rootfs; boot\' -send setenv rb \'run tftp_rootfs; boot\' -print saving... -send saveenv -send saveenv -send printenv +print setting U-Boot variables... +send setenv bootargs \'mem=64M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2\' +send setenv bootcmd \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\' +send setenv bootdelay 3 +send setenv baudrate 115200 +send setenv serverip 192.168.2.2 +send setenv ipaddr 192.168.2.1 +send setenv netmask 255.255.255.0 +send setenv loadaddr 0x21400000 +send setenv hostname MTCDP +send setenv dnsip 192.168.2.3 +send setenv stdin serial +send setenv stdout serial +send setenv stderr serial +send setenv ethact macb0 +send setenv bootstrap_file oe_bootstrap.bin +send setenv uboot_file oe_u-boot.bin +send setenv uboot_env1_file oe_uboot_env1.bin +send setenv uboot_env2_file oe_uboot_env2.bin +send setenv kernel_file oe_uImage.bin +send setenv config_file oe_config.tar.gz +send setenv oem_file oe_oem.tar.gz +send setenv rootfs_file oe_rootfs.jffs2 +send setenv bootstrap_addr 0x00000000 +send setenv uboot_addr 0x00020000 +send setenv uboot_env1_addr 0x00060000 +send setenv uboot_env2_addr 0x00080000 +send setenv kernel_addr 0x000A0000 +send setenv config_addr 0x00800000 +send setenv oem_addr 0x01000000 +send setenv rootfs_addr 0x01800000 +send setenv bootstrap_size 0x00020000 +send setenv uboot_size 0x00040000 +send setenv uboot_env1_size 0x00020000 +send setenv uboot_env2_size 0x00020000 +send setenv kernel_size 0x00760000 +send setenv config_size 0x00800000 +send setenv oem_size 0x00800000 +send setenv erase_bootstrap \'nand erase ${bootstrap_addr} ${bootstrap_size}\' +send setenv erase_uboot \'nand erase ${uboot_addr} ${uboot_size}\' +send setenv erase_uboot_env1 \'nand erase ${uboot_env1_addr} ${uboot_env1_size}\' +send setenv erase_uboot_env2 \'nand erase ${uboot_env2_addr} ${uboot_env2_size}\' +send setenv erase_kernel \'nand erase ${kernel_addr} ${kernel_size}\' +send setenv erase_config \'nand erase ${config_addr} ${config_size}\' +send setenv erase_oem \'nand erase ${oem_addr} ${oem_size}\' +send setenv erase_rootfs \'nand erase ${rootfs_addr}\' +send setenv tftp_bootstrap \'tftp ${loadaddr} ${bootstrap_file}; run erase_bootstrap; nand write.jffs2 ${fileaddr} ${bootstrap_addr} ${filesize}\' +send setenv tftp_uboot \'tftp ${loadaddr} ${uboot_file}; run erase_uboot; nand write.jffs2 ${fileaddr} ${uboot_addr} ${filesize}\' +send setenv tftp_uboot_env1 \'tftp ${loadaddr} ${uboot_env1_file}; run erase_uboot_env1; nand write.jffs2 ${fileaddr} ${uboot_env1_addr} ${filesize}\' +send setenv tftp_uboot_env2 \'tftp ${loadaddr} ${uboot_env2_file}; run erase_uboot_env2; nand write.jffs2 ${fileaddr} ${uboot_env2_addr} ${filesize}\' +send setenv tftp_kernel \'tftp ${loadaddr} ${kernel_file}; run erase_kernel; nand write.jffs2 ${fileaddr} ${kernel_addr} ${filesize}\' +send setenv tftp_config \'tftp ${loadaddr} ${config_file}; run erase_config; nand write.jffs2 ${fileaddr} ${config_addr} ${filesize}\' +send setenv tftp_oem \'tftp ${loadaddr} ${oem_file}; run erase_oem; nand write.jffs2 ${fileaddr} ${oem_addr} ${filesize}\' +send setenv tftp_rootfs \'tftp ${loadaddr} ${rootfs_file}; run erase_rootfs; nand write.jffs2 ${fileaddr} ${rootfs_addr} ${filesize}\' +send setenv krb \'run tftp_kernel; run tftp_rootfs; boot\' +send setenv rb \'run tftp_rootfs; boot\' +print saving... +send saveenv +send saveenv +send printenv -- cgit v1.2.3