Merge branch 'master' of bitbucket.org:neutrino-images/ni-buildsystem

make/ni.mk

@@ -47,6 +47,7 @@ ni-image:
 	@echo "starting 'make $@' build with "$(NUM_CPUS)" threads!"
 	make -j$(NUM_CPUS) neutrino
 	make plugins-all
+	make plugins-$(BOXSERIES)
 	make fbshot
 	make -j$(NUM_CPUS) luacurl
 	make -j$(NUM_CPUS) timezone

make/plugins.mk

@@ -73,6 +73,12 @@ plugins-all: $(D)/neutrino \
 	doscam-webif-skin \
 	playlists
 
+plugins-hd1: # nothing to do
+plugins-hd2: # nothing to do
+
+plugins-ax: \
+	showiframe
+
 ################
 ### plugins  ###
 ################
@@ -478,6 +484,16 @@ $(LIBPLUG)/oscammon.so: $(LIBPLUG) $(VARCONF)
 	cp -f oscammon.cfg $(LIBPLUG)/ && \
 	cp -f oscammon_hint.png $(LIBPLUG)/
 
+# showiframe
+showiframe: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/showiframe
+$(BIN)/showiframe: $(BIN)
+	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/showiframe && \
+	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		\
+		showiframe.c \
+		\
+		-o $@
+
 # shellexec
 shellexec: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG)/shellexec.so
 $(LIBPLUG)/shellexec.so: $(D)/freetype $(LIBPLUG) $(SHAREFLEX) $(VARCONF) $(BIN)

skel-root/axtech/ax/etc/profile

@@ -13,5 +13,5 @@ alias mc='mc -a'
 alias sc='setconsole'
 alias sr='setconsole -r'
 
-# Add your own modifications to /var/etc/profile.local!
-test -e /var/etc/profile.local && . /var/etc/profile.local
+# Add your own modifications to /etc/profile.local!
+test -e /etc/profile.local && . /etc/profile.local

skel-root/axtech/ax/etc/profile.local

@@ -1 +1 @@
-# /var/etc/profile.local: your profile modifications for the shell
+# /etc/profile.local: your profile modifications for the shell