Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/Makefile.custom

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/Makefile.custom (modified) (4 diffs)

branches/3.3/mindi-busybox/Makefile.custom

@@ -4 +4 @@
 
 busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
-    $(Q)-$(SHELL) $^ >$@
+    $(Q)-$(SHELL) $^ > $@
+
+busybox.cfg.suid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+    $(Q)-SUID="yes" $(SHELL) $^ > $@
+busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+    $(Q)-SUID="DROP" $(SHELL) $^ > $@
 
 .PHONY: install
@@ -23 +28 @@
 INSTALL_OPTS:= --scriptwrapper
 endif
+endif
+ifeq ($(CONFIG_FEATURE_INDIVIDUAL),y)
+INSTALL_OPTS:= --binaries
+LIBBUSYBOX_SONAME:= 0_lib/libbusybox.so.$(BB_VER)
 endif
 install: $(srctree)/applets/install.sh busybox busybox.links
@@ -51 +60 @@
 .PHONY: check
 .PHONY: test
+ifeq ($(CONFIG_UNIT_TEST),y)
+UNIT_CMD = ./busybox unit
+endif
 check test: busybox busybox.links
+    $(UNIT_CMD)
     test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
     bindir=$(objtree) srcdir=$(srctree)/testsuite \
@@ -69 +82 @@
         -print \
         -exec rm -r -f {} \; ; \
+    find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
+        -name .gitignore \
+        -print \
+        -exec rm -f {} \; ; \
     find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
         -name .\#* \