diff options
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 5 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 49ea3fc959..29dab544f7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -530,9 +530,8 @@ SRC_URI = "file://${FILE}" # We can choose which provider of fake root privileges to use # default is fakeroot but in Poky we use pseudo -# this is hopefully only temporary, to work around the database becoming corrupt -PSEUDO_DATADIR ?= "${WORKDIR}/pseudo/" -FAKEROOT = "PSEUDO_DATADIR=${PSEUDO_DATADIR} PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_NOSYMLINKEXP=1 pseudo" +PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" +FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 pseudo" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 2edc019acc..838d09b10e 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -106,11 +106,13 @@ SRCREV_pn-tcf-agent ??= "1078" SRCREV_pn-osc-native ??= "9096" SRCREV_pn-owl-video ??= "394" SRCREV_pn-pkgconfig ??= "66d49f1375fec838bcd301bb4ca2ef76cee0e47c" -SRCREV_pn-prelink ??= "909470ee441237563d6236c505cb2d02ddc48704" -SRCREV_pn-prelink-native ??= "909470ee441237563d6236c505cb2d02ddc48704" +PRELINKSRCREV ??= "909470ee441237563d6236c505cb2d02ddc48704" +SRCREV_pn-prelink ??= "${PRELINKSRCREV}" +SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" SRCREV_pn-psplash ??= "424" -SRCREV_pn-pseudo ??= "973e40da8e5abb080cc0b9c9eaff4d84dea5b42c" -SRCREV_pn-pseudo-native ??= "973e40da8e5abb080cc0b9c9eaff4d84dea5b42c" +PSEUDOSRCREV ??= "551bf567c171c9f6f475f02de80e35df9563dce7" +SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" +SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" QEMUSRCREV ??= "72bb3c7571226af13cfe9eec020a56add3d30a70" SRCREV_pn-qemu-native ??= "${QEMUSRCREV}" SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}" |