From 72567733033347b662d9baa07432985fd2da3efa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 14:32:45 +0100 Subject: Remove machine-specific metadata for machines no longer in oe-core Signed-off-by: Paul Eggleton --- .../recipes-core/base-files/base-files/akita/fstab | 16 ----- .../base-files/base-files/akita/rotation | 1 - meta/recipes-core/base-files/base-files/c7x0/fstab | 12 ---- meta/recipes-core/base-files/base-files/c7x0/usbd | 1 - .../base-files/base-files/collie/fstab | 8 --- .../recipes-core/base-files/base-files/collie/usbd | 1 - .../base-files/base-files/htcuniversal/rotation | 1 - .../base-files/base-files/hx2000/fstab | 9 --- .../recipes-core/base-files/base-files/mtx-1/fstab | 8 --- .../base-files/base-files/mtx-1/profile | 25 -------- .../base-files/base-files/nokia770/fstab | 6 -- .../base-files/base-files/poodle/fstab | 13 ---- .../recipes-core/base-files/base-files/poodle/usbd | 1 - .../recipes-core/base-files/base-files/spitz/fstab | 28 --------- .../base-files/base-files/spitz/rotation | 1 - meta/recipes-core/base-files/base-files/tosa/fstab | 12 ---- meta/recipes-core/base-files/base-files/tosa/usbd | 5 -- meta/recipes-core/base-files/base-files_3.0.14.bb | 17 +----- .../netbase/netbase-4.45/epia/interfaces | 10 ---- .../netbase/netbase-4.45/mtx-1/interfaces | 29 --------- .../netbase/netbase-4.45/nokia800/interfaces | 5 -- .../netbase/netbase-4.45/tosa/interfaces | 24 -------- .../netbase/netbase-4.45/wrt54/interfaces | 23 ------- .../netbase/netbase-4.45/xxs1500/interfaces | 15 ----- meta/recipes-core/netbase/netbase_4.45.bb | 5 +- meta/recipes-core/tasks/task-core-tools.bb | 2 - .../uclibc/uclibc-0.9.30.1/akita/uClibc.machine | 70 ---------------------- .../uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine | 69 --------------------- .../uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine | 70 ---------------------- .../uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine | 70 ---------------------- .../uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine | 69 --------------------- .../uclibc/uclibc-0.9.30.1/spitz/uClibc.machine | 70 ---------------------- meta/recipes-core/udev/files/50-hostap_cs.rules | 4 -- meta/recipes-core/udev/files/akita/mount.blacklist | 3 - meta/recipes-core/udev/files/c7x0/mount.blacklist | 3 - meta/recipes-core/udev/files/spitz/mount.blacklist | 4 -- meta/recipes-core/udev/files/tosa/mount.blacklist | 3 - meta/recipes-core/udev/udev-new.inc | 7 --- meta/recipes-core/udev/udev_145.bb | 9 +-- meta/recipes-core/udev/udev_164.bb | 2 +- 40 files changed, 4 insertions(+), 727 deletions(-) delete mode 100644 meta/recipes-core/base-files/base-files/akita/fstab delete mode 100644 meta/recipes-core/base-files/base-files/akita/rotation delete mode 100644 meta/recipes-core/base-files/base-files/c7x0/fstab delete mode 100644 meta/recipes-core/base-files/base-files/c7x0/usbd delete mode 100644 meta/recipes-core/base-files/base-files/collie/fstab delete mode 100644 meta/recipes-core/base-files/base-files/collie/usbd delete mode 100644 meta/recipes-core/base-files/base-files/htcuniversal/rotation delete mode 100644 meta/recipes-core/base-files/base-files/hx2000/fstab delete mode 100644 meta/recipes-core/base-files/base-files/mtx-1/fstab delete mode 100644 meta/recipes-core/base-files/base-files/mtx-1/profile delete mode 100644 meta/recipes-core/base-files/base-files/nokia770/fstab delete mode 100644 meta/recipes-core/base-files/base-files/poodle/fstab delete mode 100644 meta/recipes-core/base-files/base-files/poodle/usbd delete mode 100644 meta/recipes-core/base-files/base-files/spitz/fstab delete mode 100644 meta/recipes-core/base-files/base-files/spitz/rotation delete mode 100644 meta/recipes-core/base-files/base-files/tosa/fstab delete mode 100644 meta/recipes-core/base-files/base-files/tosa/usbd delete mode 100644 meta/recipes-core/netbase/netbase-4.45/epia/interfaces delete mode 100644 meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces delete mode 100644 meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces delete mode 100644 meta/recipes-core/netbase/netbase-4.45/tosa/interfaces delete mode 100644 meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces delete mode 100644 meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine delete mode 100644 meta/recipes-core/udev/files/50-hostap_cs.rules delete mode 100644 meta/recipes-core/udev/files/akita/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/c7x0/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/spitz/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/tosa/mount.blacklist (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/base-files/base-files/akita/fstab b/meta/recipes-core/base-files/base-files/akita/fstab deleted file mode 100644 index 5f2c941345..0000000000 --- a/meta/recipes-core/base-files/base-files/akita/fstab +++ /dev/null @@ -1,16 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 1 1 -/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 - -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# USB Storage -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 - diff --git a/meta/recipes-core/base-files/base-files/akita/rotation b/meta/recipes-core/base-files/base-files/akita/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/akita/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/c7x0/fstab b/meta/recipes-core/base-files/base-files/c7x0/fstab deleted file mode 100644 index e065e8112e..0000000000 --- a/meta/recipes-core/base-files/base-files/c7x0/fstab +++ /dev/null @@ -1,12 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 1 1 -/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 - -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/c7x0/usbd b/meta/recipes-core/base-files/base-files/c7x0/usbd deleted file mode 100644 index 40931ee8e9..0000000000 --- a/meta/recipes-core/base-files/base-files/c7x0/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=pxa_bi diff --git a/meta/recipes-core/base-files/base-files/collie/fstab b/meta/recipes-core/base-files/base-files/collie/fstab deleted file mode 100644 index dc3499b909..0000000000 --- a/meta/recipes-core/base-files/base-files/collie/fstab +++ /dev/null @@ -1,8 +0,0 @@ -/dev/mtdblock4 / jffs2 defaults 1 1 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 -/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 - -# we use a non-volatile ramdisk, see /etc/init.d/ramdisk -#tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/collie/usbd b/meta/recipes-core/base-files/base-files/collie/usbd deleted file mode 100644 index 4257614583..0000000000 --- a/meta/recipes-core/base-files/base-files/collie/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=sa1100_bi diff --git a/meta/recipes-core/base-files/base-files/htcuniversal/rotation b/meta/recipes-core/base-files/base-files/htcuniversal/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/htcuniversal/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/hx2000/fstab b/meta/recipes-core/base-files/base-files/hx2000/fstab deleted file mode 100644 index 2d4b7aae72..0000000000 --- a/meta/recipes-core/base-files/base-files/hx2000/fstab +++ /dev/null @@ -1,9 +0,0 @@ -/dev/mtdblock2 / jffs2 defaults 1 1 -/dev/mtdblock3 /home jffs2 defaults 1 1 - -proc /proc proc defaults 0 0 -sys /sys sysfs defaults 0 0 - -/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/mtx-1/fstab b/meta/recipes-core/base-files/base-files/mtx-1/fstab deleted file mode 100644 index ee3fab0c13..0000000000 --- a/meta/recipes-core/base-files/base-files/mtx-1/fstab +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/fstab: static file system information. mtx-1 -# -# -rootfs / auto defaults 1 1 -tmpfs /var/volatile tmpfs size=10m 0 0 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/mtx-1/profile b/meta/recipes-core/base-files/base-files/mtx-1/profile deleted file mode 100644 index bedf2fc7d8..0000000000 --- a/meta/recipes-core/base-files/base-files/mtx-1/profile +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" - -if [ "`id -u`" -eq 0 ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in `ls /etc/profile.d/`; do - . /etc/profile.d/$i - done - unset i -fi - -export PATH PS1 - -umask 022 - -alias ll="ls -lah" \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/nokia770/fstab b/meta/recipes-core/base-files/base-files/nokia770/fstab deleted file mode 100644 index 7dbae252fb..0000000000 --- a/meta/recipes-core/base-files/base-files/nokia770/fstab +++ /dev/null @@ -1,6 +0,0 @@ -rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 -/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 -proc /proc proc defaults 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/poodle/fstab b/meta/recipes-core/base-files/base-files/poodle/fstab deleted file mode 100644 index b96b750eb6..0000000000 --- a/meta/recipes-core/base-files/base-files/poodle/fstab +++ /dev/null @@ -1,13 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 1 1 -/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 - -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 - -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/poodle/usbd b/meta/recipes-core/base-files/base-files/poodle/usbd deleted file mode 100644 index 40931ee8e9..0000000000 --- a/meta/recipes-core/base-files/base-files/poodle/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=pxa_bi diff --git a/meta/recipes-core/base-files/base-files/spitz/fstab b/meta/recipes-core/base-files/base-files/spitz/fstab deleted file mode 100644 index 3d0e508dfd..0000000000 --- a/meta/recipes-core/base-files/base-files/spitz/fstab +++ /dev/null @@ -1,28 +0,0 @@ -# don't mount /dev/mtdblock2 since Spitz uses pivot_root -# or 2.6 directly boots from the hdd -# /dev/mtdblock2 / jffs2 rw,noatime 1 1 -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -# we can use a normal var filesystem with a microdrive -# tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# Compact Flash memory cards -/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# -# USB -# -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs noauto 0 0 - -# -# Harddisk -# -/dev/hda2 /home ext3 defaults 0 0 -/dev/hda3 /media/hdd vfat defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/spitz/rotation b/meta/recipes-core/base-files/base-files/spitz/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/spitz/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/tosa/fstab b/meta/recipes-core/base-files/base-files/tosa/fstab deleted file mode 100644 index e065e8112e..0000000000 --- a/meta/recipes-core/base-files/base-files/tosa/fstab +++ /dev/null @@ -1,12 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 1 1 -/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 - -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/tosa/usbd b/meta/recipes-core/base-files/base-files/tosa/usbd deleted file mode 100644 index 8c80044167..0000000000 --- a/meta/recipes-core/base-files/base-files/tosa/usbd +++ /dev/null @@ -1,5 +0,0 @@ -# I know that this was created for usb-client stuff -# but tosa/2.6 need (un)loading USB Host module -# on suspend/resume and this way is simplest one ;) - -usbdmodule=ohci-hcd diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 857df13332..1c5078eb77 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -2,7 +2,7 @@ SUMMARY = "Miscellaneous files for the base system." DESCRIPTION = "The base-files package creates the basic system directory structure and provides a small set of key configuration files for the system." SECTION = "base" PRIORITY = "required" -PR = "r67" +PR = "r68" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "file://rotation \ @@ -64,8 +64,6 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ # hostname = "openembedded" hostname_slugos = "nslu2" -hostname_mnci = "MNCI" -hostname_rt3000 = "MNRT" hostname_jlime = "JLime" BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" @@ -135,11 +133,6 @@ do_install_basefilesissue () { fi } -do_install_append_mnci () { - rmdir ${D}/tmp - ln -s var/tmp ${D}/tmp -} - do_install_append_nylon() { printf "" "" >${D}${sysconfdir}/resolv.conf rm -r ${D}/mnt/* @@ -156,10 +149,6 @@ do_install_append_slugos() { ln -s ../root ${D}/home/root } -do_install_append_netbook-pro () { - mkdir -p ${D}/initrd -} - do_install_append_linuxstdbase() { for d in ${dirs3755}; do install -m 0755 -d ${D}$d @@ -174,10 +163,6 @@ PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" -# M&N specific packaging -PACKAGE_ARCH_mnci = "mnci" -PACKAGE_ARCH_rt3000 = "rt3000" - PACKAGE_ARCH = "${MACHINE_ARCH}" # Unslung distribution specific packaging diff --git a/meta/recipes-core/netbase/netbase-4.45/epia/interfaces b/meta/recipes-core/netbase/netbase-4.45/epia/interfaces deleted file mode 100644 index 673618f636..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/epia/interfaces +++ /dev/null @@ -1,10 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Ethernet -auto eth0 -iface eth0 inet dhcp - diff --git a/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces b/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces deleted file mode 100644 index a7c6da5752..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces +++ /dev/null @@ -1,29 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Ethernet -auto eth0 -iface eth0 inet dhcp - -# wlan interface 1 for clients -auto wlan0 -iface wlan0 inet static - address 10.0.0.1 - netmask 255.0.0.0 - wireless_mode master - wireless_essid cube-ap - wireless_channel 1 - -# wlan interface 2 for mesh -auto wlan1 -iface wlan1 inet static - address 172.16.0.1 - netmask 255.240.0.0 - broadcast 172.31.255.255 - wireless_mode ad-hoc - wireless_essid cube-mesh - wireless_channel 11 - wireless_rts 250 diff --git a/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces b/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces deleted file mode 100644 index 16967763e5..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback diff --git a/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces b/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces deleted file mode 100644 index 0da7168535..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces +++ /dev/null @@ -1,24 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Wireless interfaces -iface wlan0 inet dhcp - wireless_type wlan-ng - wireless_mode Managed - pre-up modprobe prism2_usb -# pre-up /sbin/usbctl on 1 -# post-down /sbin/usbctl off 1 - post-down rmmod prism2_usb - -# Wired or wireless interfaces -iface eth0 inet dhcp -iface eth1 inet dhcp - -# Zaurus usbnet -iface usbd0 inet dhcp - -# usbnet from the other side -iface usb0 inet dhcp diff --git a/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces b/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces deleted file mode 100644 index 8b2852ac51..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# loopback interface -auto lo -iface lo inet loopback - -# the 4 LAN ports -auto vlan0 -iface vlan0 inet static - address 192.168.1.1 - netmask 255.255.255.0 - -# WAN port -auto vlan1 -iface vlan1 inet dhcp - -# wireless interface -auto eth1 -iface eth1 inet static - wireless_mode master - wireless_essid wrt - address 10.0.0.1 - netmask 255.255.255.0 diff --git a/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces b/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces deleted file mode 100644 index 23ccccd2dd..0000000000 --- a/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Ethernet -auto eth0 eth1 -iface eth0 inet static - address 192.168.127.1 - netmask 255.255.255.0 - -iface eth1 inet static - address 192.168.128.1 - netmask 255.255.255.0 diff --git a/meta/recipes-core/netbase/netbase_4.45.bb b/meta/recipes-core/netbase/netbase_4.45.bb index 319afa7bd2..85daa16e21 100644 --- a/meta/recipes-core/netbase/netbase_4.45.bb +++ b/meta/recipes-core/netbase/netbase_4.45.bb @@ -40,7 +40,7 @@ do_install () { # Disable network manager on machines that commonly do NFS booting case "${MACHINE}" in - "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" | "qemux86-64" ) + "qemuarm" | "qemux86" | "qemux86-64" | "qemumips" | "qemuppc" ) touch ${D}${sysconfdir}/network/nm-disabled-eth0 ;; *) @@ -50,9 +50,6 @@ do_install () { CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" -PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" -PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" -PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}" PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}" PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" PACKAGE_ARCH_qemux86-64 = "${MACHINE_ARCH}" diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb index 9b2a4ce8ee..01e93ece65 100644 --- a/meta/recipes-core/tasks/task-core-tools.bb +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -63,8 +63,6 @@ RRECOMMENDS_task-core-tools-profile = "\ RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" -RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap" -RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap" RDEPENDS_task-core-tools-testapps = "\ blktool \ diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine deleted file mode 100644 index e27931cf6b..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine +++ /dev/null @@ -1,70 +0,0 @@ -# -# Automatically generated make config: don't edit -# Sat May 12 23:18:41 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -CONFIG_ARM_IWMMXT=y -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine deleted file mode 100644 index 5df15f94cb..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine +++ /dev/null @@ -1,69 +0,0 @@ -# -# Automatically generated make config: don't edit -# Fri Nov 23 15:49:33 2007 -# -# TARGET_alpha is not set -# TARGET_arm is not set -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -TARGET_i386=y -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="i386" -FORCE_OPTIONS_FOR_ARCH=y -CONFIG_GENERIC_386=y -# CONFIG_386 is not set -# CONFIG_486 is not set -# CONFIG_586 is not set -# CONFIG_586MMX is not set -# CONFIG_686 is not set -# CONFIG_PENTIUMII is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_ELAN is not set -# CONFIG_CRUSOE is not set -# CONFIG_WINCHIPC6 is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_CYRIXIII is not set -# CONFIG_NEHEMIAH is not set -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_LITTLE_ENDIAN=y - -# -# Using Little Endian -# -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=y -DO_C99_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - -UCLIBC_HAS_FENV=y diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine deleted file mode 100644 index ec0385bc0f..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine +++ /dev/null @@ -1,70 +0,0 @@ -# -# Automatically generated make config: don't edit -# Sun May 13 11:16:02 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -CONFIG_ARM_XSCALE=y -# CONFIG_ARM_IWMMXT is not set -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" -HAVE_DOT_CONFIG=y - diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine deleted file mode 100644 index e27931cf6b..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine +++ /dev/null @@ -1,70 +0,0 @@ -# -# Automatically generated make config: don't edit -# Sat May 12 23:18:41 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -CONFIG_ARM_IWMMXT=y -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine deleted file mode 100644 index 898b73a33b..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine +++ /dev/null @@ -1,69 +0,0 @@ -# -# Automatically generated make config: don't edit -# Mon May 14 10:23:14 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -CONFIG_ARM920T=y -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_ARM_IWMMXT is not set -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine deleted file mode 100644 index e27931cf6b..0000000000 --- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine +++ /dev/null @@ -1,70 +0,0 @@ -# -# Automatically generated make config: don't edit -# Sat May 12 23:18:41 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -CONFIG_ARM_IWMMXT=y -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - diff --git a/meta/recipes-core/udev/files/50-hostap_cs.rules b/meta/recipes-core/udev/files/50-hostap_cs.rules deleted file mode 100644 index efefdc58fc..0000000000 --- a/meta/recipes-core/udev/files/50-hostap_cs.rules +++ /dev/null @@ -1,4 +0,0 @@ -# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards -# -ACTION=="add", DEVICE=="hostap_cs", \ - SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/meta/recipes-core/udev/files/akita/mount.blacklist b/meta/recipes-core/udev/files/akita/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/akita/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/c7x0/mount.blacklist b/meta/recipes-core/udev/files/c7x0/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/c7x0/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/spitz/mount.blacklist b/meta/recipes-core/udev/files/spitz/mount.blacklist deleted file mode 100644 index aee308f9b8..0000000000 --- a/meta/recipes-core/udev/files/spitz/mount.blacklist +++ /dev/null @@ -1,4 +0,0 @@ -/dev/mtdblock -/dev/hda -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/tosa/mount.blacklist b/meta/recipes-core/udev/files/tosa/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/tosa/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc index 4faaae1b8d..d1abf39074 100644 --- a/meta/recipes-core/udev/udev-new.inc +++ b/meta/recipes-core/udev/udev-new.inc @@ -27,8 +27,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udev-cache \ file://init" -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " - inherit autotools pkgconfig update-rc.d # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ @@ -39,7 +37,6 @@ EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \ PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" -PACKAGE_ARCH_h2200 = "h2200" INITSCRIPT_PACKAGES = "udev udev-cache" INITSCRIPT_NAME_udev = "udev" @@ -86,7 +83,3 @@ do_install_append () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts } - -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} diff --git a/meta/recipes-core/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb index fde5050b5b..becef04706 100644 --- a/meta/recipes-core/udev/udev_145.bb +++ b/meta/recipes-core/udev/udev_145.bb @@ -1,15 +1,12 @@ RPROVIDES_${PN} = "hotplug" -PR = "r10" +PR = "r11" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://enable-gudev.patch;patch=1 \ file://run.rules \ " -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - require udev.inc INITSCRIPT_PARAMS = "start 03 S ." @@ -56,7 +53,3 @@ do_install () { install -d ${D}${base_libdir}/udev/ } -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} - diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb index 135685f2b8..76fd907ef7 100644 --- a/meta/recipes-core/udev/udev_164.bb +++ b/meta/recipes-core/udev/udev_164.bb @@ -1,6 +1,6 @@ include udev-new.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" -- cgit 1.2.3-korg