diff options
| -rw-r--r-- | rules/post/ptxd_make_world_extract.make | 10 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/rules/post/ptxd_make_world_extract.make b/rules/post/ptxd_make_world_extract.make index 33a106ced..a0b942f0c 100644 --- a/rules/post/ptxd_make_world_extract.make +++ b/rules/post/ptxd_make_world_extract.make @@ -38,16 +38,6 @@ $(STATEDIR)/klibc-%.extract: @$(call touch) -### --- for INITRAMFS packages only --- - -$(STATEDIR)/initramfs-%.extract: - @$(call targetinfo) - @$(call clean, $($(PTX_MAP_TO_PACKAGE_initramfs-$(*))_DIR)) - @$(call extract, $(PTX_MAP_TO_PACKAGE_initramfs-$(*)), $(KLIBC_BUILDDIR)) - @$(call patchin, $(PTX_MAP_TO_PACKAGE_initramfs-$(*)), $($(PTX_MAP_TO_PACKAGE_initramfs-$(*))_DIR)) - @$(call touch) - - ### --- for TARGET packages only --- $(STATEDIR)/%.extract: diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 2f20f3525..f2a2e1045 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -149,7 +149,7 @@ ptxd_make_world_init_compat() { # pkg_sysroot_dir # case "${pkg_stamp}" in - initramfs-*|klibc-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}/usr/lib/klibc" ;; + klibc-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}/usr/lib/klibc" ;; host-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_HOST}" ;; cross-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_CROSS}" ;; *) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}" ;; |