- libaacs/libbdplus: move files to package dir

4 years ago · 54427ba3b3
20 changed files with 4 additions and 6 deletions
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@ -786,9 +786,8 @@ libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)
-	$(CD) $(TARGET_DIR); \
-		mkdir -p .config/aacs .cache/aacs/vuk
-	cp $(TARGET_FILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs
+	$(INSTALL) -d $(TARGET_DIR)/.cache/aacs/vuk
+	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/KEYDB.cfg $(TARGET_DIR)/.config/aacs/KEYDB.cfg
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

@ -819,9 +818,8 @@ libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)
-	$(CD) $(TARGET_DIR); \
-		mkdir -p .config/bdplus/vm0
-	cp -f $(TARGET_FILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0
+	$(INSTALL) -d $(TARGET_DIR)/.config/bdplus/vm0
+	$(INSTALL_COPY) $(PKG_FILES_DIR)/* $(TARGET_DIR)/.config/bdplus/vm0
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

--- a/skel-root/general/libaacs/KEYDB.cfg
+++ b/skel-root/general/libaacs/KEYDB.cfg
--- a/skel-root/general/libbdplus/aes_keys.bin
+++ b/skel-root/general/libbdplus/aes_keys.bin
--- a/skel-root/general/libbdplus/device_discovery_1.bin
+++ b/skel-root/general/libbdplus/device_discovery_1.bin
--- a/skel-root/general/libbdplus/device_discovery_2.bin
+++ b/skel-root/general/libbdplus/device_discovery_2.bin
--- a/skel-root/general/libbdplus/device_discovery_3.bin
+++ b/skel-root/general/libbdplus/device_discovery_3.bin
--- a/skel-root/general/libbdplus/device_discovery_4.bin
+++ b/skel-root/general/libbdplus/device_discovery_4.bin
--- a/skel-root/general/libbdplus/device_discovery_5.bin
+++ b/skel-root/general/libbdplus/device_discovery_5.bin
--- a/skel-root/general/libbdplus/ecdsa_keys.txt
+++ b/skel-root/general/libbdplus/ecdsa_keys.txt
--- a/skel-root/general/libbdplus/mem_area_02.bin
+++ b/skel-root/general/libbdplus/mem_area_02.bin
--- a/skel-root/general/libbdplus/mem_area_03.bin
+++ b/skel-root/general/libbdplus/mem_area_03.bin
--- a/skel-root/general/libbdplus/mem_area_04.bin
+++ b/skel-root/general/libbdplus/mem_area_04.bin
--- a/skel-root/general/libbdplus/mem_area_05.bin
+++ b/skel-root/general/libbdplus/mem_area_05.bin
--- a/skel-root/general/libbdplus/mem_area_06.bin
+++ b/skel-root/general/libbdplus/mem_area_06.bin
--- a/skel-root/general/libbdplus/mem_area_07.bin
+++ b/skel-root/general/libbdplus/mem_area_07.bin
--- a/skel-root/general/libbdplus/mem_free.bin
+++ b/skel-root/general/libbdplus/mem_free.bin
--- a/skel-root/general/libbdplus/mem_player_executable.bin
+++ b/skel-root/general/libbdplus/mem_player_executable.bin
--- a/skel-root/general/libbdplus/mem_player_name.bin
+++ b/skel-root/general/libbdplus/mem_player_name.bin
--- a/skel-root/general/libbdplus/mem_player_version.bin
+++ b/skel-root/general/libbdplus/mem_player_version.bin
--- a/skel-root/general/libbdplus/memory.map
+++ b/skel-root/general/libbdplus/memory.map