diff options
| author | Simon Rettberg | 2021-07-12 13:32:27 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-07-12 13:32:27 +0200 |
| commit | d69028811168853efdaad3f07f70dff93fccd112 (patch) | |
| tree | ceeb992ba51e0712419272c06420a37ae921eb19 /core/rootfs | |
| parent | [vbox-src] fix awk call (diff) | |
| download | mltk-d69028811168853efdaad3f07f70dff93fccd112.tar.gz mltk-d69028811168853efdaad3f07f70dff93fccd112.tar.xz mltk-d69028811168853efdaad3f07f70dff93fccd112.zip | |
Remove COPYLIST boilerplate from every module; move to setup_target
Diffstat (limited to 'core/rootfs')
| -rw-r--r-- | core/rootfs/rootfs-stage31/module.build | 4 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage32/module.build | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/core/rootfs/rootfs-stage31/module.build b/core/rootfs/rootfs-stage31/module.build index 024aadd0..3c72c385 100644 --- a/core/rootfs/rootfs-stage31/module.build +++ b/core/rootfs/rootfs-stage31/module.build @@ -6,8 +6,8 @@ fetch_source() { build() { local COPYLIST BIN_LOCATION DRM_MODULES FILE BIN MODNAME PCI_FILE ALIAS VENDOR DEVICE LIB - local COPYLIST="list_binaries_and_files" - [ -e "$COPYLIST" ] && rm -f "$COPYLIST" + COPYLIST="${MODULE_WORK_DIR}/list_binaries_and_files" + rm --f "$COPYLIST" for BIN in $REQUIRED_BINARIES; do local BIN_LOCATION=$(which "$BIN") [ -z "$BIN_LOCATION" ] && perror "Cannot find $BIN" diff --git a/core/rootfs/rootfs-stage32/module.build b/core/rootfs/rootfs-stage32/module.build index 3c32878b..c7190586 100644 --- a/core/rootfs/rootfs-stage32/module.build +++ b/core/rootfs/rootfs-stage32/module.build @@ -5,15 +5,8 @@ fetch_source() { } build() { - if [ ! -z "$REQUIRED_CONTENT_PACKAGES" ]; then - local COPYLIST="list_dpkg_output" - [ -e "${COPYLIST}" ] && rm "${COPYLIST}" - list_packet_files >> "${COPYLIST}" - tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}" - fi - local FILELIST="list_binaries_and_files" - [ -e "${FILELIST}" ] && rm "${FILELIST}" + rm -f "${FILELIST}" # Get ldconfig mkdir -p "$MODULE_BUILD_DIR/sbin" |