From ccf238f852fd0463e68d33b91f0dd55000c325e3 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 26 Mar 2008 14:18:01 +0000 Subject: [PATCH] Merge net.OS into net --- net.BSD/Makefile | 5 ----- net.FreeBSD/Makefile | 5 ----- net.Linux/Makefile | 7 ------- net/Makefile | 3 ++- net/Makefile.FreeBSD | 6 ++++++ net/Makefile.Linux | 8 ++++++++ net/Makefile.NetBSD | 4 +++- {net.Linux => net}/adsl.sh | 0 {net.Linux => net}/apipa.sh | 0 {net.Linux => net}/arping.sh | 0 {net.Linux => net}/bonding.sh | 0 {net.Linux => net}/br2684ctl.sh | 0 {net.Linux => net}/bridge.sh | 0 {net.Linux => net}/ccwgroup.sh | 0 {net.Linux => net}/clip.sh | 0 net.BSD/ifconfig.sh => net/ifconfig.sh.BSD.in | 0 net.Linux/ifconfig.sh => net/ifconfig.sh.Linux.in | 0 {net.Linux => net}/ifplugd.sh | 0 {net.Linux => net}/ip6to4.sh | 0 {net.Linux => net}/ipppd.sh | 0 {net.Linux => net}/iproute2.sh | 0 net.FreeBSD/iwconfig.sh => net/iwconfig.sh.BSD.in | 0 net.Linux/iwconfig.sh => net/iwconfig.sh.Linux.in | 0 {net.Linux => net}/netplugd.sh | 0 {net.Linux => net}/pppd.sh | 0 {net.Linux => net}/pump.sh | 0 {net.Linux => net}/tuntap.sh | 0 {net.Linux => net}/udhcpc.sh | 0 {net.Linux => net}/vlan.sh | 0 29 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 net.BSD/Makefile delete mode 100644 net.FreeBSD/Makefile delete mode 100644 net.Linux/Makefile rename {net.Linux => net}/adsl.sh (100%) rename {net.Linux => net}/apipa.sh (100%) rename {net.Linux => net}/arping.sh (100%) rename {net.Linux => net}/bonding.sh (100%) rename {net.Linux => net}/br2684ctl.sh (100%) rename {net.Linux => net}/bridge.sh (100%) rename {net.Linux => net}/ccwgroup.sh (100%) rename {net.Linux => net}/clip.sh (100%) rename net.BSD/ifconfig.sh => net/ifconfig.sh.BSD.in (100%) rename net.Linux/ifconfig.sh => net/ifconfig.sh.Linux.in (100%) rename {net.Linux => net}/ifplugd.sh (100%) rename {net.Linux => net}/ip6to4.sh (100%) rename {net.Linux => net}/ipppd.sh (100%) rename {net.Linux => net}/iproute2.sh (100%) rename net.FreeBSD/iwconfig.sh => net/iwconfig.sh.BSD.in (100%) rename net.Linux/iwconfig.sh => net/iwconfig.sh.Linux.in (100%) rename {net.Linux => net}/netplugd.sh (100%) rename {net.Linux => net}/pppd.sh (100%) rename {net.Linux => net}/pump.sh (100%) rename {net.Linux => net}/tuntap.sh (100%) rename {net.Linux => net}/udhcpc.sh (100%) rename {net.Linux => net}/vlan.sh (100%) diff --git a/net.BSD/Makefile b/net.BSD/Makefile deleted file mode 100644 index 95391e8f..00000000 --- a/net.BSD/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -DIR= ${PREFIX}/${RC_LIB}/net -INC= ifconfig.sh - -MK= ../mk -include ${MK}/scripts.mk diff --git a/net.FreeBSD/Makefile b/net.FreeBSD/Makefile deleted file mode 100644 index da75fc37..00000000 --- a/net.FreeBSD/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -DIR= ${PREFIX}/${RC_LIB}/net -INC= iwconfig.sh - -MK= ../mk -include ${MK}/scripts.mk diff --git a/net.Linux/Makefile b/net.Linux/Makefile deleted file mode 100644 index 628f5f40..00000000 --- a/net.Linux/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -DIR= ${PREFIX}/${RC_LIB}/net -INC= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh ccwgroup.sh \ - clip.sh ifconfig.sh ifplugd.sh ip6to4.sh ipppd.sh iproute2.sh \ - iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh vlan.sh - -MK= ../mk -include ${MK}/scripts.mk diff --git a/net/Makefile b/net/Makefile index 677bd2f7..bde659e1 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,5 +1,6 @@ DIR= ${PREFIX}/${RC_LIB}/net -INC= dhclient.sh dhcpcd.sh macchanger.sh macnet.sh \ +SRCS= ifconfig.sh.in +INC= dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \ ssidnet.sh system.sh wpa_supplicant.sh MK= ../mk diff --git a/net/Makefile.FreeBSD b/net/Makefile.FreeBSD index e69de29b..cd1a6712 100644 --- a/net/Makefile.FreeBSD +++ b/net/Makefile.FreeBSD @@ -0,0 +1,6 @@ +SRCS+= iwconfig.sh.in +INC+= iwconfig.sh + +.SUFFIXES: .sh.BSD.in +.sh.BSD.in.sh: + sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ diff --git a/net/Makefile.Linux b/net/Makefile.Linux index e69de29b..1a496c73 100644 --- a/net/Makefile.Linux +++ b/net/Makefile.Linux @@ -0,0 +1,8 @@ +SRCS+= iwconfig.sh.in +INC+= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \ + ccwgroup.sh iproute2.sh ifplugd.sh ip6to4.sh ipppd.sh \ + iwconfig.sh netplugd.sh pppd.sh tuntap.sh udhcpc.sh vlan.sh + +.SUFFIXES: .sh.Linux.in +.sh.Linux.in.sh: + sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ diff --git a/net/Makefile.NetBSD b/net/Makefile.NetBSD index cda89ef9..2ff47505 100644 --- a/net/Makefile.NetBSD +++ b/net/Makefile.NetBSD @@ -1 +1,3 @@ -INC+= ifwatchd.sh +.SUFFIXES: .sh.BSD.in +.sh.BSD.in.sh: + sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ diff --git a/net.Linux/adsl.sh b/net/adsl.sh similarity index 100% rename from net.Linux/adsl.sh rename to net/adsl.sh diff --git a/net.Linux/apipa.sh b/net/apipa.sh similarity index 100% rename from net.Linux/apipa.sh rename to net/apipa.sh diff --git a/net.Linux/arping.sh b/net/arping.sh similarity index 100% rename from net.Linux/arping.sh rename to net/arping.sh diff --git a/net.Linux/bonding.sh b/net/bonding.sh similarity index 100% rename from net.Linux/bonding.sh rename to net/bonding.sh diff --git a/net.Linux/br2684ctl.sh b/net/br2684ctl.sh similarity index 100% rename from net.Linux/br2684ctl.sh rename to net/br2684ctl.sh diff --git a/net.Linux/bridge.sh b/net/bridge.sh similarity index 100% rename from net.Linux/bridge.sh rename to net/bridge.sh diff --git a/net.Linux/ccwgroup.sh b/net/ccwgroup.sh similarity index 100% rename from net.Linux/ccwgroup.sh rename to net/ccwgroup.sh diff --git a/net.Linux/clip.sh b/net/clip.sh similarity index 100% rename from net.Linux/clip.sh rename to net/clip.sh diff --git a/net.BSD/ifconfig.sh b/net/ifconfig.sh.BSD.in similarity index 100% rename from net.BSD/ifconfig.sh rename to net/ifconfig.sh.BSD.in diff --git a/net.Linux/ifconfig.sh b/net/ifconfig.sh.Linux.in similarity index 100% rename from net.Linux/ifconfig.sh rename to net/ifconfig.sh.Linux.in diff --git a/net.Linux/ifplugd.sh b/net/ifplugd.sh similarity index 100% rename from net.Linux/ifplugd.sh rename to net/ifplugd.sh diff --git a/net.Linux/ip6to4.sh b/net/ip6to4.sh similarity index 100% rename from net.Linux/ip6to4.sh rename to net/ip6to4.sh diff --git a/net.Linux/ipppd.sh b/net/ipppd.sh similarity index 100% rename from net.Linux/ipppd.sh rename to net/ipppd.sh diff --git a/net.Linux/iproute2.sh b/net/iproute2.sh similarity index 100% rename from net.Linux/iproute2.sh rename to net/iproute2.sh diff --git a/net.FreeBSD/iwconfig.sh b/net/iwconfig.sh.BSD.in similarity index 100% rename from net.FreeBSD/iwconfig.sh rename to net/iwconfig.sh.BSD.in diff --git a/net.Linux/iwconfig.sh b/net/iwconfig.sh.Linux.in similarity index 100% rename from net.Linux/iwconfig.sh rename to net/iwconfig.sh.Linux.in diff --git a/net.Linux/netplugd.sh b/net/netplugd.sh similarity index 100% rename from net.Linux/netplugd.sh rename to net/netplugd.sh diff --git a/net.Linux/pppd.sh b/net/pppd.sh similarity index 100% rename from net.Linux/pppd.sh rename to net/pppd.sh diff --git a/net.Linux/pump.sh b/net/pump.sh similarity index 100% rename from net.Linux/pump.sh rename to net/pump.sh diff --git a/net.Linux/tuntap.sh b/net/tuntap.sh similarity index 100% rename from net.Linux/tuntap.sh rename to net/tuntap.sh diff --git a/net.Linux/udhcpc.sh b/net/udhcpc.sh similarity index 100% rename from net.Linux/udhcpc.sh rename to net/udhcpc.sh diff --git a/net.Linux/vlan.sh b/net/vlan.sh similarity index 100% rename from net.Linux/vlan.sh rename to net/vlan.sh