diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/mozilla/fennec_hg.bb | 9 | ||||
| -rw-r--r-- | packages/mozilla/firefox.inc | 40 |
2 files changed, 26 insertions, 23 deletions
diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index 8aeca90f6e..8faa26030c 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -1,9 +1,10 @@ DEPENDS += "cairo" PV = "0.0" +PR = "r1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=d14db8996980 \ - hg://hg.mozilla.org/;module=mobile-browser;rev=60dd20721284 \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \ + hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \ file://jsautocfg.h \ " @@ -24,7 +25,9 @@ do_configure_prepend() { do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk + sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ + -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ + ${S}/security/coreconf/Linux.mk } do_stage() { diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 1fae3a759e..76f12df365 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,26 +1,26 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" -PACKAGES =+ "firefox-inspector" +PACKAGES =+ "${PN}-inspector" -PACKAGES += "firefox-sdk" +PACKAGES += "${PN}-sdk" -FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ - ${libdir}/firefox-${PV}/components/*nspector* \ - ${libdir}/firefox-${PV}/extensions/inspector* \ - ${libdir}/firefox-${PV}/defaults/preferences/inspector* \ +FILES_${PN}-inspector = " ${libdir}/${PN}-${PV}/chrome/inspector* \ + ${libdir}/${PN}-${PV}/components/*nspector* \ + ${libdir}/${PN}-${PV}/extensions/inspector* \ + ${libdir}/${PN}-${PV}/defaults/preferences/inspector* \ " -FILES_${PN} = "${bindir}/firefox \ +FILES_${PN} = "${bindir}/${PN} \ ${datadir}/applications/ \ ${datadir}/pixmaps/ \ - ${libdir}/firefox-${PV}/* \ - ${libdir}/firefox-${PV}/.autoreg \ + ${libdir}/${PN}-${PV}/* \ + ${libdir}/${PN}-${PV}/.autoreg \ ${bindir}/defaults" -FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config" -FILES_firefox-sdk += "${libdir}/firefox-devel-${PV}" -FILES_${PN}-dbg += " ${libdir}/firefox-*/.debug \ - ${libdir}/firefox-*/*/.debug \ - ${libdir}/firefox-*/*/*/.debug \ - ${libdir}/firefox-*/*/*/*/.debug \ +FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config" +FILES_${PN}-sdk += "${libdir}/${PN}-devel-${PV}" +FILES_${PN}-dbg += " ${libdir}/${PN}-*/.debug \ + ${libdir}/${PN}-*/*/.debug \ + ${libdir}/${PN}-*/*/*/.debug \ + ${libdir}/${PN}-*/*/*/*/.debug \ ${bindir}/.debug \ " @@ -28,14 +28,14 @@ do_install() { oe_runmake DESTDIR="${D}" destdir="${D}" install install -d ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps - install -m 0644 ${WORKDIR}/mozilla-firefox.desktop ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/mozilla-firefox.png ${D}${datadir}/pixmaps/ - rm -f ${D}${libdir}/firefox-*/TestGtkEmbed + install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ + rm -f ${D}${libdir}/${PN}-*/TestGtkEmbed } -pkg_postinst_firefox() { +pkg_postinst_${PN}() { # work around requirement for root access on first startup - chmod -R a+w ${libdir}/firefox* ||true + chmod -R a+w ${libdir}/${PN}* ||true } do_stage() { |