changed CHANGELOG.md
 
@@ -1,5 +1,15 @@
1
1
# Changelog
2
2
3
+ ## v0.1.2
4
+
5
+ * Improvements
6
+ * Support sending out the DNS server's IP address with udhcpd
7
+
8
+ * Bug fixes
9
+ * Minor tweaks to scripts to make them work on different platforms better
10
+ * Improvements to stubs generated on OSX to make some trivial unit testing
11
+ possible in applications that use this
12
+
3
13
## v0.1.1
4
14
5
15
* Bug fixes
changed Makefile
 
@@ -58,15 +58,20 @@ install: $(BUILD) $(PREFIX) $(BUILD)/.config $(TOP)/make_menuconfig
58
58
59
59
$(TOP)/make_menuconfig: Makefile
60
60
# Simple script for running "make menuconfig"
61
- echo "#!/bin/sh\n$(MAKE_ENV) $(MAKE) $(MAKE_OPTS) -C $(BUILD) menuconfig\ncp $(BUILD)/.config $(TOP)/busybox.config" > $(TOP)/make_menuconfig
61
+ printf "#!/bin/sh\n$(MAKE_ENV) $(MAKE) $(MAKE_OPTS) -C $(BUILD) menuconfig\ncp $(BUILD)/.config $(TOP)/busybox.config" > $(TOP)/make_menuconfig
62
62
63
63
fake_install: $(PREFIX)
64
+ # Fake some scripts to aide regression testing on platforms that can't
65
+ # compile Busybox
64
66
mkdir -p $(PREFIX)/bin $(PREFIX)/sbin $(PREFIX)/usr/bin $(PREFIX)/usr/sbin
65
- echo "#!/bin/sh\necho \"BusyBox v$(BUSYBOX_VERSION) () multi-call binary.\"\n" > $(PREFIX)/bin/busybox
66
- echo "#!/bin/sh\nexit 1\n" > $(PREFIX)/bin/false
67
- echo "#!/bin/sh\nexit 1\n" > $(PREFIX)/sbin/udhcpc
68
- echo "#!/bin/sh\nexit 1\n" > $(PREFIX)/sbin/udhcpd
69
- chmod +x $(PREFIX)/bin/busybox $(PREFIX)/bin/false $(PREFIX)/sbin/udhcpc $(PREFIX)/sbin/udhcpd
67
+ printf "#!/bin/sh\nprintf \"BusyBox v$(BUSYBOX_VERSION) () multi-call binary.\\\n\"\n" > $(PREFIX)/bin/busybox
68
+ printf "#!/bin/sh\nexit 1\n" > $(PREFIX)/bin/false
69
+ printf "#!/bin/sh\nexit 1\n" > $(PREFIX)/sbin/udhcpc
70
+ printf "#!/bin/sh\nexit 1\n" > $(PREFIX)/sbin/udhcpd
71
+ printf '#!/bin/sh\n/usr/bin/touch "$$1"\n' > $(PREFIX)/usr/bin/touch
72
+ chmod +x $(PREFIX)/bin/busybox $(PREFIX)/bin/false \
73
+ $(PREFIX)/sbin/udhcpc $(PREFIX)/sbin/udhcpd \
74
+ $(PREFIX)/usr/bin/touch
70
75
71
76
# Initialize the build directory, but use our .config (use make oldconfig to fixup symbols)
72
77
$(BUILD)/.config: $(SRC_TOP)/.patched $(TOP)/busybox.config
changed busybox.config
 
@@ -332,10 +332,10 @@ CONFIG_BASE64=y
332
332
CONFIG_UUENCODE=y
333
333
CONFIG_WC=y
334
334
# CONFIG_FEATURE_WC_LARGE is not set
335
+ CONFIG_WHOAMI=y
335
336
CONFIG_WHO=y
336
337
CONFIG_W=y
337
338
# CONFIG_USERS is not set
338
- CONFIG_WHOAMI=y
339
339
CONFIG_YES=y
340
340
341
341
#
 
@@ -505,10 +505,10 @@ CONFIG_INIT_TERMINAL_TYPE=""
505
505
# CONFIG_USE_BB_SHADOW is not set
506
506
CONFIG_USE_BB_CRYPT=y
507
507
# CONFIG_USE_BB_CRYPT_SHA is not set
508
- # CONFIG_ADD_SHELL is not set
509
- # CONFIG_REMOVE_SHELL is not set
510
508
# CONFIG_ADDGROUP is not set
511
509
# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
510
+ # CONFIG_ADD_SHELL is not set
511
+ # CONFIG_REMOVE_SHELL is not set
512
512
# CONFIG_ADDUSER is not set
513
513
# CONFIG_FEATURE_CHECK_NAMES is not set
514
514
CONFIG_LAST_ID=0
 
