From 3580fd582923886112c503f2d9eca832a5701b75 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 6 Oct 2022 19:27:00 +0200 Subject: [PATCH] 644 -> 0644; 755->0755 --- archive-patches/ofgwrite/ofgwrite_bin.patch | 11 ------ make/applications.mk | 40 ++++++++++----------- make/bootstrap.mk | 24 ++++++++----- make/drivers-arm.mk | 2 +- make/extras.mk | 4 +-- make/kernel-arm.mk | 4 +-- make/kernel.mk | 2 +- make/libraries.mk | 6 ++-- make/ofgwrite.mk | 14 ++++---- make/openvpn.mk | 4 +-- make/plugins.mk | 10 +++--- make/rtl8192eu.mk | 3 +- make/rtl8812au.mk | 3 +- make/rtl8822bu.mk | 3 +- make/samba.mk | 7 ++-- 15 files changed, 65 insertions(+), 72 deletions(-) delete mode 100644 archive-patches/ofgwrite/ofgwrite_bin.patch diff --git a/archive-patches/ofgwrite/ofgwrite_bin.patch b/archive-patches/ofgwrite/ofgwrite_bin.patch deleted file mode 100644 index 2accfd6..0000000 --- a/archive-patches/ofgwrite/ofgwrite_bin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ofgwrite -+++ b/ofgwrite -@@ -12,7 +12,7 @@ if [ -e /tmp/backup_flash.tar.gz ]; then - fi - - echo "Copying ofgwrite_bin to /newroot" --cp /usr/bin/ofgwrite_bin /newroot/ -+cp /bin/ofgwrite_bin /newroot/ - - echo "Calling /newroot/ofgwrite_bin $@" - /newroot/ofgwrite_bin "$@" diff --git a/make/applications.mk b/make/applications.mk index 8484276..ec13b4c 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -12,8 +12,8 @@ $(D)/procps: $(D)/libncurses $(ARCHIVE)/procps-3.2.8.tar.gz | $(TARGETPREFIX) CPPFLAGS="-pipe -O2 -g -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/ncurses -D__GNU_LIBRARY__" top ps/ps && \ mkdir -p $(TARGETPREFIX)/bin && \ rm -f $(TARGETPREFIX)/bin/ps $(TARGETPREFIX)/bin/top && \ - install -m 755 top ps/ps $(TARGETPREFIX)/bin && \ - install -m 755 proc/libproc-3.2.8.so $(TARGETPREFIX)/lib + install -m 0755 top ps/ps $(TARGETPREFIX)/bin && \ + install -m 0755 proc/libproc-3.2.8.so $(TARGETPREFIX)/lib $(REMOVE)/procps-3.2.8 $(TOUCH) @@ -72,7 +72,7 @@ $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGET $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ $(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS) $(TARGET)-strip $(TARGETPREFIX)/bin/busybox - install -m 755 $(PATCHES)/busybox/crond.init $(TARGETPREFIX)/etc/init.d/crond + install -m 0755 $(PATCHES)/busybox/crond.init $(TARGETPREFIX)/etc/init.d/crond pushd $(TARGETPREFIX)/etc/init.d ln -sf crond $(TARGETPREFIX)/etc/init.d/S75crond ln -sf crond $(TARGETPREFIX)/etc/init.d/K75crond @@ -239,8 +239,8 @@ $(D)/vsftpd: $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGETPREFIX) sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h && \ sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h && \ $(MAKE) CC=$(TARGET)-gcc $(BUILDENV) LIBS="-lcrypt -lcrypto -lssl" CFLAGS="-I$(TARGETPREFIX)/include" && \ - install -m755 vsftpd $(TARGETPREFIX)/sbin/vsftpd && \ - install -m 644 vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf && \ + install -m 0755 vsftpd $(TARGETPREFIX)/sbin/vsftpd && \ + install -m 0644 vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf && \ install -d $(TARGETPREFIX)/share/empty && \ $(REMOVE)/vsftpd-$(VSFTPD_VER) $(TOUCH) @@ -261,7 +261,7 @@ $(D)/irqbalance: $(D)/libglib2 $(ARCHIVE)/irqbalance-$(IRQBALANCE_VER).tar.gz | --without-irqbalance-ui; \ $(MAKE) && \ $(MAKE) install DESTDIR=$(TARGETPREFIX) - install -m 755 $(PATCHES)/irqbalance/irqbalance.init $(TARGETPREFIX)/etc/init.d/irqbalance + install -m 0755 $(PATCHES)/irqbalance/irqbalance.init $(TARGETPREFIX)/etc/init.d/irqbalance pushd $(TARGETPREFIX)/etc/init.d ln -sf irqbalance $(TARGETPREFIX)/etc/init.d/S25irqbalance ln -sf irqbalance $(TARGETPREFIX)/etc/init.d/K25irqbalance @@ -282,7 +282,7 @@ $(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $( ; \ $(MAKE); \ $(MAKE) install prefix= DESTDIR=$(TARGETPREFIX) - install -m 755 $(PATCHES)/minidlna/minidlnad.init $(TARGETPREFIX)/etc/init.d/minidlnad + install -m 0755 $(PATCHES)/minidlna/minidlnad.init $(TARGETPREFIX)/etc/init.d/minidlnad pushd $(TARGETPREFIX)/etc/init.d ln -sf minidlnad $(TARGETPREFIX)/etc/init.d/S75minidlnad ln -sf minidlnad $(TARGETPREFIX)/etc/init.d/K75minidlnad @@ -669,13 +669,13 @@ $(D)/mjpg-streamer: $(ARCHIVE)/mjpg-streamer-r63.tar.gz | $(TARGETPREFIX) sed -i 's@LFLAGS += -lpthread -ldl@LFLAGS += $(TARGET_LDFLAGS) -lpthread -ldl@' plugins/output_http/Makefile && \ $(BUILDENV) && \ $(MAKE) clean all - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/input_gspcav1.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/input_testpicture.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/input_uvc.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/output_autofocus.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/output_file.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/output_http.so $(TARGETPREFIX)/lib - install -D -m 755 $(BUILD_TMP)/mjpg-streamer-r63/mjpg_streamer $(TARGETPREFIX)/bin + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/input_gspcav1.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/input_testpicture.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/input_uvc.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/output_autofocus.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/output_file.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/output_http.so $(TARGETPREFIX)/lib + install -D -m 0755 $(BUILD_TMP)/mjpg-streamer-r63/mjpg_streamer $(TARGETPREFIX)/bin mkdir -p $(TARGETPREFIX)/var/mjpg-streamer cp -f -R $(BUILD_TMP)/mjpg-streamer-r63/www/* $(TARGETPREFIX)/var/mjpg-streamer/ $(REMOVE)/mjpg-streamer-r63 @@ -726,7 +726,7 @@ $(D)/djmount: $(D)/libfuse $(ARCHIVE)/djmount-0.71.tar.gz | $(TARGETPREFIX) --disable-debug && \ make CFLAGS=" -fcommon"; \ make CFLAGS=" -fcommon" install DESTDIR=$(TARGETPREFIX); - install -m 755 $(PATCHES)/djmount/djmount.init $(TARGETPREFIX)/etc/init.d/djmount + install -m 0755 $(PATCHES)/djmount/djmount.init $(TARGETPREFIX)/etc/init.d/djmount $(TARGET)-strip $(BUILD_TMP)/djmount-0.71/djmount/djmount pushd $(TARGETPREFIX)/etc/init.d ln -sf djmount $(TARGETPREFIX)/etc/init.d/S75djmount @@ -765,8 +765,8 @@ $(D)/ushare: $(D)/libupnp $(LIBGETTEXT) $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 cp $(BUILD_TMP)/ushare-$(USHARE_VER)/config.h $(BUILD_TMP)/ushare-$(USHARE_VER)/src/config.h && \ $(MAKE) && \ $(MAKE) install && \ - install -m 644 $(BUILD_TMP)/ushare-$(USHARE_VER)/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf - install -m 755 $(PATCHES)/ushare/ushare.init $(TARGETPREFIX)/etc/init.d/ushare + install -m 0644 $(BUILD_TMP)/ushare-$(USHARE_VER)/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf + install -m 0755 $(PATCHES)/ushare/ushare.init $(TARGETPREFIX)/etc/init.d/ushare pushd $(TARGETPREFIX)/etc/init.d ln -sf ushare $(TARGETPREFIX)/etc/init.d/S75ushare ln -sf ushare $(TARGETPREFIX)/etc/init.d/K75ushare @@ -816,7 +816,7 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua $(D) cp -f $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/*.lua $(TARGETPREFIX)/share/xupnpd/ mv $(TARGETPREFIX)/share/xupnpd/xupnpd.lua $(TARGETPREFIX)/var/tuxbox/config ln -sf /var/tuxbox/config/xupnpd.lua $(TARGETPREFIX)/share/xupnpd/xupnpd.lua - install -m 755 $(PATCHES)/xupnpd/xupnpd.init $(TARGETPREFIX)/etc/init.d/xupnpd + install -m 0755 $(PATCHES)/xupnpd/xupnpd.init $(TARGETPREFIX)/etc/init.d/xupnpd pushd $(TARGETPREFIX)/etc/init.d ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/S75xupnpd ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/K75xupnpd @@ -840,7 +840,7 @@ $(D)/udpxy: $(ARCHIVE)/$(UDPXY_VER).tar.gz | $(TARGETPREFIX) PREFIX= \ CC=$(TARGET)-gcc \ CFLAGS=-Wno-error install DESTDIR=$(TARGETPREFIX); - install -m 755 $(PATCHES)/udpxy/udpxy.init $(TARGETPREFIX)/etc/init.d/udpxy + install -m 0755 $(PATCHES)/udpxy/udpxy.init $(TARGETPREFIX)/etc/init.d/udpxy pushd $(TARGETPREFIX)/etc/init.d ln -sf udpxy $(TARGETPREFIX)/etc/init.d/S75udpxy ln -sf udpxy $(TARGETPREFIX)/etc/init.d/K75udpxy @@ -973,7 +973,7 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS_UTILS_VER).tar.bz2 | $(T ; \ $(MAKE) && \ $(MAKE) install DESTDIR=$(TARGETPREFIX) - chmod 755 $(TARGETPREFIX)/sbin/mount.nfs + chmod 0755 $(TARGETPREFIX)/sbin/mount.nfs rm -rf $(TARGETPREFIX)/sbin/mountstats rm -rf $(TARGETPREFIX)/sbin/nfsiostat rm -rf $(TARGETPREFIX)/sbin/osd_login diff --git a/make/bootstrap.mk b/make/bootstrap.mk index c29ab4b..af9065e 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -51,11 +51,22 @@ endif system-tools: $(SYSTEM_TOOLS) targetprefix: - mkdir -p $(TARGETPREFIX) - mkdir -p $(TARGETPREFIX)/bin - mkdir -p $(TARGETPREFIX)/include - mkdir -p $(PKG_CONFIG_PATH) - mkdir -p $(D) + install -d $(TARGETPREFIX) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x)) + install -d $(TARGETPREFIX)/boot + ln -sf /var/root $(TARGETPREFIX)/home +endif + install -d $(TARGETPREFIX)/bin + install -d $(TARGETPREFIX)/dev + ln -sf /tmp/media $(TARGETPREFIX)/media + install -d $(TARGETPREFIX)/mnt + install -d $(TARGETPREFIX)/proc + install -d $(TARGETPREFIX)/srv + install -d $(TARGETPREFIX)/sys + install -d $(TARGETPREFIX)/tmp + install -d $(TARGETPREFIX)/include + install -d $(PKG_CONFIG_PATH) + install -d $(D) make skeleton $(TARGETPREFIX): @@ -273,9 +284,6 @@ skeleton: | $(TARGETPREFIX) $(BUILD_TMP): mkdir -p $(BUILD_TMP) -$(BUILD_TMP)/extras: - mkdir -p $@ - $(CROSS_BASE): mkdir -p $(CROSS_BASE) diff --git a/make/drivers-arm.mk b/make/drivers-arm.mk index 851a71b..dce1b00 100755 --- a/make/drivers-arm.mk +++ b/make/drivers-arm.mk @@ -221,6 +221,6 @@ $(D)/hd6x-mali-drivers: $(ARCHIVE)/$(HD6X_MALI_DRIVERS_SOURCE) $(D)/hd6x-libgles pushd $(BUILD_TMP)/$(HD6X_MALI_DRIVERS_DIR); \ $(call apply_patches, $(addprefix hd6x-mali-drivers/patches/, $(HD6X_MALI_PATCH))); \ $(MAKE) -C $(BUILD_TMP)/$(KERNEL_DIR) $(LINUX_KERNEL_MAKE_VARS) $(HD6X_MALI_DRIVERS_MAKE_OPTS) - install -m 644 $(BUILD_TMP)/$(HD6X_MALI_DRIVERS_DIR)/driver/src/devicedrv/mali/mali.ko $(TARGET_modulesdir)/extra/mali.ko + install -m 0644 $(BUILD_TMP)/$(HD6X_MALI_DRIVERS_DIR)/driver/src/devicedrv/mali/mali.ko $(TARGET_modulesdir)/extra/mali.ko $(REMOVE)/$(HD6X_MALI_DRIVERS_DIR) $(TOUCH) diff --git a/make/extras.mk b/make/extras.mk index 1a59174..267f1ea 100644 --- a/make/extras.mk +++ b/make/extras.mk @@ -14,7 +14,7 @@ $(D)/inadyn-mt: $(ARCHIVE)/inadyn-mt.v.$(INADYN_VER).tar.gz | $(BUILD_TMP)/extra --prefix= \ --disable-sound && \ $(MAKE) all && \ - install -m 755 $(BUILD_TMP)/inadyn-mt.v.$(INADYN_VER)/src/inadyn-mt $(BUILD_TMP)/extras + install -m 0755 $(BUILD_TMP)/inadyn-mt.v.$(INADYN_VER)/src/inadyn-mt $(BUILD_TMP)/extras $(TARGET)-strip $(BUILD_TMP)/extras/inadyn-mt @echo "# Basic configuration file for inadyn-mt" > $(BUILD_TMP)/extras/inadyn-mt.conf @echo "#" >> $(BUILD_TMP)/extras/inadyn-mt.conf @@ -61,7 +61,7 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(BUILD_T $(MAKE) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI=1 SCPPROGRESS=1 && \ $(MAKE) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI=1 SCPPROGRESS=1 install DESTDIR=$(BUILD_TMP)/extras $(TARGET)-strip $(BUILD_TMP)/extras/var/bin/dropbearmulti - install -m 755 $(PATCHES)/dropbear/dropbear.init $(TARGETPREFIX)/var/etc/init.d/dropbear + install -m 0755 $(PATCHES)/dropbear/dropbear.init $(TARGETPREFIX)/var/etc/init.d/dropbear pushd $(TARGETPREFIX)/var/etc/init.d ln -sf dropbear $(TARGETPREFIX)/var/etc/init.d/S60dropbear ln -sf dropbear $(TARGETPREFIX)/var/etc/init.d/K60dropbear diff --git a/make/kernel-arm.mk b/make/kernel-arm.mk index c1d296c..71754da 100644 --- a/make/kernel-arm.mk +++ b/make/kernel-arm.mk @@ -182,9 +182,9 @@ $(D)/kernel.do_prepare: $(ARCHIVE)/$(KERNEL_SRC) $(PATCHES)/armbox/$(KERNEL_CONF $(PATCH)/$$i; \ done $(LINUX_FIX_YYLLOC) - install -m 644 $(PATCHES)/armbox/$(KERNEL_CONFIG) $(KERNEL_OBJ_DIR)/.config + install -m 0644 $(PATCHES)/armbox/$(KERNEL_CONFIG) $(KERNEL_OBJ_DIR)/.config $(MAKE) -C $(BUILD_TMP)/$(KERNEL_DIR) $(LINUX_KERNEL_MAKE_VARS) silentoldconfig - install -m 644 $(PATCHES)/initramfs-subdirboot.cpio.gz $(KERNEL_OBJ_DIR) + install -m 0644 $(PATCHES)/initramfs-subdirboot.cpio.gz $(KERNEL_OBJ_DIR) #ifeq ($(OPTIMIZATIONS), $(filter $(OPTIMIZATIONS), kerneldebug debug)) # @echo "Using kernel debug" # @grep -v "CONFIG_PRINTK" "$(KERNEL_DIR)/.config" > $(KERNEL_DIR)/.config.tmp diff --git a/make/kernel.mk b/make/kernel.mk index 5cd9d3b..954e15b 100644 --- a/make/kernel.mk +++ b/make/kernel.mk @@ -88,7 +88,7 @@ kernel-image: $(D)/kernel-$(BOXTYPE) | $(HOSTPREFIX)/bin/mkimage # rule for the autofs4 module - needed by the automounter # installs the already built module into the "proper" path $(TARGET_MODULE)/kernel/fs/autofs4/autofs4.ko: $(D)/kernel-cool - install -m 644 -D $(SOURCE_MODULE)/kernel/fs/autofs4/autofs4.ko $@ + install -m 0644 -D $(SOURCE_MODULE)/kernel/fs/autofs4/autofs4.ko $@ make depmod kernel-clean: diff --git a/make/libraries.mk b/make/libraries.mk index 8de39bd..dc93f5d 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -183,7 +183,7 @@ $(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL_LINUX_VER).tar.xz --disable-makeinstall-chown \ --without-systemdsystemunitdir && \ $(MAKE) sfdisk && \ - install -m755 sfdisk $(TARGETPREFIX)/sbin/sfdisk + install -m 0755 sfdisk $(TARGETPREFIX)/sbin/sfdisk $(REMOVE)/util-linux-$(UTIL_LINUX_VER) $(TOUCH) @@ -500,7 +500,7 @@ $(D)/ca-bundle: | $(TARGETPREFIX) $(START_BUILD) cd $(ARCHIVE); \ curl -s --remote-name --time-cond $(ARCHIVE)/cacert.pem $(CA_URL) - install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) + install -D -m 0644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) openssl verify $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) $(TOUCH) @@ -539,7 +539,7 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D) $(MAKE) all; \ mkdir -p $(HOSTPREFIX)/bin; \ sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config; \ - chmod 755 $(HOSTPREFIX)/bin/curl-config; \ + chmod 0755 $(HOSTPREFIX)/bin/curl-config; \ $(MAKE) install DESTDIR=$(TARGETPREFIX) rm $(TARGETPREFIX)/bin/curl-config rm -fr $(TARGETPREFIX)/share/man diff --git a/make/ofgwrite.mk b/make/ofgwrite.mk index fd70f3b..144f8a3 100644 --- a/make/ofgwrite.mk +++ b/make/ofgwrite.mk @@ -25,9 +25,9 @@ $(D)/ofgwrite_new: $(ARCHIVE)/$(OFGWRITE_SOURCE).tar.bz2 | $(TARGETREFIX) $(BUILDENV); \ $(MAKE) $(TARGET)-strip $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_bin - install -m 755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_bin $(TARGETPREFIX)/bin - install -m 755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_caller $(TARGETPREFIX)/bin - install -m 755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite $(TARGETPREFIX)/bin + install -m 0755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_bin $(TARGETPREFIX)/bin + install -m 0755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_caller $(TARGETPREFIX)/bin + install -m 0755 $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite $(TARGETPREFIX)/bin $(REMOVE)/$(OFGWRITE_SOURCE) $(TOUCH) @@ -46,9 +46,9 @@ $(D)/ofgwrite: $(ARCHIVE)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2 | $(TARGETPREFIX) export CC=$(TARGET)-gcc && \ export AR=$(TARGET)-ar && \ $(BUILDENV); \ - $(MAKE); \ - install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite_bin $(TARGETPREFIX)/bin - install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite_caller $(TARGETPREFIX)/bin - install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite $(TARGETPREFIX)/bin + $(MAKE); + install -m 0755 $(PATCHES)/ofgwrite/ofgwrite $(TARGETPREFIX)/bin + install -m 0755 $(PATCHES)/ofgwrite/ofgwrite_caller $(TARGETPREFIX)/bin + install -m 0755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite_bin $(TARGETPREFIX)/bin $(REMOVE)/ofgwrite-git-$(OFGWRITE_VER) $(TOUCH) \ No newline at end of file diff --git a/make/openvpn.mk b/make/openvpn.mk index d5ee3d3..2f53f65 100644 --- a/make/openvpn.mk +++ b/make/openvpn.mk @@ -32,8 +32,8 @@ $(D)/openvpn: $(D)/openssl $(D)/lzo $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $ ROUTE="/sbin/route"; \ $(MAKE) all && \ $(MAKE) install DESTDIR=$(OPENVPN_TARGET) - install -m 755 $(PATCHES)/openvpn/files/openvpn.init $(OPENVPN_TARGET)/var/etc/init.d/openvpn - install -m 755 $(PATCHES)/openvpn/files/*.conf $(OPENVPN_TARGET)/var/etc/openvpn/ + install -m 0755 $(PATCHES)/openvpn/files/openvpn.init $(OPENVPN_TARGET)/var/etc/init.d/openvpn + install -m 0755 $(PATCHES)/openvpn/files/*.conf $(OPENVPN_TARGET)/var/etc/openvpn/ ln -sf openvpn $(OPENVPN_TARGET)/var/etc/init.d/S99openvpn ln -sf openvpn $(OPENVPN_TARGET)/var/etc/init.d/K05openvpn $(TARGET)-strip $(OPENVPN_TARGET)/sbin/* diff --git a/make/plugins.mk b/make/plugins.mk index bedc1c5..9a8dee7 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -338,11 +338,11 @@ $(D)/sdparm: $(ARCHIVE)/sdparm-1.08.tar.gz | $(TARGETPREFIX) pushd $(BUILD_TMP)/sdparm-1.08 && \ $(BUILDENV) CC=$(TARGET)-gcc ./configure --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) && \ $(MAKE) && \ - install -D -m 755 $(BUILD_TMP)/sdparm-1.08/src/sdparm $(TARGETPREFIX)/sbin - install -D -m 755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spindown.cfg $(TARGETPREFIX)/lib/tuxbox/plugins - install -D -m 755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spindown.sh $(TARGETPREFIX)/lib/tuxbox/plugins - install -D -m 755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spinup.cfg $(TARGETPREFIX)/lib/tuxbox/plugins - install -D -m 755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spinup.sh $(TARGETPREFIX)/lib/tuxbox/plugins + install -D -m 0755 $(BUILD_TMP)/sdparm-1.08/src/sdparm $(TARGETPREFIX)/sbin + install -D -m 0755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spindown.cfg $(TARGETPREFIX)/lib/tuxbox/plugins + install -D -m 0755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spindown.sh $(TARGETPREFIX)/lib/tuxbox/plugins + install -D -m 0755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spinup.cfg $(TARGETPREFIX)/lib/tuxbox/plugins + install -D -m 0755 $(BASE_DIR)/archive-sources/sdparm/HDD_Spinup.sh $(TARGETPREFIX)/lib/tuxbox/plugins $(REMOVE)/sdparm-1.08 $(TOUCH) diff --git a/make/rtl8192eu.mk b/make/rtl8192eu.mk index 03a6616..728c726 100644 --- a/make/rtl8192eu.mk +++ b/make/rtl8192eu.mk @@ -21,6 +21,5 @@ rtl8192eu: $(ARCHIVE)/$(RTL8192EU_SOURCE).tar.bz2 | $(TARGETPREFIX) $(UNTAR)/$(RTL8192EU_SOURCE).tar.bz2 pushd $(BUILD_TMP)/$(RTL8192EU_DIR); \ $(MAKE) $(KERNEL_MODULE_MAKE_VARS) - install -m 644 $(BUILD_TMP)/$(RTL8192EU_DIR)/8192eu.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/8192eu.ko + install -m 0644 $(BUILD_TMP)/$(RTL8192EU_DIR)/8192eu.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/8192eu.ko $(REMOVE)/$(RTL8192EU_DIR) - diff --git a/make/rtl8812au.mk b/make/rtl8812au.mk index fccc8eb..0cb6975 100644 --- a/make/rtl8812au.mk +++ b/make/rtl8812au.mk @@ -20,6 +20,5 @@ rtl8812au: $(ARCHIVE)/$(RTL8812AU_SOURCE) | $(TARGETPREFIX) pushd $(BUILD_TMP)/$(RTL8812AU_DIR); \ $(call apply_patches, $(addprefix rtl8812au/patches/, $(RTL8812AU_PATCH))); \ $(MAKE) $(KERNEL_MODULE_MAKE_VARS); - install -m 644 $(BUILD_TMP)/$(RTL8812AU_DIR)/8812au.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/8812au.ko + install -m 0644 $(BUILD_TMP)/$(RTL8812AU_DIR)/8812au.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/8812au.ko $(REMOVE)/$(RTL8812AU_DIR) - diff --git a/make/rtl8822bu.mk b/make/rtl8822bu.mk index 4bc63f4..7e0d923 100644 --- a/make/rtl8822bu.mk +++ b/make/rtl8822bu.mk @@ -23,6 +23,5 @@ rtl8822bu: $(ARCHIVE)/$(RTL8822BU_SOURCE) | $(TARGETPREFIX) pushd $(BUILD_TMP)/$(RTL8822BU_DIR); \ $(call apply_patches, $(addprefix rtl8822bu/patches/, $(RTL8822BU_PATCH))); \ $(MAKE) $(KERNEL_MODULE_MAKE_VARS); - install -m 644 $(BUILD_TMP)/$(RTL8822BU_DIR)/88x2bu.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/88x2bu.ko + install -m 0644 $(BUILD_TMP)/$(RTL8822BU_DIR)/88x2bu.ko $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)/kernel/drivers/net/wireless/88x2bu.ko $(REMOVE)/$(RTL8822BU_DIR) - diff --git a/make/samba.mk b/make/samba.mk index 11d8e3d..7517454 100644 --- a/make/samba.mk +++ b/make/samba.mk @@ -82,7 +82,7 @@ $(D)/samba2: $(ARCHIVE)/samba-$(SAMBA2_VER).tar.gz | $(TARGETPREFIX) install -d $(SAMBA_TARGET)$(SMB_PREFIX)/etc/samba/private install -d $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d install $(SCRIPTS)/smb.conf $(SAMBA_TARGET)$(SMB_PREFIX)/etc - install -m 755 $(SCRIPTS)/samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/samba + install -m 0755 $(SCRIPTS)/samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/samba ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/S99samba ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/K01samba cp -a $(SAMBA_TARGET)/* $(TARGETPREFIX) @@ -152,10 +152,9 @@ $(D)/samba36: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGETPREFIX) ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/S99samba ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/K01samba $(TARGET)-strip $(SAMBA_TARGET)/var/sbin/* - install -m 644 $(PATCHES)/samba36/files/smb3.conf $(SAMBA_TARGET)$(SMB_PREFIX)/etc/samba/smb.conf - install -m 755 $(PATCHES)/samba36/files/samba3.init $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/samba + install -m 0644 $(PATCHES)/samba36/files/smb3.conf $(SAMBA_TARGET)$(SMB_PREFIX)/etc/samba/smb.conf + install -m 0755 $(PATCHES)/samba36/files/samba3.init $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/samba -rm -rf $(addprefix $(SAMBA_TARGET)/var/bin/,testparm findsmb smbtar smbclient smbpasswd) rm -rf $(SAMBA_TARGET)/.remove $(REMOVE)/samba-$(SAMBA36_VER) # $(TOUCH) - -- 2.39.5