[Pkg-privacy-commits] [tails-installer] 21/34: Drop OLPC "support".

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to branch tails/master
in repository tails-installer.

commit a18a80d5d0f07e67c3f4bb84d7f0b3936fb13aa7
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Jan 20 14:14:56 2018 +0000

    Drop OLPC "support".
    
    AFAIK we've never run this code. Let's simplify.
---
 tails-installer            |  2 --
 tails_installer/creator.py | 24 ++----------------------
 tails_installer/gui.py     |  2 --
 tails_installer/olpc.py    | 40 ----------------------------------------
 4 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/tails-installer b/tails-installer
index 65f9616..8fb250d 100755
--- a/tails-installer
+++ b/tails-installer
@@ -47,8 +47,6 @@ def parse_args():
                       action='store', metavar='ARGS',
                       help='Supply extra kernel arguments'
                            ' (eg: -k noswap,selinux=0,elevator=noop)')
-    parser.add_option('-x', '--no-xo', dest='xo', action='store_false',
-                      help='Disable OLPC support')
     parser.add_option('-m', '--reset-mbr', dest='reset_mbr',
                       action='store_true', default=False,
                       help='Reset the Master Boot Record')
diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index ad32c59..13205e9 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -167,29 +167,9 @@ class TailsInstallerCreator(object):
 
         Platform-specific classes inheriting from the TailsInstallerCreator are
         expected to implement this method to install the bootloader to the
-        specified device using syslinux.  This specific implemention is
-        platform independent and performs sanity checking along with adding
-        OLPC support.
+        specified device using syslinux.
         """
-        if self.opts.xo:
-            self.setup_olpc()
-
-    def setup_olpc(self):
-        """ Install the Open Firmware configuration for the OLPC.
-
-        This method will make the selected device bootable on the OLPC.  It
-        does this by installing a /boot/olpc.fth open firmware configuration
-        file that enables booting off of USB and SD cards on the XO.
-        """
-        from tails_installer.olpc import ofw_config
-        self.log.info(_('Setting up OLPC boot file...'))
-        args = self.get_kernel_args()
-        if not os.path.exists(self.get_liveos_file_path('boot')):
-            os.mkdir(self.get_liveos_file_path('boot'))
-        olpc_cfg = file(self.get_liveos_file_path('boot', 'olpc.fth'), 'w')
-        olpc_cfg.write(ofw_config % ' '.join(args))
-        olpc_cfg.close()
-        self.log.debug('Wrote %s' % olpc_cfg.name)
+        return
 
     def get_kernel_args(self):
         """ Grab the kernel arguments from our syslinux configuration """
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 42c492d..65fa7ab 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -308,8 +308,6 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             self.opts.unprivileged = True
         if self.opts.noverify == None:
             self.opts.noverify = True
-        if self.opts.xo == None:
-            self.opts.xo = False
 
         self._build_ui()
 
diff --git a/tails_installer/olpc.py b/tails_installer/olpc.py
deleted file mode 100644
index 97dc30e..0000000
--- a/tails_installer/olpc.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Open Firmware Configuration for the OLPC
-ofw_config = """\
-\ Boot script for USB boot
-\ Authors: Mitch Bradley <wmb AT laptop DOT org>
-hex  rom-pa fffc7 + 4 $number drop  h# 2e19 < [if]
-  patch 2drop erase claim-params
-  : high-ramdisk  ( -- )
-     cv-load-ramdisk
-     h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk - ffff.f000 and ( new-ramdisk-adr )
-     ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
-     to ramdisk-adr
-  ;
-  ' high-ramdisk to load-ramdisk
-[then]
-
-: set-bootpath-dev  ( -- )
-   " /chosen" find-package  if                       ( phandle )
-      " bootpath" rot  get-package-property  0=  if  ( propval$ )
-         get-encoded-string                          ( bootpath$ )
-         [char] \ left-parse-string  2nip            ( dn$ )
-         dn-buf place                                ( )
-      then
-   then
-
-   " /sd"  dn-buf  count  sindex  0>=   if
-          " sd:"
-   else
-          " u:"
-   then
-   " BOOTPATHDEV" $set-macro
-;
-
-set-bootpath-dev
-" %s" to boot-file
-" ${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
-" ${BOOTPATHDEV}\syslinux\\vmlinuz0" expand$ to boot-device
-unfreeze
-dcon-unfreeze
-boot
-"""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git