Browse Source

catch up with upstream

master
Alf Gaida 3 years ago
parent
commit
6fab4d76a4
5 changed files with 99 additions and 95 deletions
  1. 2
    2
      pyfll/data/grub.cfg
  2. 4
    5
      pyfll/data/locales/keyboards
  3. 82
    49
      pyfll/debian/changelog
  4. 1
    11
      pyfll/fll.conf
  5. 10
    28
      pyfll/pyfll

+ 2
- 2
pyfll/data/grub.cfg View File

@@ -438,11 +438,11 @@ if [ -z "${loaded}" ]; then
438 438
   theme=${grub_theme}
439 439
   export theme
440 440
  fi
441
-
441
+ 
442 442
  menu_color_normal=cyan/blue
443 443
  menu_color_highlight=white/blue
444 444
 
445
- if [ -n "${iso_path}" ]; then
445
+ if [ -n "${iso_path}" ]; then 
446 446
   auto="${auto} fromiso=${iso_path}"
447 447
  fi
448 448
 

+ 4
- 5
pyfll/data/locales/keyboards View File

@@ -1,7 +1,6 @@
1 1
 for kk in us ba be bg br by ca ch cz de dk es et fi fr gb gr hr hu ie il is it jp kr latam no pl pt ro ru se si sk tr ua; do
2
-      menuentry "keytable=${kk}" "${kk}" {
3
-        def_keyboard="${2}"
4
-        keyboard="keytable=${2}"
5
-        menu_reload
6
-      }
2
+      menuentry "keytable=${kk}" "${kk}" {def_keyboard="${2}"
3
+keyboard="keytable=${2}"
4
+menu_reload
5
+}
7 6
     done

+ 82
- 49
pyfll/debian/changelog View File

@@ -2,6 +2,53 @@ pyfll (2013.02) UNRELEASED; urgency=low
2 2
 
3 3
   * NOT RELEASED YET
4 4
 
5
+  [ Joaquim Boura ]
6
+  * cleaned up xfce4-desktop-min
7
+
8
+  [ Niall Walsh ]
9
+  * grub >=2 fixups:
10
+    - do not append grub arch in $prefix
11
+    - postpone rename of kernel/initrd to 8.3 until after bootloader configs
12
+    - drop grub-legacy support
13
+    - stage non-efi files under i386-pc
14
+  * major overhaul of live grub.cfg
15
+  * added locales2grub to use fll-live-initsripts locales.csv to produce
16
+    data/locales/ll_CC data/tz/$region and data/locales/keyboards
17
+  * change kernel sorting to use apt_pkg and reverse
18
+  * re-kill display of memtest on UEFI where it fails
19
+  * fix sources generation by recreating and restarting SourceRecords for
20
+    each package.
21
+  * generate efi images for ia32 on x86 and add grub debs to extras for it
22
+  * adapt for syslinux v6.
23
+  * TEMP? drop isolinux and switch to grub (automatic fromhd broken)
24
+  * drop bluez-pcmcia-support (gone with bluez 5.x)
25
+  * add efibootmgr for i386.
26
+  * same bootloader (grub-* and efibootmgr) packages for i386 and amd64
27
+  * set and export pager by default in grub.cfg
28
+  * add grub2-fll-portable-efi to extras
29
+  * add part_gpt to built in modules for cd efi loader (for detect efi anyway)
30
+  * create /disks to reflect changed fstab_generator
31
+  * enable networkd, resolved, timesyncd (drop ntpdate and resolvconf)
32
+    - setup symlink for resolved and stop it having any fallback DNS servers
33
+  * use xorriso newer grub2 boot handling and simplify things
34
+    - drop our grub_eltorito hackery and just build a grub2 eltorito image
35
+    - drop grub_embed hackery and use existing grub_hybrid.img
36
+    - drop to single set of efis as in efi.img
37
+    - detect fromhd in grub itself
38
+    - handle uuid creation in pyfll itself not grub
39
+  * grub menu
40
+    - start hotkeys and classes
41
+    - make more editor friendly
42
+    - add local kernel command line option menu(s)
43
+    - clock always at start, lang before default (kernel)
44
+  * add internal gpthybrid
45
+  * add secondary squashfs
46
+  * comment nbd-client out, needed love anyway and is causing ordering issues
47
+
48
+  [ Roland Engert ]
49
+  * add initial razorqt profile 
50
+  * add qupzilla, qpdfview
51
+
5 52
   [ Stefan Lippers-Hollmann ]
