From 3ebcb4dc5c0ea8c32a325e40b2801aa7b8451fa1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 25 Jul 2016 19:50:15 +0200 Subject: trdx-config: delete/mv all files into recipes-angstrom/angstrom/ Move angstrom-feed-configs.bbappend to the appropriate subdirectory. The files in the files/ subdirectory have been obsoleted with 3c3719ec6f9e ("trdx-config: remove obsolete package") and are no longer used, hence delete them. Signed-off-by: Max Krummenacher Signed-off-by: Stefan Agner --- .../angstrom/angstrom-feed-configs.bbappend | 9 +++++ recipes/trdx-config/angstrom-feed-configs.bbappend | 9 ----- recipes/trdx-config/files/COPYING | 5 --- recipes/trdx-config/files/base-feed.conf | 5 --- recipes/trdx-config/files/inittab | 42 ---------------------- recipes/trdx-config/files/noarch-feed.conf | 2 -- recipes/trdx-config/files/udev-late-mount | 31 ---------------- 7 files changed, 9 insertions(+), 94 deletions(-) create mode 100644 recipes-angstrom/angstrom/angstrom-feed-configs.bbappend delete mode 100644 recipes/trdx-config/angstrom-feed-configs.bbappend delete mode 100644 recipes/trdx-config/files/COPYING delete mode 100644 recipes/trdx-config/files/base-feed.conf delete mode 100644 recipes/trdx-config/files/inittab delete mode 100644 recipes/trdx-config/files/noarch-feed.conf delete mode 100755 recipes/trdx-config/files/udev-late-mount diff --git a/recipes-angstrom/angstrom/angstrom-feed-configs.bbappend b/recipes-angstrom/angstrom/angstrom-feed-configs.bbappend new file mode 100644 index 0000000..8515971 --- /dev/null +++ b/recipes-angstrom/angstrom/angstrom-feed-configs.bbappend @@ -0,0 +1,9 @@ +ANGSTROM_URI = "http://feeds.toradex.com/angstrom" + +do_compile_append() { + #no debug feed available so empty the feed configs + echo "" > ${S}/${sysconfdir}/opkg/debug-feed.conf + + #trdx: no machine feed available so empty the feed configs + echo "" > ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf +} diff --git a/recipes/trdx-config/angstrom-feed-configs.bbappend b/recipes/trdx-config/angstrom-feed-configs.bbappend deleted file mode 100644 index 8515971..0000000 --- a/recipes/trdx-config/angstrom-feed-configs.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -ANGSTROM_URI = "http://feeds.toradex.com/angstrom" - -do_compile_append() { - #no debug feed available so empty the feed configs - echo "" > ${S}/${sysconfdir}/opkg/debug-feed.conf - - #trdx: no machine feed available so empty the feed configs - echo "" > ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf -} diff --git a/recipes/trdx-config/files/COPYING b/recipes/trdx-config/files/COPYING deleted file mode 100644 index 040e990..0000000 --- a/recipes/trdx-config/files/COPYING +++ /dev/null @@ -1,5 +0,0 @@ -This piece is software is provided by Toradex AG as sample code. -There is no warranty for the program. -Toradex AG put this program in public domain, uncopyrighted. - -Renens, Swizterland, 2008-10-23 diff --git a/recipes/trdx-config/files/base-feed.conf b/recipes/trdx-config/files/base-feed.conf deleted file mode 100644 index 6fd2130..0000000 --- a/recipes/trdx-config/files/base-feed.conf +++ /dev/null @@ -1,5 +0,0 @@ -src/gz base http://www.angstrom-distribution.org/feeds/next/ipk/eglibc/armv7a-vfp/base -src/gz base2 http://www.angstrom-distribution.org/feeds/next/ipk/eglibc/armv6/base -src/gz base3 http://www.angstrom-distribution.org/feeds/next/ipk/eglibc/armv5te/base -src/gz base4 http://www.angstrom-distribution.org/feeds/unstable/ipk/glibc/armv6/base -src/gz base5 http://www.angstrom-distribution.org/feeds/unstable/ipk/glibc/armv5te/base \ No newline at end of file diff --git a/recipes/trdx-config/files/inittab b/recipes/trdx-config/files/inittab deleted file mode 100644 index a43057d..0000000 --- a/recipes/trdx-config/files/inittab +++ /dev/null @@ -1,42 +0,0 @@ -# /etc/inittab: init(8) configuration. -# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ - -# The default runlevel. -id:5:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:wait:/sbin/sulogin - -# /etc/init.d executes the S and K scripts upon change -# of runlevel. -# -# Runlevel 0 is halt. -# Runlevel 1 is single-user. -# Runlevels 2-5 are multi-user. -# Runlevel 6 is reboot. - -l0:0:wait:/etc/init.d/rc 0 -l1:1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 -# Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogin -S:2345:respawn:/sbin/getty 115200 ttyS0 -# /sbin/getty invocations for the runlevels. -# -# The "id" field MUST be the same as the last -# characters of the device (after "tty"). -# -# Format: -# ::: -# - -1:2345:respawn:/sbin/getty 115200 tty1 - diff --git a/recipes/trdx-config/files/noarch-feed.conf b/recipes/trdx-config/files/noarch-feed.conf deleted file mode 100644 index d2b1835..0000000 --- a/recipes/trdx-config/files/noarch-feed.conf +++ /dev/null @@ -1,2 +0,0 @@ -src/gz no-arch http://www.angstrom-distribution.org/feeds/next/ipk/eglibc/all -src/gz no-arch2 http://www.angstrom-distribution.org/feeds/unstable/ipk/glibc/all diff --git a/recipes/trdx-config/files/udev-late-mount b/recipes/trdx-config/files/udev-late-mount deleted file mode 100755 index f0506e0..0000000 --- a/recipes/trdx-config/files/udev-late-mount +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# mount drives missed during the udev 'add' action due to not yet avaliable filesytem -# -# Based on debian apmd scripts - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS - -case "$1" in - start) - #get all found drives - LIST=`ls /dev/sd??` - - for DRIVEFILE in $LIST - do - #if the drive is not in the already mounted drives generate an add event - DRIVE=`basename $DRIVEFILE` - cat /proc/mounts | awk '{print $1}' | grep -q "^$DRIVEFILE" || udevadm trigger --subsystem-match=block --sysname-match=$DRIVE --action=add ; echo "mounted $DRIVEFILE" - done - ;; - *) - echo "Usage: /etc/init.d/udev-late-mount {start}" - exit 1 - ;; -esac - -exit 0 - - -- cgit v1.2.3