topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- use TARGET_SHARE_DIR

master
vanhofen 6 years ago
parent
299e8ae0a9
commit
abb15b8dec
10 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      make/development-tools.mk
  2. 12
      make/environment-target.mk
  3. 4
      make/image-updates.mk
  4. 4
      make/neutrino-plugins.mk
  5. 4
      make/rootfs.mk
  6. 6
      make/system-libs.mk
  7. 2
      make/system-lua.mk
  8. 4
      make/system-scripts.mk
  9. 4
      make/system-tools-extra.mk
  10. 36
      make/system-tools.mk

4
make/development-tools.mk
View File

@ -110,8 +110,8 @@ $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_
; \
$(MAKE) all-gdb; \
$(MAKE) install-gdb DESTDIR=$(TARGET_DIR)
rm -rf $(TARGET_DIR)/share/gdb/system-gdbinit
find $(TARGET_DIR)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
rm -rf $(TARGET_SHARE_DIR)/gdb/system-gdbinit
find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
$(REMOVE)/gdb-$(GDB_VER)
$(TOUCH)

12
make/environment-target.mk
View File

@ -6,12 +6,12 @@
BIN = $(TARGET_DIR)/bin
ETCINITD = $(TARGET_DIR)/etc/init.d
SBIN = $(TARGET_DIR)/sbin
SHAREFLEX = $(TARGET_DIR)/share/tuxbox/neutrino/flex
SHAREICONS = $(TARGET_DIR)/share/tuxbox/neutrino/icons
SHAREPLUGINS = $(TARGET_DIR)/share/tuxbox/neutrino/plugins
SHARETHEMES = $(TARGET_DIR)/share/tuxbox/neutrino/themes
SHAREWEBRADIO = $(TARGET_DIR)/share/tuxbox/neutrino/webradio
SHAREWEBTV = $(TARGET_DIR)/share/tuxbox/neutrino/webtv
SHAREFLEX = $(TARGET_SHARE_DIR)/tuxbox/neutrino/flex
SHAREICONS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons
SHAREPLUGINS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/plugins
SHARETHEMES = $(TARGET_SHARE_DIR)/tuxbox/neutrino/themes
SHAREWEBRADIO = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webradio
SHAREWEBTV = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webtv
VARCONFIG = $(TARGET_DIR)/var/tuxbox/config
VARINITD = $(TARGET_DIR)/var/etc/init.d
VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins

4
make/image-updates.mk
View File

@ -39,8 +39,8 @@ u-neutrino: neutrino-clean
$(MAKE) neutrino
install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
install -D -m 0755 $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino
install -D -m 0644 $(TARGET_DIR)/share/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
install -D -m 0644 $(TARGET_DIR)/share/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
install -D -m 0644 $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
install -D -m 0644 $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
ifneq ($(DEBUG), yes)
find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET)-strip || true
endif

4
make/neutrino-plugins.mk
View File

@ -127,8 +127,8 @@ $(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREPLUGINS)
# -----------------------------------------------------------------------------
$(D)/doscam-webif-skin:
install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_DIR)/share/doscam/skin/doscam_ni-dark.css
install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_DIR)/share/doscam/tpl/IC_doscam_ni.tpl
install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
$(TOUCH)
# -----------------------------------------------------------------------------

4
make/rootfs.mk
View File

@ -41,8 +41,8 @@ e2-multiboot:
#
echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_DIR)/etc/issue
#
mkdir -p $(TARGET_DIR)/share
touch $(TARGET_DIR)/share/bootlogo.mvi
mkdir -p $(TARGET_SHARE_DIR)
touch $(TARGET_SHARE_DIR)/bootlogo.mvi
#
mkdir -p $(TARGET_DIR)/var/lib/opkg
touch $(TARGET_DIR)/var/lib/opkg/status

6
make/system-libs.mk
View File

@ -184,7 +184,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl
$(MAKE) install DESTDIR=$(TARGET_DIR)
mv $(TARGET_DIR)/bin/curl-config $(HOST_DIR)/bin/
$(REWRITE_CONFIG) $(HOST_DIR)/bin/curl-config
rm -f $(TARGET_DIR)/share/zsh
rm -f $(TARGET_SHARE_DIR)/zsh
$(REWRITE_LIBTOOL)/libcurl.la
$(REWRITE_PKGCONF)/libcurl.pc
$(REMOVE)/curl-$(LIBCURL_VER)
@ -265,7 +265,7 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
$(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config
$(REWRITE_PKGCONF)/freetype2.pc
$(REWRITE_LIBTOOL)/libfreetype.la
$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_DIR)/share/aclocal
$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_SHARE_DIR)/aclocal
$(TOUCH)
# -----------------------------------------------------------------------------
@ -725,7 +725,7 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE
$(REWRITE_CONFIG) $(HOST_DIR)/bin/gpg-error-config
$(REWRITE_LIBTOOL)/libgpg-error.la
rm -rf $(TARGET_DIR)/bin/gpg-error
rm -rf $(TARGET_DIR)/share/common-lisp
rm -rf $(TARGET_SHARE_DIR)/common-lisp
$(REMOVE)/libgpg-error-$(LIBGPG-ERROR_VER)
$(TOUCH)

2
make/system-lua.mk
View File

@ -89,7 +89,7 @@ $(ARCHIVE)/$(LUAJSON_SOURCE):
$(D)/luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
$(CD) $(ARCHIVE); \
curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_URL) || true
install -D -m 0644 $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_DIR)/share/lua/$(LUA_ABIVER)
install -D -m 0644 $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)
$(TOUCH)
# -----------------------------------------------------------------------------

4
make/system-scripts.mk
View File