6 53
   * drop explicit dependency on xserver-xorg-input-vmmouse, it's covered by
7 54
     xserver-xorg-input-all for jessie.
@@ -55,7 +102,8 @@ pyfll (2013.02) UNRELEASED; urgency=low
55 102
   * fix up lamp package selection.
56 103
   * exclude grub_eltorito from md5sum generation, it's modified after the
57 104
     fact.
58
-  * hwsupport-powermanagement: drop pm-utils, acpi-support-base
105
+  * drop hwsupport-powermanagement sub-profile, it's been replaced by systemd
106
+    and related higher level powermanagement integration.
59 107
   * s/kbattleship/knavalbattle/
60 108
   * don't modify lvm.conf anymore, it's been a no-op for a while already.
61 109
   * fix memtest86+ entry for live grub.cfg.
@@ -69,54 +117,39 @@ pyfll (2013.02) UNRELEASED; urgency=low
69 117
     better choice for the uncommon ones.
70 118
   * switch to http.debian.net as GeoMirror.
71 119
   * convert to machine readable copyright.
72
-
73
-  [ Joaquim Boura ]
74
-  * cleaned up xfce4-desktop-min
75
-
76
-  [ Niall Walsh ]
77
-  * grub >=2 fixups:
78
-    - do not append grub arch in $prefix
79
-    - postpone rename of kernel/initrd to 8.3 until after bootloader configs
80
-    - drop grub-legacy support
81
-    - stage non-efi files under i386-pc
82
-  * major overhaul of live grub.cfg
83
-  * added locales2grub to use fll-live-initsripts locales.csv to produce
84
-    data/locales/ll_CC data/tz/$region and data/locales/keyboards
85
-  * change kernel sorting to use apt_pkg and reverse
86
-  * re-kill display of memtest on UEFI where it fails
87
-  * fix sources generation by recreating and restarting SourceRecords for
88
-    each package.
89
-  * generate efi images for ia32 on x86 and add grub debs to extras for it
90
-  * adapt for syslinux v6.
91
-  * TEMP? drop isolinux and switch to grub (automatic fromhd broken)
92
-  * drop bluez-pcmcia-support (gone with bluez 5.x)
93
-  * add efibootmgr for i386.
94
-  * same bootloader (grub-* and efibootmgr) packages for i386 and amd64
95
-  * set and export pager by default in grub.cfg
96
-  * add grub2-fll-portable-efi to extras
97
-  * add part_gpt to built in modules for cd efi loader (for detect efi anyway)
98
-  * create /disks to reflect changed fstab_generator
99
-  * enable networkd, resolved, timesyncd (drop ntpdate and resolvconf)
100
-    - setup symlink for resolved and stop it having any fallback DNS servers
101
-  * use xorriso newer grub2 boot handling and simplify things
102
-    - drop our grub_eltorito hackery and just build a grub2 eltorito image
103
-    - drop grub_embed hackery and use existing grub_hybrid.img
104
-    - drop to single set of efis as in efi.img
105
-    - detect fromhd in grub itself
106
-    - handle uuid creation in pyfll itself not grub
107
-  * grub menu
108
-    - start hotkeys and classes
109
-    - make more editor friendly
110
-    - add local kernel command line option menu(s)
111
-    - clock always at start, lang before default (kernel)
112
-  * add internal gpthybrid
113
-  * add secondary squashfs
114
-
115
-  [ Roland Engert ]
116
-  * add initial razorqt profile 
117
-  * add qupzilla, qpdfview
118
-
119
- -- Niall Walsh <niallwalsh@celtux.org>  Fri, 05 Sep 2014 02:39:12 +0100
120
+  * add kio-mtp to kde-basic (kde-lite/ kde-full).
121
+  * silence grepping /etc/default/grub.
122
+  * drop acpid, it's no longer needed with systemd.
123
+  * switch to httpredir.debian.org as official GeoMirror.
124
+  * switch default to sddm.
125
+  * inital update for KDE5.
126
+  * kde-essential: add plasma-workspace, kde-baseapps, kio and kwin-x11.
127
+  * kde-basic: kio-extras
128
+  * work around broken kde-desktop recommends.
129
+  * drop fluxbox from non-fluxbox profiles.
130
+  * disable kio-mtp for the time being.
131
+  * add missing dependencies for KDE5.
132
+  * packages.d/kde-basic: drop knemo, it's no longer in Debian.
133
+  * s/gstreamer0.10/gstreamer1.0/.
134
+  * drop kio-mtp, it's no longer necessary with KDE5/ dolphin 15.08.x
135
+    (kio-extras taking over that aspect for KDE5 based applications).
136
+  * kde-desktop: add plasma-systray-legacy to help hplip-gui staying legacy.
137
+  * move iceweasel to utils-x, in order to get it pulled into all
138
+    profiles >= lite, as konqueror can't really be considered to be an option
139
+    anymore; kde-stripped keeps excluding it.
140
+  * packages.d/firmware: update to recent package reshuffling.
141
+  * s/myspell/hunspell/.
142
+    being, as they haven't been fixed for KDE4 for several months.
143
+  * disable xfce4-volumed, it's no longer available.
144
+  * add initial lxqt-stripped and lxqt-lite profiles.
145
+  * s/xchat/hexchat/.
146
+  * lxqt/lxde: use lightdm as display-manager.
147
+  * prevent gnupg v1 from getting pulled into the ISO.
148
+  * gnome-desktop: disable f-spot and epiphany-extensions.
149
+  * add apt-transport-https.
150
+  * s/kgamma/kgamma5/.
151
+
152
+ -- Niall Walsh <niallwalsh@celtux.org>  Tue, 09 Jun 2015 18:49:51 +0100
120 153
 
