Remove distro-specific metadata for distros not in oe-core
(From OE-Core rev: ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
Richard Purdie
parent
cdf878387a
commit
bbd6999a72
|
|
@ -6,8 +6,7 @@ HOMEPAGE = "http://www.openswan.org"
|
|||
LICENSE = "GPLv2"
|
||||
DEPENDS = "gmp flex-native"
|
||||
RRECOMMENDS_${PN} = "kernel-module-ipsec"
|
||||
RDEPENDS_${PN}_nylon = "perl"
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
|
||||
file://openswan-2.4.7-gentoo.patch;patch=1 \
|
||||
|
|
|
|||
|
|
@ -47,7 +47,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${
|
|||
RDEPENDS_dhcp-client = "bash"
|
||||
|
||||
FILES_dhcp-omshell = "${bindir}/omshell"
|
||||
|
||||
CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
|
||||
CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
|
||||
CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${
|
|||
RDEPENDS_dhcp-client = "bash"
|
||||
|
||||
FILES_dhcp-omshell = "${bindir}/omshell"
|
||||
|
||||
CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
|
||||
CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
|
||||
CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
require dhcp4.inc
|
||||
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI += "file://fixincludes.patch \
|
||||
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
|
|||
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
|
||||
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
|
||||
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
||||
file://makefile.patch \
|
||||
|
|
@ -29,8 +29,6 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
|||
SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57"
|
||||
SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505"
|
||||
|
||||
SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
|
||||
|
||||
inherit autotools
|
||||
|
||||
EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
|
||||
|
|
@ -54,7 +52,6 @@ do_install_append () {
|
|||
CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
|
||||
PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
|
||||
FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
|
||||
FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
|
||||
FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug"
|
||||
FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
|
||||
FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
|
||||
|
|
|
|||
|
|
@ -63,8 +63,6 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
|
|||
# set standard hostname, might be a candidate for a DISTRO variable? :M:
|
||||
#
|
||||
hostname = "openembedded"
|
||||
hostname_slugos = "nslu2"
|
||||
hostname_jlime = "JLime"
|
||||
|
||||
BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
|
||||
|
||||
|
|
@ -133,22 +131,6 @@ do_install_basefilesissue () {
|
|||
fi
|
||||
}
|
||||
|
||||
do_install_append_nylon() {
|
||||
printf "" "" >${D}${sysconfdir}/resolv.conf
|
||||
rm -r ${D}/mnt/*
|
||||
rm -r ${D}/media
|
||||
rm -rf ${D}/tmp
|
||||
ln -sf /var/tmp ${D}/tmp
|
||||
}
|
||||
|
||||
do_install_append_slugos() {
|
||||
printf "" "" >${D}${sysconfdir}/resolv.conf
|
||||
rm -r ${D}/mnt/*
|
||||
rmdir ${D}/home/root
|
||||
install -m 0755 -d ${D}/root
|
||||
ln -s ../root ${D}/home/root
|
||||
}
|
||||
|
||||
do_install_append_linuxstdbase() {
|
||||
for d in ${dirs3755}; do
|
||||
install -m 0755 -d ${D}$d
|
||||
|
|
@ -165,16 +147,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
|
|||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
# Unslung distribution specific packaging
|
||||
|
||||
PACKAGES_unslung = "${PN}-unslung"
|
||||
PACKAGE_ARCH_${PN}-unslung = "nslu2"
|
||||
RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
|
||||
RPROVIDES_${PN}-unslung = "${PN}"
|
||||
|
||||
FILES_${PN}-unslung = ""
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
|
||||
CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
|
||||
CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
SUMMARY = "Base system master password/group files."
|
||||
DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files."
|
||||
SECTION = "base"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
|
||||
|
||||
|
|
@ -35,11 +35,6 @@ do_install () {
|
|||
install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
|
||||
}
|
||||
|
||||
do_install_append_openmn() {
|
||||
echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst_${PN} () {
|
||||
set -e
|
||||
|
||||
|
|
|
|||
|
|
@ -29,9 +29,6 @@ CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
|
|||
|
||||
RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
|
||||
|
||||
# This disables the syslog startup links in slugos (see slugos-init)
|
||||
INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
|
||||
|
||||
inherit cml1 update-rc.d
|
||||
|
||||
do_configure () {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
require busybox.inc
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
||||
file://udhcpscript.patch \
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
|
|||
DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
|
||||
|
||||
do_configure_prepend() {
|
||||
if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then
|
||||
if [ "${DISTRO_TYPE}" = "debug" ]; then
|
||||
bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
|
||||
patch -p1 < ${WORKDIR}/allow-nopw.patch
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ require dropbear.inc
|
|||
SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
|
||||
SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
|
||||
|
||||
PR="r0"
|
||||
PR = "r1"
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
|
||||
|
||||
# The loopback interface
|
||||
auto lo
|
||||
iface lo inet loopback
|
||||
|
||||
# Wired or wireless interfaces
|
||||
iface eth0 inet dhcp
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
127.0.0.1 localhost.localdomain localhost
|
||||
192.168.233.1 www.mn-solutions.de
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
auto lo
|
||||
auto eth1
|
||||
|
||||
iface lo inet loopback
|
||||
|
||||
iface eth0 inet dhcp
|
||||
|
||||
iface eth1 inet dhcp
|
||||
wireless_mode managed
|
||||
wireless_essid any
|
||||
|
|
@ -10,11 +10,6 @@ inherit update-rc.d
|
|||
|
||||
INITSCRIPT_NAME = "networking"
|
||||
INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
|
||||
# On MNCI etc, start very late so that our own apps come up faster
|
||||
INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
|
||||
# On SlugOS (NSLU2) delay the stop until after network apps have exited
|
||||
# Do not stop in single user - there's no way to sulogin!
|
||||
INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ."
|
||||
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
|
||||
file://init \
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
ram[0-9]$
|
||||
mtdblock[0-9]$
|
||||
hd[a-z]$
|
||||
sd[a-z]$
|
||||
|
|
@ -17,7 +17,6 @@ PARALLEL_MAKE = ""
|
|||
inherit autotools gettext
|
||||
|
||||
DPKG_INIT_POSITION = "98"
|
||||
DPKG_INIT_POSITION_slugos = "41"
|
||||
|
||||
pkg_postinst_dpkg () {
|
||||
#!/bin/sh
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ SRC_URI += "file://noman.patch;patch=1 \
|
|||
SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
|
||||
SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
|
||||
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
EXTRA_OECONF = "--without-static-progs \
|
||||
--without-dselect \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ SECTION = "libs"
|
|||
LICENSE = "Artistic|GPL"
|
||||
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
||||
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
||||
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
||||
|
|
@ -98,9 +98,3 @@ do_install () {
|
|||
|
||||
create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
|
||||
}
|
||||
do_install_append_nylon() {
|
||||
# get rid of definitions not supported by the gcc version we use for nylon...
|
||||
for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
|
||||
perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
|
||||
done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
depmod -ae
|
||||
exit 0
|
||||
|
|
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
|
|||
|
||||
PACKAGE_ARCH = "all"
|
||||
RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
|
||||
PR = "r8"
|
||||
PR = "r9"
|
||||
|
||||
SRC_URI = "file://update-modules \
|
||||
file://COPYING.GPL"
|
||||
|
|
@ -22,12 +22,3 @@ do_install() {
|
|||
install ${WORKDIR}/update-modules ${D}${sbindir}
|
||||
}
|
||||
|
||||
# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which
|
||||
# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have
|
||||
# to deal with that unique legacy corner case, we just nullify the
|
||||
# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this
|
||||
# is ugly. Please don't remove it unless you first make the RDEPENDS
|
||||
# line at the top of this file understand that a machine can be used
|
||||
# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
|
||||
# not worth the effort to do that, so just overlook the next line.
|
||||
RDEPENDS_unslung = ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue