From 54427ba3b3f84ef5c6dfb0d5d276bac0754ce5be Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 27 Feb 2021 23:50:35 +0100 Subject: [PATCH] - libaacs/libbdplus: move files to package dir --- make/target-libs.mk | 10 ++++------ .../libaacs => package/libaacs/files}/KEYDB.cfg | 0 .../libbdplus/files}/aes_keys.bin | Bin .../libbdplus/files}/device_discovery_1.bin | Bin .../libbdplus/files}/device_discovery_2.bin | Bin .../libbdplus/files}/device_discovery_3.bin | Bin .../libbdplus/files}/device_discovery_4.bin | Bin .../libbdplus/files}/device_discovery_5.bin | Bin .../libbdplus/files}/ecdsa_keys.txt | 0 .../libbdplus/files}/mem_area_02.bin | Bin .../libbdplus/files}/mem_area_03.bin | Bin .../libbdplus/files}/mem_area_04.bin | Bin .../libbdplus/files}/mem_area_05.bin | Bin .../libbdplus/files}/mem_area_06.bin | Bin .../libbdplus/files}/mem_area_07.bin | Bin .../libbdplus/files}/mem_free.bin | 0 .../libbdplus/files}/mem_player_executable.bin | Bin .../libbdplus/files}/mem_player_name.bin | Bin .../libbdplus/files}/mem_player_version.bin | Bin .../libbdplus/files}/memory.map | 0 20 files changed, 4 insertions(+), 6 deletions(-) rename {skel-root/general/libaacs => package/libaacs/files}/KEYDB.cfg (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/aes_keys.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/device_discovery_1.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/device_discovery_2.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/device_discovery_3.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/device_discovery_4.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/device_discovery_5.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/ecdsa_keys.txt (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_02.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_03.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_04.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_05.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_06.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_area_07.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_free.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_player_executable.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_player_name.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/mem_player_version.bin (100%) rename {skel-root/general/libbdplus => package/libbdplus/files}/memory.map (100%) diff --git a/make/target-libs.mk b/make/target-libs.mk index 0607c462..a3543136 100644 --- 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) diff --git a/skel-root/general/libaacs/KEYDB.cfg b/package/libaacs/files/KEYDB.cfg similarity index 100% rename from skel-root/general/libaacs/KEYDB.cfg rename to package/libaacs/files/KEYDB.cfg diff --git a/skel-root/general/libbdplus/aes_keys.bin b/package/libbdplus/files/aes_keys.bin similarity index 100% rename from skel-root/general/libbdplus/aes_keys.bin rename to package/libbdplus/files/aes_keys.bin diff --git a/skel-root/general/libbdplus/device_discovery_1.bin b/package/libbdplus/files/device_discovery_1.bin similarity index 100% rename from skel-root/general/libbdplus/device_discovery_1.bin rename to package/libbdplus/files/device_discovery_1.bin diff --git a/skel-root/general/libbdplus/device_discovery_2.bin b/package/libbdplus/files/device_discovery_2.bin similarity index 100% rename from skel-root/general/libbdplus/device_discovery_2.bin rename to package/libbdplus/files/device_discovery_2.bin diff --git a/skel-root/general/libbdplus/device_discovery_3.bin b/package/libbdplus/files/device_discovery_3.bin similarity index 100% rename from skel-root/general/libbdplus/device_discovery_3.bin rename to package/libbdplus/files/device_discovery_3.bin diff --git a/skel-root/general/libbdplus/device_discovery_4.bin b/package/libbdplus/files/device_discovery_4.bin similarity index 100% rename from skel-root/general/libbdplus/device_discovery_4.bin rename to package/libbdplus/files/device_discovery_4.bin diff --git a/skel-root/general/libbdplus/device_discovery_5.bin b/package/libbdplus/files/device_discovery_5.bin similarity index 100% rename from skel-root/general/libbdplus/device_discovery_5.bin rename to package/libbdplus/files/device_discovery_5.bin diff --git a/skel-root/general/libbdplus/ecdsa_keys.txt b/package/libbdplus/files/ecdsa_keys.txt similarity index 100% rename from skel-root/general/libbdplus/ecdsa_keys.txt rename to package/libbdplus/files/ecdsa_keys.txt diff --git a/skel-root/general/libbdplus/mem_area_02.bin b/package/libbdplus/files/mem_area_02.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_02.bin rename to package/libbdplus/files/mem_area_02.bin diff --git a/skel-root/general/libbdplus/mem_area_03.bin b/package/libbdplus/files/mem_area_03.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_03.bin rename to package/libbdplus/files/mem_area_03.bin diff --git a/skel-root/general/libbdplus/mem_area_04.bin b/package/libbdplus/files/mem_area_04.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_04.bin rename to package/libbdplus/files/mem_area_04.bin diff --git a/skel-root/general/libbdplus/mem_area_05.bin b/package/libbdplus/files/mem_area_05.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_05.bin rename to package/libbdplus/files/mem_area_05.bin diff --git a/skel-root/general/libbdplus/mem_area_06.bin b/package/libbdplus/files/mem_area_06.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_06.bin rename to package/libbdplus/files/mem_area_06.bin diff --git a/skel-root/general/libbdplus/mem_area_07.bin b/package/libbdplus/files/mem_area_07.bin similarity index 100% rename from skel-root/general/libbdplus/mem_area_07.bin rename to package/libbdplus/files/mem_area_07.bin diff --git a/skel-root/general/libbdplus/mem_free.bin b/package/libbdplus/files/mem_free.bin similarity index 100% rename from skel-root/general/libbdplus/mem_free.bin rename to package/libbdplus/files/mem_free.bin diff --git a/skel-root/general/libbdplus/mem_player_executable.bin b/package/libbdplus/files/mem_player_executable.bin similarity index 100% rename from skel-root/general/libbdplus/mem_player_executable.bin rename to package/libbdplus/files/mem_player_executable.bin diff --git a/skel-root/general/libbdplus/mem_player_name.bin b/package/libbdplus/files/mem_player_name.bin similarity index 100% rename from skel-root/general/libbdplus/mem_player_name.bin rename to package/libbdplus/files/mem_player_name.bin diff --git a/skel-root/general/libbdplus/mem_player_version.bin b/package/libbdplus/files/mem_player_version.bin similarity index 100% rename from skel-root/general/libbdplus/mem_player_version.bin rename to package/libbdplus/files/mem_player_version.bin diff --git a/skel-root/general/libbdplus/memory.map b/package/libbdplus/files/memory.map similarity index 100% rename from skel-root/general/libbdplus/memory.map rename to package/libbdplus/files/memory.map