121 154
 pyfll (2013.01) hesperides; urgency=low
122 155
 

+ 1
- 11
pyfll/fll.conf View File

@@ -79,15 +79,6 @@ i18n = """
79 79
        suite          = sid
80 80
        components     = main
81 81
 
82
-       [[ 'base' ]]
83
-       label          = base
84
-       uri            = http://packages.siduction.org/base
85
-       #cached         =  http://176.9.46.77:3142/packages.siduction.org/base
86
-       suite          = unstable
87
-       components     = main
88
-       #gpgkey        = 151E2489
89
-       #gpgkey        = /usr/share/aptosid-archive-keyring/0xE3BD538B.asc
90
-       keyring        = siduction-archive-keyring
91 82
 
92 83
        [[ 'extra' ]]
93 84
        label          = extra
@@ -113,7 +104,7 @@ i18n = """
113 104
 #build_dir =
114 105
 #output_dir =
115 106
 
116
-#build_log = /path/to/build.log
107
+#build_log =
117 108
 
118 109
 #media_include = /path/to/release/notes
119 110
 
@@ -142,7 +133,6 @@ FLL_DISTRO_URL =  "http://siduction.org"
142 133
 
143 134
 FLL_IMAGE_DIR  = "siduction"
144 135
 FLL_IMAGE_FILE = "siduction"
145
-FLL_UNION_MODULE = "overlay"
146 136
 FLL_MOUNTPOINT = "/fll/siduction"
147 137
 FLL_MEDIA_NAME = "siduction.iso"
148 138
 FLL_LIVE_USER        = "siducer"

+ 10
- 28
pyfll/pyfll View File

@@ -180,6 +180,7 @@ class FLLBuilder(object):
180 180
                '/usr/sbin/update-grub',
181 181
                '/usr/sbin/update-initramfs']
182 182
 
183
+
183 184
     def __init__(self, options):
184 185
         '''Accept options dict, setup logging.'''
185 186
         self.opts = options
@@ -502,7 +503,7 @@ class FLLBuilder(object):
502 503
             self.log.info('No key for signing ISO hashes!')
503 504
             self.opts.k = None
504 505
         else:
505
-            self.opts.k = self.conf['options']['hashkey']
506
+            self.opts.k = self.conf['options'].get('hashkey')
506 507
             self.log.debug('Using key %s for signing.' % self.opts.k)
507 508
 
508 509
         if not 'options' in self.conf:
@@ -516,7 +517,7 @@ class FLLBuilder(object):
516 517
             if not self.opts.b:
517 518
                 self.opts.b = self.__prepDir(os.getcwd())
518 519
 
519
-        if self.conf['options']['output_dir']:
520
+        if self.conf['options'].get('output_dir'):
520 521
             if not self.opts.o:
521 522
                 dir = self.conf['options']['output_dir']
522 523
                 self.opts.o = self.__prepDir(dir)
@@ -946,7 +947,8 @@ class FLLBuilder(object):
946 947
     def __cdebBootStrap(self, arch, dir, mirror, codename):
