summaryrefslogtreecommitdiff
path: root/strata/cpe-wrt
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2015-06-19 12:01:48 +0100
committerRichard Dale <richard.dale@codethink.co.uk>2015-06-19 12:01:48 +0100
commit03b253157803d2b095edd8773a7fd10808aec54c (patch)
tree9d9aea3a109f8ede7d55f593997b76f72a6f767b /strata/cpe-wrt
parent8429ca3a0c3a86af69cb802e9c65618503db8832 (diff)
downloaddefinitions-03b253157803d2b095edd8773a7fd10808aec54c.tar.gz
Fix the cpe-wrt system so that it builds with musl
Diffstat (limited to 'strata/cpe-wrt')
-rw-r--r--strata/cpe-wrt/fstools.morph1
-rw-r--r--strata/cpe-wrt/hostapd.morph13
-rw-r--r--strata/cpe-wrt/ppp.morph14
-rw-r--r--strata/cpe-wrt/wpa_supplicant_wrt.morph14
4 files changed, 28 insertions, 14 deletions
diff --git a/strata/cpe-wrt/fstools.morph b/strata/cpe-wrt/fstools.morph
index 0a455968..ac05a780 100644
--- a/strata/cpe-wrt/fstools.morph
+++ b/strata/cpe-wrt/fstools.morph
@@ -3,6 +3,7 @@ kind: chunk
pre-configure-commands:
- sed -i "s/-Werror//" CMakeLists.txt
+- sed -i 's/ | GLOB_ONLYDIR//' libfstools/overlay.c
build-commands:
- cmake -DCMAKE_INSTALL_PREFIX=/
diff --git a/strata/cpe-wrt/hostapd.morph b/strata/cpe-wrt/hostapd.morph
new file mode 100644
index 00000000..06887d5c
--- /dev/null
+++ b/strata/cpe-wrt/hostapd.morph
@@ -0,0 +1,13 @@
+name: hostapd
+kind: chunk
+
+configure-commands:
+- cp files/hostapd-full.config hostapd/.config
+- echo "CONFIG_LIBNL_TINY=y" >> hostapd/.config
+- echo "CFLAGS += -I/usr/include/libnl-tiny -DLIBNL1_COMPAT -D_GNU_SOURCE" >> hostapd/.config
+
+build-commands:
+- make -C hostapd
+
+install-commands:
+- make -C hostapd DESTDIR="$DESTDIR" install
diff --git a/strata/cpe-wrt/ppp.morph b/strata/cpe-wrt/ppp.morph
new file mode 100644
index 00000000..8d72ec05
--- /dev/null
+++ b/strata/cpe-wrt/ppp.morph
@@ -0,0 +1,14 @@
+name: ppp
+kind: chunk
+
+pre-configure-commands:
+- sed -i 's/USE_LIBUTIL=y/# USE_LIBUTIL=y/' pppd/Makefile.linux
+
+configure-commands:
+- ./configure --prefix=$PREFIX
+
+build-commands:
+- make
+
+install-commands:
+- make DESTDIR=$DESTDIR install
diff --git a/strata/cpe-wrt/wpa_supplicant_wrt.morph b/strata/cpe-wrt/wpa_supplicant_wrt.morph
deleted file mode 100644
index f8e0b57b..00000000
--- a/strata/cpe-wrt/wpa_supplicant_wrt.morph
+++ /dev/null
@@ -1,14 +0,0 @@
-name: wpa-supplicant-wrt
-kind: chunk
-configure-commands:
-- sed -i 's/^CONFIG_READLINE=y$//' wpa_supplicant/.config
-- sed -i 's/^CONFIG_CTRL_IFACE_DBUS=y$//' wpa_supplicant/.config
-- sed -i 's/^CONFIG_CTRL_IFACE_DBUS_NEW=y$//' wpa_supplicant/.config
-- sed -i 's/^CONFIG_CTRL_IFACE_DBUS_INTRO=y$//' wpa_supplicant/.config
-- sed -i 's/^CONFIG_LIBNL32/CONFIG_LIBNL_TINY/' wpa_supplicant/.config
-- echo "CFLAGS += -I/usr/include/libnl-tiny -DLIBNL1_COMPAT -D_GNU_SOURCE" >> wpa_supplicant/.config
-
-build-commands:
-- make -C wpa_supplicant
-install-commands:
-- make -C wpa_supplicant DESTDIR="$DESTDIR" install