Skip to content

Firefox: update installation paths for ESR,l10n,addons #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2016
Merged

Firefox: update installation paths for ESR,l10n,addons #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions recipes-mozilla/firefox-addon/firefox-addon.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ do_install() {
EXTENSION=`sed --posix '/em:id=/!d;s/[ ]*em:id="//;s/".*//' $e/install.rdf`
[ -z "$EXTENSION" ] && exit 1

mkdir -p ${D}${libdir}/firefox/extensions/
cp -R --no-dereference --preserve=mode,links -v $e ${D}${libdir}/firefox/extensions/${EXTENSION}
mkdir -p ${D}${libdir}/firefox/browser/extensions/
cp -R --no-dereference --preserve=mode,links -v $e ${D}${libdir}/firefox/browser/extensions/${EXTENSION}
done
}

Expand Down
4 changes: 2 additions & 2 deletions recipes-mozilla/firefox-l10n/firefox-l10n.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ do_install() {

xpi-pack ${LANGUAGE} ${EXTENSION}.xpi

mkdir -p ${D}${libdir}/firefox/extensions/
install -m 0644 ${EXTENSION}.xpi ${D}${libdir}/firefox/extensions/${EXTENSION}.xpi
mkdir -p ${D}${libdir}/firefox/browser/extensions/
install -m 0644 ${EXTENSION}.xpi ${D}${libdir}/firefox/browser/extensions/${EXTENSION}.xpi
}

FILES_${PN} += "${libdir}/firefox"
12 changes: 12 additions & 0 deletions recipes-mozilla/firefox/firefox/fixes/Fix-firefox-install-dir.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -up a/config/baseconfig.mk.orig b/config/baseconfig.mk
--- a/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200
+++ b/config/baseconfig.mk 2016-03-30 13:32:10.035403121 +0200
@@ -4,7 +4,7 @@
# whether a normal build is happening or whether the check is running.
MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
ifndef TOP_DIST
1 change: 1 addition & 0 deletions recipes-mozilla/firefox/firefox_38.6.1esr.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}/source/firefox
file://debian-hacks/NSS-Adds-the-SPI-Inc.-and-CAcert.org-CA-certificates.patch \
file://debian-hacks/Work-around-binutils-assertion-on-mips.patch \
file://debian-hacks/Revert-Bump-search-engine-max-icon-size-to-35kB.patch \
file://fixes/Fix-firefox-install-dir.patch \
"

SRC_URI[archive.md5sum] = "cc74abc48ac7a888aeb24ba31a7ff209"
Expand Down