947 948
         '''Bootstrap a debian system with cdebootstrap.'''
948 949
         cmd = ['cdebootstrap', '--arch=%s' % arch,
949
-               '--include=apt-utils,bzip2,gnupg,xz-utils',
950
+               '--include=apt-utils,bzip2,gnupg2,xz-utils',
951
+               '--exclude=gnupg',
950 952
                '--flavour=minimal', codename, dir, mirror]
951 953
 
952 954
         if self.opts.d:
@@ -963,7 +965,7 @@ class FLLBuilder(object):
963 965
     def __debBootStrap(self, arch, dir, mirror, codename):
964 966
         '''Bootstrap a debian system with debootstrap.'''
965 967
         cmd = ['debootstrap', '--arch=%s' % arch,
966
-               '--include=apt-utils,bzip2,gnupg,xz-utils',
968
+               '--include=apt-utils,bzip2,gnupg2,xz-utils',
967 969
                '--variant=minbase', codename, dir, mirror]
968 970
 
969 971
         if self.opts.d or self.opts.v:
@@ -1070,16 +1072,6 @@ class FLLBuilder(object):
1070 1072
         self.log.info('preparing apt in %s chroot...' % arch)
1071 1073
         chroot = os.path.join(self.temp, arch)
1072 1074
 
1073
-        #apt_preferences = self.conf['options']['apt_preferences']
1074
-        #if apt_preferences:
1075
-        #    self.log.info('importing apt preferences file')
1076
-        #    try:
1077
-        #        shutil.copy(apt_preferences, os.path.join(chroot, 'etc/apt/'))
1078
-        #    except IOError:
1079
-        #        self.log.error('apt preferences file failed to copy: %s' %
1080
-        #                       apt_preferences)
1081
-        #        raise FllError
1082
-
1083 1075
         preferences_d = self.conf['options']['preferences_d']
1084 1076
         if preferences_d:
1085 1077
             self.log.info('importing apt preferences directory')
@@ -1092,16 +1084,6 @@ class FLLBuilder(object):
1092 1084
                                preferences_d)
1093 1085
                 raise FllError
1094 1086
 
1095
-        #apt_configuration = self.conf['options']['apt_configuration']
1096
-        #if apt_configuration:
1097
-        #    self.log.info('importing apt configuration file')
1098
-        #    try:
1099
-        #        shutil.copy(apt_configuration, os.path.join(chroot, 'etc/apt/'))
1100
-        #    except IOError:
1101
-        #        self.log.error('apt configuration file failed to copy: %s' %
1102
-        #                       apt_configuration)
1103
-        #        raise FllError
1104
-
1105 1087
         apt_conf_d = self.conf['options']['apt_conf_d']
1106 1088
         if apt_conf_d:
1107 1089
             self.log.info('importing apt configuration directory')
@@ -2190,16 +2172,16 @@ class FLLBuilder(object):
2190 2172
             isolinuxmsg.write('%s_%s_safe_settings\n' % (distro, cpu))
2191 2173
             kcount[cpu[0:3]] = kcount[cpu[0:3]] + 1
2192 2174
 
2193
-        isolinuxcfg.write('label Boot_from_HardDisk\n')
2175
+        isolinuxcfg.write('label Boot_from_Hard_Disk\n')
2194 2176
         isolinuxcfg.write('\tlocalboot 0x80\n')
2195 2177
         isolinuxcfg.write('\n')
2196
-        isolinuxmsg.write('hdboot\n')
2178
+        isolinuxmsg.write('Boot_from_Hard_Disk\n')
2197 2179
 
2198 2180
         if os.path.isfile(os.path.join(boot_dir, 'memtest')):
2199
-            isolinuxcfg.write('label Memorytest\n')
2181
+            isolinuxcfg.write('label Memory_test_(memtest86+)\n')
2200 2182
             isolinuxcfg.write('\tkernel /boot/memtest\n')
2201 2183
             isolinuxcfg.write('\n')
2202
-            isolinuxmsg.write('memtest\n')
2184
+            isolinuxmsg.write('Memory_test_(memtest86+)\n')
2203 2185
 
2204 2186
         isolinuxcfg.write('label Hardwaredetection\n')
2205 2187
         isolinuxcfg.write('\tkernel /boot/isolinux/hdt.c32\n')

Loading…
Cancel
Save