mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-03 18:34:11 +00:00 
			
		
		
		
	Import patches-unapplied version 2.285 to ubuntu/vivid-proposed
Imported using git-ubuntu import.
Changelog parent: f065c9b603d5821413a53d1241efe361b193bcc8
New changelog entries:
  * touch: removing dependencies on a specific mir platform driver as mir can
    now identify and load the correct driver during runtime
			
			
This commit is contained in:
		
							parent
							
								
									f065c9b603
								
							
						
					
					
						commit
						ff016f4510
					
				
							
								
								
									
										7
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,10 @@
 | 
			
		||||
livecd-rootfs (2.285) vivid; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * touch: removing dependencies on a specific mir platform driver as mir can
 | 
			
		||||
    now identify and load the correct driver during runtime
 | 
			
		||||
 | 
			
		||||
 -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Wed, 11 Feb 2015 23:35:42 -0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.284) vivid; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * bump the gshadow hash in 00-uid-gid-fix.chroot_early too
 | 
			
		||||
 | 
			
		||||
@ -404,7 +404,7 @@ case $PROJECT in
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
	ubuntu-touch)
 | 
			
		||||
		add_package install ubuntu-minimal mir-client-platform-android libmirplatform5driver-android ubuntu-touch
 | 
			
		||||
		add_package install ubuntu-minimal ubuntu-touch
 | 
			
		||||
		COMPONENTS='main restricted universe'
 | 
			
		||||
		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
 | 
			
		||||
		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
 | 
			
		||||
 | 
			
		||||
@ -3,8 +3,5 @@
 | 
			
		||||
echo "I: making libhybris the default alternatives for @DEB_HOST_MULTIARCH@_egl_conf"
 | 
			
		||||
update-alternatives --set @DEB_HOST_MULTIARCH@_egl_conf /usr/lib/@DEB_HOST_MULTIARCH@/libhybris-egl/ld.so.conf
 | 
			
		||||
 | 
			
		||||
echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirplatform5driver_conf"
 | 
			
		||||
update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform5driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/mir/platform5driver/android/ld.so.conf
 | 
			
		||||
 | 
			
		||||
# ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives.
 | 
			
		||||
LDCONFIG_NOTRIGGER=y ldconfig
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user