diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/etcnet | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/etcnet')
-rw-r--r-- | abs/core-testing/etcnet/10-defaults | 11 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/PKGBUILD | 37 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/adddhcp.patch | 51 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/etcnet.install | 53 | ||||
-rw-r--r-- | abs/core-testing/etcnet/functions.patch | 11 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/ipv4address | 1 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/ipv4route | 1 | ||||
-rw-r--r-- | abs/core-testing/etcnet/network | 6 | ||||
-rwxr-xr-x | abs/core-testing/etcnet/options | 62 |
9 files changed, 0 insertions, 233 deletions
diff --git a/abs/core-testing/etcnet/10-defaults b/abs/core-testing/etcnet/10-defaults deleted file mode 100644 index 3aeac58..0000000 --- a/abs/core-testing/etcnet/10-defaults +++ /dev/null @@ -1,11 +0,0 @@ -DHCP_CLIENT=/sbin/dhcpcd -DHCP_ARGS=-L -IP=/usr/sbin/ip -TC=/usr/sbin/tc -LSMOD=/bin/lsmod -IFGROUP[1]='eth wlan plip usb dvb bnep tuntap ath0' -IFRENAME=/usr/sbin/ifrename -IPTABLES=/usr/sbin/iptables -IP6TABLES=/usr/sbin/ip6tables -AUTO_BROADCAST=on - diff --git a/abs/core-testing/etcnet/PKGBUILD b/abs/core-testing/etcnet/PKGBUILD deleted file mode 100755 index e9ac4f4..0000000 --- a/abs/core-testing/etcnet/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -pkgname=etcnet -pkgver=0.9.8 -pkgrel=13 -pkgdesc="/etc/net network configuration subsystem" -url="http://etcnet.org/" -depends=('bash' 'grep' 'sed' 'iproute2' 'wireless_tools' 'iptables' 'dhcpcd') -arch=i686 -install=etcnet.install -source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) -#backup=(etc/net/ifaces/eth0/options etc/net/ifaces/eth0/ipv4route etc/net/ifaces/eth0/ipv4address) - -build() { - cd $startdir/src/$pkgname-$pkgver - mkdir -p $startdir/pkg/var/lib/etcnet - mkdir -p $startdir/pkg/etc/sysconfig - cd etc/net - patch -p0 < $startdir/src/functions.patch || return 1 - - install -D -m 644 $startdir/src/10-defaults $startdir/pkg/etc/net/options.d/10-defaults - install -D -m 644 $startdir/src/network $startdir/pkg/etc/sysconfig/network - cp -rp $startdir/src/$pkgname-$pkgver/docs $startdir/pkg/etc/net - cp -rp $startdir/src/$pkgname-$pkgver/examples $startdir/pkg/etc/net - - #setup default for eth0 - mkdir -p $startdir/pkg/etc/net/ifaces/eth0 -# cp $startdir/src/options $startdir/pkg/etc/net/ifaces/eth0/options -# cp $startdir/src/ipv4route $startdir/pkg/etc/net/ifaces/eth0/ipv4route -# cp $startdir/src/ipv4address $startdir/pkg/etc/net/ifaces/eth0/ipv4address - - cd $startdir/src/$pkgname-$pkgver - rm -Rf etc/sysconfig etc/net/{README.ALT,TODO,ChangeLog,ifaces/unknown} - cp -Rf etc $startdir/pkg - cd $startdir/pkg/etc/net/scripts - ln -s ifup-ifplugd ifup-wireless - ln -s ifdown-ifplugd ifdown-wireless - -} diff --git a/abs/core-testing/etcnet/adddhcp.patch b/abs/core-testing/etcnet/adddhcp.patch deleted file mode 100755 index ee7b782..0000000 --- a/abs/core-testing/etcnet/adddhcp.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ruN etc/net/ifaces/default/options /etc/net/ifaces/default/options ---- etc/net/ifaces/default/options 2005-08-02 08:26:44.000000000 +0000 -+++ /etc/net/ifaces/default/options 2005-10-24 16:20:07.000000000 +0000 -@@ -24,7 +24,7 @@ - # /etc/net will try to configure interface at the first succeeding - # method. Note that etcnet will process routes and rules despite of - # BOOTPROTO. --BOOTPROTO=static -+BOOTPROTO=dhcp - - # Defines if the interface will be automatically brought up during - # system startup or 'service network start' invocation. -diff -ruN etc/net/scripts/config-ipv4 /etc/net/scripts/config-ipv4 ---- etc/net/scripts/config-ipv4 2005-08-10 08:08:40.000000000 +0000 -+++ /etc/net/scripts/config-ipv4 2005-10-24 16:48:49.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - . $SCRIPTDIR/functions - pickup_options - -diff -ruN etc/net/scripts/ifup /etc/net/scripts/ifup ---- etc/net/scripts/ifup 2005-09-16 18:38:01.000000000 +0000 -+++ /etc/net/scripts/ifup 2005-10-24 16:42:12.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - # This script is intended to be run from command-line or etcnet - # initscript. It determines if the iface should be created, then - # creates the device and calls ifup-common to do the rest. -diff -ruN etc/net/scripts/ifup-common /etc/net/scripts/ifup-common ---- etc/net/scripts/ifup-common 2005-08-03 09:03:26.000000000 +0000 -+++ /etc/net/scripts/ifup-common 2005-10-24 16:42:51.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - # This script continues configuration of an interface started by ifup, - # ifup-removable or ifup-ifplugd scripts. We assume that all necessary - # checks are done yet. -diff -ruN etc/net/scripts/network.init /etc/net/scripts/network.init ---- etc/net/scripts/network.init 2005-09-29 12:54:32.000000000 +0000 -+++ /etc/net/scripts/network.init 2005-10-24 16:41:17.000000000 +0000 -@@ -1,4 +1,5 @@ - #!/bin/bash -+#set -x - # - # network - # chkconfig: 2345 10 90 diff --git a/abs/core-testing/etcnet/etcnet.install b/abs/core-testing/etcnet/etcnet.install deleted file mode 100755 index f34629f..0000000 --- a/abs/core-testing/etcnet/etcnet.install +++ /dev/null @@ -1,53 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1 - if [ ! -d /var/lock/subsys ] - then - mkdir -p /var/lock/subsys - fi - -} - -# arg 1: the new package version -post_install() { - /bin/true - touch /etc/net/ -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1 - if [ ! -d /var/lock/subsys ] - then - mkdir -p /var/lock/subsys - fi -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ -f /etc/net/ifaces/eth0/options.pacsave ] - then - systemconfig.py -m network - mv /etc/net/ifaces/eth0/options.pacsave /etc/net/ifaces/eth0/options.pacsave.orig - fi -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* - diff --git a/abs/core-testing/etcnet/functions.patch b/abs/core-testing/etcnet/functions.patch deleted file mode 100644 index 855ef90..0000000 --- a/abs/core-testing/etcnet/functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/functions.orig 2009-06-14 17:24:46.000000000 +0000 -+++ scripts/functions 2009-06-14 17:25:24.000000000 +0000 -@@ -16,7 +16,7 @@ - DEFAULT_IFPLUGSTATUS=/usr/sbin/ifplugstatus - DEFAULT_IFPLUGD=/usr/sbin/ifplugd - DEFAULT_IWPRIV=/sbin/iwpriv --DEFAULT_IWCONFIG=/sbin/iwconfig -+DEFAULT_IWCONFIG=/usr/sbin/iwconfig - DEFAULT_WLANCONFIG=/usr/sbin/wlanconfig - DEFAULT_WPA_SUPPLICANT=/usr/sbin/wpa_supplicant - DEFAULT_WPA_CLI=/usr/sbin/wpa_cli diff --git a/abs/core-testing/etcnet/ipv4address b/abs/core-testing/etcnet/ipv4address deleted file mode 100755 index 39a5dd4..0000000 --- a/abs/core-testing/etcnet/ipv4address +++ /dev/null @@ -1 +0,0 @@ -192.168.1.5/24 diff --git a/abs/core-testing/etcnet/ipv4route b/abs/core-testing/etcnet/ipv4route deleted file mode 100755 index b0dbb61..0000000 --- a/abs/core-testing/etcnet/ipv4route +++ /dev/null @@ -1 +0,0 @@ -default via 192.168.1.1 diff --git a/abs/core-testing/etcnet/network b/abs/core-testing/etcnet/network deleted file mode 100644 index a0a17ab..0000000 --- a/abs/core-testing/etcnet/network +++ /dev/null @@ -1,6 +0,0 @@ -# When set to no, this may cause most daemons' initscripts skip starting. -NETWORKING=yes -# Used by hotplug/pcmcia/ifplugd scripts to detect current network config -# subsystem. -CONFMETHOD=etcnet - diff --git a/abs/core-testing/etcnet/options b/abs/core-testing/etcnet/options deleted file mode 100755 index 23bb8bf..0000000 --- a/abs/core-testing/etcnet/options +++ /dev/null @@ -1,62 +0,0 @@ -# 0.4.0: now we don't have to specify TYPE for disabled interfaces -DISABLED=no - -# BOOTPROTO can be any of the following: static, dhcp, ipv4ll. -# * "static": use ipv4address/ipv6address -# 'static' has the same meaning as 'none' in initscripts/net-scripts sense. -# IF you don't want to assing any address to an interface, but still keep -# it up and running, you can just use 'static' and have no ipv4address file. -# * "dhcp": run DHCP client -# * "ipv4ll": run IPv4LL client (zcip) -# As far as I know, there are no working IPv6 DHCP -# implementations. IPv4LL is not required for IPv6 because of -# link-scope addresses. -# Additional feature is multi-method configurations (methods -# can be delimited by ' ', ',' or '-': -# * "dhcp-static": try DHCP, if it fails, configure static address(es) -# * "dhcp-ipv4ll": same, but fallback to IPv4LL -# * "dhcp-ipv4ll-static": try DHCP, fallback to IPv4LL (very unlikely to fail), -# fallback to static -# /etc/net will try to configure interface at the first succeeding -# method. Note that etcnet will process routes and rules despite of -# BOOTPROTO. -BOOTPROTO=dhcp-static - -# Defines if the interface will be automatically brought up during -# system startup or 'service network start' invocation. -ONBOOT=yes -USE_HOTPLUG=no -USE_PCMCIA=no -CONFIG_IPV4=yes -CONFIG_IPV6=no -CONFIG_IPX=no -CONFIG_QOS=yes -CONFIG_WIRELESS=no -CONFIG_FW=no - -# If set to yes, interface will not be set UP, but configured. -KEEP_DOWN=no -# IPv4/IPv6. Don't flush existing addresses from interface before assigning new. -DONT_FLUSH=no - -# ****************** Interface dependencies ****************** -# If interface A has REQUIRES=B in it's options file, A is the child, B is the parent. -# I don't recommend changing defaults here. See also: README/3.5 - -# If set to yes, this variable will cause ifup call for all child (having current -# interface in their REQUIRES list) after the current interface is set up. -IFUP_CHILDREN=no - -# If set to yes, this variable will cause ifup call for all parent (listed in current -# REQUIRES list) before the current interface is set up. -# Note: this will not work for ifplugd-controlled interfaces. -IFUP_PARENTS=yes - -# If set to yes, this variable will cause ifdown call for all child (having current -# interface in their REQUIRES list) before the current interface is shut down. -IFDOWN_CHILDREN=yes - -# If set to yes, this variable will cause ifdown call for all parent (listed in current -# REQUIRES list) after the current interface is shut down. -# Note: this will not work for ifplugd-controlled interfaces. -IFDOWN_PARENTS=no |