@@ -765,10 +765,10 @@ CONFIG_CRONTAB=y
765
765
# CONFIG_FEATURE_DEVFS is not set
766
766
CONFIG_DEVMEM=y
767
767
# CONFIG_FBSPLASH is not set
768
+ # CONFIG_FLASHCP is not set
768
769
# CONFIG_FLASH_ERASEALL is not set
769
770
# CONFIG_FLASH_LOCK is not set
770
771
# CONFIG_FLASH_UNLOCK is not set
771
- # CONFIG_FLASHCP is not set
772
772
# CONFIG_HDPARM is not set
773
773
# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
774
774
# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
 
@@ -815,13 +815,13 @@ CONFIG_SETSERIAL=y
815
815
CONFIG_STRINGS=y
816
816
CONFIG_TIME=y
817
817
# CONFIG_TTYSIZE is not set
818
+ # CONFIG_UBIRENAME is not set
818
819
# CONFIG_UBIATTACH is not set
819
820
# CONFIG_UBIDETACH is not set
820
821
# CONFIG_UBIMKVOL is not set
821
822
# CONFIG_UBIRMVOL is not set
822
823
# CONFIG_UBIRSVOL is not set
823
824
# CONFIG_UBIUPDATEVOL is not set
824
- # CONFIG_UBIRENAME is not set
825
825
# CONFIG_VOLNAME is not set
826
826
CONFIG_WATCHDOG=y
827
827
 
@@ -985,7 +985,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
985
985
# CONFIG_FEATURE_UDHCP_PORT is not set
986
986
CONFIG_UDHCP_DEBUG=0
987
987
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
988
- # CONFIG_FEATURE_UDHCP_RFC3397 is not set
988
+ CONFIG_FEATURE_UDHCP_RFC3397=y
989
989
CONFIG_FEATURE_UDHCP_8021Q=y
990
990
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
changed hex_metadata.config
 
@@ -18,4 +18,4 @@
18
18
{<<"optional">>,false},
19
19
{<<"repository">>,<<"hexpm">>},
20
20
{<<"requirement">>,<<"~> 0.5">>}]]}.
21
- {<<"version">>,<<"0.1.1">>}.
21
+ {<<"version">>,<<"0.1.2">>}.
changed mix.exs
 
@@ -1,10 +1,12 @@
1
1
defmodule Busybox.MixProject do
2
2
use Mix.Project
3
3
4
+ @version "0.1.2"
5
+
4
6
def project do
5
7
[
6
8
app: :busybox,
7
- version: "0.1.1",
9
+ version: @version,
8
10
elixir: "~> 1.6",
9
11
compilers: [:elixir_make | Mix.compilers()],
10
12
make_targets: ["all"],
 
@@ -13,7 +15,7 @@ defmodule Busybox.MixProject do
13
15
start_permanent: Mix.env() == :prod,
14
16
build_embedded: true,
15
17
deps: deps(),
16
- docs: [extras: ["README.md"], main: "readme"],
18
+ docs: docs(),
17
19
description: description(),
18
20
package: package()
19
21
]
 
@@ -26,7 +28,7 @@ defmodule Busybox.MixProject do
26
28
defp deps do
27
29
[
28
30
{:elixir_make, "~> 0.5", runtime: false},
29
- {:ex_doc, "~> 0.19", only: :dev, runtime: false},
31
+ {:ex_doc, "~> 0.19", only: :docs, runtime: false},
30
32
{:dialyxir, "~> 1.0.0-rc.6", only: [:dev, :test], runtime: false}
31
33
]
32
34
end
 
@@ -53,6 +55,15 @@ defmodule Busybox.MixProject do
53
55
]
54
56
end
55
57
58
+ defp docs do
59
+ [
60
+ extras: ["README.md"],
61
+ main: "readme",
62
+ source_ref: "v#{@version}",
63
+ source_url: "https://github.com/nerves-networking/elixir_busybox"
64
+ ]
65
+ end
66
+
56
67
defp make_args do
57
68
# Tell make to use all cores when building
58
69
["-j", to_string(:erlang.system_info(:schedulers))]