Bug 679575 - Aegis should be enabled for Maemo6 define; r=dougt
authorOleg Romashin <romaxa@gmail.com>
Sun, 21 Aug 2011 20:11:40 +0100
changeset 75622 30e7c0dfeb3a9b8aedd44f2606429edeb3ee01c7
parent 75621 45f8416ebe6560de8c2f1cb3448e54b0504dad09
child 75623 09420e7880130fea54f60a9a7d4e9f038a16c9bd
push id1372
push userbmo@edmorley.co.uk
push dateSun, 21 Aug 2011 19:16:38 +0000
treeherdermozilla-inbound@30e7c0dfeb3a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs679575
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 679575 - Aegis should be enabled for Maemo6 define; r=dougt
mobile/installer/Makefile.in
mobile/installer/debian/fennec.aegis.in
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -174,26 +174,23 @@ PP_DEB_FILES =	debian/control \
 		debian/compat \
 		debian/files \
 		debian/menu \
 		debian/fennec.preinst \
 		debian/fennec.prerm \
 		debian/fennec.postinst \
 		$(NULL)
 
-ifdef MOZ_ENABLE_CONTENTMANAGER
+ifeq ($(MOZ_PLATFORM_MAEMO),6)
 PP_DEB_FILES += debian/fennec.aegis \
-               $(NULL)
-endif
-ifeq ($(MOZ_PLATFORM_MAEMO),6)
-PP_DEB_FILES += debian/backup \
-                debian/restore \
-		 debian/fennec.conf \
-		 debian/fennec-cud.sh \
-		 debian/fennec-rfs.sh \
+		debian/backup \
+		debian/restore \
+		debian/fennec.conf \
+		debian/fennec-cud.sh \
+		debian/fennec-rfs.sh \
 		 debian/fennec.policy \
                 $(NULL)
 endif
 
 $(PP_DEB_FILES):
 	@$(EXIT_ON_ERROR) \
 	for f in $(PP_DEB_FILES); do \
            src=$(srcdir)/debian/`basename $$f`.in; \
@@ -237,17 +234,17 @@ else
 	cp $(DIST)/branding/$(MOZ_APP_NAME)_26x26.png $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/$(MOZ_APP_NAME).png
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/
 	cp $(DIST)/branding/$(MOZ_APP_NAME)_40x40.png $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/$(MOZ_APP_NAME).png
 endif
 	fakeroot dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; fakeroot dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; fakeroot dh_builddeb;
 
 # a defined CONTENTMANAGER implicitly means MOZ_PLATFORM_MAEMO is equals 6
 # in case you use CONTENTMANGER you need to sign your package to gain tracker access.
-ifdef MOZ_ENABLE_CONTENTMANAGER
+ifeq ($(MOZ_PLATFORM_MAEMO),6)
 	if test -e "/usr/bin/aegis-deb-add"; then \
 	   fakeroot aegis-deb-add -control $(DEBDESTDIR)/DEBIAN/control .. debian/fennec.aegis=_aegis; \
 	else \
 	   echo aegis-builder not found, security signing failed!; \
 	fi
 endif
 
 	echo $(DEB_PKG_NAME) > $(DIST)/deb_name.txt
--- a/mobile/installer/debian/fennec.aegis.in
+++ b/mobile/installer/debian/fennec.aegis.in
@@ -1,8 +1,9 @@
+#filter substitution
 <aegis>
   <request>
     <credential name="TrackerReadAccess" />
     <credential name="TrackerWriteAccess" />
     <credential name="Location" />
     <for path="@installdir@/@MOZ_APP_NAME@" />
     <for path="@installdir@/plugin-container" />
   </request>