From 735bc8427446a2bfcf42e1b155faf519089cf3f5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 29 Nov 2020 20:34:03 +0100 Subject: [PATCH] - the huge move-to-usr commit --- Makefile | 4 + configs/luarocks-config.lua | 4 +- make/bootstrap.mk | 40 +- make/environment-build.mk | 33 +- make/environment-target.mk | 121 ++--- make/helpers.mk | 18 +- make/host-tools.mk | 10 +- make/image-updates.mk | 12 +- make/images.mk | 6 +- make/linux-drivers.mk | 2 +- make/linux-kernel.mk | 38 +- make/neutrino-plugins.mk | 23 +- make/neutrino.mk | 27 +- make/ni.mk | 2 +- make/target-blobs.mk | 70 +-- make/target-development.mk | 32 +- make/target-ffmpeg-coolstream.mk | 8 +- make/target-ffmpeg.mk | 8 +- make/target-files.mk | 16 +- make/target-libs-static.mk | 14 +- make/target-libs-unused.mk | 34 +- make/target-libs.mk | 227 +++++----- make/target-lua.mk | 46 +- make/target-rootfs.mk | 92 ++-- make/target-scripts.mk | 114 ++--- make/target-tools-unused.mk | 30 +- make/target-tools.mk | 425 +++++++++--------- patches/ext4_utils.mk | 103 +++++ patches/lua-01-fix-LUA_ROOT.patch | 2 +- patches/luaposix-fix-build.patch | 26 -- ...-notify-use-sbin-instead-of-usr-sbin.patch | 35 -- patches/xupnpd-change-XUPNPDROOTDIR.diff | 13 - .../ca-certificates/{ => usr}/bin/c_rehash | 2 +- .../{ => usr}/bin/certsconf.sh | 2 +- .../{ => usr}/sbin/update-ca-certificates | 4 +- .../general/lcd4linux/etc/init.d/lcd4linux | 4 +- .../share/lcd/icons/background/1024x600/1.png | Bin .../lcd/icons/background/1024x600/10.png | Bin .../share/lcd/icons/background/1024x600/2.png | Bin .../share/lcd/icons/background/1024x600/3.png | Bin .../share/lcd/icons/background/1024x600/4.png | Bin .../share/lcd/icons/background/1024x600/5.png | Bin .../share/lcd/icons/background/1024x600/6.png | Bin .../share/lcd/icons/background/1024x600/7.png | Bin .../share/lcd/icons/background/1024x600/8.png | Bin .../share/lcd/icons/background/1024x600/9.png | Bin .../1024x600/Samsung1024x600_standard.png | Bin .../1024x600/Samsung1024x600_standby.png | Bin .../1024x600/Samsung1024x600_user.png | Bin .../1024x600/Samsung1024x600_xcam.png | Bin .../share/lcd/icons/background/800x480/1.png | Bin .../share/lcd/icons/background/800x480/10.png | Bin .../share/lcd/icons/background/800x480/2.png | Bin .../share/lcd/icons/background/800x480/3.png | Bin .../share/lcd/icons/background/800x480/4.png | Bin .../share/lcd/icons/background/800x480/5.png | Bin .../share/lcd/icons/background/800x480/6.png | Bin .../share/lcd/icons/background/800x480/7.png | Bin .../share/lcd/icons/background/800x480/8.png | Bin .../share/lcd/icons/background/800x480/9.png | Bin .../800x480/Samsung800x480_standard.png | Bin .../800x480/Samsung800x480_standby.png | Bin .../800x480/Samsung800x480_user.png | Bin .../800x480/Samsung800x480_xcam.png | Bin .../share/lcd/icons/background/800x600/1.png | Bin .../share/lcd/icons/background/800x600/10.png | Bin .../share/lcd/icons/background/800x600/2.png | Bin .../share/lcd/icons/background/800x600/3.png | Bin .../share/lcd/icons/background/800x600/4.png | Bin .../share/lcd/icons/background/800x600/5.png | Bin .../share/lcd/icons/background/800x600/6.png | Bin .../share/lcd/icons/background/800x600/7.png | Bin .../share/lcd/icons/background/800x600/8.png | Bin .../share/lcd/icons/background/800x600/9.png | Bin .../800x600/Samsung800x600_standard.png | Bin .../800x600/Samsung800x600_standby.png | Bin .../800x600/Samsung800x600_user.png | Bin .../800x600/Samsung800x600_xcam.png | Bin .../lcd/icons/background/Pearl_d-box2.png | Bin .../lcd/icons/background/Pearl_large.png | Bin .../lcd/icons/background/Pearl_radio.png | Bin .../lcd/icons/background/Pearl_small.png | Bin .../lcd/icons/background/Pearl_standard.png | Bin .../lcd/icons/background/Pearl_standby.png | Bin .../share/lcd/icons/background/Pearl_user.png | Bin .../share/lcd/icons/background/Pearl_xcam.png | Bin .../{ => usr}/share/lcd/icons/blank.png | Bin .../share/lcd/icons/clock/analog/dial.png | Bin .../share/lcd/icons/clock/analog/h0.png | Bin .../share/lcd/icons/clock/analog/h00.png | Bin .../share/lcd/icons/clock/analog/h01.png | Bin .../share/lcd/icons/clock/analog/h02.png | Bin .../share/lcd/icons/clock/analog/h03.png | Bin .../share/lcd/icons/clock/analog/h04.png | Bin .../share/lcd/icons/clock/analog/h05.png | Bin .../share/lcd/icons/clock/analog/h06.png | Bin .../share/lcd/icons/clock/analog/h07.png | Bin .../share/lcd/icons/clock/analog/h08.png | Bin .../share/lcd/icons/clock/analog/h09.png | Bin .../share/lcd/icons/clock/analog/h1.png | Bin .../share/lcd/icons/clock/analog/h10.png | Bin .../share/lcd/icons/clock/analog/h11.png | Bin .../share/lcd/icons/clock/analog/h12.png | Bin .../share/lcd/icons/clock/analog/h13.png | Bin .../share/lcd/icons/clock/analog/h14.png | Bin .../share/lcd/icons/clock/analog/h15.png | Bin .../share/lcd/icons/clock/analog/h16.png | Bin .../share/lcd/icons/clock/analog/h17.png | Bin .../share/lcd/icons/clock/analog/h18.png | Bin .../share/lcd/icons/clock/analog/h19.png | Bin .../share/lcd/icons/clock/analog/h2.png | Bin .../share/lcd/icons/clock/analog/h20.png | Bin .../share/lcd/icons/clock/analog/h21.png | Bin .../share/lcd/icons/clock/analog/h22.png | Bin .../share/lcd/icons/clock/analog/h23.png | Bin .../share/lcd/icons/clock/analog/h24.png | Bin .../share/lcd/icons/clock/analog/h25.png | Bin .../share/lcd/icons/clock/analog/h26.png | Bin .../share/lcd/icons/clock/analog/h27.png | Bin .../share/lcd/icons/clock/analog/h28.png | Bin .../share/lcd/icons/clock/analog/h29.png | Bin .../share/lcd/icons/clock/analog/h3.png | Bin .../share/lcd/icons/clock/analog/h30.png | Bin .../share/lcd/icons/clock/analog/h31.png | Bin .../share/lcd/icons/clock/analog/h32.png | Bin .../share/lcd/icons/clock/analog/h33.png | Bin .../share/lcd/icons/clock/analog/h34.png | Bin .../share/lcd/icons/clock/analog/h35.png | Bin .../share/lcd/icons/clock/analog/h36.png | Bin .../share/lcd/icons/clock/analog/h37.png | Bin .../share/lcd/icons/clock/analog/h38.png | Bin .../share/lcd/icons/clock/analog/h39.png | Bin .../share/lcd/icons/clock/analog/h4.png | Bin .../share/lcd/icons/clock/analog/h40.png | Bin .../share/lcd/icons/clock/analog/h41.png | Bin .../share/lcd/icons/clock/analog/h42.png | Bin .../share/lcd/icons/clock/analog/h43.png | Bin .../share/lcd/icons/clock/analog/h44.png | Bin .../share/lcd/icons/clock/analog/h45.png | Bin .../share/lcd/icons/clock/analog/h46.png | Bin .../share/lcd/icons/clock/analog/h47.png | Bin .../share/lcd/icons/clock/analog/h48.png | Bin .../share/lcd/icons/clock/analog/h49.png | Bin .../share/lcd/icons/clock/analog/h5.png | Bin .../share/lcd/icons/clock/analog/h50.png | Bin .../share/lcd/icons/clock/analog/h51.png | Bin .../share/lcd/icons/clock/analog/h52.png | Bin .../share/lcd/icons/clock/analog/h53.png | Bin .../share/lcd/icons/clock/analog/h54.png | Bin .../share/lcd/icons/clock/analog/h55.png | Bin .../share/lcd/icons/clock/analog/h56.png | Bin .../share/lcd/icons/clock/analog/h57.png | Bin .../share/lcd/icons/clock/analog/h58.png | Bin .../share/lcd/icons/clock/analog/h59.png | Bin .../share/lcd/icons/clock/analog/h6.png | Bin .../share/lcd/icons/clock/analog/h7.png | Bin .../share/lcd/icons/clock/analog/h8.png | Bin .../share/lcd/icons/clock/analog/h9.png | Bin .../share/lcd/icons/clock/analog/m00.png | Bin .../share/lcd/icons/clock/analog/m01.png | Bin .../share/lcd/icons/clock/analog/m02.png | Bin .../share/lcd/icons/clock/analog/m03.png | Bin .../share/lcd/icons/clock/analog/m04.png | Bin .../share/lcd/icons/clock/analog/m05.png | Bin .../share/lcd/icons/clock/analog/m06.png | Bin .../share/lcd/icons/clock/analog/m07.png | Bin .../share/lcd/icons/clock/analog/m08.png | Bin .../share/lcd/icons/clock/analog/m09.png | Bin .../share/lcd/icons/clock/analog/m10.png | Bin .../share/lcd/icons/clock/analog/m11.png | Bin .../share/lcd/icons/clock/analog/m12.png | Bin .../share/lcd/icons/clock/analog/m13.png | Bin .../share/lcd/icons/clock/analog/m14.png | Bin .../share/lcd/icons/clock/analog/m15.png | Bin .../share/lcd/icons/clock/analog/m16.png | Bin .../share/lcd/icons/clock/analog/m17.png | Bin .../share/lcd/icons/clock/analog/m18.png | Bin .../share/lcd/icons/clock/analog/m19.png | Bin .../share/lcd/icons/clock/analog/m20.png | Bin .../share/lcd/icons/clock/analog/m21.png | Bin .../share/lcd/icons/clock/analog/m22.png | Bin .../share/lcd/icons/clock/analog/m23.png | Bin .../share/lcd/icons/clock/analog/m24.png | Bin .../share/lcd/icons/clock/analog/m25.png | Bin .../share/lcd/icons/clock/analog/m26.png | Bin .../share/lcd/icons/clock/analog/m27.png | Bin .../share/lcd/icons/clock/analog/m28.png | Bin .../share/lcd/icons/clock/analog/m29.png | Bin .../share/lcd/icons/clock/analog/m30.png | Bin .../share/lcd/icons/clock/analog/m31.png | Bin .../share/lcd/icons/clock/analog/m32.png | Bin .../share/lcd/icons/clock/analog/m33.png | Bin .../share/lcd/icons/clock/analog/m34.png | Bin .../share/lcd/icons/clock/analog/m35.png | Bin .../share/lcd/icons/clock/analog/m36.png | Bin .../share/lcd/icons/clock/analog/m37.png | Bin .../share/lcd/icons/clock/analog/m38.png | Bin .../share/lcd/icons/clock/analog/m39.png | Bin .../share/lcd/icons/clock/analog/m40.png | Bin .../share/lcd/icons/clock/analog/m41.png | Bin .../share/lcd/icons/clock/analog/m42.png | Bin .../share/lcd/icons/clock/analog/m43.png | Bin .../share/lcd/icons/clock/analog/m44.png | Bin .../share/lcd/icons/clock/analog/m45.png | Bin .../share/lcd/icons/clock/analog/m46.png | Bin .../share/lcd/icons/clock/analog/m47.png | Bin .../share/lcd/icons/clock/analog/m48.png | Bin .../share/lcd/icons/clock/analog/m49.png | Bin .../share/lcd/icons/clock/analog/m50.png | Bin .../share/lcd/icons/clock/analog/m51.png | Bin .../share/lcd/icons/clock/analog/m52.png | Bin .../share/lcd/icons/clock/analog/m53.png | Bin .../share/lcd/icons/clock/analog/m54.png | Bin .../share/lcd/icons/clock/analog/m55.png | Bin .../share/lcd/icons/clock/analog/m56.png | Bin .../share/lcd/icons/clock/analog/m57.png | Bin .../share/lcd/icons/clock/analog/m58.png | Bin .../share/lcd/icons/clock/analog/m59.png | Bin .../share/lcd/icons/clock/digital/0.png | Bin .../share/lcd/icons/clock/digital/1.png | Bin .../share/lcd/icons/clock/digital/2.png | Bin .../share/lcd/icons/clock/digital/3.png | Bin .../share/lcd/icons/clock/digital/4.png | Bin .../share/lcd/icons/clock/digital/5.png | Bin .../share/lcd/icons/clock/digital/6.png | Bin .../share/lcd/icons/clock/digital/7.png | Bin .../share/lcd/icons/clock/digital/8.png | Bin .../share/lcd/icons/clock/digital/9.png | Bin .../share/lcd/icons/clock/digital/dp.png | Bin .../lcd/icons/clock/digital_grau_129px/0.png | Bin .../lcd/icons/clock/digital_grau_129px/1.png | Bin .../lcd/icons/clock/digital_grau_129px/2.png | Bin .../lcd/icons/clock/digital_grau_129px/3.png | Bin .../lcd/icons/clock/digital_grau_129px/4.png | Bin .../lcd/icons/clock/digital_grau_129px/5.png | Bin .../lcd/icons/clock/digital_grau_129px/6.png | Bin .../lcd/icons/clock/digital_grau_129px/7.png | Bin .../lcd/icons/clock/digital_grau_129px/8.png | Bin .../lcd/icons/clock/digital_grau_129px/9.png | Bin .../lcd/icons/clock/digital_grau_129px/dp.png | Bin .../lcd/icons/clock/digital_weiss_129px/0.png | Bin .../lcd/icons/clock/digital_weiss_129px/1.png | Bin .../lcd/icons/clock/digital_weiss_129px/2.png | Bin .../lcd/icons/clock/digital_weiss_129px/3.png | Bin .../lcd/icons/clock/digital_weiss_129px/4.png | Bin .../lcd/icons/clock/digital_weiss_129px/5.png | Bin .../lcd/icons/clock/digital_weiss_129px/6.png | Bin .../lcd/icons/clock/digital_weiss_129px/7.png | Bin .../lcd/icons/clock/digital_weiss_129px/8.png | Bin .../lcd/icons/clock/digital_weiss_129px/9.png | Bin .../icons/clock/digital_weiss_129px/dp.png | Bin .../{ => usr}/share/lcd/icons/menu.png | Bin .../share/lcd/icons/mode/d-box2/ecm_off.png | Bin .../share/lcd/icons/mode/d-box2/ecm_on.png | Bin .../share/lcd/icons/mode/d-box2/rec_off.png | Bin .../share/lcd/icons/mode/d-box2/rec_on.png | Bin .../share/lcd/icons/mode/d-box2/timer_off.png | Bin .../share/lcd/icons/mode/d-box2/timer_on.png | Bin .../share/lcd/icons/mode/d-box2/ts_off.png | Bin .../share/lcd/icons/mode/d-box2/ts_on.png | Bin .../share/lcd/icons/mode/ecm_off.png | Bin .../{ => usr}/share/lcd/icons/mode/ecm_on.png | Bin .../share/lcd/icons/mode/rec_off.png | Bin .../{ => usr}/share/lcd/icons/mode/rec_on.png | Bin .../share/lcd/icons/mode/timer_off.png | Bin .../share/lcd/icons/mode/timer_on.png | Bin .../{ => usr}/share/lcd/icons/mode/ts_off.png | Bin .../{ => usr}/share/lcd/icons/mode/ts_on.png | Bin .../share/lcd/icons/mode/weather_off.png | Bin .../share/lcd/icons/mode/weather_on.png | Bin .../{ => usr}/share/lcd/icons/spf.txt | 0 .../share/tuxbox/neutrino/plugins/links.cfg | 0 skel-root/general/scripts/dropbear.init | 4 +- skel-root/general/scripts/inadyn.init | 2 +- skel-root/general/scripts/post-wlan0.sh | 2 +- skel-root/general/scripts/pre-wlan0.sh | 4 +- skel-root/general/scripts/suspend.init | 2 +- skel-root/general/scripts/sys_update.sh | 2 +- skel-root/general/scripts/syslogd.init | 2 +- skel-root/general/scripts/xupnpd.init | 2 +- .../share/xupnpd/playlists/youtube_music.m3u | 0 .../{ => usr}/share/xupnpd/xupnpd_cfg.lua | 0 .../{ => usr}/share/xupnpd/xupnpd_feeds.lua | 0 .../share/xupnpd/xupnpd_playlist.lua | 0 skel-root/hd1/etc/profile | 6 + skel-root/hd2/etc/profile | 6 + skel-root/hd5x/etc/profile | 6 + skel-root/hd6x/etc/profile | 6 + skel-root/vuduo/etc/profile | 6 + skel-root/vuplus/etc/profile | 6 + 290 files changed, 894 insertions(+), 809 deletions(-) create mode 100644 patches/ext4_utils.mk delete mode 100644 patches/luaposix-fix-build.patch delete mode 100644 patches/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch delete mode 100644 patches/xupnpd-change-XUPNPDROOTDIR.diff rename skel-root/general/ca-certificates/{ => usr}/bin/c_rehash (99%) rename skel-root/general/ca-certificates/{ => usr}/bin/certsconf.sh (87%) mode change 100755 => 100644 rename skel-root/general/ca-certificates/{ => usr}/sbin/update-ca-certificates (97%) mode change 100755 => 100644 rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/10.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/Samsung1024x600_standard.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/Samsung1024x600_standby.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/Samsung1024x600_user.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/1024x600/Samsung1024x600_xcam.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/10.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/Samsung800x480_standard.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/Samsung800x480_standby.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/Samsung800x480_user.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x480/Samsung800x480_xcam.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/10.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/Samsung800x600_standard.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/Samsung800x600_standby.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/Samsung800x600_user.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/800x600/Samsung800x600_xcam.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_d-box2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_large.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_radio.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_small.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_standard.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_standby.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_user.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/background/Pearl_xcam.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/blank.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/dial.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h0.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h00.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h01.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h02.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h03.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h04.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h05.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h06.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h07.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h08.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h09.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h10.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h11.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h12.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h13.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h14.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h15.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h16.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h17.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h18.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h19.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h20.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h21.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h22.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h23.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h24.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h25.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h26.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h27.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h28.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h29.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h30.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h31.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h32.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h33.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h34.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h35.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h36.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h37.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h38.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h39.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h40.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h41.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h42.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h43.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h44.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h45.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h46.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h47.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h48.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h49.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h50.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h51.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h52.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h53.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h54.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h55.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h56.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h57.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h58.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h59.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/h9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m00.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m01.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m02.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m03.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m04.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m05.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m06.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m07.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m08.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m09.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m10.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m11.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m12.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m13.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m14.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m15.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m16.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m17.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m18.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m19.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m20.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m21.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m22.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m23.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m24.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m25.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m26.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m27.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m28.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m29.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m30.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m31.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m32.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m33.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m34.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m35.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m36.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m37.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m38.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m39.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m40.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m41.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m42.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m43.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m44.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m45.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m46.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m47.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m48.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m49.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m50.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m51.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m52.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m53.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m54.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m55.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m56.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m57.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m58.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/analog/m59.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/0.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital/dp.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/0.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_grau_129px/dp.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/0.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/1.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/2.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/3.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/4.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/5.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/6.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/7.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/8.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/9.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/clock/digital_weiss_129px/dp.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/menu.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/ecm_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/ecm_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/rec_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/rec_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/timer_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/timer_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/ts_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/d-box2/ts_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/ecm_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/ecm_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/rec_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/rec_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/timer_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/timer_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/ts_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/ts_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/weather_off.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/mode/weather_on.png (100%) rename skel-root/general/lcd4linux/{ => usr}/share/lcd/icons/spf.txt (100%) rename skel-root/general/links/{ => usr}/share/tuxbox/neutrino/plugins/links.cfg (100%) rename skel-root/general/xupnpd/{ => usr}/share/xupnpd/playlists/youtube_music.m3u (100%) mode change 100755 => 100644 rename skel-root/general/xupnpd/{ => usr}/share/xupnpd/xupnpd_cfg.lua (100%) rename skel-root/general/xupnpd/{ => usr}/share/xupnpd/xupnpd_feeds.lua (100%) rename skel-root/general/xupnpd/{ => usr}/share/xupnpd/xupnpd_playlist.lua (100%) diff --git a/Makefile b/Makefile index 3b63ee6e..e0031ba6 100755 --- a/Makefile +++ b/Makefile @@ -37,6 +37,8 @@ config.local: $(eval BOXMODEL=hd51) @echo " 4) Coolstream Kronos (Zee², Trinity V2)" @echo " 5) Coolstream Kronos V2 (Link, Trinity Duo)" @echo " 11) AX/Mutant HD51" + @echo " 12) AX/Mutant HD60" + @echo " 13) AX/Mutant HD61" @echo " 21) WWIO BRE2ZE4K" @echo " 31) Air Digital Zgemma H7S/C" @echo " 41) VU+ Solo 4k" @@ -57,6 +59,8 @@ config.local: $(eval BOXMODEL=hd51) 4) boxmodel=kronos;; \ 5) boxmodel=kronos_v2;; \ 11) boxmodel=hd51;; \ + 12) boxmodel=hd60;; \ + 13) boxmodel=hd61;; \ 21) boxmodel=bre2ze4k;; \ 31) boxmodel=h7;; \ 41) boxmodel=vusolo4k;; \ diff --git a/configs/luarocks-config.lua b/configs/luarocks-config.lua index 477ed042..865bba3b 100644 --- a/configs/luarocks-config.lua +++ b/configs/luarocks-config.lua @@ -3,8 +3,8 @@ local function getenv(name) return os_getenv(name) or '' end -- cross-compilation -variables.LUA_INCDIR = getenv('TARGET_INCLUDE_DIR') -variables.LUA_LIBDIR = getenv('TARGET_LIB_DIR') +variables.LUA_INCDIR = getenv('TARGET_includedir') +variables.LUA_LIBDIR = getenv('TARGET_libdir') variables.CC = getenv('TARGET_CC') variables.LD = getenv('TARGET_LD') variables.CFLAGS = getenv('TARGET_CFLAGS') diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 1e2fcc38..88eb39af 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -36,38 +36,40 @@ skeleton: | $(TARGET_DIR) $(INSTALL_COPY) --remove-destination $(SKEL-ROOT)/. $(TARGET_DIR)/ find $(TARGET_DIR) -type f -print0 | xargs --no-run-if-empty -0 \ sed -i 's|%(BOXMODEL)|$(BOXMODEL)|' - sed -i 's|%(BOOT_PARTITION)|$(BOOT_PARTITION)|' $(TARGET_DIR)/etc/mdev.conf + sed -i 's|%(BOOT_PARTITION)|$(BOOT_PARTITION)|' $(TARGET_sysconfdir)/mdev.conf $(INSTALL_COPY) $(STATIC_DIR)/. $(TARGET_DIR)/ # ----------------------------------------------------------------------------- target-dir: mkdir -p $(TARGET_DIR) - mkdir -p $(TARGET_BIN_DIR) - mkdir -p $(TARGET_INCLUDE_DIR) - mkdir -p $(TARGET_LIB_DIR) + mkdir -p $(TARGET_bindir) + mkdir -p $(TARGET_includedir) + mkdir -p $(TARGET_libdir) + mkdir -p $(TARGET_sbindir) + mkdir -p $(TARGET_datadir) + #mkdir -p $(TARGET_prefix)/local/{bin,include,lib,sbin,share} + mkdir -p $(TARGET_sysconfdir)/network/if-{up,pre-up,post-up,down,pre-down,post-down}.d + mkdir -p $(TARGET_localstatedir)/bin + mkdir -p $(TARGET_localstatedir)/etc/init.d + mkdir -p $(TARGET_localstatedir)/keys + mkdir -p $(TARGET_localstatedir)/root + mkdir -p $(TARGET_localstatedir)/spool/cron/crontabs ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) mkdir -p $(TARGET_DIR)/boot endif mkdir -p $(TARGET_DIR)/dev - mkdir -p $(TARGET_DIR)/etc/network/if-{up,pre-up,post-up,down,pre-down,post-down}.d mkdir -p $(TARGET_DIR)/media mkdir -p $(TARGET_DIR)/mnt mkdir -p $(TARGET_DIR)/proc mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/sys mkdir -p $(TARGET_DIR)/tmp - mkdir -p $(TARGET_DIR)/var/bin - mkdir -p $(TARGET_DIR)/var/etc/init.d - mkdir -p $(TARGET_DIR)/var/keys - mkdir -p $(TARGET_DIR)/var/root - mkdir -p $(TARGET_DIR)/var/spool/cron/crontabs - mkdir -p $(TARGET_USR_BIN_DIR) mkdir -p $(PKG_CONFIG_PATH) make skeleton ifeq ($(PERSISTENT_VAR_PARTITION), yes) ifeq ($(IMAGE_NEW), yes) - touch -f $(TARGET_DIR)/var/etc/.newimage + touch -f $(TARGET_localstatedir)/etc/.newimage endif endif @@ -93,14 +95,14 @@ $(UPDATE_DIR): libs-cross: | $(TARGET_DIR) if [ -d $(CROSS_DIR)/$(TARGET)/sys-root/lib/ ]; then \ - $(INSTALL_COPY) $(CROSS_DIR)/$(TARGET)/sys-root/lib/*so* $(TARGET_LIB_DIR); \ + $(INSTALL_COPY) $(CROSS_DIR)/$(TARGET)/sys-root/lib/*so* $(TARGET_base_libdir); \ elif [ -d $(CROSS_DIR)/$(TARGET)/lib/ ]; then \ - $(INSTALL_COPY) $(CROSS_DIR)/$(TARGET)/lib/*so* $(TARGET_LIB_DIR); \ + $(INSTALL_COPY) $(CROSS_DIR)/$(TARGET)/lib/*so* $(TARGET_base_libdir); \ else \ false; \ fi ifeq ($(BOXSERIES), hd2) - $(CD) $(TARGET_LIB_DIR); \ + $(CD) $(TARGET_base_libdir); \ ln -sf libuClibc-$(UCLIBC_VER).so libcrypt.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so libdl.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so libm.so.0; \ @@ -108,7 +110,7 @@ ifeq ($(BOXSERIES), hd2) ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0 endif ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) - $(CD) $(TARGET_LIB_DIR); \ + $(CD) $(TARGET_base_libdir); \ ln -sf ld-2.23.so ld-linux.so.3 endif @@ -116,9 +118,9 @@ endif ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) -var-update: $(TARGET_DIR)/var/update +var-update: $(TARGET_localstatedir)/update -$(TARGET_DIR)/var/update: | $(TARGET_DIR) +$(TARGET_localstatedir)/update: | $(TARGET_DIR) mkdir -p $(@) ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1)) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage $(@) @@ -138,7 +140,7 @@ endif # ----------------------------------------------------------------------------- # hack to make sure they are always copied -PHONY += $(TARGET_DIR)/var/update +PHONY += $(TARGET_localstatedir)/update # ----------------------------------------------------------------------------- diff --git a/make/environment-build.mk b/make/environment-build.mk index 90371737..7b50ec43 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -146,27 +146,12 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vuduo)) endif -STATIC_LIB_DIR = $(STATIC_DIR)/lib - -TARGET_BIN_DIR = $(TARGET_DIR)/bin -TARGET_INCLUDE_DIR = $(TARGET_DIR)/include -TARGET_LIB_DIR = $(TARGET_DIR)/lib -TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VER) -TARGET_SBIN_DIR = $(TARGET_DIR)/sbin -TARGET_SHARE_DIR = $(TARGET_DIR)/share - -TARGET_USR_DIR = $(TARGET_DIR)/usr -TARGET_USR_BIN_DIR = $(TARGET_USR_DIR)/bin -TARGET_USR_INCLUDE_DIR = $(TARGET_USR_DIR)/include -TARGET_USR_LIB_DIR = $(TARGET_USR_DIR)/lib -TARGET_USR_MODULES_DIR = $(TARGET_USR_LIB_DIR)/modules/$(KERNEL_VER) -TARGET_USR_SBIN_DIR = $(TARGET_USR_DIR)/sbin -TARGET_USR_SHARE_DIR = $(TARGET_USR_DIR)/share - -TARGET_CFLAGS = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR) +STATIC_libdir = $(STATIC_DIR)/$(prefix)/lib + +TARGET_CFLAGS = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_includedir) TARGET_CPPFLAGS = $(TARGET_CFLAGS) TARGET_CXXFLAGS = $(TARGET_CFLAGS) -TARGET_LDFLAGS = $(CORTEX-STRINGS_LDFLAG) -Wl,-O1 -Wl,-rpath,$(TARGET_LIB_DIR) -Wl,-rpath-link,$(TARGET_LIB_DIR) -L$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS) +TARGET_LDFLAGS = $(CORTEX-STRINGS_LDFLAG) -Wl,-O1 -Wl,-rpath,$(TARGET_libdir) -Wl,-rpath-link,$(TARGET_libdir) -L$(TARGET_libdir) $(TARGET_EXTRA_LDFLAGS) TARGET_CROSS = $(TARGET)- @@ -204,7 +189,7 @@ PATH := $(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(CROSS_DIR)/bin:$(PATH) # ----------------------------------------------------------------------------- PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config -PKG_CONFIG_LIBDIR = $(TARGET_LIB_DIR) +PKG_CONFIG_LIBDIR = $(TARGET_libdir) PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig # ----------------------------------------------------------------------------- @@ -295,11 +280,11 @@ CMAKE_OPTS = \ -DCMAKE_BUILD_TYPE="None" \ -DCMAKE_SYSTEM_NAME="Linux" \ -DCMAKE_SYSTEM_PROCESSOR="$(BOXARCH)" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_INSTALL_DOCDIR="$(remove-docdir)" \ - -DCMAKE_INSTALL_MANDIR="$(remove-mandir)" \ + -DCMAKE_INSTALL_PREFIX="$(prefix)" \ + -DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \ + -DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \ -DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \ - -DCMAKE_INCLUDE_PATH="$(TARGET_INCLUDE_DIR)" \ + -DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \ -DCMAKE_C_COMPILER="$(TARGET_CC)" \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ -DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \ diff --git a/make/environment-target.mk b/make/environment-target.mk index b5f2515d..38c1ddb0 100644 --- a/make/environment-target.mk +++ b/make/environment-target.mk @@ -3,29 +3,6 @@ # # ----------------------------------------------------------------------------- -SHARE_FLEX = $(TARGET_SHARE_DIR)/tuxbox/neutrino/flex -SHARE_ICONS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons -SHARE_LOGOS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons/logo -SHARE_PLUGINS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/plugins -SHARE_THEMES = $(TARGET_SHARE_DIR)/tuxbox/neutrino/themes -SHARE_WEBRADIO = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webradio -SHARE_WEBTV = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webtv -VAR_CONFIG = $(TARGET_DIR)/var/tuxbox/config -VAR_PLUGINS = $(TARGET_DIR)/var/tuxbox/plugins - -$(SHARE_FLEX) \ -$(SHARE_ICONS) \ -$(SHARE_LOGOS) \ -$(SHARE_PLUGINS) \ -$(SHARE_THEMES) \ -$(SHARE_WEBRADIO) \ -$(SHARE_WEBTV) \ -$(VAR_CONFIG) \ -$(VAR_PLUGINS) : | $(TARGET_DIR) - mkdir -p $(@) - -# ----------------------------------------------------------------------------- - # Path prefixes base_prefix = prefix = /usr @@ -34,8 +11,13 @@ exec_prefix = $(prefix) # Base paths base_bindir = $(base_prefix)/bin base_sbindir = $(base_prefix)/sbin +base_datarootdir = $(base_prefix)/share +base_datadir = $(base_datarootdir) +base_includedir = $(base_prefix)/include base_libdir = $(base_prefix)/lib +modulesdir = $(base_libdir)/modules + # ----------------------------------------------------------------------------- # https://www.gnu.org/prep/standards/html_node/Directory-Variables.html @@ -64,36 +46,75 @@ mandir = $(datadir)/man mandir1 = $(mandir)/man1 mandir2 = $(mandir)/man2 -remove-dir = /.remove -remove-bindir = $(remove-dir)/bin -remove-sbindir = $(remove-dir)/sbin -remove-libexecdir = $(remove-dir)/libexec -remove-datarootdir = $(remove-dir)/share -remove-datadir = $(remove-datarootdir) -remove-sysconfdir = $(remove-dir)/etc -remove-sharedstatedir = $(remove-dir)/com -remove-localstatedir = $(remove-dir)/var -remove-runstatedir = $(remove-localstatedir)/run -remove-includedir = $(remove-dir)/include -remove-oldincludedir = $(remove-includedir) -remove-docdir = $(remove-datarootdir)/doc -remove-infodir = $(remove-datarootdir)/info -remove-htmldir = $(remove-docdir) -remove-dvidir = $(remove-docdir) -remove-pdfdir = $(remove-docdir) -remove-psdir = $(remove-docdir) -remove-libdir = $(remove-dir)/lib -remove-lispdir = $(remove-datarootdir)/emacs/site-lisp -remove-localedir = $(remove-datarootdir)/locale -remove-mandir = $(remove-datarootdir)/man -remove-man1dir = $(remove-mandir)/man1 -remove-man2dir = $(remove-mandir)/man2 +# ----------------------------------------------------------------------------- + +REMOVE_dir = /.remove +REMOVE_bindir = $(REMOVE_dir)/bin +REMOVE_sbindir = $(REMOVE_dir)/sbin +REMOVE_libexecdir = $(REMOVE_dir)/libexec +REMOVE_datarootdir = $(REMOVE_dir)/share +REMOVE_datadir = $(REMOVE_datarootdir) +REMOVE_sysconfdir = $(REMOVE_dir)/etc +REMOVE_sharedstatedir = $(REMOVE_dir)/com +REMOVE_localstatedir = $(REMOVE_dir)/var +REMOVE_runstatedir = $(REMOVE_localstatedir)/run +REMOVE_includedir = $(REMOVE_dir)/include +REMOVE_oldincludedir = $(REMOVE_includedir) +REMOVE_docdir = $(REMOVE_datarootdir)/doc +REMOVE_infodir = $(REMOVE_datarootdir)/info +REMOVE_htmldir = $(REMOVE_docdir) +REMOVE_dvidir = $(REMOVE_docdir) +REMOVE_pdfdir = $(REMOVE_docdir) +REMOVE_psdir = $(REMOVE_docdir) +REMOVE_libdir = $(REMOVE_dir)/lib +REMOVE_lispdir = $(REMOVE_datarootdir)/emacs/site-lisp +REMOVE_localedir = $(REMOVE_datarootdir)/locale +REMOVE_mandir = $(REMOVE_datarootdir)/man +REMOVE_man1dir = $(REMOVE_mandir)/man1 +REMOVE_man2dir = $(REMOVE_mandir)/man2 # ----------------------------------------------------------------------------- -# ca-certificates -CA-BUNDLE = ca-certificates.crt -CA-BUNDLE_DIR = /etc/ssl/certs +TARGET_prefix = $(TARGET_DIR)$(prefix) +TARGET_exec_prefix = $(TARGET_DIR)$(exec_prefix) + +TARGET_base_bindir = $(TARGET_DIR)$(base_bindir) +TARGET_base_sbindir = $(TARGET_DIR)$(base_sbindir) +TARGET_base_includedir = $(TARGET_DIR)$(base_includedir) +TARGET_base_libdir = $(TARGET_DIR)$(base_libdir) + +TARGET_modulesdir = $(TARGET_base_libdir)/modules/$(KERNEL_VER) + +TARGET_bindir = $(TARGET_DIR)$(bindir) +TARGET_sbindir = $(TARGET_DIR)$(sbindir) +TARGET_libdir = $(TARGET_DIR)$(libdir) +TARGET_datadir = $(TARGET_DIR)$(datadir) +TARGET_sysconfdir = $(TARGET_DIR)$(sysconfdir) +TARGET_includedir = $(TARGET_DIR)$(includedir) +TARGET_localstatedir = $(TARGET_DIR)$(localstatedir) + +# ----------------------------------------------------------------------------- + +SHARE_FLEX = $(TARGET_datadir)/tuxbox/neutrino/flex +SHARE_ICONS = $(TARGET_datadir)/tuxbox/neutrino/icons +SHARE_LOGOS = $(TARGET_datadir)/tuxbox/neutrino/icons/logo +SHARE_PLUGINS = $(TARGET_datadir)/tuxbox/neutrino/plugins +SHARE_THEMES = $(TARGET_datadir)/tuxbox/neutrino/themes +SHARE_WEBRADIO = $(TARGET_datadir)/tuxbox/neutrino/webradio +SHARE_WEBTV = $(TARGET_datadir)/tuxbox/neutrino/webtv +VAR_CONFIG = $(TARGET_localstatedir)/tuxbox/config +VAR_PLUGINS = $(TARGET_localstatedir)/tuxbox/plugins + +$(SHARE_FLEX) \ +$(SHARE_ICONS) \ +$(SHARE_LOGOS) \ +$(SHARE_PLUGINS) \ +$(SHARE_THEMES) \ +$(SHARE_WEBRADIO) \ +$(SHARE_WEBTV) \ +$(VAR_CONFIG) \ +$(VAR_PLUGINS) : | $(TARGET_DIR) + mkdir -p $(@) # ----------------------------------------------------------------------------- diff --git a/make/helpers.mk b/make/helpers.mk index 01e53916..274ff09c 100644 --- a/make/helpers.mk +++ b/make/helpers.mk @@ -48,16 +48,16 @@ github = https://github.com/$(1)/$(2)/archive/$(3) # rewrite libtool libraries REWRITE_LIBTOOL_RULES = sed -i \ - -e "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," \ - -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_LIB_DIR),g" + -e "s,^libdir=.*,libdir='$(TARGET_libdir)'," \ + -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_libdir),g" -REWRITE_LIBTOOL = $(REWRITE_LIBTOOL_RULES) $(TARGET_LIB_DIR) -REWRITE_LIBTOOL_STATIC = $(REWRITE_LIBTOOL_RULES) $(STATIC_LIB_DIR) +REWRITE_LIBTOOL = $(REWRITE_LIBTOOL_RULES) $(TARGET_libdir) +REWRITE_LIBTOOL_STATIC = $(REWRITE_LIBTOOL_RULES) $(STATIC_libdir) REWRITE_LIBTOOL_TAG = rewritten=1 define rewrite_libtool - cd $(TARGET_LIB_DIR); \ + cd $(TARGET_libdir); \ LA=$$(find . -name "*.la" -type f); \ for la in $${LA}; do \ if ! grep -q "$(REWRITE_LIBTOOL_TAG)" $${la}; then \ @@ -75,10 +75,10 @@ REWRITE_LIBTOOL_LA = $(call rewrite_libtool) # rewrite pkg-config files REWRITE_CONFIG_RULES = sed -i \ - -e "s,^prefix=.*,prefix='$(TARGET_DIR)'," \ - -e "s,^exec_prefix=.*,exec_prefix='$(TARGET_DIR)'," \ - -e "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," \ - -e "s,^includedir=.*,includedir='$(TARGET_INCLUDE_DIR)'," + -e "s,^prefix=.*,prefix='$(TARGET_prefix)'," \ + -e "s,^exec_prefix=.*,exec_prefix='$(TARGET_exec_prefix)'," \ + -e "s,^libdir=.*,libdir='$(TARGET_libdir)'," \ + -e "s,^includedir=.*,includedir='$(TARGET_includedir)'," REWRITE_CONFIG = $(REWRITE_CONFIG_RULES) REWRITE_PKGCONF = $(REWRITE_CONFIG_RULES) $(PKG_CONFIG_PATH) diff --git a/make/host-tools.mk b/make/host-tools.mk index 412534b5..4a243406 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -77,8 +77,8 @@ host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs ./configure \ --prefix=$(HOST_DIR) \ --with-sysroot=$(TARGET_DIR) \ - --with-system-libdir=$(TARGET_LIB_DIR) \ - --with-system-includedir=$(TARGET_INCLUDE_DIR) \ + --with-system-libdir=$(TARGET_libdir) \ + --with-system-includedir=$(TARGET_includedir) \ ; \ $(MAKE); \ $(MAKE) install @@ -344,10 +344,10 @@ HOST_LUAROCKS_MAKE_ENV = \ TARGET_CC="$(TARGET_CC)" \ TARGET_LD="$(TARGET_LD)" \ TARGET_CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - TARGET_LDFLAGS="-L$(TARGET_LIB_DIR)" \ + TARGET_LDFLAGS="-L$(TARGET_libdir)" \ TARGET_DIR="$(TARGET_DIR)" \ - TARGET_INCLUDE_DIR="$(TARGET_INCLUDE_DIR)" \ - TARGET_LIB_DIR="$(TARGET_LIB_DIR)" + TARGET_includedir="$(TARGET_includedir)" \ + TARGET_libdir="$(TARGET_libdir)" HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks diff --git a/make/image-updates.mk b/make/image-updates.mk index b3298715..1ee10c99 100644 --- a/make/image-updates.mk +++ b/make/image-updates.mk @@ -37,10 +37,10 @@ u-neutrino: neutrino-clean echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH) echo "sync; /bin/busybox reboot" >> $(POSTINSTALL_SH) $(MAKE) neutrino - $(INSTALL_EXEC) -D $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino - $(INSTALL_EXEC) -D $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino - $(INSTALL_DATA) -D $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale - $(INSTALL_DATA) -D $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale + $(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino + $(INSTALL_EXEC) -D $(TARGET_bindir)/neutrino $(UPDATE_INST_DIR)/bin/neutrino + $(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale + $(INSTALL_DATA) -D $(TARGET_datadir)/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 @@ -54,7 +54,7 @@ u-neutrino-full: neutrino-clean echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH) echo "sync; /bin/busybox reboot" >> $(POSTINSTALL_SH) $(MAKE) neutrino N_INST_DIR=$(UPDATE_INST_DIR) - $(INSTALL_EXEC) -D $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino + $(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino ifneq ($(DEBUG), yes) find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true endif @@ -71,7 +71,7 @@ u-update.urls: update.urls $(MAKE) u-init echo "wget -q "http://localhost/control/message?popup=update.urls%20installed." -O /dev/null" >> $(POSTINSTALL_SH) mkdir -pv $(UPDATE_INST_DIR)/var/etc - cp -f $(TARGET_DIR)/var/etc/update.urls $(UPDATE_INST_DIR)/var/etc/ + cp -f $(TARGET_localstatedir)/etc/update.urls $(UPDATE_INST_DIR)/var/etc/ $(MAKE) u-update-bin \ UPDATE_NAME=update.urls \ UPDATE_DESC=update.urls diff --git a/make/images.mk b/make/images.mk index a7a355ef..9f3d22bb 100644 --- a/make/images.mk +++ b/make/images.mk @@ -49,7 +49,7 @@ devtable-remove: # ----------------------------------------------------------------------------- -flash-image: rootfs +flash-image: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), nevis kronos kronos_v2)) make flash-image-coolstream ERASE_SIZE=0x20000 endif @@ -269,8 +269,8 @@ flash-image-hd6x-multi-recovery: | $(IMAGE_DIR) unzip -o $(DL_DIR)/$(HD6x_BOOTARGS_SOURCE) -d $(IMAGE_BUILD_DIR) unzip -o $(DL_DIR)/$(HD6x_PARTITONS_SOURCE) -d $(IMAGE_BUILD_DIR) unzip -o $(DL_DIR)/$(HD6x_RECOVERY_SOURCE) -d $(IMAGE_BUILD_DIR) - $(INSTALL_EXEC) $(IMAGE_BUILD_DIR)/bootargs-8gb.bin $(ROOTFS)/share/bootargs.bin - $(INSTALL_EXEC) $(IMAGE_BUILD_DIR)/fastboot.bin $(ROOTFS)/share/fastboot.bin + $(INSTALL_EXEC) $(IMAGE_BUILD_DIR)/bootargs-8gb.bin $(ROOTFS)$(datadir)/bootargs.bin + $(INSTALL_EXEC) $(IMAGE_BUILD_DIR)/fastboot.bin $(ROOTFS)$(datadir)/fastboot.bin dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) bs=1024 count=$(HD6x_BOOTOPTIONS_PARTITION_SIZE) mkfs.msdos -S 512 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) echo "bootcmd=setenv bootargs \$$(bootargs) \$$(bootargs_common); mmc read 0 0x1000000 0x3BD000 0x8000; bootm 0x1000000; run bootcmd_fallback" > $(IMAGE_BUILD_DIR)/STARTUP diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index 7bb90efb..8429d63c 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -13,7 +13,7 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR) $(CPDIR)/$(RTL8192EU_SOURCE) $(CHDIR)/$(RTL8192EU_SOURCE); \ $(MAKE) $(KERNEL_MAKEVARS); \ - $(INSTALL_DATA) 8192eu.ko $(TARGET_MODULES_DIR)/kernel/drivers/net/wireless/ + $(INSTALL_DATA) 8192eu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ make depmod $(REMOVE)/$(RTL8192EU_SOURCE) $(TOUCH) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index f39391db..bc787829 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -297,29 +297,29 @@ STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/cifs/cifs.ko STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko kernel-modules-coolstream-hd1: kernel-coolstream - mkdir -p $(TARGET_MODULES_DIR) + mkdir -p $(TARGET_modulesdir) for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \ - mkdir -p $(TARGET_MODULES_DIR)/$$(dirname $$module); \ - $(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_MODULES_DIR)/$$module $(TARGET_MODULES_DIR)/$$module; \ + mkdir -p $(TARGET_modulesdir)/$$(dirname $$module); \ + $(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_MODULES_DIR)/$$module $(TARGET_modulesdir)/$$module; \ done; - rm -f $(TARGET_MODULES_DIR)/usb-storage.ko # already builtin + rm -f $(TARGET_modulesdir)/usb-storage.ko # already builtin make depmod $(TOUCH) kernel-modules-coolstream-hd2: kernel-coolstream - mkdir -p $(TARGET_MODULES_DIR) - $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) + mkdir -p $(TARGET_modulesdir) + $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_modulesdir) make depmod make rtl8192eu $(TOUCH) kernel-modules-armbox: kernel-armbox - mkdir -p $(TARGET_MODULES_DIR) - $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) + mkdir -p $(TARGET_modulesdir) + $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_modulesdir) make depmod ifeq ($(BOXSERIES), hd5x hd6x) make rtl8192eu @@ -330,10 +330,10 @@ endif $(TOUCH) kernel-modules-mipsbox: kernel-mipsbox - mkdir -p $(TARGET_MODULES_DIR) - $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) - $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) + mkdir -p $(TARGET_modulesdir) + $(INSTALL_COPY) $(KERNEL_MODULES_DIR)/kernel $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_modulesdir) + $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_modulesdir) make depmod $(TOUCH) @@ -348,9 +348,9 @@ vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ-INITRD_SOURCE) depmod: PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VER) ifeq ($(BOXSERIES), hd1) - mv $(TARGET_MODULES_DIR)/modules.dep $(TARGET_MODULES_DIR)/.modules.dep - rm $(TARGET_MODULES_DIR)/modules.* - mv $(TARGET_MODULES_DIR)/.modules.dep $(TARGET_MODULES_DIR)/modules.dep + mv $(TARGET_modulesdir)/modules.dep $(TARGET_modulesdir)/.modules.dep + rm $(TARGET_modulesdir)/modules.* + mv $(TARGET_modulesdir)/.modules.dep $(TARGET_modulesdir)/modules.dep endif # ----------------------------------------------------------------------------- diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index a0c37e9f..5acdd903 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -70,7 +70,8 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ - --prefix= \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ --enable-maintainer-mode \ --enable-silent-rules \ \ @@ -80,7 +81,7 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS) $(NP_CONFIGURE_ADDITIONS) \ \ --with-target=cdk \ - --with-targetprefix= \ + --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) \ --with-boxmodel=$(NP_BOXMODEL) @@ -99,18 +100,18 @@ NP_INIT-SCRIPTS += turnoff_power define NP_RUNLEVEL-LINKS_INSTALL for script in $(NP_INIT-SCRIPTS-DEFAULTS); do \ - if [ -x $(TARGET_DIR)/etc/init.d/$$script ]; then \ + if [ -x $(TARGET_sysconfdir)/init.d/$$script ]; then \ $(UPDATE-RC.D) $$script defaults 80 20; \ fi; \ done - if [ -x $(TARGET_DIR)/etc/init.d/turnoff_power ]; then \ + if [ -x $(TARGET_sysconfdir)/init.d/turnoff_power ]; then \ $(UPDATE-RC.D) turnoff_power start 99 0 .; \ fi endef define NP_RUNLEVEL-LINKS_UNINSTALL for link in $(NP_INIT-SCRIPTS); do \ - find $(TARGET_DIR)/etc -type l -name [SK]??$$link -print0 | \ + find $(TARGET_sysconfdir) -type l -name [SK]??$$link -print0 | \ xargs --no-run-if-empty -0 rm -f; \ done endef @@ -172,8 +173,8 @@ logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_PLUGINS) # ----------------------------------------------------------------------------- doscam-webif-skin: - $(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css - $(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl + $(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_datadir)/doscam/skin/doscam_ni-dark.css + $(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_datadir)/doscam/tpl/IC_doscam_ni.tpl $(TOUCH) # ----------------------------------------------------------------------------- @@ -189,7 +190,7 @@ neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CHDIR)/$(NEUTRINO-MEDIATHEK_DIR); \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \ - $(INSTALL_COPY) share $(TARGET_DIR) + $(INSTALL_COPY) share/* $(TARGET_datadir) $(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR) # temporarily use beta-version from our board rm -rf $(SHARE_PLUGINS)/neutrino-mediathek* @@ -232,8 +233,8 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) $(call apply_patches, $(LINKS_PATCH)); \ autoreconf -vfi; \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --enable-graphics \ --with-fb \ --with-libjpeg \ @@ -248,7 +249,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv -f $(TARGET_BIN_DIR)/links $(SHARE_PLUGINS)/links.so + mv -f $(TARGET_bindir)/links $(SHARE_PLUGINS)/links.so $(INSTALL_COPY) $(TARGET_FILES)/links/* $(TARGET_DIR)/ $(REMOVE)/$(LINKS_DIR) $(TOUCH) diff --git a/make/neutrino.mk b/make/neutrino.mk index a1bed99b..7a76c086 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -54,7 +54,7 @@ ifeq ($(BOXSERIES), hd2) endif ifeq ($(DEBUG), yes) - N_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_INCLUDE_DIR) + N_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_includedir) else N_CFLAGS += $(TARGET_CFLAGS) endif @@ -63,11 +63,11 @@ N_CFLAGS += -Wno-psabi # ----------------------------------------------------------------------------- -N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS_LDFLAG) -L$(TARGET_LIB_DIR) +N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS_LDFLAG) -L$(TARGET_libdir) ifeq ($(DEBUG), yes) - N_LDFLAGS += -Wl,-rpath-link,$(TARGET_LIB_DIR) + N_LDFLAGS += -Wl,-rpath-link,$(TARGET_libdir) else - N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS) + N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_libdir) $(TARGET_EXTRA_LDFLAGS) endif # ----------------------------------------------------------------------------- @@ -77,7 +77,7 @@ ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes) ifeq ($(DEBUG), yes) N_CONFIGURE_DEBUG += \ --enable-libcoolstream-static \ - --with-libcoolstream-static-dir=$(TARGET_LIB_DIR) + --with-libcoolstream-static-dir=$(TARGET_libdir) endif endif @@ -148,7 +148,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS) $(SOURCE_DIR)/$(NI-NEUTRINO)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ - --prefix= \ + --prefix=$(prefix) \ $(N_CONFIGURE_DEBUG) \ --enable-maintainer-mode \ --enable-silent-rules \ @@ -172,7 +172,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS) $(N_CONFIGURE_LIBSTB-HAL) \ --with-tremor \ --with-target=cdk \ - --with-targetprefix= \ + --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) \ --with-boxmodel=$(N_BOXMODEL) @@ -182,12 +182,12 @@ neutrino: $(N_OBJ_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(MAKE) -C $(N_OBJ_DIR) all DESTDIR=$(TARGET_DIR) $(MAKE) -C $(N_OBJ_DIR) install DESTDIR=$(N_INST_DIR) - $(MAKE) $(TARGET_DIR)/etc/init.d/start_neutrino + $(MAKE) $(TARGET_sysconfdir)/init.d/start_neutrino $(TOUCH) # ----------------------------------------------------------------------------- -$(TARGET_DIR)/etc/init.d/start_neutrino: +$(TARGET_sysconfdir)/init.d/start_neutrino: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/start_neutrino.$(BOXTYPE) $(@) # ----------------------------------------------------------------------------- @@ -210,12 +210,13 @@ $(LH_OBJ_DIR)/config.status: $(LH_DEPS) $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ - --prefix= \ + --prefix=$(prefix) \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared=no \ \ --with-target=cdk \ + --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) \ --with-boxmodel=$(N_BOXMODEL) @@ -237,9 +238,9 @@ endif $(MAKE) $(N_OBJ_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(MAKE) -C $(N_OBJ_DIR) all DESTDIR=$(TARGET_DIR) - $(INSTALL_EXEC) -D $(N_OBJ_DIR)/src/neutrino $(TARGET_DIR)/bin/neutrino + $(INSTALL_EXEC) -D $(N_OBJ_DIR)/src/neutrino $(TARGET_bindir)/neutrino ifneq ($(DEBUG), yes) - $(TARGET_STRIP) $(TARGET_DIR)/bin/neutrino + $(TARGET_STRIP) $(TARGET_bindir)/neutrino endif make done @@ -254,7 +255,7 @@ neutrino-distclean: neutrino-clean: neutrino-uninstall neutrino-distclean rm -f $(N_OBJ_DIR)/config.status rm -f $(DEPS_DIR)/neutrino - rm -f $(TARGET_DIR)/etc/init.d/start_neutrino + rm -f $(TARGET_sysconfdir)/init.d/start_neutrino neutrino-clean-all: neutrino-clean rm -rf $(N_OBJ_DIR) diff --git a/make/ni.mk b/make/ni.mk index bfa7f51d..a20dd3c9 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -58,7 +58,7 @@ ni-image: $(MAKE) wpa_supplicant $(MAKE) mtd-utils $(MAKE) wget - $(MAKE) streamripper + #$(MAKE) streamripper ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) less $(MAKE) parted diff --git a/make/target-blobs.mk b/make/target-blobs.mk index 90b3efeb..dbcb6c12 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -23,8 +23,8 @@ endif firmware: firmware-boxmodel firmware-wireless firmware-boxmodel: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) - $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/.,$(TARGET_LIB_DIR)/firmware) - $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/.,$(TARGET_LIB_DIR)/firmware) + $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware) + $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware) ifeq ($(BOXMODEL), nevis) FIRMWARE-WIRELESS = rt2870.bin @@ -38,7 +38,7 @@ endif firmware-wireless: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) for firmware in $(FIRMWARE-WIRELESS); do \ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless/$$firmware $(TARGET_LIB_DIR)/firmware/$$firmware; \ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \ done # ----------------------------------------------------------------------------- @@ -128,16 +128,16 @@ shiner-drivers \ kronos-drivers \ kronos_v2-drivers \ coolstream-drivers: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) - mkdir -p $(TARGET_LIB_DIR) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_LIB_DIR) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_LIB_DIR) + mkdir -p $(TARGET_libdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_libdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir) ifeq ($(BOXMODEL), nevis) - ln -sf libnxp.so $(TARGET_LIB_DIR)/libconexant.so + ln -sf libnxp.so $(TARGET_libdir)/libconexant.so endif - mkdir -p $(TARGET_MODULES_DIR) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_MODULES_DIR) + mkdir -p $(TARGET_modulesdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir) ifeq ($(BOXMODEL), nevis) - ln -sf $(KERNEL_VER) $(TARGET_MODULES_DIR)-$(BOXMODEL) + ln -sf $(KERNEL_VER) $(TARGET_modulesdir)-$(BOXMODEL) endif make depmod $(TOUCH) @@ -145,17 +145,17 @@ endif hd51-drivers \ bre2ze4k-drivers \ h7-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) - mkdir -p $(TARGET_MODULES_DIR)/extra - unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra + mkdir -p $(TARGET_modulesdir)/extra + unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra make depmod $(TOUCH) hd60-drivers \ hd61-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) - mkdir -p $(TARGET_MODULES_DIR)/extra - unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra - rm -f $(TARGET_MODULES_DIR)/extra/hi_play.ko - mv $(TARGET_MODULES_DIR)/extra/turnoff_power $(TARGET_DIR)/bin + mkdir -p $(TARGET_modulesdir)/extra + unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra + rm -f $(TARGET_modulesdir)/extra/hi_play.ko + mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir) make depmod $(TOUCH) @@ -168,8 +168,8 @@ vuuno4k-drivers \ vuuno4kse-drivers \ vuduo-drivers \ vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) - mkdir -p $(TARGET_MODULES_DIR)/extra - tar -xf $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_MODULES_DIR)/extra + mkdir -p $(TARGET_modulesdir)/extra + tar -xf $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra make depmod $(TOUCH) @@ -253,22 +253,22 @@ endif hd51-libgles \ bre2ze4k-libgles \ h7-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) - ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libEGL.so - ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.so + unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir) + ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so + ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so $(TOUCH) $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE): $(DOWNLOAD) $(HD6x-LIBGLES-HEADERS_SITE)/$(HD6x-LIBGLES-HEADERS_SOURCE) hd6x-libgles-headers: $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_INCLUDE_DIR) + unzip -o $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_includedir) $(TOUCH) hd60-libgles \ hd61-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) - $(CD) $(TARGET_LIB_DIR); \ + unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir) + $(CD) $(TARGET_libdir); \ ln -sf libMali.so libmali.so; \ ln -sf libMali.so libEGL.so.1.4; ln -sf libEGL.so.1.4 libEGL.so.1; ln -sf libEGL.so.1 libEGL.so; \ ln -sf libMali.so libGLESv1_CM.so.1.1; ln -sf libGLESv1_CM.so.1.1 libGLESv1_CM.so.1; ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so; \ @@ -287,10 +287,10 @@ vuuno4kse-libgles \ vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) $(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/lib/* $(TARGET_LIB_DIR) - ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libEGL.so - ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.so - $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_INCLUDE_DIR) + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/lib/* $(TARGET_libdir) + ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so + ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so + $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_includedir) $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) $(TOUCH) @@ -322,10 +322,10 @@ hd60-libs \ hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBS_DIR) unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR) - mkdir -p $(TARGET_USR_LIB_DIR)/hisilicon - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon - ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_USR_LIB_DIR)/hisilicon/ld-linux.so + mkdir -p $(TARGET_libdir)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon + ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_libdir)/hisilicon/ld-linux.so $(REMOVE)/$(BOXMODEL-LIBS_DIR) $(TOUCH) @@ -381,10 +381,10 @@ endif vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_USR_BIN_DIR) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_bindir) + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_sysconfdir)/init.d/vuplus-platform-util ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_bindir)/bp3flash.sh endif $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) $(TOUCH) diff --git a/make/target-development.mk b/make/target-development.mk index 58b98489..c520f369 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -28,16 +28,16 @@ valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) export AR=$(TARGET_AR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-only32bit \ - --mandir=$(remove-mandir) \ - --datadir=$(remove-datadir) \ + --mandir=$(REMOVE_mandir) \ + --datadir=$(REMOVE_datadir) \ ; \ $(MAKE) all; \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - rm -f $(addprefix $(TARGET_LIB_DIR)/valgrind/,*.a *.xml) - rm -f $(addprefix $(TARGET_BIN_DIR)/,cg_* callgrind_* ms_print) + rm -f $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) + rm -f $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) $(REMOVE)/$(VALGRIND_DIR) $(TOUCH) @@ -54,10 +54,10 @@ valgrind12305: | $(TARGET_DIR) $(call apply_patches, $(VALGRIND12305_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-only32bit \ - --mandir=$(remove-mandir) \ - --datadir=$(remove-datadir) \ + --mandir=$(REMOVE_mandir) \ + --datadir=$(REMOVE_datadir) \ ; \ $(MAKE) all; \ make install DESTDIR=$(TARGET_DIR) @@ -80,13 +80,13 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(STRACE_SOURCE) $(CHDIR)/$(STRACE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --enable-silent-rules \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_BIN_DIR)/,strace-graph strace-log-merge) + rm -f $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) $(REMOVE)/$(STRACE_DIR) $(TOUCH) @@ -107,9 +107,9 @@ gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(GDB_SOURCE) $(CHDIR)/$(GDB_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --infodir=$(remove-infodir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --infodir=$(REMOVE_infodir) \ --disable-binutils \ --disable-gdbserver \ --disable-gdbtk \ @@ -125,7 +125,7 @@ gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) all-gdb; \ $(MAKE) install-gdb DESTDIR=$(TARGET_DIR) - rm -rf $(addprefix $(TARGET_SHARE_DIR)/,system-gdbinit) - find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- + rm -rf $(addprefix $(TARGET_datadir)/,system-gdbinit) + find $(TARGET_datadir)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- $(REMOVE)/$(GDB_DIR) $(TOUCH) diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk index 6b4c4192..9a33b1ee 100644 --- a/make/target-ffmpeg-coolstream.mk +++ b/make/target-ffmpeg-coolstream.mk @@ -20,9 +20,9 @@ endif # ----------------------------------------------------------------------------- FFMPEG_CONFIGURE_GENERIC = \ - --prefix=/ \ + --prefix=$(prefix) \ --cross-prefix=$(TARGET_CROSS) \ - --datadir=$(remove-datadir) \ + --datadir=$(REMOVE_datadir) \ \ --disable-doc \ --disable-htmlpages \ @@ -156,7 +156,7 @@ ifeq ($(BOXSERIES), hd1) FFMPEG_CONFIGURE_PLATFORM = \ --enable-small \ --cpu=armv6 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR)" + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" endif ifeq ($(BOXSERIES), hd2) @@ -165,7 +165,7 @@ ifeq ($(BOXSERIES), hd2) --enable-decoder=vc1 \ --enable-hardcoded-tables \ --cpu=cortex-a9 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR) -mfpu=vfpv3-d16 -mfloat-abi=hard" + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard" endif # ----------------------------------------------------------------------------- diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 8f01f127..0545b663 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -20,9 +20,9 @@ FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib # ----------------------------------------------------------------------------- FFMPEG_CONFIGURE_GENERIC = \ - --prefix=/ \ + --prefix=$(prefix) \ --cross-prefix=$(TARGET_CROSS) \ - --datadir=$(remove-datadir) \ + --datadir=$(REMOVE_datadir) \ \ --disable-doc \ --disable-htmlpages \ @@ -332,12 +332,12 @@ FFMPEG_CONFIGURE_GENERIC = \ ifeq ($(BOXARCH), arm) FFMPEG_CONFIGURE_PLATFORM = \ --cpu=cortex-a15 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR) -mfpu=neon-vfpv4 -mfloat-abi=hard" + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard" else ifeq ($(BOXARCH), mips) FFMPEG_CONFIGURE_PLATFORM = \ --cpu=generic \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR)" + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" endif # ----------------------------------------------------------------------------- diff --git a/make/target-files.mk b/make/target-files.mk index d2d68320..e99654f1 100644 --- a/make/target-files.mk +++ b/make/target-files.mk @@ -4,23 +4,23 @@ # ----------------------------------------------------------------------------- files-etc: \ - $(TARGET_DIR)/etc/default/rcS \ - $(TARGET_DIR)/etc/fstab \ - $(TARGET_DIR)/etc/inittab + $(TARGET_sysconfdir)/default/rcS \ + $(TARGET_sysconfdir)/fstab \ + $(TARGET_sysconfdir)/inittab -$(TARGET_DIR)/etc/default/rcS: +$(TARGET_sysconfdir)/default/rcS: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/default/rcS $(@) -$(TARGET_DIR)/etc/fstab: +$(TARGET_sysconfdir)/fstab: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/fstab $(@) -$(TARGET_DIR)/etc/inittab: +$(TARGET_sysconfdir)/inittab: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/inittab $(@) # ----------------------------------------------------------------------------- files-var-etc: \ - $(TARGET_DIR)/var/etc/fstab + $(TARGET_localstatedir)/etc/fstab -$(TARGET_DIR)/var/etc/fstab: +$(TARGET_localstatedir)/etc/fstab: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/fstab-var $(@) diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index 8abb71e9..a0755187 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -22,19 +22,19 @@ $(DL_DIR)/$(CORTEX-STRINGS_SOURCE): CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) -cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la -$(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) +cortex-strings: $(STATIC_libdir)/libcortex-strings.la +$(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) $(REMOVE)/$(CORTEX-STRINGS_DIR) $(UNTAR)/$(CORTEX-STRINGS_SOURCE) $(CHDIR)/$(CORTEX-STRINGS_DIR); \ ./autogen.sh; \ - CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \ - CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \ - CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \ - LDFLAGS="-Wl,-O1 -L$(TARGET_LIB_DIR)" \ + CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)" \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ ./configure $(CONFIGURE_OPTS) \ - --prefix= \ + --prefix=$(prefix) \ --disable-shared \ --enable-static \ $(CORTEX-STRINGS_CONF) \ diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 308b49af..e521869d 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -22,7 +22,7 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(LIBID3TAG_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared=yes \ ; \ $(MAKE) all; \ @@ -48,8 +48,8 @@ libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBFLAC_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-shared \ --disable-static \ --disable-cpplibs \ @@ -61,8 +61,8 @@ libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - rm -rf $(TARGET_DIR)/bin/flac - rm -rf $(TARGET_DIR)/bin/metaflac + rm -rf $(TARGET_bindir)/flac + rm -rf $(TARGET_bindir)/metaflac $(REMOVE)/$(LIBFLAC_DIR) $(TOUCH) @@ -87,7 +87,7 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(MAKE_ENV) \ $(MAKE) all; \ $(MAKE) install PREFIX=$(TARGET_DIR) - rm -f $(TARGET_DIR)/bin/bzip2 + rm -f $(TARGET_bindir)/bzip2 $(REMOVE)/$(BZIP2_DIR) $(TOUCH) @@ -108,10 +108,10 @@ fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(FONTCONFIG_SOURCE) $(CHDIR)/$(FONTCONFIG_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --with-freetype-config=$(HOST_DIR)/bin/freetype-config \ - --with-expat-includes=$(TARGET_INCLUDE_DIR) \ - --with-expat-lib=$(TARGET_LIB_DIR) \ + --with-expat-includes=$(TARGET_includedir) \ + --with-expat-lib=$(TARGET_libdir) \ --sysconfdir=/etc \ --disable-docs \ ; \ @@ -144,7 +144,7 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(PIXMAN_DIR); \ $(call apply_patches, $(PIXMAN_PATCH)); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --disable-gtk \ --disable-arm-simd \ --disable-loongson-mmi \ @@ -179,7 +179,7 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) $(MAKE_ENV) \ ax_cv_c_float_words_bigendian="no" \ ./configure $(CONFIGURE_OPTS) \ - --prefix= \ + --prefix=$(prefix) \ --with-x=no \ --disable-xlib \ --disable-xcb \ @@ -190,11 +190,11 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_BIN_DIR)/cairo-sphinx - rm -rf $(TARGET_LIB_DIR)/cairo/cairo-fdr* - rm -rf $(TARGET_LIB_DIR)/cairo/cairo-sphinx* - rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-fdr* - rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-sphinx* + rm -rf $(TARGET_bindir)/cairo-sphinx + rm -rf $(TARGET_libdir)/cairo/cairo-fdr* + rm -rf $(TARGET_libdir)/cairo/cairo-sphinx* + rm -rf $(TARGET_libdir)/cairo/.debug/cairo-fdr* + rm -rf $(TARGET_libdir)/cairo/.debug/cairo-sphinx* $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(CAIRO_DIR) @@ -221,7 +221,7 @@ harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(HARFBUZZ_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --with-cairo \ --with-fontconfig \ --with-freetype \ diff --git a/make/target-libs.mk b/make/target-libs.mk index c0990c9a..49a3729e 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -20,9 +20,9 @@ zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(ZLIB_DIR); \ $(call apply_patches, $(ZLIB_PATCH)); \ $(MAKE_ENV) \ - mandir=$(remove-mandir) \ + mandir=$(REMOVE_mandir) \ ./configure \ - --prefix= \ + --prefix=$(prefix) \ --shared \ --uname=Linux \ ; \ @@ -47,8 +47,8 @@ libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBFUSE_SOURCE) $(CHDIR)/$(LIBFUSE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --disable-static \ --disable-example \ --disable-mtab \ @@ -61,8 +61,8 @@ libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - rm -rf $(TARGET_DIR)/etc/udev - rm -rf $(TARGET_DIR)/etc/init.d/fuse + rm -rf $(TARGET_sysconfdir)/udev + rm -rf $(TARGET_sysconfdir)/init.d/fuse $(REMOVE)/$(LIBFUSE_DIR) $(TOUCH) @@ -81,7 +81,7 @@ libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBUPNP_SOURCE) $(CHDIR)/$(LIBUPNP_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared \ --disable-static \ ; \ @@ -108,7 +108,7 @@ libdvbsi: | $(TARGET_DIR) $(CHDIR)/$(LIBDVBSI_DIR); \ $(call apply_patches, $(LIBDVBSI_PATCH)); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared \ --enable-silent-rules \ --disable-static \ @@ -136,7 +136,7 @@ giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(GIFLIB_DIR); \ $(MAKE_ENV) \ $(MAKE); \ - $(MAKE) install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX= + $(MAKE) install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) $(REMOVE)/$(GIFLIB_DIR) $(TOUCH) @@ -159,8 +159,8 @@ libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBCURL_SOURCE) $(CHDIR)/$(LIBCURL_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --disable-manual \ --disable-file \ --disable-rtsp \ @@ -179,16 +179,16 @@ libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) --without-libidn \ --with-ca-bundle=$(CA-BUNDLE_DIR)/$(CA-BUNDLE) \ --with-random=/dev/urandom \ - --with-ssl=$(TARGET_DIR) \ - --with-librtmp=$(TARGET_LIB_DIR) \ + --with-ssl=$(TARGET_prefix) \ + --with-librtmp=$(TARGET_libdir) \ --enable-optimize \ $(LIBCURL_CONF) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv $(TARGET_BIN_DIR)/curl-config $(HOST_DIR)/bin/ + mv $(TARGET_bindir)/curl-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/curl-config - rm -f $(TARGET_SHARE_DIR)/zsh + rm -f $(TARGET_datadir)/zsh $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(LIBCURL_DIR) @@ -216,15 +216,15 @@ libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBPNG_DIR); \ $(call apply_patches, $(LIBPNG_PATCH)); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --enable-silent-rules \ --disable-static \ $(LIBPNG_CONF) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv $(TARGET_BIN_DIR)/libpng*-config $(HOST_DIR)/bin/ + mv $(TARGET_bindir)/libpng*-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -259,8 +259,8 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) autoconf $(CHDIR)/$(FREETYPE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --enable-shared \ --disable-static \ --enable-freetype-config \ @@ -271,13 +271,13 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - ln -sf freetype2 $(TARGET_INCLUDE_DIR)/freetype - mv $(TARGET_BIN_DIR)/freetype-config $(HOST_DIR)/bin + ln -sf freetype2 $(TARGET_includedir)/freetype + mv $(TARGET_bindir)/freetype-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(FREETYPE_DIR) \ - $(TARGET_SHARE_DIR)/aclocal + $(TARGET_datadir)/aclocal $(TOUCH) # ----------------------------------------------------------------------------- @@ -304,7 +304,7 @@ libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - rm -f $(addprefix $(TARGET_BIN_DIR)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) + rm -f $(addprefix $(TARGET_bindir)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) $(REMOVE)/$(LIBJPEG-TURBO_DIR) $(TOUCH) @@ -349,27 +349,27 @@ openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(TARGET_LDFLAGS) \ \ --cross-compile-prefix=$(TARGET_CROSS) \ - --prefix=/ \ + --prefix=$(prefix)/ \ --openssldir=/etc/ssl \ ; \ sed -i "s| build_tests||" Makefile; \ - sed -i 's|^MANDIR=.*|MANDIR=$(remove-mandir)|' Makefile; \ - sed -i 's|^HTMLDIR=.*|HTMLDIR=$(remove-htmldir)|' Makefile; \ + sed -i 's|^MANDIR=.*|MANDIR=$(REMOVE_mandir)|' Makefile; \ + sed -i 's|^HTMLDIR=.*|HTMLDIR=$(REMOVE_htmldir)|' Makefile; \ $(MAKE) depend; \ $(MAKE); \ $(MAKE) install_sw INSTALL_PREFIX=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - rm -rf $(TARGET_LIB_DIR)/engines - rm -f $(TARGET_BIN_DIR)/c_rehash - rm -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget} + rm -rf $(TARGET_libdir)/engines + rm -f $(TARGET_bindir)/c_rehash + rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.pl,tsget} ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) - rm -f $(TARGET_BIN_DIR)/openssl - rm -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*} + rm -f $(TARGET_bindir)/openssl + rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.*,c_*} endif - chmod 0755 $(TARGET_LIB_DIR)/lib{crypto,ssl}.so.* + chmod 0755 $(TARGET_libdir)/lib{crypto,ssl}.so.* for version in 0.9.7 0.9.8 1.0.2; do \ - ln -sf libcrypto.so.1.0.0 $(TARGET_LIB_DIR)/libcrypto.so.$$version; \ - ln -sf libssl.so.1.0.0 $(TARGET_LIB_DIR)/libssl.so.$$version; \ + ln -sf libcrypto.so.1.0.0 $(TARGET_libdir)/libcrypto.so.$$version; \ + ln -sf libssl.so.1.0.0 $(TARGET_libdir)/libssl.so.$$version; \ done $(REMOVE)/$(OPENSSL_DIR) $(TOUCH) @@ -393,10 +393,10 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(NCURSES_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --enable-pc-files \ --with-pkg-config \ - --with-pkg-config-libdir=/lib/pkgconfig \ + --with-pkg-config-libdir=$(libdir)/pkgconfig \ --with-shared \ --with-fallbacks='linux vt100 xterm' \ --disable-big-core \ @@ -410,15 +410,12 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) libs; \ $(MAKE) install.libs DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_LIB_DIR)/,libform* libmenu* libpanel*) + rm -f $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*) rm -f $(addprefix $(PKG_CONFIG_PATH)/,form.pc menu.pc panel.pc) rm -f $(HOST_DIR)/bin/ncurses* - mv $(TARGET_BIN_DIR)/ncurses6-config $(HOST_DIR)/bin + mv $(TARGET_bindir)/ncurses6-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/ncurses6-config $(REWRITE_PKGCONF_PC) - ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/curses.h - ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/ncurses.h - ln -sf ./ncurses/term.h $(TARGET_INCLUDE_DIR)/term.h $(REMOVE)/$(NCURSES_DIR) $(TOUCH) @@ -434,7 +431,7 @@ openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(TARGET_LIB_DIR)/cmake + rm -f $(TARGET_libdir)/cmake $(REMOVE)/$(NI-OPENTHREADS) $(REWRITE_PKGCONF_PC) $(TOUCH) @@ -454,7 +451,7 @@ libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBUSB_SOURCE) $(CHDIR)/$(LIBUSB_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --disable-udev \ ; \ $(MAKE); \ @@ -484,11 +481,11 @@ libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGE $(CHDIR)/$(LIBUSB-COMPAT_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(LIBUSB-COMPAT_PATCH))); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ - mv $(TARGET_BIN_DIR)/libusb-config $(HOST_DIR)/bin + mv $(TARGET_bindir)/libusb-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -513,8 +510,8 @@ libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBGD_DIR); \ ./bootstrap.sh; \ $(CONFIGURE) \ - --prefix= \ - --bindir=$(remove-bindir) \ + --prefix=$(prefix) \ + --bindir=$(REMOVE_bindir) \ --without-fontconfig \ --without-xpm \ --without-x \ @@ -543,12 +540,12 @@ libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) $(CPDIR)/$(LIBDPF_SOURCE) $(CHDIR)/$(LIBDPF_DIR)/dpflib; \ $(call apply_patches, $(LIBDPF_PATCH)); \ - make libdpf.a CC=$(TARGET_CC) PREFIX=$(TARGET_DIR); \ - mkdir -p $(TARGET_INCLUDE_DIR)/libdpf; \ - cp dpf.h $(TARGET_INCLUDE_DIR)/libdpf/libdpf.h; \ - cp ../include/spiflash.h $(TARGET_INCLUDE_DIR)/libdpf/; \ - cp ../include/usbuser.h $(TARGET_INCLUDE_DIR)/libdpf/; \ - cp libdpf.a $(TARGET_LIB_DIR)/ + make libdpf.a CC=$(TARGET_CC) PREFIX=$(TARGET_prefix); \ + mkdir -p $(TARGET_includedir)/libdpf; \ + cp dpf.h $(TARGET_includedir)/libdpf/libdpf.h; \ + cp ../include/spiflash.h $(TARGET_includedir)/libdpf/; \ + cp ../include/usbuser.h $(TARGET_includedir)/libdpf/; \ + cp libdpf.a $(TARGET_libdir)/ $(REMOVE)/$(LIBDPF_DIR) $(TOUCH) @@ -567,9 +564,9 @@ lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LZO_SOURCE) $(CHDIR)/$(LZO_DIR); \ $(CONFIGURE) \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ - --prefix= \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ + --prefix=$(prefix) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -592,14 +589,14 @@ libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBSIGC_SOURCE) $(CHDIR)/$(LIBSIGC_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --disable-documentation \ --enable-silent-rules \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ - cp sigc++config.h $(TARGET_INCLUDE_DIR) - ln -sf ./sigc++-2.0/sigc++ $(TARGET_INCLUDE_DIR)/sigc++ + cp sigc++config.h $(TARGET_includedir) + ln -sf ./sigc++-2.0/sigc++ $(TARGET_includedir)/sigc++ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(LIBSIGC_DIR) @@ -624,9 +621,9 @@ expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(EXPAT_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_mandir) \ --enable-shared \ --disable-static \ --without-xmlwf \ @@ -662,7 +659,7 @@ libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(LIBBLURAY_PATCH)); \ ./bootstrap; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared \ --disable-static \ --disable-extra-warnings \ @@ -705,7 +702,7 @@ libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(LIBASS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --disable-static \ --disable-test \ --disable-fontconfig \ @@ -738,8 +735,8 @@ libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.linux-uclibcgnueabi.h; \ popd; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-maintainer-mode \ --enable-shared \ --disable-doc \ @@ -749,11 +746,11 @@ libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv $(TARGET_BIN_DIR)/gpg-error-config $(HOST_DIR)/bin + mv $(TARGET_bindir)/gpg-error-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/gpg-error-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - rm -f $(addprefix $(TARGET_BIN_DIR)/,gpg-error gpgrt-config) + rm -f $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config) $(REMOVE)/$(LIBGPG-ERROR_DIR) $(TOUCH) @@ -774,8 +771,8 @@ libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBGCRYPT_SOURCE) $(CHDIR)/$(LIBGCRYPT_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ @@ -784,12 +781,12 @@ libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv $(TARGET_BIN_DIR)/libgcrypt-config $(HOST_DIR)/bin + mv $(TARGET_bindir)/libgcrypt-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/libgcrypt-config $(REWRITE_LIBTOOL_LA) - rm -rf $(TARGET_BIN_DIR)/dumpsexp - rm -rf $(TARGET_BIN_DIR)/hmac256 - rm -rf $(TARGET_BIN_DIR)/mpicalc + rm -rf $(TARGET_bindir)/dumpsexp + rm -rf $(TARGET_bindir)/hmac256 + rm -rf $(TARGET_bindir)/mpicalc $(REMOVE)/$(LIBGCRYPT_DIR) $(TOUCH) @@ -811,7 +808,7 @@ libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBAACS_DIR); \ ./bootstrap; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ @@ -845,7 +842,7 @@ libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBBDPLUS_DIR); \ ./bootstrap; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ @@ -877,10 +874,10 @@ libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBXML2_DIR); \ $(APPLY_PATCHES); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared \ --disable-static \ - --datarootdir=$(remove-datarootdir) \ + --datarootdir=$(REMOVE_datarootdir) \ --without-python \ --without-debug \ --without-c14n \ @@ -893,12 +890,12 @@ libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mv $(TARGET_BIN_DIR)/xml2-config $(HOST_DIR)/bin + mv $(TARGET_bindir)/xml2-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/xml2-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh - rm -rf $(TARGET_LIB_DIR)/cmake + rm -rf $(TARGET_libdir)/xml2Conf.sh + rm -rf $(TARGET_libdir)/cmake $(REMOVE)/$(LIBXML2_DIR) $(TOUCH) @@ -922,7 +919,7 @@ pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR) $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_LIB_DIR)/cmake + rm -rf $(TARGET_libdir)/cmake $(REMOVE)/$(PUGIXML_DIR) $(TOUCH) @@ -941,7 +938,7 @@ libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBROXML_SOURCE) $(CHDIR)/$(LIBROXML_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --disable-roxml \ ; \ $(MAKE); \ @@ -957,14 +954,14 @@ RTMPDUMP_DEPS = zlib openssl RTMPDUMP_MAKE_OPTS = \ prefix= \ - mandir=$(remove-mandir) + mandir=$(REMOVE_mandir) rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) $(REMOVE)/$(NI-RTMPDUMP) tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-RTMPDUMP); \ $(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \ - $(MAKE) $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) + $(MAKE) $(RTMPDUMP_MAKE_OPTS) install prefix=$(prefix) DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_DIR)/sbin/rtmpgw rm -rf $(TARGET_DIR)/sbin/rtmpsrv rm -rf $(TARGET_DIR)/sbin/rtmpsuck @@ -994,15 +991,19 @@ libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ --disable-gssapi \ --enable-silent-rules \ - --mandir=$(remove-mandir) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) +ifeq ($(BOXSERIES), hd1) + sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_sysconfdir)/netconfig +endif $(REMOVE)/$(LIBTIRPC_DIR) $(TOUCH) @@ -1021,9 +1022,9 @@ confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(CONFUSE_SOURCE) $(CHDIR)/$(CONFUSE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_mandir) \ --enable-silent-rules \ --enable-static \ --disable-shared \ @@ -1049,9 +1050,9 @@ libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBITE_SOURCE) $(CHDIR)/$(LIBITE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-docdir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_docdir) \ --enable-silent-rules \ --enable-static \ --disable-shared \ @@ -1086,7 +1087,7 @@ libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(LIBMAD_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --enable-shared=yes \ --enable-accuracy \ --enable-fpm=arm \ @@ -1118,7 +1119,7 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGE sed -i '122 s/^/#/' configure.in; \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ @@ -1142,8 +1143,8 @@ libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LIBOGG_SOURCE) $(CHDIR)/$(LIBOGG_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-shared \ ; \ $(MAKE); \ @@ -1168,8 +1169,8 @@ fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(FRIBIDI_SOURCE) $(CHDIR)/$(FRIBIDI_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --disable-debug \ --disable-deprecated \ ; \ @@ -1200,8 +1201,8 @@ libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LIBFFI_DIR); \ $(call apply_patches, $(LIBFFI_PATCH)); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ $(LIBFFI_CONF) \ ; \ $(MAKE) all; \ @@ -1250,8 +1251,8 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) echo "ac_cv_func_posix_getgrgid_r=yes" >> arm-linux.cache; \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --cache-file=arm-linux.cache \ --disable-debug \ --disable-selinux \ @@ -1265,7 +1266,7 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) $(GLIB2_CONF) \ ; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_BIN_DIR)/,gapplication gdbus* gio* glib* gobject-query gresource gsettings gtester*) + rm -f $(addprefix $(TARGET_bindir)/,gapplication gdbus* gio* glib* gobject-query gresource gsettings gtester*) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(GLIB2_DIR) @@ -1288,8 +1289,8 @@ alsa-lib: $(DL_DIR)/$(ALSA-LIB_SOURCE) $(APPLY_PATCHES); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --with-alsa-devdir=/dev/snd/ \ --with-plugindir=/lib/alsa \ --without-debug \ @@ -1327,8 +1328,8 @@ popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(POPT_SOURCE) $(CHDIR)/$(POPT_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -1354,8 +1355,8 @@ libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR) sed -i -e '/preload/d' Makefile.in; \ $(CONFIGURE) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ --target=$(TARGET) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-static \ --disable-shared \ --enable-relocatable \ @@ -1386,7 +1387,7 @@ GRAPHLCD_BASE_MAKE_OPTS = \ $(MAKE_ENV) \ CXXFLAGS+="-fPIC" \ TARGET=$(TARGET_CROSS) \ - PREFIX= \ + PREFIX=$(prefix) \ DESTDIR=$(TARGET_DIR) graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) @@ -1399,6 +1400,6 @@ graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcddrivers all; \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcdgraphics install; \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcddrivers install; \ - $(INSTALL_DATA) -D graphlcd.conf $(TARGET_DIR)/etc/graphlcd.conf + $(INSTALL_DATA) -D graphlcd.conf $(TARGET_sysconfdir)/graphlcd.conf $(REMOVE)/$(GRAPHLCD_BASE_DIR) $(TOUCH) diff --git a/make/target-lua.mk b/make/target-lua.mk index 18c45e04..417ebb2d 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -31,10 +31,10 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) AR="$(TARGET_AR) rcu" \ LDFLAGS="$(TARGET_LDFLAGS)" \ ; \ - $(MAKE) install INSTALL_TOP=$(TARGET_DIR) INSTALL_MAN=$(TARGET_DIR)$(remove-man1dir); \ - $(MAKE) pc INSTALL_TOP=$(TARGET_DIR) > $(PKG_CONFIG_PATH)/lua.pc + $(MAKE) install INSTALL_TOP=$(TARGET_prefix) INSTALL_MAN=$(TARGET_DIR)$(REMOVE_man1dir); \ + $(MAKE) pc INSTALL_TOP=$(TARGET_prefix) > $(PKG_CONFIG_PATH)/lua.pc $(REWRITE_PKGCONF_PC) - rm -rf $(TARGET_DIR)/bin/luac + rm -rf $(TARGET_bindir)/luac $(REMOVE)/$(LUA_DIR) $(TOUCH) @@ -54,15 +54,15 @@ luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUAEXPAT_DIR) $(UNTAR)/$(LUAEXPAT_SOURCE) $(CHDIR)/$(LUAEXPAT_DIR); \ - sed -i 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_INCLUDE_DIR)|' makefile; \ - sed -i 's|^CFLAGS =.*|& -L$(TARGET_LIB_DIR)|' makefile; \ + sed -i 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_includedir)|' makefile; \ + sed -i 's|^CFLAGS =.*|& -L$(TARGET_libdir)|' makefile; \ sed -i 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \ $(MAKE_ENV) \ $(MAKE) \ - PREFIX=$(TARGET_DIR) \ + PREFIX=$(TARGET_prefix) \ LUA_SYS_VER=$(LUA_ABIVER); \ $(MAKE) install \ - PREFIX=$(TARGET_DIR) \ + PREFIX=$(TARGET_prefix) \ LUA_SYS_VER=$(LUA_ABIVER) $(REMOVE)/$(LUAEXPAT_DIR) $(TOUCH) @@ -87,7 +87,7 @@ lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TA $(CHDIR)/$(LUA-FEEDPARSER_DIR); \ sed -i 's|^PREFIX =|PREFIX ?=|' Makefile; \ $(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \ - $(MAKE) install PREFIX=$(TARGET_DIR) + $(MAKE) install PREFIX=$(TARGET_prefix) $(REMOVE)/$(LUA-FEEDPARSER_DIR) $(TOUCH) @@ -102,8 +102,8 @@ $(DL_DIR)/$(LUAJSON_SOURCE): luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR) $(CD) $(DL_DIR); \ curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_SITE)/$(LUAJSON_SOURCE) || true - $(INSTALL_DATA) -D $(DL_DIR)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER) - ln -sf $(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)/json.lua + $(INSTALL_DATA) -D $(DL_DIR)/$(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER) + ln -sf $(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua $(TOUCH) # ----------------------------------------------------------------------------- @@ -116,17 +116,20 @@ LUACURL_SITE = https://github.com/lua-curl/$(LUACURL_SOURCE) LUACURL_DEPS = libcurl lua luacurl: $(LUACURL_DEPS) | $(TARGET_DIR) + echo $(TARGET_libdir) + echo $(TARGET_includedir) + echo $(TARGET_datadir) $(REMOVE)/$(LUACURL_DIR) $(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE) $(CPDIR)/$(LUACURL_SOURCE) $(CHDIR)/$(LUACURL_DIR); \ $(MAKE_ENV) \ $(MAKE) \ - LIBDIR=$(TARGET_LIB_DIR) \ - LUA_INC=$(TARGET_INCLUDE_DIR); \ + LIBDIR=$(TARGET_libdir) \ + LUA_INC=$(TARGET_includedir); \ $(MAKE) install DESTDIR=$(TARGET_DIR) \ - LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ - LUA_LMOD=/share/lua/$(LUA_ABIVER) + LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \ + LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER) $(REMOVE)/$(LUACURL_DIR) $(TOUCH) @@ -140,8 +143,7 @@ LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive $(DL_DIR)/$(LUAPOSIX_SOURCE): $(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VER).tar.gz -O $(@) -LUAPOSIX_PATCH = luaposix-fix-build.patch -LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch +LUAPOSIX_PATCH = luaposix-fix-docdir-build.patch LUAPOSIX_DEPS = $(HOST_LUA) lua luaexpat @@ -170,12 +172,12 @@ luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOUR ./bootstrap; \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --exec-prefix= \ - --libdir=$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER) \ - --datarootdir=$(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER) \ - --mandir=$(TARGET_DIR)$(remove-mandir) \ - --docdir=$(TARGET_DIR)$(remove-docdir) \ + --prefix=$(prefix) \ + --exec-prefix=$(exec_prefix) \ + --libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \ + --datarootdir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \ + --mandir=$(TARGET_DIR)$(REMOVE_mandir) \ + --docdir=$(TARGET_DIR)$(REMOVE_docdir) \ --enable-silent-rules \ ; \ $(MAKE); \ diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk index 12277066..e2f9c613 100644 --- a/make/target-rootfs.mk +++ b/make/target-rootfs.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- target-finish: .version update.urls symbolic-links - sed -i 's|%(YEAR)|$(shell date +%Y)|' $(TARGET_DIR)/etc/init.d/rcS + sed -i 's|%(YEAR)|$(shell date +%Y)|' $(TARGET_sysconfdir)/init.d/rcS ifeq ($(BOXTYPE), armbox) make e2-multiboot endif @@ -29,8 +29,8 @@ endif # ----------------------------------------------------------------------------- -update.urls: $(TARGET_DIR)/var/etc/update.urls -$(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR) +update.urls: $(TARGET_localstatedir)/etc/update.urls +$(TARGET_localstatedir)/etc/update.urls: | $(TARGET_DIR) echo "$(NI-SERVER)/update.php" > $(@) echo "$(CHANNELLISTS_SITE)/$(CHANNELLISTS_MD5FILE)" >> $(@) @@ -39,46 +39,45 @@ $(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR) # create symbolic links in TARGET_DIR symbolic-links: | $(TARGET_DIR) $(CD) $(TARGET_DIR); \ - ln -sf /var/root root; \ - ln -sf /var/root home - $(CD) $(TARGET_DIR)/var; \ + ln -sf /var/root ./root; \ + ln -sf /var/root ./home; \ + ln -sf /usr/share ./share + $(CD) $(TARGET_localstatedir); \ rm -rf run; ln -sf /tmp run; \ rm -rf tmp; ln -sf /tmp tmp - $(CD) $(TARGET_DIR)/etc; \ + $(CD) $(TARGET_sysconfdir); \ ln -sf /proc/mounts mtab ifeq ($(PERSISTENT_VAR_PARTITION), yes) - $(CD) $(TARGET_DIR)/etc; \ + $(CD) $(TARGET_sysconfdir); \ ln -sf /var/etc/exports exports; \ ln -sf /var/etc/hostname hostname; \ ln -sf /var/etc/localtime localtime; \ ln -sf /var/etc/passwd passwd; \ ln -sf /var/etc/resolv.conf resolv.conf; \ ln -sf /var/etc/wpa_supplicant.conf wpa_supplicant.conf - $(CD) $(TARGET_DIR)/etc/network; \ + $(CD) $(TARGET_sysconfdir)/network; \ ln -sf /var/etc/network/interfaces interfaces endif - mkdir -p $(TARGET_DIR)/var/tuxbox/config - $(CD) $(TARGET_DIR)/var/tuxbox/config; \ + mkdir -p $(TARGET_localstatedir)/tuxbox/config + $(CD) $(TARGET_localstatedir)/tuxbox/config; \ ln -sf /var/keys/SoftCam.Key SoftCam.Key - $(CD) $(TARGET_USR_DIR); \ - ln -sf /share share # ----------------------------------------------------------------------------- e2-multiboot: | $(TARGET_DIR) - mkdir -p $(TARGET_USR_BIN_DIR) - echo -e "#!/bin/sh\necho Nope!" > $(TARGET_USR_BIN_DIR)/enigma2 - chmod 0755 $(TARGET_USR_BIN_DIR)/enigma2 + mkdir -p $(TARGET_bindir) + echo -e "#!/bin/sh\necho Nope!" > $(TARGET_bindir)/enigma2 + chmod 0755 $(TARGET_bindir)/enigma2 # - echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_DIR)/etc/issue + echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_sysconfdir)/issue # - mkdir -p $(TARGET_SHARE_DIR) - touch $(TARGET_SHARE_DIR)/bootlogo.mvi + mkdir -p $(TARGET_datadir) + touch $(TARGET_datadir)/bootlogo.mvi # - mkdir -p $(TARGET_DIR)/var/lib/opkg - touch $(TARGET_DIR)/var/lib/opkg/status + mkdir -p $(TARGET_localstatedir)/lib/opkg + touch $(TARGET_localstatedir)/lib/opkg/status # - $(INSTALL_DATA) $(TARGET_DIR)/.version $(TARGET_DIR)/etc/image-version + $(INSTALL_DATA) $(TARGET_DIR)/.version $(TARGET_sysconfdir)/image-version # ----------------------------------------------------------------------------- @@ -106,24 +105,32 @@ $(ROOTFS): | $(TARGET_DIR) # cleanup root filesystem from useless stuff rootfs-cleanup: $(ROOTFS) - rm -rf $(ROOTFS)$(remove-dir) - rm -rf $(ROOTFS)/include - rm -rf $(ROOTFS)/lib/pkgconfig - rm -rf $(ROOTFS)/lib/sigc++* - rm -rf $(ROOTFS)/lib/glib-2.0 - rm -f $(ROOTFS)/lib/libvorbisenc* + rm -rf $(ROOTFS)$(REMOVE_dir) + rm -rf $(ROOTFS)$(base_includedir) + rm -rf $(ROOTFS)$(includedir) + rm -rf $(ROOTFS)$(libdir)/pkgconfig + rm -rf $(ROOTFS)$(libdir)/sigc++* + rm -rf $(ROOTFS)$(libdir)/glib-2.0 + rm -f $(ROOTFS)$(libdir)/libvorbisenc* find $(ROOTFS) \( -name .gitignore -o -name .gitkeep \) -type f -print0 | xargs --no-run-if-empty -0 rm -f find $(ROOTFS) \( -name Makefile.am \) -type f -print0 | xargs --no-run-if-empty -0 rm -f - find $(ROOTFS)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f + find $(ROOTFS)$(base_libdir) \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f + find $(ROOTFS)$(libdir) \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f @echo -e "$(TERM_YELLOW)" + @echo -n "After cleanup: " @du -sh $(ROOTFS) @echo -e "$(TERM_NORMAL)" # ----------------------------------------------------------------------------- -ROOTFS-STRIP_DIRS = /bin -ROOTFS-STRIP_DIRS += /sbin -ROOTFS-STRIP_DIRS += /share/tuxbox/neutrino/plugins +ROOTFS-STRIP_BINS = $(base_bindir) +ROOTFS-STRIP_BINS += $(base_sbindir) +ROOTFS-STRIP_BINS += $(bindir) +ROOTFS-STRIP_BINS += $(sbindir) +ROOTFS-STRIP_BINS += /usr/share/tuxbox/neutrino/plugins + +ROOTFS-STRIP_LIBS = $(base_libdir) +ROOTFS-STRIP_LIBS += $(libdir) # strip bins and libs in root filesystem rootfs-strip: $(ROOTFS) @@ -131,20 +138,23 @@ ifneq ($(DEBUG), yes) $(call draw_line); @echo "The following warnings from strip are harmless!" $(call draw_line); - for dir in $(ROOTFS-STRIP_DIRS); do \ + for dir in $(ROOTFS-STRIP_BINS); do \ find $(ROOTFS)$${dir} -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \ done - find $(ROOTFS)/lib \( \ - -path $(ROOTFS)/lib/libnexus.so -o \ - -path $(ROOTFS)/lib/libnxpl.so -o \ - -path $(ROOTFS)/lib/libv3ddriver.so -o \ - \ - -path $(ROOTFS)/lib/modules \) -prune -o \ - -type f -print0 | xargs -0 $(TARGET_STRIP) || true + for dir in $(ROOTFS-STRIP_LIBS); do \ + find $(ROOTFS)$${dir} \( \ + -path $(ROOTFS)/lib/libnexus.so -o \ + -path $(ROOTFS)/lib/libnxpl.so -o \ + -path $(ROOTFS)/lib/libv3ddriver.so -o \ + \ + -path $(ROOTFS)/lib/modules \) -prune -o \ + -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \ + done ifeq ($(BOXSERIES), hd2) find $(ROOTFS)/lib/modules/$(KERNEL_VER)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET_OBJCOPY) --strip-unneeded endif @echo -e "$(TERM_YELLOW)" + @echo -n "After strip: " @du -sh $(ROOTFS) @echo -e "$(TERM_NORMAL)" endif @@ -189,7 +199,7 @@ endif PHONY += target-finish PHONY += .version $(TARGET_DIR)/.version -PHONY += update.urls $(TARGET_DIR)/var/etc/update.urls +PHONY += update.urls $(TARGET_localstatedir)/etc/update.urls PHONY += symbolic-links PHONY += e2-multiboot PHONY += personalize diff --git a/make/target-scripts.mk b/make/target-scripts.mk index 4a783aad..df5a0fba 100644 --- a/make/target-scripts.mk +++ b/make/target-scripts.mk @@ -4,152 +4,152 @@ # ----------------------------------------------------------------------------- init-scripts: \ - $(TARGET_DIR)/etc/init.d/globals \ - $(TARGET_DIR)/etc/init.d/functions \ - $(TARGET_DIR)/etc/init.d/rc \ - $(TARGET_DIR)/etc/init.d/rcK \ + $(TARGET_sysconfdir)/init.d/globals \ + $(TARGET_sysconfdir)/init.d/functions \ + $(TARGET_sysconfdir)/init.d/rc \ + $(TARGET_sysconfdir)/init.d/rcK \ \ - $(TARGET_DIR)/etc/init.d/camd \ - $(TARGET_DIR)/etc/init.d/camd_datefix \ - $(TARGET_DIR)/etc/init.d/coredump \ - $(TARGET_DIR)/etc/init.d/crond \ - $(TARGET_DIR)/etc/init.d/custom-poweroff \ - $(TARGET_DIR)/etc/init.d/fstab \ - $(TARGET_DIR)/etc/init.d/hostname \ - $(TARGET_DIR)/etc/init.d/inetd \ - $(TARGET_DIR)/etc/init.d/mdev \ - $(TARGET_DIR)/etc/init.d/networking \ - $(TARGET_DIR)/etc/init.d/partitions-by-name \ - $(TARGET_DIR)/etc/init.d/proc \ - $(TARGET_DIR)/etc/init.d/resizerootfs \ - $(TARGET_DIR)/etc/init.d/swap \ - $(TARGET_DIR)/etc/init.d/sys_update.sh \ - $(TARGET_DIR)/etc/init.d/syslogd \ - $(TARGET_DIR)/etc/init.d/sendsigs \ - $(TARGET_DIR)/etc/init.d/umountfs \ - $(TARGET_DIR)/etc/init.d/suspend \ - $(TARGET_DIR)/etc/init.d/user-initscripts - -$(TARGET_DIR)/etc/init.d/globals: + $(TARGET_sysconfdir)/init.d/camd \ + $(TARGET_sysconfdir)/init.d/camd_datefix \ + $(TARGET_sysconfdir)/init.d/coredump \ + $(TARGET_sysconfdir)/init.d/crond \ + $(TARGET_sysconfdir)/init.d/custom-poweroff \ + $(TARGET_sysconfdir)/init.d/fstab \ + $(TARGET_sysconfdir)/init.d/hostname \ + $(TARGET_sysconfdir)/init.d/inetd \ + $(TARGET_sysconfdir)/init.d/mdev \ + $(TARGET_sysconfdir)/init.d/networking \ + $(TARGET_sysconfdir)/init.d/partitions-by-name \ + $(TARGET_sysconfdir)/init.d/proc \ + $(TARGET_sysconfdir)/init.d/resizerootfs \ + $(TARGET_sysconfdir)/init.d/swap \ + $(TARGET_sysconfdir)/init.d/sys_update.sh \ + $(TARGET_sysconfdir)/init.d/syslogd \ + $(TARGET_sysconfdir)/init.d/sendsigs \ + $(TARGET_sysconfdir)/init.d/umountfs \ + $(TARGET_sysconfdir)/init.d/suspend \ + $(TARGET_sysconfdir)/init.d/user-initscripts + +$(TARGET_sysconfdir)/init.d/globals: $(INSTALL_DATA) -D $(TARGET_FILES)/scripts/init.globals $(@) -$(TARGET_DIR)/etc/init.d/functions: +$(TARGET_sysconfdir)/init.d/functions: $(INSTALL_DATA) -D $(TARGET_FILES)/scripts/init.functions $(@) -$(TARGET_DIR)/etc/init.d/rc: +$(TARGET_sysconfdir)/init.d/rc: $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rc $(@) -$(TARGET_DIR)/etc/init.d/rcK: +$(TARGET_sysconfdir)/init.d/rcK: $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcK $(@) -$(TARGET_DIR)/etc/init.d/camd: +$(TARGET_sysconfdir)/init.d/camd: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/camd.init $(@) $(UPDATE-RC.D) $(@F) defaults 98 01 -$(TARGET_DIR)/etc/init.d/camd_datefix: +$(TARGET_sysconfdir)/init.d/camd_datefix: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/camd_datefix.init $(@) -$(TARGET_DIR)/etc/init.d/coredump: +$(TARGET_sysconfdir)/init.d/coredump: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/coredump.init $(@) $(UPDATE-RC.D) $(@F) start 40 S . -$(TARGET_DIR)/etc/init.d/crond: +$(TARGET_sysconfdir)/init.d/crond: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/crond.init $(@) $(UPDATE-RC.D) $(@F) defaults 50 -$(TARGET_DIR)/etc/init.d/custom-poweroff: +$(TARGET_sysconfdir)/init.d/custom-poweroff: ifeq ($(BOXTYPE), coolstream) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/custom-poweroff.init $(@) $(UPDATE-RC.D) $(@F) start 99 0 6 . endif -$(TARGET_DIR)/etc/init.d/fstab: +$(TARGET_sysconfdir)/init.d/fstab: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/fstab.init $(@) $(UPDATE-RC.D) $(@F) defaults 01 98 -$(TARGET_DIR)/etc/init.d/hostname: +$(TARGET_sysconfdir)/init.d/hostname: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/hostname.init $(@) -$(TARGET_DIR)/etc/init.d/inetd: +$(TARGET_sysconfdir)/init.d/inetd: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inetd.init $(@) $(UPDATE-RC.D) $(@F) defaults 50 -$(TARGET_DIR)/etc/init.d/mdev: +$(TARGET_sysconfdir)/init.d/mdev: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/mdev.init $(@) -$(TARGET_DIR)/etc/init.d/networking: +$(TARGET_sysconfdir)/init.d/networking: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/networking.init $(@) $(UPDATE-RC.D) $(@F) stop 98 0 6 . -$(TARGET_DIR)/etc/init.d/partitions-by-name: +$(TARGET_sysconfdir)/init.d/partitions-by-name: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@) endif -$(TARGET_DIR)/etc/init.d/proc: +$(TARGET_sysconfdir)/init.d/proc: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/proc.init $(@) $(UPDATE-RC.D) $(@F) start 90 S . endif -$(TARGET_DIR)/etc/init.d/resizerootfs: +$(TARGET_sysconfdir)/init.d/resizerootfs: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/resizerootfs.init $(@) endif -$(TARGET_DIR)/etc/init.d/swap: +$(TARGET_sysconfdir)/init.d/swap: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/swap.init $(@) $(UPDATE-RC.D) $(@F) stop 98 0 6 . endif -$(TARGET_DIR)/etc/init.d/sys_update.sh: +$(TARGET_sysconfdir)/init.d/sys_update.sh: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sys_update.sh $(@) -$(TARGET_DIR)/etc/init.d/syslogd: +$(TARGET_sysconfdir)/init.d/syslogd: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/syslogd.init $(@) $(UPDATE-RC.D) $(@F) stop 98 0 6 . -$(TARGET_DIR)/etc/init.d/sendsigs: +$(TARGET_sysconfdir)/init.d/sendsigs: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sendsigs.init $(@) $(UPDATE-RC.D) $(@F) start 85 0 . endif -$(TARGET_DIR)/etc/init.d/umountfs: +$(TARGET_sysconfdir)/init.d/umountfs: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/umountfs.init $(@) $(UPDATE-RC.D) $(@F) start 86 0 . endif -$(TARGET_DIR)/etc/init.d/suspend: +$(TARGET_sysconfdir)/init.d/suspend: ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/suspend.init $(@) $(UPDATE-RC.D) $(@F) start 89 0 . endif -$(TARGET_DIR)/etc/init.d/user-initscripts: +$(TARGET_sysconfdir)/init.d/user-initscripts: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/user-initscripts.init $(@) $(UPDATE-RC.D) $(@F) defaults 98 01 # ----------------------------------------------------------------------------- scripts: \ - $(TARGET_DIR)/sbin/service \ - $(TARGET_DIR)/sbin/flash_eraseall \ - $(TARGET_DIR)/sbin/update-rc.d \ - $(TARGET_SHARE_DIR)/udhcpc/default.script + $(TARGET_sbindir)/service \ + $(TARGET_sbindir)/flash_eraseall \ + $(TARGET_sbindir)/update-rc.d \ + $(TARGET_datadir)/udhcpc/default.script -$(TARGET_DIR)/sbin/service: +$(TARGET_sbindir)/service: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/service $(@) -$(TARGET_DIR)/sbin/flash_eraseall: +$(TARGET_sbindir)/flash_eraseall: ifeq ($(BOXTYPE), coolstream) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/flash_eraseall $(@) endif -$(TARGET_DIR)/sbin/update-rc.d: +$(TARGET_sbindir)/update-rc.d: $(INSTALL_EXEC) -D $(HELPERS_DIR)/update-rc.d $(@) -$(TARGET_SHARE_DIR)/udhcpc/default.script: +$(TARGET_datadir)/udhcpc/default.script: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/udhcpc-default.script $(@) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 1c4e35f0..4f29c935 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -24,17 +24,17 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(USBUTILS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --infodir=$(remove-infodir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --infodir=$(REMOVE_infodir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_BIN_DIR)/lsusb.py - rm -rf $(TARGET_BIN_DIR)/usbhid-dump + rm -rf $(TARGET_bindir)/lsusb.py + rm -rf $(TARGET_bindir)/usbhid-dump rm -rf $(TARGET_DIR)/sbin/update-usbids.sh - rm -rf $(TARGET_SHARE_DIR)/pkgconfig - rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz + rm -rf $(TARGET_datadir)/pkgconfig + rm -rf $(TARGET_datadir)/usb.ids.gz $(REMOVE)/$(USBUTILS_DIR) $(TOUCH) @@ -56,7 +56,7 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(BINUTILS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --disable-multilib \ --disable-werror \ --disable-plugins \ @@ -66,7 +66,7 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ for bin in $(BINUTILS_BIN); do \ - $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_DIR)/bin/; \ + $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_bindir)/; \ done $(REMOVE)/$(BINUTILS_DIR) $(TOUCH) @@ -89,8 +89,8 @@ util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(UTIL-LINUX_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(base_prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-static \ --disable-shared \ --disable-hardlink \ @@ -138,7 +138,7 @@ astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR) $(CHDIR)/$(ASTRA-SM_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --without-lua \ ; \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -163,7 +163,7 @@ iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR) sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \ $(MAKE_ENV) \ $(MAKE) linux-arm; \ - $(INSTALL_EXEC) iozone $(TARGET_BIN_DIR)/ + $(INSTALL_EXEC) iozone $(TARGET_bindir)/ $(REMOVE)/$(IOZONE_DIR) $(TOUCH) @@ -182,8 +182,8 @@ readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(READLINE_SOURCE) $(CHDIR)/$(READLINE_DIR); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) diff --git a/make/target-tools.mk b/make/target-tools.mk index 903cedc8..a2bffef5 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -96,16 +96,16 @@ endef define BUSYBOX_ADD_TO_SHELLS if grep -q 'CONFIG_ASH=y' $(BUSYBOX_BUILD_CONFIG); then \ - grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \ - || echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \ + grep -qsE '^/bin/ash$$' $(TARGET_sysconfdir)/shells \ + || echo "/bin/ash" >> $(TARGET_sysconfdir)/shells; \ fi if grep -q 'CONFIG_HUSH=y' $(BUSYBOX_BUILD_CONFIG); then \ - grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \ - || echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \ + grep -qsE '^/bin/hush$$' $(TARGET_sysconfdir)/shells \ + || echo "/bin/hush" >> $(TARGET_sysconfdir)/shells; \ fi if grep -q 'CONFIG_SH_IS_ASH=y\|CONFIG_SH_IS_HUSH=y' $(BUSYBOX_BUILD_CONFIG); then \ - grep -qsE '^/bin/sh$$' $(TARGET_DIR)/etc/shells \ - || echo "/bin/sh" >> $(TARGET_DIR)/etc/shells; \ + grep -qsE '^/bin/sh$$' $(TARGET_sysconfdir)/shells \ + || echo "/bin/sh" >> $(TARGET_sysconfdir)/shells; \ fi endef @@ -144,10 +144,10 @@ openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) NETSTAT="/bin/netstat" \ ROUTE="/sbin/route" \ IPROUTE="/sbin/ip" \ - --prefix= \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ - --infodir=$(remove-infodir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ + --infodir=$(REMOVE_infodir) \ --enable-shared \ --disable-static \ --enable-small \ @@ -181,15 +181,16 @@ openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR) export ac_cv_search_dlopen=no; \ ./configure \ $(CONFIGURE_OPTS) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ - --infodir=$(remove-infodir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ + --infodir=$(REMOVE_infodir) \ + --sysconfdir=$(sysconfdir)/ssh \ + --libexecdir=$(sbindir) \ --with-pid-dir=/tmp \ --with-privsep-path=/var/empty \ - --with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) -I$(TARGET_INCLUDE_DIR)" \ - --with-ldflags="-L$(TARGET_LIB_DIR)" \ - --libexecdir=/bin \ + --with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) -I$(TARGET_includedir)" \ + --with-ldflags="-L$(TARGET_libdir)" \ --disable-strip \ --disable-lastlog \ --disable-utmp \ @@ -238,11 +239,11 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) done; \ test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \ done; \ - mkdir -p $(TARGET_SHARE_DIR); \ - rm -rf $(TARGET_SHARE_DIR)/zoneinfo; \ - mv zoneinfo/ $(TARGET_SHARE_DIR)/ - $(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml - $(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)$(ETC_LOCALTIME) + mkdir -p $(TARGET_datadir); \ + rm -rf $(TARGET_datadir)/zoneinfo; \ + mv zoneinfo/ $(TARGET_datadir)/ + $(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_sysconfdir)/timezone.xml + $(INSTALL_DATA) $(TARGET_datadir)/zoneinfo/CET $(TARGET_DIR)$(ETC_LOCALTIME) $(REMOVE)/$(TZDATA_DIR) $(TOUCH) @@ -264,21 +265,21 @@ mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(MTD-UTILS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --enable-silent-rules \ --disable-tests \ --without-xattr \ ; \ $(MAKE) ifeq ($(BOXSERIES), hd2) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nanddump $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandtest $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandwrite $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mtd_debug $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mkfs.jffs2 $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nanddump $(TARGET_sbindir) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandtest $(TARGET_sbindir) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandwrite $(TARGET_sbindir) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mtd_debug $(TARGET_sbindir) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mkfs.jffs2 $(TARGET_sbindir) endif - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/flash_erase $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/flash_erase $(TARGET_sbindir) $(REMOVE)/$(MTD-UTILS_DIR) $(TOUCH) @@ -301,8 +302,8 @@ iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(IPERF_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -333,9 +334,9 @@ parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --infodir=$(remove-infodir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --infodir=$(REMOVE_infodir) \ --enable-silent-rules \ --enable-shared \ --disable-static \ @@ -368,7 +369,7 @@ hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(HDPARM_DIR); \ $(MAKE_ENV) \ $(MAKE); \ - $(INSTALL_EXEC) -D hdparm $(TARGET_DIR)/sbin/hdparm + $(INSTALL_EXEC) -D hdparm $(TARGET_sbindir)/hdparm $(REMOVE)/$(HDPARM_DIR) $(TOUCH) @@ -388,7 +389,7 @@ hd-idle: $(DL_DIR)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(HD-IDLE_DIR); \ $(MAKE_ENV) \ $(MAKE); \ - $(INSTALL_EXEC) -D hd-idle $(TARGET_DIR)/sbin/hd-idle + $(INSTALL_EXEC) -D hd-idle $(TARGET_sbindir)/hd-idle $(REMOVE)/$(HD-IDLE_DIR) $(TOUCH) @@ -414,10 +415,10 @@ coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(base_prefix) \ --bindir=/bin.$(@F) \ - --libexecdir=$(remove-libexecdir) \ - --datarootdir=$(remove-datarootdir) \ + --libexecdir=$(REMOVE_libexecdir) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-silent-rules \ --disable-xattr \ --disable-libcap \ @@ -428,8 +429,8 @@ coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for bin in $(COREUTILS_BIN); do \ - rm -f $(TARGET_DIR)/bin/$$bin; \ - $(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \ + rm -f $(TARGET_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_bindir)/$$bin; \ done $(REMOVE)/$(COREUTILS_DIR) \ $(TARGET_DIR)/bin.$(@F) @@ -453,8 +454,8 @@ less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(LESS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -480,7 +481,7 @@ ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) $(APPLY_PATCHES); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --disable-debugging \ --with-shared \ --with-crypto \ @@ -488,8 +489,8 @@ ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) --without-ntpsnmpd \ ; \ $(MAKE); \ - $(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_DIR)/sbin/ntpdate - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate + $(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_sbindir)/ntpdate + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ntpdate.init $(TARGET_sysconfdir)/init.d/ntpdate $(REMOVE)/$(NTP_DIR) $(TOUCH) @@ -522,12 +523,12 @@ djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) touch libupnp/config.aux/config.rpath; \ autoreconf -fi; \ $(CONFIGURE) -C \ - --prefix= \ + --prefix=$(prefix) \ --disable-debug \ ; \ make; \ make install DESTDIR=$(TARGET_DIR) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_sysconfdir)/init.d/djmount $(UPDATE-RC.D) djmount defaults 75 25 $(REMOVE)/$(DJMOUNT_DIR) $(TOUCH) @@ -555,20 +556,19 @@ ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE)| $(TARGET_DIR) $(call apply_patches, $(USHARE_PATCH)); \ $(MAKE_ENV) \ ./configure \ - --prefix= \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ --disable-dlna \ --disable-nls \ --cross-compile \ --cross-prefix=$(TARGET_CROSS) \ ; \ - 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) - $(INSTALL_DATA) -D $(TARGET_FILES)/configs/ushare.conf $(TARGET_DIR)/etc/ushare.conf - sed -i 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_DIR)/etc/ushare.conf - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/ushare.conf $(TARGET_sysconfdir)/ushare.conf + sed -i 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_sysconfdir)/ushare.conf + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ushare.init $(TARGET_sysconfdir)/init.d/ushare $(UPDATE-RC.D) ushare defaults 75 25 $(REMOVE)/$(USHARE_DIR) $(TOUCH) @@ -589,10 +589,10 @@ smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(SMARTMONTOOLS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ ; \ $(MAKE); \ - $(INSTALL_EXEC) -D smartctl $(TARGET_DIR)/sbin/smartctl + $(INSTALL_EXEC) -D smartctl $(TARGET_sbindir)/smartctl $(REMOVE)/$(SMARTMONTOOLS_DIR) $(TOUCH) @@ -614,18 +614,18 @@ inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(INADYN_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --libdir=$(TARGET_LIB_DIR) \ - --includedir=$(TARGET_INCLUDE_DIR) \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ + --prefix=$(prefix) \ + --libdir=$(TARGET_libdir) \ + --includedir=$(TARGET_includedir) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ --enable-openssl \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(INSTALL_DATA) -D $(TARGET_FILES)/configs/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf - ln -sf /var/etc/inadyn.conf $(TARGET_DIR)/etc/inadyn.conf - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/inadyn.conf $(TARGET_localstatedir)/etc/inadyn.conf + ln -sf /var/etc/inadyn.conf $(TARGET_sysconfdir)/inadyn.conf + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inadyn.init $(TARGET_sysconfdir)/init.d/inadyn $(UPDATE-RC.D) inadyn defaults 75 25 $(REMOVE)/$(INADYN_DIR) $(TOUCH) @@ -656,11 +656,11 @@ vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ $(MAKE) clean; \ $(MAKE) $(MAKE_ENV) LIBS="-lcrypt -lcrypto -lssl"; \ - $(INSTALL_EXEC) -D vsftpd $(TARGET_DIR)/sbin/vsftpd - mkdir -p $(TARGET_SHARE_DIR)/empty - $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf - $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd + $(INSTALL_EXEC) -D vsftpd $(TARGET_sbindir)/vsftpd + mkdir -p $(TARGET_datadir)/empty + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.conf $(TARGET_sysconfdir)/vsftpd.conf + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.chroot_list $(TARGET_sysconfdir)/vsftpd.chroot_list + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vsftpd.init $(TARGET_sysconfdir)/init.d/vsftpd $(UPDATE-RC.D) vsftpd defaults 75 25 $(REMOVE)/$(VSFTPD_DIR) $(TOUCH) @@ -691,17 +691,18 @@ procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(base_prefix) \ --bindir=/bin.$(@F) \ --sbindir=/sbin.$(@F) \ - --datarootdir=$(remove-datarootdir) \ + --includedir=$(includedir) \ + --datarootdir=$(REMOVE_datarootdir) \ --without-systemd \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for bin in $(PROCPS-NG_BIN); do \ - rm -f $(TARGET_DIR)/bin/$$bin; \ - $(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \ + rm -f $(TARGET_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_bindir)/$$bin; \ done $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) @@ -729,8 +730,8 @@ nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR) export ac_cv_prog_NCURSESW_CONFIG=false; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --disable-nls \ --enable-tiny \ ; \ @@ -760,11 +761,11 @@ minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(MINICOM_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --disable-nls \ ; \ $(MAKE); \ - $(INSTALL_EXEC) src/minicom $(TARGET_DIR)/bin + $(INSTALL_EXEC) src/minicom $(TARGET_bindir) $(REMOVE)/$(MINICOM_DIR) $(TOUCH) @@ -781,8 +782,8 @@ $(DL_DIR)/$(BASH_SOURCE): BASH_PATCH = $(PATCHES)/bash define BASH_ADD_TO_SHELLS - grep -qsE '^/bin/bash$$' $(TARGET_DIR)/etc/shells \ - || echo "/bin/bash" >> $(TARGET_DIR)/etc/shells + grep -qsE '^/bin/bash$$' $(TARGET_sysconfdir)/shells \ + || echo "/bin/bash" >> $(TARGET_sysconfdir)/shells endef bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) @@ -791,13 +792,13 @@ bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(BASH_DIR); \ $(call apply_patches, $(BASH_PATCH), 0); \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - -rm $(addprefix $(TARGET_LIB_DIR)/bash/, loadables.h Makefile.inc) + -rm $(addprefix $(TARGET_libdir)/bash/, loadables.h Makefile.inc) $(BASH_ADD_TO_SHELLS) $(REMOVE)/$(BASH_DIR) $(TOUCH) @@ -821,8 +822,9 @@ e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix=/ \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ + --datarootdir=$(REMOVE_datarootdir) \ --disable-nls \ --disable-profile \ --disable-e2initrd-helper \ @@ -850,8 +852,8 @@ e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR); \ cd lib/uuid/; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_DIR)/bin/, chattr compile_et lsattr mk_cmds uuidgen) - -rm $(addprefix $(TARGET_DIR)/sbin/, dumpe2fs e2freefrag e2mmpstatus e2undo e4crypt filefrag logsave) + -rm $(addprefix $(TARGET_bin)/, chattr compile_et lsattr mk_cmds uuidgen) + -rm $(addprefix $(TARGET_sbindir)/, dumpe2fs e2freefrag e2mmpstatus e2undo e4crypt filefrag logsave) $(REWRITE_PKGCONF_PC) $(REMOVE)/$(E2FSPROGS_DIR) $(TOUCH) @@ -871,18 +873,18 @@ ntfs-3g: $(DL_DIR)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(NTFS-3G_SOURCE) $(CHDIR)/$(NTFS-3G_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ --disable-ntfsprogs \ --disable-ldconfig \ --disable-library \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_DIR)/bin/,lowntfs-3g ntfs-3g.probe) - -rm $(addprefix $(TARGET_DIR)/sbin/,mount.lowntfs-3g) - ln -sf /bin/ntfs-3g $(TARGET_DIR)/sbin/mount.ntfs + -rm $(addprefix $(TARGET_bindir)/,lowntfs-3g ntfs-3g.probe) + -rm $(addprefix $(TARGET_sbindir)/,mount.lowntfs-3g) + ln -sf ntfs-3g $(TARGET_sbindir)/mount.ntfs $(REMOVE)/$(NTFS-3G_DIR) $(TOUCH) @@ -917,8 +919,8 @@ autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) export ac_cv_path_RANLIB=$(TARGET_RANLIB); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ --enable-ignore-busy \ --disable-mount-locking \ --without-openldap \ @@ -969,14 +971,14 @@ samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba33-config.site; \ $(CONFIGURE) \ - --prefix=/ \ + --prefix=$(prefix)/ \ --datadir=/var/samba \ - --datarootdir=$(remove-datarootdir) \ + --datarootdir=$(REMOVE_datarootdir) \ --localstatedir=/var/samba \ --sysconfdir=/etc/samba \ --with-configdir=/etc/samba \ --with-privatedir=/etc/samba \ - --with-modulesdir=$(remove-libdir)/samba \ + --with-modulesdir=$(REMOVE_libdir)/samba \ --with-sys-quotas=no \ --with-piddir=/var/run \ --enable-static \ @@ -1004,17 +1006,17 @@ samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) --disable-relro \ --disable-swat \ ; \ - $(MAKE) all; \ + $(MAKE1) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mkdir -p $(TARGET_DIR)/var/samba/locks - $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf - $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba + mkdir -p $(TARGET_localstatedir)/samba/locks + $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf + $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 - rm -rf $(TARGET_DIR)/bin/testparm - rm -rf $(TARGET_DIR)/bin/findsmb - rm -rf $(TARGET_DIR)/bin/smbtar - rm -rf $(TARGET_DIR)/bin/smbclient - rm -rf $(TARGET_DIR)/bin/smbpasswd + rm -rf $(TARGET_bindir)/testparm + rm -rf $(TARGET_bindir)/findsmb + rm -rf $(TARGET_bindir)/smbtar + rm -rf $(TARGET_bindir)/smbclient + rm -rf $(TARGET_bindir)/smbpasswd $(REMOVE)/$(SAMBA33_DIR) $(TOUCH) @@ -1052,14 +1054,14 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba36-config.site; \ $(CONFIGURE) \ - --prefix=/ \ + --prefix=$(prefix)/ \ --datadir=/var/samba \ - --datarootdir=$(remove-datarootdir) \ + --datarootdir=$(REMOVE_datarootdir) \ --localstatedir=/var/samba \ --sysconfdir=/etc/samba \ --with-configdir=/etc/samba \ --with-privatedir=/etc/samba \ - --with-modulesdir=$(remove-libdir)/samba \ + --with-modulesdir=$(REMOVE_libdir)/samba \ --with-piddir=/var/run \ --with-sys-quotas=no \ --enable-static \ @@ -1087,15 +1089,15 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - mkdir -p $(TARGET_DIR)/var/samba/locks - $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf - $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba + mkdir -p $(TARGET_localstatedir)/samba/locks + $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf + $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 - rm -rf $(TARGET_DIR)/bin/testparm - rm -rf $(TARGET_DIR)/bin/findsmb - rm -rf $(TARGET_DIR)/bin/smbtar - rm -rf $(TARGET_DIR)/bin/smbclient - rm -rf $(TARGET_DIR)/bin/smbpasswd + rm -rf $(TARGET_bindir)/testparm + rm -rf $(TARGET_bindir)/findsmb + rm -rf $(TARGET_bindir)/smbtar + rm -rf $(TARGET_bindir)/smbclient + rm -rf $(TARGET_bindir)/smbpasswd $(REMOVE)/$(SAMBA36_DIR) $(TOUCH) @@ -1116,8 +1118,8 @@ dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(DROPBEAR_SOURCE) $(CHDIR)/$(DROPBEAR_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --disable-lastlog \ --disable-pututxline \ --disable-wtmp \ @@ -1134,13 +1136,11 @@ dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) # disable SMALL_CODE define; \ echo '#define DROPBEAR_SMALL_CODE 0' >> localoptions.h; \ # fix PATH define; \ - echo '#define DEFAULT_PATH "/sbin:/bin:/var/bin"' >> localoptions.h; \ - # remove /usr prefix; \ - sed -i 's|/usr/|/|g' default_options.h; \ + echo '#define DEFAULT_PATH "/usr/sbin:/usr/bin:/var/bin"' >> localoptions.h; \ $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \ $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR) - mkdir -p $(TARGET_DIR)/etc/dropbear - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear + mkdir -p $(TARGET_sysconfdir)/dropbear + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/dropbear.init $(TARGET_sysconfdir)/init.d/dropbear $(UPDATE-RC.D) dropbear defaults 75 25 $(REMOVE)/$(DROPBEAR_DIR) $(TOUCH) @@ -1162,18 +1162,18 @@ sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(SG3_UTILS_SOURCE) $(CHDIR)/$(SG3_UTILS_DIR); \ $(CONFIGURE) \ - --prefix= \ + --prefix=$(prefix) \ --bindir=/bin.$(@F) \ - --mandir=$(remove-mandir) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for bin in $(SG3_UTILS_BIN); do \ - rm -f $(TARGET_DIR)/bin/$$bin; \ - $(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \ + rm -f $(TARGET_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_bindir)/$$bin; \ done $(REWRITE_LIBTOOL_LA) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_sysconfdir)/init.d/sdX $(UPDATE-RC.D) sdX stop 97 0 6 . $(REMOVE)/$(SG3_UTILS_DIR) \ $(TARGET_DIR)/bin.$(@F) @@ -1202,7 +1202,7 @@ fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) sed -i 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ sed -i '/strip fbshot/d' Makefile; \ $(MAKE) all; \ - $(INSTALL_EXEC) -D fbshot $(TARGET_DIR)/bin/fbshot + $(INSTALL_EXEC) -D fbshot $(TARGET_bindir)/fbshot $(REMOVE)/$(FBSHOT_DIR) $(TOUCH) @@ -1222,14 +1222,14 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) $(CHDIR)/$(LCD4LINUX_DIR); \ ./bootstrap; \ $(CONFIGURE) \ - --libdir=$(TARGET_LIB_DIR) \ - --includedir=$(TARGET_INCLUDE_DIR) \ - --bindir=$(TARGET_DIR)/bin \ - --prefix= \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ - --infodir=$(remove-infodir) \ - --with-ncurses=$(TARGET_LIB_DIR) \ + --libdir=$(TARGET_libdir) \ + --includedir=$(TARGET_includedir) \ + --bindir=$(TARGET_bindir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ + --infodir=$(REMOVE_infodir) \ + --with-ncurses=$(TARGET_libdir) \ --with-drivers='DPF, SamsungSPF, PNG' \ --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' \ ; \ @@ -1253,8 +1253,8 @@ samsunglcd4linux: | $(TARGET_DIR) $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_SITE)/$(SAMSUNGLCD4LINUX_SOURCE) $(DL_DIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CHDIR)/$(SAMSUNGLCD4LINUX_DIR)/ni; \ - $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \ - $(INSTALL_COPY) share/* $(TARGET_SHARE_DIR) + $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_sysconfdir); \ + $(INSTALL_COPY) share/* $(TARGET_datadir) $(REMOVE)/$(SAMSUNGLCD4LINUX_DIR) $(TOUCH) @@ -1277,9 +1277,9 @@ wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TA $(INSTALL_DATA) $(CONFIGS)/wpa_supplicant.config .config; \ $(MAKE_ENV) \ $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh + $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=$(sbindir) + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_sysconfdir)/network/pre-wlan0.sh + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/post-wlan0.sh $(TARGET_sysconfdir)/network/post-wlan0.sh $(REMOVE)/$(WPA_SUPPLICANT_DIR) $(TOUCH) @@ -1293,7 +1293,6 @@ XUPNPD_SITE = https://github.com/clark15b XUPNPD_PATCH = xupnpd-dynamic-lua.patch XUPNPD_PATCH += xupnpd-fix-memleak.patch XUPNPD_PATCH += xupnpd-fix-webif-backlinks.diff -XUPNPD_PATCH += xupnpd-change-XUPNPDROOTDIR.diff XUPNPD_PATCH += xupnpd-add-configuration-files.diff XUPNPD_DEPS = lua openssl @@ -1307,17 +1306,17 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) $(call apply_patches, $(XUPNPD_PATCH)) $(CHDIR)/$(XUPNPD_DIR)/src; \ $(MAKE_ENV) \ - $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \ - $(INSTALL_EXEC) -D xupnpd $(TARGET_BIN_DIR)/; \ - mkdir -p $(TARGET_SHARE_DIR)/xupnpd/config; \ - $(INSTALL_COPY) plugins profiles ui www *.lua $(TARGET_SHARE_DIR)/xupnpd/ - rm $(TARGET_SHARE_DIR)/xupnpd/plugins/staff/xupnpd_18plus.lua - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_vimeo.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd + $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_includedir)"; \ + $(INSTALL_EXEC) -D xupnpd $(TARGET_bindir)/; \ + mkdir -p $(TARGET_datadir)/xupnpd/config; \ + $(INSTALL_COPY) plugins profiles ui www *.lua $(TARGET_datadir)/xupnpd/ + rm $(TARGET_datadir)/xupnpd/plugins/staff/xupnpd_18plus.lua + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_vimeo.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_sysconfdir)/init.d/xupnpd $(UPDATE-RC.D) xupnpd defaults 75 25 $(INSTALL_COPY) $(TARGET_FILES)/xupnpd/* $(TARGET_DIR)/ $(REMOVE)/$(XUPNPD_DIR) @@ -1344,9 +1343,9 @@ dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --docdir=$(remove-docdir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --docdir=$(REMOVE_docdir) \ --without-udev \ --enable-compat-symlinks \ CFLAGS="$(DOSFSTOOLS_CFLAGS)" \ @@ -1370,7 +1369,6 @@ NFS-UTILS_PATCH = nfs-utils_01-Patch-taken-from-Gentoo.patch NFS-UTILS_PATCH += nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch NFS-UTILS_PATCH += nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch NFS-UTILS_PATCH += nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch -NFS-UTILS_PATCH += nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch NFS-UTILS_DEPS = rpcbind @@ -1385,9 +1383,9 @@ nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_mandir) \ --enable-maintainer-mode \ --disable-nfsv4 \ --disable-nfsv41 \ @@ -1401,16 +1399,10 @@ nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - chmod 0755 $(TARGET_DIR)/sbin/mount.nfs - rm -rf $(TARGET_DIR)/sbin/mountstats - rm -rf $(TARGET_DIR)/sbin/nfsiostat - rm -rf $(TARGET_DIR)/sbin/osd_login - rm -rf $(TARGET_DIR)/sbin/start-statd - rm -rf $(TARGET_DIR)/sbin/mount.nfs* - rm -rf $(TARGET_DIR)/sbin/umount.nfs* - rm -rf $(TARGET_DIR)/sbin/showmount - rm -rf $(TARGET_DIR)/sbin/rpcdebug - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd + chmod 0755 $(TARGET_base_sbindir)/mount.nfs + rm -f $(addprefix $(TARGET_base_sbindir)/,mount.nfs4 osd_login umount.nfs umount.nfs4) + rm -f $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat) + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/nfsd.init $(TARGET_sysconfdir)/init.d/nfsd $(UPDATE-RC.D) nfsd defaults 75 25 $(REMOVE)/$(NFS-UTILS_DIR) $(TOUCH) @@ -1438,18 +1430,15 @@ rpcbind: $(RPCBIND_DEPS) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --enable-silent-rules \ --with-rpcuser=root \ --with-systemdsystemunitdir=no \ - --mandir=$(remove-mandir) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) -ifeq ($(BOXSERIES), hd1) - sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_DIR)/etc/netconfig -endif - rm -rf $(TARGET_DIR)/bin/rpcgen + rm -rf $(TARGET_bindir)/rpcgen $(REMOVE)/$(RPCBIND_DIR) $(TOUCH) @@ -1471,9 +1460,9 @@ fuse-exfat: $(FUSE-EXFAT_DEPS) $(DL_DIR)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(FUSE-EXFAT_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -1498,9 +1487,9 @@ exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(EXFAT-UTILS_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --docdir=$(remove-docdir) \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --docdir=$(REMOVE_docdir) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -1518,15 +1507,14 @@ streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ - --includedir=$(TARGET_INCLUDE_DIR) \ - --datarootdir=$(remove-datarootdir) \ + --includedir=$(TARGET_includedir) \ + --datarootdir=$(REMOVE_datarootdir) \ --with-included-argv=yes \ --with-included-libmad=no \ ; \ $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) - $(INSTALL_EXEC) $(TARGET_FILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/ - $(REMOVE)/$(NI-STREAMRIPPER) + $(INSTALL_EXEC) -D streamripper $(TARGET_bindir)/streamripper + $(INSTALL_EXEC) $(TARGET_FILES)/scripts/streamripper.sh $(TARGET_bindir)/ $(TOUCH) # ----------------------------------------------------------------------------- @@ -1545,9 +1533,9 @@ gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(GETTEXT_DIR)/gettext-runtime; \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --bindir=$(remove-bindir) \ - --datarootdir=$(remove-datarootdir) \ + --prefix=$(prefix) \ + --bindir=$(REMOVE_bindir) \ + --datarootdir=$(REMOVE_datarootdir) \ --disable-libasprintf \ --disable-acl \ --disable-openmp \ @@ -1582,8 +1570,9 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) $(APPLY_PATCHES); \ autoreconf -fi; \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ + --mandir=$(REMOVE_mandir) \ --enable-maintainer-mode \ --enable-silent-rules \ \ @@ -1600,8 +1589,8 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_SHARE_DIR)/mc/examples - find $(TARGET_SHARE_DIR)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm + rm -rf $(TARGET_datadir)/mc/examples + find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm $(REMOVE)/$(MC_DIR) $(TOUCH) @@ -1629,9 +1618,9 @@ wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) $(call apply_patches, $(addprefix $(@F)/,$(WGET_PATCH))); \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ - --datarootdir=$(remove-datarootdir) \ - --sysconfdir=$(remove-sysconfdir) \ + --prefix=$(prefix) \ + --datarootdir=$(REMOVE_datarootdir) \ + --sysconfdir=$(REMOVE_sysconfdir) \ --with-gnu-ld \ --with-ssl=openssl \ --disable-debug \ @@ -1650,9 +1639,10 @@ ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) $(CHDIR)/$(NI-OFGWRITE); \ $(MAKE_ENV) \ $(MAKE) - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_bindir) + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_bindir) + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite $(TARGET_bindir) + sed -i 's|prefix=.*|prefix=$(prefix)|' $(TARGET_bindir)/ofgwrite $(REMOVE)/$(NI-OFGWRITE) $(TOUCH) @@ -1676,7 +1666,7 @@ aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) automake --add-missing --copy --force-missing --foreign; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= \ + --prefix=$(prefix) \ --enable-silent-rules \ ; \ $(MAKE) all; \ @@ -1698,8 +1688,8 @@ dvbsnoop: | $(TARGET_DIR) $(CHDIR)/$(DVBSNOOP_DIR); \ $(CONFIGURE) \ --enable-silent-rules \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -1721,9 +1711,9 @@ ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(ETHTOOL_SOURCE) $(CHDIR)/$(ETHTOOL_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ - --libdir=$(TARGET_LIB_DIR) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ + --libdir=$(TARGET_libdir) \ --disable-pretty-dump \ ; \ $(MAKE); \ @@ -1754,7 +1744,7 @@ gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) sed -i 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \ $(MAKE_ENV) \ $(MAKE) sgdisk; \ - $(INSTALL_EXEC) -D sgdisk $(TARGET_DIR)/sbin/sgdisk + $(INSTALL_EXEC) -D sgdisk $(TARGET_sbindir)/sgdisk $(REMOVE)/$(GPTFDISK_DIR) $(TOUCH) @@ -1775,8 +1765,8 @@ rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(RSYNC_SOURCE) $(CHDIR)/$(RSYNC_DIR); \ $(CONFIGURE) \ - --prefix= \ - --mandir=$(remove-mandir) \ + --prefix=$(prefix) \ + --mandir=$(REMOVE_mandir) \ --disable-debug \ --disable-locale \ --disable-acl-support \ @@ -1800,11 +1790,11 @@ $(DL_DIR)/$(SYSVINIT_SOURCE): define SYSVINIT_INSTALL for sbin in halt init shutdown killall5 runlevel; do \ - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(SYSVINIT_DIR)/src/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \ + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(SYSVINIT_DIR)/src/$$sbin $(TARGET_base_sbindir)/$$sbin || exit 1; \ done - ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot - ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff - ln -sf /sbin/killall5 $(TARGET_DIR)/sbin/pidof + ln -sf /sbin/halt $(TARGET_base_sbindir)/reboot + ln -sf /sbin/halt $(TARGET_base_sbindir)/poweroff + ln -sf /sbin/killall5 $(TARGET_base_sbindir)/pidof endef sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) @@ -1826,6 +1816,9 @@ CA-BUNDLE_SITE = https://curl.haxx.se/ca $(DL_DIR)/$(CA-BUNDLE_SOURCE): $(DOWNLOAD) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) +CA-BUNDLE = ca-certificates.crt +CA-BUNDLE_DIR = /etc/ssl/certs + ca-bundle: $(DL_DIR)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR) $(CD) $(DL_DIR); \ curl --remote-name --time-cond $(CA-BUNDLE_SOURCE) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) || true diff --git a/patches/ext4_utils.mk b/patches/ext4_utils.mk new file mode 100644 index 00000000..5f4ed39a --- /dev/null +++ b/patches/ext4_utils.mk @@ -0,0 +1,103 @@ +# Makefile for ext4_utils + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +make_ext4fs_SRC_FILES += make_ext4fs_main.c +make_ext4fs_SRC_FILES += canned_fs_config.c +make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o) + +ext2simg_SRC_FILES += ext2simg.c +ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o) + +ext4fixup_SRC_FILES += ext4fixup_main.c +ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o) + +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libsparse +simg2img_SRC_FILES += simg2img.c +simg2img_SRC_FILES += sparse_crc32.c +simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o) + +img2simg_SRC_FILES += img2simg.c +img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o) + +simg2simg_SRC_FILES += simg2simg.c +simg2simg_SRC_FILES += sparse_crc32.c +simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o) + +libsparse_SRC_FILES += backed_block.c +libsparse_SRC_FILES += output_file.c +libsparse_SRC_FILES += sparse.c +libsparse_SRC_FILES += sparse_crc32.c +libsparse_SRC_FILES += sparse_err.c +libsparse_SRC_FILES += sparse_read.c +libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -DHOST +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +#CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg + +make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS) + $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \ + libext4_utils.a libsparse.a libselinux.a -lz -lpcre + +ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \ + libext4_utils.a libselinux.a libsparse.a -lz -lpcre + +ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz + +simg2img: libsparse.a $(simg2img_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz + +img2simg: libsparse.a $(img2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz + +simg2simg: libsparse.a $(simg2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +libsparse.a: $(libsparse_OBJS) + $(AR) rcs $@ $(libsparse_OBJS) + +libselinux.a: $(libselinux_OBJS) + $(AR) rcs $@ $(libselinux_OBJS) + +clean: + $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \ + $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \ + $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \ + make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a diff --git a/patches/lua-01-fix-LUA_ROOT.patch b/patches/lua-01-fix-LUA_ROOT.patch index b65193e2..02ba76fb 100644 --- a/patches/lua-01-fix-LUA_ROOT.patch +++ b/patches/lua-01-fix-LUA_ROOT.patch @@ -7,7 +7,7 @@ index 18be9a9..131747b 100644 #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" -#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/" ++#define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ diff --git a/patches/luaposix-fix-build.patch b/patches/luaposix-fix-build.patch deleted file mode 100644 index 6ed62c69..00000000 --- a/patches/luaposix-fix-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ee191f0f87af7903c0052c54ad0b9d4057c5708c Mon Sep 17 00:00:00 2001 -Message-Id: -From: striper -Date: Thu, 23 Jan 2014 22:31:51 +0100 -Subject: [PATCH] - fix luaposix build - ---- - ext/curses/curses.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/curses/curses.c b/ext/curses/curses.c -index 8750b3f..140e980 100644 ---- a/ext/curses/curses.c -+++ b/ext/curses/curses.c -@@ -44,7 +44,7 @@ - #else - # error "SysV or X/Open-compatible Curses header file required" - #endif --#include -+#include - - /* The extra indirection to these macros is required so that if the - arguments are themselves macros, they will get expanded too. */ --- -1.8.5.2 - diff --git a/patches/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch b/patches/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch deleted file mode 100644 index b3c5421b..00000000 --- a/patches/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 117b5e420519c376228766f0fda7dbda5beb980f Mon Sep 17 00:00:00 2001 -Message-Id: <117b5e420519c376228766f0fda7dbda5beb980f.1492181441.git.gandharva@gmx.de> -From: gandharva -Date: Fri, 14 Apr 2017 16:50:27 +0200 -Subject: [PATCH] - sm-notify: use /sbin instead of /usr/sbin - ---- - utils/statd/statd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/statd/statd.c b/utils/statd/statd.c -index 2b7a167..b2a251b 100644 ---- a/utils/statd/statd.c -+++ b/utils/statd/statd.c -@@ -194,7 +194,7 @@ static void run_sm_notify(int outport) - char *av[6]; - int ac = 0; - -- av[ac++] = "/usr/sbin/sm-notify"; -+ av[ac++] = "/sbin/sm-notify"; - if (run_mode & MODE_NODAEMON) - av[ac++] = "-d"; - if (outport) { -@@ -359,7 +359,7 @@ int main (int argc, char **argv) - } - - if (run_mode & MODE_NOTIFY_ONLY) { -- fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n", -+ fprintf(stderr, "%s: -N deprecated, consider using /sbin/sm-notify directly\n", - name_p); - run_sm_notify(out_port); - } --- -2.12.2 - diff --git a/patches/xupnpd-change-XUPNPDROOTDIR.diff b/patches/xupnpd-change-XUPNPDROOTDIR.diff deleted file mode 100644 index bbd9ef7b..00000000 --- a/patches/xupnpd-change-XUPNPDROOTDIR.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index be569a2..d00c2b9 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -43,7 +43,7 @@ int main(int argc,char** argv) - if(fp) - fclose(fp); - else -- rc=chdir("/usr/share/xupnpd/"); -+ rc=chdir("/share/xupnpd/"); - } - - lua_State* L=lua_open(); diff --git a/skel-root/general/ca-certificates/bin/c_rehash b/skel-root/general/ca-certificates/usr/bin/c_rehash similarity index 99% rename from skel-root/general/ca-certificates/bin/c_rehash rename to skel-root/general/ca-certificates/usr/bin/c_rehash index e9129b55..b2452c22 100755 --- a/skel-root/general/ca-certificates/bin/c_rehash +++ b/skel-root/general/ca-certificates/usr/bin/c_rehash @@ -167,7 +167,7 @@ if [ -n "${OPENSSL}" ] then SSL_CMD=$(which ${OPENSSL} 2>/dev/null) else - SSL_CMD=/bin/openssl + SSL_CMD=/usr/bin/openssl OPENSSL=${SSL_CMD} export OPENSSL fi diff --git a/skel-root/general/ca-certificates/bin/certsconf.sh b/skel-root/general/ca-certificates/usr/bin/certsconf.sh old mode 100755 new mode 100644 similarity index 87% rename from skel-root/general/ca-certificates/bin/certsconf.sh rename to skel-root/general/ca-certificates/usr/bin/certsconf.sh index 214544b3..706cfd07 --- a/skel-root/general/ca-certificates/bin/certsconf.sh +++ b/skel-root/general/ca-certificates/usr/bin/certsconf.sh @@ -1,7 +1,7 @@ #!/bin/sh CERTSCONF=/etc/ca-certificates.conf -CERTSDIR=/share/ca-certificates +CERTSDIR=/usr/share/ca-certificates rm -f $CERTSCONF diff --git a/skel-root/general/ca-certificates/sbin/update-ca-certificates b/skel-root/general/ca-certificates/usr/sbin/update-ca-certificates old mode 100755 new mode 100644 similarity index 97% rename from skel-root/general/ca-certificates/sbin/update-ca-certificates rename to skel-root/general/ca-certificates/usr/sbin/update-ca-certificates index 17e05d0f..73257f1c --- a/skel-root/general/ca-certificates/sbin/update-ca-certificates +++ b/skel-root/general/ca-certificates/usr/sbin/update-ca-certificates @@ -25,7 +25,7 @@ verbose=0 fresh=0 default=0 CERTSCONF=/etc/ca-certificates.conf -CERTSDIR=/share/ca-certificates +CERTSDIR=/usr/share/ca-certificates LOCALCERTSDIR=/var/share/ca-certificates CERTBUNDLE=ca-certificates.crt ETCCERTSDIR=/etc/ssl/certs @@ -180,7 +180,7 @@ fi chmod 0644 "$TEMPBUNDLE" mv -f "$TEMPBUNDLE" "$CERTBUNDLE" # Restore proper SELinux label after moving the file -[ -x /sbin/restorecon ] && /sbin/restorecon "$CERTBUNDLE" >/dev/null 2>&1 +[ -x /usr/sbin/restorecon ] && /usr/sbin/restorecon "$CERTBUNDLE" >/dev/null 2>&1 echo "$ADDED_CNT added, $REMOVED_CNT removed; done." diff --git a/skel-root/general/lcd4linux/etc/init.d/lcd4linux b/skel-root/general/lcd4linux/etc/init.d/lcd4linux index 4be1eaaa..8e6667a2 100755 --- a/skel-root/general/lcd4linux/etc/init.d/lcd4linux +++ b/skel-root/general/lcd4linux/etc/init.d/lcd4linux @@ -1,6 +1,6 @@ #!/bin/sh -[ -x /bin/lcd4linux ] || exit 1 +[ -x /usr/bin/lcd4linux ] || exit 1 [ -e /tmp/.lcd-* ] || exit 1 . /etc/init.d/globals @@ -18,7 +18,7 @@ configfile() { doStart() { ( # do always run in background while [ ! -e /tmp/.lcd4linux ]; do sleep 2; done - /bin/lcd4linux -f $(configfile) + /usr/bin/lcd4linux -f $(configfile) ) & } diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/10.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/10.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/10.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/10.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_standard.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_standard.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_standard.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_standard.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_standby.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_standby.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_standby.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_standby.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_user.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_user.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_user.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_user.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_xcam.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_xcam.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/1024x600/Samsung1024x600_xcam.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/1024x600/Samsung1024x600_xcam.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/10.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/10.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/10.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/10.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_standard.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_standard.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_standard.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_standard.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_standby.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_standby.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_standby.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_standby.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_user.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_user.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_user.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_user.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_xcam.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_xcam.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x480/Samsung800x480_xcam.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x480/Samsung800x480_xcam.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/10.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/10.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/10.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/10.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_standard.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_standard.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_standard.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_standard.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_standby.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_standby.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_standby.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_standby.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_user.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_user.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_user.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_user.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_xcam.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_xcam.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/800x600/Samsung800x600_xcam.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/800x600/Samsung800x600_xcam.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_d-box2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_d-box2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_d-box2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_d-box2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_large.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_large.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_large.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_large.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_radio.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_radio.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_radio.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_radio.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_small.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_small.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_small.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_small.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_standard.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_standard.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_standard.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_standard.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_standby.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_standby.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_standby.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_standby.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_user.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_user.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_user.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_user.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_xcam.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_xcam.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/background/Pearl_xcam.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/background/Pearl_xcam.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/blank.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/blank.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/blank.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/blank.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/dial.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/dial.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/dial.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/dial.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h0.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h0.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h0.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h0.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h00.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h00.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h00.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h00.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h01.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h01.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h01.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h01.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h02.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h02.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h02.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h02.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h03.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h03.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h03.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h03.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h04.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h04.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h04.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h04.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h05.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h05.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h05.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h05.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h06.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h06.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h06.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h06.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h07.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h07.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h07.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h07.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h08.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h08.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h08.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h08.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h09.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h09.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h09.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h09.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h10.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h10.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h10.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h10.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h11.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h11.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h11.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h11.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h12.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h12.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h12.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h12.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h13.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h13.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h13.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h13.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h14.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h14.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h14.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h14.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h15.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h15.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h15.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h15.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h16.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h16.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h16.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h16.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h17.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h17.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h17.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h17.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h18.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h18.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h18.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h18.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h19.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h19.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h19.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h19.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h20.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h20.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h20.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h20.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h21.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h21.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h21.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h21.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h22.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h22.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h22.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h22.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h23.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h23.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h23.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h23.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h24.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h24.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h24.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h24.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h25.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h25.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h25.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h25.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h26.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h26.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h26.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h26.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h27.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h27.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h27.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h27.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h28.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h28.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h28.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h28.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h29.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h29.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h29.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h29.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h30.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h30.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h30.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h30.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h31.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h31.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h31.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h31.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h32.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h32.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h32.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h32.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h33.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h33.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h33.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h33.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h34.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h34.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h34.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h34.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h35.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h35.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h35.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h35.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h36.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h36.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h36.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h36.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h37.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h37.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h37.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h37.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h38.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h38.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h38.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h38.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h39.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h39.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h39.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h39.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h40.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h40.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h40.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h40.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h41.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h41.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h41.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h41.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h42.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h42.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h42.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h42.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h43.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h43.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h43.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h43.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h44.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h44.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h44.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h44.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h45.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h45.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h45.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h45.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h46.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h46.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h46.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h46.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h47.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h47.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h47.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h47.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h48.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h48.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h48.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h48.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h49.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h49.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h49.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h49.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h50.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h50.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h50.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h50.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h51.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h51.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h51.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h51.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h52.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h52.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h52.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h52.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h53.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h53.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h53.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h53.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h54.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h54.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h54.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h54.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h55.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h55.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h55.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h55.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h56.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h56.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h56.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h56.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h57.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h57.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h57.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h57.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h58.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h58.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h58.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h58.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h59.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h59.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h59.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h59.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/h9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/h9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m00.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m00.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m00.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m00.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m01.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m01.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m01.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m01.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m02.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m02.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m02.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m02.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m03.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m03.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m03.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m03.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m04.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m04.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m04.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m04.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m05.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m05.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m05.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m05.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m06.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m06.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m06.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m06.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m07.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m07.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m07.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m07.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m08.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m08.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m08.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m08.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m09.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m09.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m09.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m09.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m10.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m10.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m10.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m10.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m11.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m11.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m11.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m11.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m12.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m12.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m12.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m12.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m13.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m13.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m13.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m13.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m14.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m14.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m14.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m14.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m15.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m15.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m15.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m15.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m16.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m16.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m16.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m16.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m17.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m17.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m17.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m17.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m18.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m18.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m18.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m18.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m19.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m19.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m19.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m19.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m20.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m20.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m20.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m20.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m21.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m21.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m21.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m21.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m22.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m22.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m22.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m22.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m23.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m23.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m23.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m23.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m24.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m24.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m24.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m24.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m25.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m25.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m25.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m25.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m26.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m26.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m26.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m26.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m27.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m27.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m27.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m27.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m28.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m28.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m28.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m28.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m29.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m29.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m29.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m29.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m30.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m30.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m30.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m30.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m31.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m31.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m31.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m31.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m32.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m32.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m32.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m32.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m33.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m33.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m33.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m33.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m34.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m34.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m34.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m34.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m35.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m35.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m35.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m35.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m36.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m36.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m36.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m36.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m37.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m37.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m37.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m37.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m38.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m38.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m38.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m38.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m39.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m39.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m39.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m39.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m40.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m40.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m40.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m40.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m41.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m41.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m41.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m41.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m42.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m42.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m42.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m42.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m43.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m43.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m43.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m43.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m44.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m44.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m44.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m44.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m45.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m45.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m45.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m45.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m46.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m46.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m46.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m46.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m47.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m47.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m47.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m47.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m48.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m48.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m48.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m48.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m49.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m49.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m49.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m49.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m50.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m50.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m50.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m50.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m51.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m51.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m51.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m51.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m52.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m52.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m52.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m52.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m53.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m53.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m53.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m53.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m54.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m54.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m54.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m54.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m55.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m55.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m55.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m55.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m56.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m56.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m56.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m56.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m57.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m57.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m57.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m57.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m58.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m58.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m58.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m58.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m59.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m59.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/analog/m59.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/analog/m59.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/0.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/0.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/0.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/0.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital/dp.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/dp.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital/dp.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital/dp.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/0.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/0.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/0.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/0.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/dp.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/dp.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_grau_129px/dp.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_grau_129px/dp.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/0.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/0.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/0.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/0.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/1.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/1.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/1.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/1.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/2.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/2.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/2.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/2.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/3.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/3.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/3.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/3.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/4.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/4.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/4.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/4.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/5.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/5.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/5.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/5.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/6.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/6.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/6.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/6.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/7.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/7.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/7.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/7.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/8.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/8.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/8.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/8.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/9.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/9.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/9.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/9.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/dp.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/dp.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/clock/digital_weiss_129px/dp.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/clock/digital_weiss_129px/dp.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/menu.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/menu.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/menu.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/menu.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ecm_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ecm_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ecm_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ecm_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ecm_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ecm_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ecm_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ecm_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/rec_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/rec_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/rec_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/rec_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/rec_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/rec_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/rec_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/rec_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/timer_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/timer_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/timer_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/timer_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/timer_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/timer_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/timer_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/timer_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ts_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ts_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ts_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ts_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ts_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ts_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/d-box2/ts_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/d-box2/ts_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/ecm_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ecm_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/ecm_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ecm_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/ecm_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ecm_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/ecm_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ecm_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/rec_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/rec_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/rec_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/rec_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/rec_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/rec_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/rec_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/rec_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/timer_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/timer_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/timer_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/timer_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/timer_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/timer_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/timer_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/timer_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/ts_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ts_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/ts_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ts_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/ts_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ts_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/ts_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/ts_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/weather_off.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/weather_off.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/weather_off.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/weather_off.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/mode/weather_on.png b/skel-root/general/lcd4linux/usr/share/lcd/icons/mode/weather_on.png similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/mode/weather_on.png rename to skel-root/general/lcd4linux/usr/share/lcd/icons/mode/weather_on.png diff --git a/skel-root/general/lcd4linux/share/lcd/icons/spf.txt b/skel-root/general/lcd4linux/usr/share/lcd/icons/spf.txt similarity index 100% rename from skel-root/general/lcd4linux/share/lcd/icons/spf.txt rename to skel-root/general/lcd4linux/usr/share/lcd/icons/spf.txt diff --git a/skel-root/general/links/share/tuxbox/neutrino/plugins/links.cfg b/skel-root/general/links/usr/share/tuxbox/neutrino/plugins/links.cfg similarity index 100% rename from skel-root/general/links/share/tuxbox/neutrino/plugins/links.cfg rename to skel-root/general/links/usr/share/tuxbox/neutrino/plugins/links.cfg diff --git a/skel-root/general/scripts/dropbear.init b/skel-root/general/scripts/dropbear.init index 26be09cc..5f3c6768 100644 --- a/skel-root/general/scripts/dropbear.init +++ b/skel-root/general/scripts/dropbear.init @@ -8,7 +8,7 @@ genkeys() { for keytype in dss rsa ecdsa; do keyfile=$ETCDIR/dropbear_${keytype}_host_key test -e $keyfile && continue - /bin/dropbearkey -t $keytype -f $keyfile + /usr/bin/dropbearkey -t $keytype -f $keyfile done } @@ -25,7 +25,7 @@ case $1 in if [ -e /var/etc/.dropbear ]; then genkeys fixperms - /sbin/dropbear + /usr/sbin/dropbear fi ;; stop) diff --git a/skel-root/general/scripts/inadyn.init b/skel-root/general/scripts/inadyn.init index 2a844b0d..a0e00ac6 100644 --- a/skel-root/general/scripts/inadyn.init +++ b/skel-root/general/scripts/inadyn.init @@ -5,7 +5,7 @@ case $1 in start) if [ -e /var/etc/.inadyn ]; then - /sbin/inadyn --cache-dir=/tmp/.inadyn + /usr/sbin/inadyn --cache-dir=/tmp/.inadyn fi ;; stop) diff --git a/skel-root/general/scripts/post-wlan0.sh b/skel-root/general/scripts/post-wlan0.sh index ecca9ef5..06123750 100644 --- a/skel-root/general/scripts/post-wlan0.sh +++ b/skel-root/general/scripts/post-wlan0.sh @@ -4,5 +4,5 @@ SHOWINFO "Stopping wlan0" -/sbin/wpa_cli terminate +/usr/sbin/wpa_cli terminate sleep 2 diff --git a/skel-root/general/scripts/pre-wlan0.sh b/skel-root/general/scripts/pre-wlan0.sh index 03493315..ead981ca 100644 --- a/skel-root/general/scripts/pre-wlan0.sh +++ b/skel-root/general/scripts/pre-wlan0.sh @@ -6,8 +6,8 @@ SHOWINFO "Starting wlan0" ifconfig eth0 down -/sbin/wpa_cli terminate +/usr/sbin/wpa_cli terminate sleep 2 -/sbin/wpa_supplicant -D wext -c /etc/wpa_supplicant.conf -B -i wlan0 +/usr/sbin/wpa_supplicant -D wext -c /etc/wpa_supplicant.conf -B -i wlan0 sleep 8 diff --git a/skel-root/general/scripts/suspend.init b/skel-root/general/scripts/suspend.init index d141c3dd..f202c5c4 100644 --- a/skel-root/general/scripts/suspend.init +++ b/skel-root/general/scripts/suspend.init @@ -8,4 +8,4 @@ fi mount -t sysfs sys /sys -/bin/turnoff_power +/usr/bin/turnoff_power diff --git a/skel-root/general/scripts/sys_update.sh b/skel-root/general/scripts/sys_update.sh index 5245f6a7..a0d3dfb4 100644 --- a/skel-root/general/scripts/sys_update.sh +++ b/skel-root/general/scripts/sys_update.sh @@ -3,6 +3,6 @@ . /etc/init.d/globals # install correct yWeb style -cd /share/tuxbox/neutrino/httpd/scripts/ && ./Y_Tools.sh style_set +cd /usr/share/tuxbox/neutrino/httpd/scripts/ && ./Y_Tools.sh style_set #rm -f /etc/init.d/sys_update.sh diff --git a/skel-root/general/scripts/syslogd.init b/skel-root/general/scripts/syslogd.init index ced64520..b8f448e7 100644 --- a/skel-root/general/scripts/syslogd.init +++ b/skel-root/general/scripts/syslogd.init @@ -8,7 +8,7 @@ case "$1" in start) - /sbin/syslogd $SYSLOGD_OPTS + syslogd $SYSLOGD_OPTS ;; stop) killall syslogd diff --git a/skel-root/general/scripts/xupnpd.init b/skel-root/general/scripts/xupnpd.init index 2178b7ec..f0d42b3e 100644 --- a/skel-root/general/scripts/xupnpd.init +++ b/skel-root/general/scripts/xupnpd.init @@ -8,7 +8,7 @@ case $1 in rm -rf /tmp/xupnpd-* rm -f /tmp/xupnpd.pid sleep 10 # FIXME; This is to workaround slow DHCP - /bin/xupnpd & + xupnpd & fi ;; stop) diff --git a/skel-root/general/xupnpd/share/xupnpd/playlists/youtube_music.m3u b/skel-root/general/xupnpd/usr/share/xupnpd/playlists/youtube_music.m3u old mode 100755 new mode 100644 similarity index 100% rename from skel-root/general/xupnpd/share/xupnpd/playlists/youtube_music.m3u rename to skel-root/general/xupnpd/usr/share/xupnpd/playlists/youtube_music.m3u diff --git a/skel-root/general/xupnpd/share/xupnpd/xupnpd_cfg.lua b/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_cfg.lua similarity index 100% rename from skel-root/general/xupnpd/share/xupnpd/xupnpd_cfg.lua rename to skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_cfg.lua diff --git a/skel-root/general/xupnpd/share/xupnpd/xupnpd_feeds.lua b/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_feeds.lua similarity index 100% rename from skel-root/general/xupnpd/share/xupnpd/xupnpd_feeds.lua rename to skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_feeds.lua diff --git a/skel-root/general/xupnpd/share/xupnpd/xupnpd_playlist.lua b/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_playlist.lua similarity index 100% rename from skel-root/general/xupnpd/share/xupnpd/xupnpd_playlist.lua rename to skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_playlist.lua diff --git a/skel-root/hd1/etc/profile b/skel-root/hd1/etc/profile index 873de0ab..51b25e8b 100644 --- a/skel-root/hd1/etc/profile +++ b/skel-root/hd1/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ ' diff --git a/skel-root/hd2/etc/profile b/skel-root/hd2/etc/profile index b5d6e2cb..4fb10840 100644 --- a/skel-root/hd2/etc/profile +++ b/skel-root/hd2/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ ' diff --git a/skel-root/hd5x/etc/profile b/skel-root/hd5x/etc/profile index fab4e876..ec8f2b69 100644 --- a/skel-root/hd5x/etc/profile +++ b/skel-root/hd5x/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ ' diff --git a/skel-root/hd6x/etc/profile b/skel-root/hd6x/etc/profile index fab4e876..ec8f2b69 100644 --- a/skel-root/hd6x/etc/profile +++ b/skel-root/hd6x/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ ' diff --git a/skel-root/vuduo/etc/profile b/skel-root/vuduo/etc/profile index fab4e876..ec8f2b69 100644 --- a/skel-root/vuduo/etc/profile +++ b/skel-root/vuduo/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ ' diff --git a/skel-root/vuplus/etc/profile b/skel-root/vuplus/etc/profile index fab4e876..ec8f2b69 100644 --- a/skel-root/vuplus/etc/profile +++ b/skel-root/vuplus/etc/profile @@ -1,6 +1,12 @@ # /etc/profile: system-wide profile file for the shell PATH=/sbin:/bin:/usr/sbin:/usr/bin:/var/bin + +# set PATH so it includes user's private bin if it exists +if [ -d "/usr/local/bin" ]; then + PATH="/usr/local/bin:$PATH" +fi + TERM=linux PS1='[\h] \w \$ '