@ -62,7 +62,7 @@ $(TARGET_DIR)/etc/init.d/syslogd:
scripts: \
$(TARGET_DIR)/sbin/service \
$(TARGET_DIR)/sbin/flash_eraseall \
$(TARGET_DIR)/share/udhcpc/default.script
$(TARGET_SHARE_DIR)/udhcpc/default.script
$(TARGET_DIR)/sbin/service:
install -D -m 0755 $(IMAGEFILES)/scripts/service $@
@ -72,5 +72,5 @@ ifeq ($(BOXTYPE), coolstream)
install -D -m 0755 $(IMAGEFILES)/scripts/flash_eraseall $@
endif
$(TARGET_DIR)/share/udhcpc/default.script:
$(TARGET_SHARE_DIR)/udhcpc/default.script:
install -D -m 0755 $(IMAGEFILES)/scripts/udhcpc-default.script $@

4
make/system-tools-extra.mk
View File

@ -28,8 +28,8 @@ $(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/usbutils-$(USBUTILS_VER).tar.xz | $
rm -rf $(TARGET_DIR)/bin/lsusb.py
rm -rf $(TARGET_DIR)/bin/usbhid-dump
rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
rm -rf $(TARGET_DIR)/share/pkgconfig
rm -rf $(TARGET_DIR)/share/usb.ids.gz
rm -rf $(TARGET_SHARE_DIR)/pkgconfig
rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz
$(REMOVE)/usbutils-$(USBUTILS_VER)
$(TOUCH)

36
make/system-tools.mk
View File

@ -156,10 +156,10 @@ $(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGET_DIR)
done; \
test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \
done; \
install -d -m 0755 $(TARGET_DIR)/share/ $(TARGET_DIR)/etc; \
mv zoneinfo/ $(TARGET_DIR)/share/
install -d -m 0755 $(TARGET_SHARE_DIR)/ $(TARGET_DIR)/etc; \
mv zoneinfo/ $(TARGET_SHARE_DIR)/
install -m 0644 $(IMAGEFILES)/timezone/timezone.xml $(TARGET_DIR)/etc/
cp $(TARGET_DIR)/share/zoneinfo/CET $(TARGET_DIR)/$(LOCALTIME)
cp $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)/$(LOCALTIME)
$(REMOVE)/timezone
$(TOUCH)
@ -423,8 +423,8 @@ $(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGET_DIR
--cross-compile \
--cross-prefix=$(TARGET)- \
; \
sed -i config.h -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@'; \
sed -i config.h -e 's@LOCALEDIR.*@LOCALEDIR "/share"@'; \
sed -i config.h -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@'; \
sed -i config.h -e 's@LOCALEDIR.*@LOCALEDIR "/share"@'; \
ln -sf ../config.h src/; \
$(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR)
@ -506,7 +506,7 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGET_DIR)
sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \
make clean; \
TARGET_DIR=$(TARGET_DIR) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
install -d $(TARGET_DIR)/share/empty
install -d $(TARGET_SHARE_DIR)/empty
install -D -m 0755 $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/vsftpd $(TARGET_DIR)/sbin/vsftpd
install -D -m 0644 $(IMAGEFILES)/scripts/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
install -D -m 0644 $(IMAGEFILES)/scripts/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
@ -623,8 +623,8 @@ $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGET_DIR)
$(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_PKGCONF)/bash.pc
rm -f $(TARGET_DIR)/lib/bash/loadables.h
rm -f $(TARGET_DIR)/lib/bash/Makefile.inc
rm -f $(TARGET_LIB_DIR)/bash/loadables.h
rm -f $(TARGET_LIB_DIR)/bash/Makefile.inc
$(REMOVE)/bash-$(BASH_VER)
$(TOUCH)
@ -1037,7 +1037,7 @@ $(D)/samsunglcd4linux: | $(TARGET_DIR)
$(CPDIR)/samsunglcd4linux.git
$(CHDIR)/samsunglcd4linux.git/ni; \
install -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \
cp -a share/* $(TARGET_DIR)/share
cp -a share/* $(TARGET_SHARE_DIR)
$(REMOVE)/samsunglcd4linux.git
$(TOUCH)
@ -1081,15 +1081,15 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR)
$(BUILDENV) \
$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \
install -D -m 0755 xupnpd $(BIN)/; \
mkdir -p $(TARGET_DIR)/share/xupnpd/config; \
mkdir -p $(TARGET_SHARE_DIR)/xupnpd/config; \
for object in *.lua plugins/ profiles/ ui/ www/; do \
cp -a $$object $(TARGET_DIR)/share/xupnpd/; \
cp -a $$object $(TARGET_SHARE_DIR)/xupnpd/; \
done;
rm $(TARGET_DIR)/share/xupnpd/plugins/staff/xupnpd_18plus.lua
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_DIR)/share/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_DIR)/share/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_DIR)/share/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_DIR)/share/xupnpd/plugins/
rm $(TARGET_SHARE_DIR)/xupnpd/plugins/staff/xupnpd_18plus.lua
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
mkdir -p $(TARGET_DIR)/etc/init.d/
install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
ln -sf xupnpd $(TARGET_DIR)/etc/init.d/S99xupnpd
@ -1344,8 +1344,8 @@ $(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/glib2 $(D)/libncurses | $(TARGET_DI
; \
$(MAKE) all; \
$(MAKE) install DESTDIR=$(TARGET_DIR)
rm -rf $(TARGET_DIR)/share/mc/examples
find $(TARGET_DIR)/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm
rm -rf $(TARGET_SHARE_DIR)/mc/examples
find $(TARGET_SHARE_DIR)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm
$(REMOVE)/mc-$(MC_VER)
$(TOUCH)

Write Preview
Loading…
Cancel
Save