diff options
-rw-r--r-- | meta/classes/package.bbclass | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7a8ebf4716..8e5d9b425f 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -548,15 +548,14 @@ python package_do_shlibs() { | |||
548 | bb.error("PV not defined") | 548 | bb.error("PV not defined") |
549 | return | 549 | return |
550 | 550 | ||
551 | target_sys = bb.data.getVar('TARGET_SYS', d, 1) | 551 | host_sys = bb.data.getVar('HOST_SYS', d, 1) |
552 | if not target_sys: | 552 | if not host_sys: |
553 | bb.error("TARGET_SYS not defined") | 553 | bb.error("HOST_SYS not defined") |
554 | return | 554 | return |
555 | 555 | ||
556 | pkgdest = bb.data.getVar('PKGDEST', d, 1) | 556 | pkgdest = bb.data.getVar('PKGDEST', d, 1) |
557 | 557 | ||
558 | shlibs_dir = os.path.join(staging, target_sys, "shlibs") | 558 | shlibs_dir = os.path.join(staging, host_sys, "shlibs") |
559 | old_shlibs_dir = os.path.join(staging, "shlibs") | ||
560 | bb.mkdirhier(shlibs_dir) | 559 | bb.mkdirhier(shlibs_dir) |
561 | 560 | ||
562 | needed = {} | 561 | needed = {} |
@@ -613,7 +612,7 @@ python package_do_shlibs() { | |||
613 | 612 | ||
614 | shlib_provider = {} | 613 | shlib_provider = {} |
615 | list_re = re.compile('^(.*)\.list$') | 614 | list_re = re.compile('^(.*)\.list$') |
616 | for dir in [old_shlibs_dir, shlibs_dir]: | 615 | for dir in [shlibs_dir]: |
617 | if not os.path.exists(dir): | 616 | if not os.path.exists(dir): |
618 | continue | 617 | continue |
619 | for file in os.listdir(dir): | 618 | for file in os.listdir(dir): |
@@ -678,15 +677,14 @@ python package_do_pkgconfig () { | |||
678 | bb.error("STAGING_DIR not defined") | 677 | bb.error("STAGING_DIR not defined") |
679 | return | 678 | return |
680 | 679 | ||
681 | target_sys = bb.data.getVar('TARGET_SYS', d, 1) | 680 | host_sys = bb.data.getVar('HOST_SYS', d, 1) |
682 | if not target_sys: | 681 | if not host_sys: |
683 | bb.error("TARGET_SYS not defined") | 682 | bb.error("HOST_SYS not defined") |
684 | return | 683 | return |
685 | 684 | ||
686 | pkgdest = bb.data.getVar('PKGDEST', d, 1) | 685 | pkgdest = bb.data.getVar('PKGDEST', d, 1) |
687 | 686 | ||
688 | shlibs_dir = os.path.join(staging, target_sys, "shlibs") | 687 | shlibs_dir = os.path.join(staging, host_sys, "shlibs") |
689 | old_shlibs_dir = os.path.join(staging, "shlibs") | ||
690 | bb.mkdirhier(shlibs_dir) | 688 | bb.mkdirhier(shlibs_dir) |
691 | 689 | ||
692 | pc_re = re.compile('(.*)\.pc$') | 690 | pc_re = re.compile('(.*)\.pc$') |
@@ -736,7 +734,7 @@ python package_do_pkgconfig () { | |||
736 | f.write('%s\n' % p) | 734 | f.write('%s\n' % p) |
737 | f.close() | 735 | f.close() |
738 | 736 | ||
739 | for dir in [old_shlibs_dir, shlibs_dir]: | 737 | for dir in [shlibs_dir]: |
740 | if not os.path.exists(dir): | 738 | if not os.path.exists(dir): |
741 | continue | 739 | continue |
742 | for file in os.listdir(dir): | 740 | for file in os.listdir(dir): |