From c5bebcc14966d29be1ad866ad236a2d4819154dc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jan 2014 07:31:48 +0100 Subject: [PATCH] ppp: convert to new package format Signed-off-by: Stephan Raue --- packages/network/ppp/build | 40 ----------------------- packages/network/ppp/install | 24 -------------- packages/network/ppp/{meta => package.mk} | 33 +++++++++++++++++-- 3 files changed, 30 insertions(+), 67 deletions(-) delete mode 100755 packages/network/ppp/build delete mode 100755 packages/network/ppp/install rename packages/network/ppp/{meta => package.mk} (65%) diff --git a/packages/network/ppp/build b/packages/network/ppp/build deleted file mode 100755 index 22d177e09f..0000000000 --- a/packages/network/ppp/build +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -# ppp-2.4.5 contains an out of date copy of the kernel header linux/if_pppol2tp.h. -# This needs to be removed to force it to use the one installed in /usr. If you don't -# remove this file the build will still succeed (thanks to a poorly written Makefile) -# but it will fail to compile the openl2tp.so, pppol2tp.so and rp-pppoe.so plugins - rm -rf include/linux/if_pppol2tp.h - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - -make COPTS="$CFLAGS" -C pppd -make DESTDIR=$SYSROOT_PREFIX/usr -C pppd install-devel diff --git a/packages/network/ppp/install b/packages/network/ppp/install deleted file mode 100755 index 4e3c1194bc..0000000000 --- a/packages/network/ppp/install +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/pppd/pppd $INSTALL/usr/sbin diff --git a/packages/network/ppp/meta b/packages/network/ppp/package.mk similarity index 65% rename from packages/network/ppp/meta rename to packages/network/ppp/package.mk index ba912bca73..e9750184d8 100644 --- a/packages/network/ppp/meta +++ b/packages/network/ppp/package.mk @@ -23,12 +23,39 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://samba.org/" PKG_URL="http://samba.org/ftp/ppp/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libpcap" +PKG_DEPENDS_TARGET="" +PKG_BUILD_DEPENDS_TARGET="toolchain libpcap" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="ppp: contains the pppd daemon and the chat program. This is used for connecting to other machines; often for connecting to the Internet via a dial-up or PPPoE connection to an ISP." PKG_LONGDESC="The PPP package contains the pppd daemon and the chat program. This is used for connecting to other machines; often for connecting to the Internet via a dial-up or PPPoE connection to an ISP." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +pre_configure_target() { +# ppp fails to build in subdirs + cd $ROOT/$PKG_BUILD + rm -rf .$TARGET_NAME + +# ppp-2.4.5 contains an out of date copy of the kernel header linux/if_pppol2tp.h. +# This needs to be removed to force it to use the one installed in /usr. If you don't +# remove this file the build will still succeed (thanks to a poorly written Makefile) +# but it will fail to compile the openl2tp.so, pppol2tp.so and rp-pppoe.so plugins + rm -rf include/linux/if_pppol2tp.h +} + +make_target() { + make COPTS="$CFLAGS" +} + +makeinstall_target() { + make INSTROOT=$INSTALL install +} + +post_makeinstall_target() { + rm -rf $INSTALL/usr/sbin/chat + rm -rf $INSTALL/usr/sbin/pppdump + rm -rf $INSTALL/usr/sbin/pppoe-discovery + rm -rf $INSTALL/usr/sbin/pppstats +}