Browse Source

move configurations to ./conf

update to upstream, if applicable
master
Alf Gaida 4 years ago
parent
commit
12e819696a
80 changed files with 307 additions and 9 deletions
  1. 1
    1
      bootstrap-current.sh
  2. 1
    1
      bootstrap-next.sh
  3. 1
    1
      bootstrap-xperimental.sh
  4. 0
    3
      pyfll/apt/xperimental
  5. 1
    0
      pyfll/apt/xperimental/apt.conf
  6. 3
    0
      pyfll/apt/xperimental/preferences
  7. 0
    0
      pyfll/conf/cinnamon_current_amd64.conf
  8. 0
    0
      pyfll/conf/cinnamon_current_i386.conf
  9. 0
    0
      pyfll/conf/cinnamon_next_amd64.conf
  10. 0
    0
      pyfll/conf/cinnamon_next_i386.conf
  11. 0
    0
      pyfll/conf/cinnamon_xperimental_amd64.conf
  12. 0
    0
      pyfll/conf/cinnamon_xperimental_i386.conf
  13. 0
    0
      pyfll/conf/gnome_current_amd64.conf
  14. 0
    0
      pyfll/conf/gnome_current_i386.conf
  15. 0
    0
      pyfll/conf/gnome_next_amd64.conf
  16. 0
    0
      pyfll/conf/gnome_next_i386.conf
  17. 0
    0
      pyfll/conf/gnome_xperimental_amd64.conf
  18. 0
    0
      pyfll/conf/gnome_xperimental_i386.conf
  19. 0
    0
      pyfll/conf/kde_current_amd64.conf
  20. 0
    0
      pyfll/conf/kde_current_i386.conf
  21. 0
    0
      pyfll/conf/kde_next_amd64.conf
  22. 0
    0
      pyfll/conf/kde_next_i386.conf
  23. 0
    0
      pyfll/conf/kde_plasma5_current_amd64.conf
  24. 0
    0
      pyfll/conf/kde_plasma5_current_i386.conf
  25. 0
    0
      pyfll/conf/kde_plasma5_next_amd64.conf
  26. 0
    0
      pyfll/conf/kde_plasma5_next_i386.conf
  27. 0
    0
      pyfll/conf/kde_plasma5_xperimental_amd64.conf
  28. 0
    0
      pyfll/conf/kde_plasma5_xperimental_i386.conf
  29. 0
    0
      pyfll/conf/kde_xperimental_amd64.conf
  30. 0
    0
      pyfll/conf/kde_xperimental_i386.conf
  31. 0
    0
      pyfll/conf/lxde_current_amd64.conf
  32. 0
    0
      pyfll/conf/lxde_current_i386.conf
  33. 0
    0
      pyfll/conf/lxde_next_amd64.conf
  34. 0
    0
      pyfll/conf/lxde_next_i386.conf
  35. 0
    0
      pyfll/conf/lxde_xperimental_amd64.conf
  36. 0
    0
      pyfll/conf/lxde_xperimental_i386.conf
  37. 0
    0
      pyfll/conf/lxqt_current_amd64.conf
  38. 0
    0
      pyfll/conf/lxqt_current_i386.conf
  39. 0
    0
      pyfll/conf/lxqt_next_amd64.conf
  40. 0
    0
      pyfll/conf/lxqt_next_i386.conf
  41. 2
    1
      pyfll/conf/lxqt_xperimental_amd64.conf
  42. 0
    0
      pyfll/conf/lxqt_xperimental_i386.conf
  43. 0
    0
      pyfll/conf/mate_current_amd64.conf
  44. 0
    0
      pyfll/conf/mate_current_i386.conf
  45. 0
    0
      pyfll/conf/mate_next_amd64.conf
  46. 0
    0
      pyfll/conf/mate_next_i386.conf
  47. 0
    0
      pyfll/conf/mate_xperimental_amd64.conf
  48. 0
    0
      pyfll/conf/mate_xperimental_i386.conf
  49. 1
    0
      pyfll/conf/nox_current_amd64.conf
  50. 0
    0
      pyfll/conf/nox_current_i386.conf
  51. 0
    0
      pyfll/conf/nox_next_amd64.conf
  52. 0
    0
      pyfll/conf/nox_next_i386.conf
  53. 0
    0
      pyfll/conf/nox_xperimental_amd64.conf
  54. 0
    0
      pyfll/conf/nox_xperimental_i386.conf
  55. 0
    0
      pyfll/conf/rqt_current_amd64.conf
  56. 0
    0
      pyfll/conf/rqt_current_i386.conf
  57. 0
    0
      pyfll/conf/rqt_next_amd64.conf
  58. 0
    0
      pyfll/conf/rqt_next_i386.conf
  59. 0
    0
      pyfll/conf/rqt_xperimental_amd64.conf
  60. 0
    0
      pyfll/conf/rqt_xperimental_i386.conf
  61. 0
    0
      pyfll/conf/siducation-full.conf
  62. 0
    0
      pyfll/conf/siducation-lite.conf
  63. 132
    0
      pyfll/conf/steam_current_i386.conf
  64. 0
    0
      pyfll/conf/xfce_current_amd64.conf
  65. 0
    0
      pyfll/conf/xfce_current_i386.conf
  66. 0
    0
      pyfll/conf/xfce_next_amd64.conf
  67. 0
    0
      pyfll/conf/xfce_next_i386.conf
  68. 0
    0
      pyfll/conf/xfce_xperimental_amd64.conf
  69. 0
    0
      pyfll/conf/xfce_xperimental_i386.conf
  70. 0
    0
      pyfll/conf/xorg_current_amd64.conf
  71. 0
    0
      pyfll/conf/xorg_current_i386.conf
  72. 0
    0
      pyfll/conf/xorg_next_amd64.conf
  73. 0
    0
      pyfll/conf/xorg_next_i386.conf
  74. 0
    0
      pyfll/conf/xorg_xperimental_amd64.conf
  75. 0
    0
      pyfll/conf/xorg_xperimental_i386.conf
  76. 0
    0
      pyfll/conf/xxx_lxqt_sid_amd64.conf
  77. 31
    0
      pyfll/debian/changelog
  78. 113
    0
      pyfll/doc/fll.8
  79. 19
    2
      pyfll/pyfll
  80. 2
    0
      steam_current_i386

+ 1
- 1
bootstrap-current.sh View File

@@ -12,5 +12,5 @@ sed -e "s/\@CODENAME\@/${CODENAME}/g" \
12 12
     -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
13 13
     -e "s/\@VERSION\@/${VERSION}/g" \
14 14
       ${TEMPLATE} \
15
-       > ../${TEMPLATE} 
15
+       > ../conf/${TEMPLATE} 
16 16
 done

+ 1
- 1
bootstrap-next.sh View File

@@ -12,5 +12,5 @@ sed -e "s/\@CODENAME\@/${CODENAME}/g" \
12 12
     -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
13 13
     -e "s/\@VERSION\@/${VERSION}/g" \
14 14
       ${TEMPLATE} \
15
-       > ../${TEMPLATE}
15
+       > ../conf/${TEMPLATE}
16 16
 done

+ 1
- 1
bootstrap-xperimental.sh View File

@@ -12,5 +12,5 @@ sed -e "s/\@CODENAME\@/${CODENAME}/g" \
12 12
     -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
13 13
     -e "s/\@VERSION\@/${VERSION}/g" \
14 14
       ${TEMPLATE} \
15
-       > ../${TEMPLATE} 
15
+       > ../conf/${TEMPLATE} 
16 16
 done

+ 0
- 3
pyfll/apt/xperimental View File

@@ -1,3 +0,0 @@
1
-Package: *
2
-Pin: release n=experimental,o=Siduction
3
-Pin-Priority: 1000

+ 1
- 0
pyfll/apt/xperimental/apt.conf View File

@@ -0,0 +1 @@
1
+Acquire::http { Proxy "http://192.168.150.41:3142"; };

+ 3
- 0
pyfll/apt/xperimental/preferences View File

@@ -0,0 +1,3 @@
1
+Package: *
2
+Pin: release n=experimental, o=Siduction
3
+Pin-Priority: 500

pyfll/cinnamon_current_amd64.conf → pyfll/conf/cinnamon_current_amd64.conf View File


pyfll/cinnamon_current_i386.conf → pyfll/conf/cinnamon_current_i386.conf View File


pyfll/cinnamon_next_amd64.conf → pyfll/conf/cinnamon_next_amd64.conf View File


pyfll/cinnamon_next_i386.conf → pyfll/conf/cinnamon_next_i386.conf View File


pyfll/cinnamon_xperimental_amd64.conf → pyfll/conf/cinnamon_xperimental_amd64.conf View File


pyfll/cinnamon_xperimental_i386.conf → pyfll/conf/cinnamon_xperimental_i386.conf View File


pyfll/gnome_current_amd64.conf → pyfll/conf/gnome_current_amd64.conf View File


pyfll/gnome_current_i386.conf → pyfll/conf/gnome_current_i386.conf View File


pyfll/gnome_next_amd64.conf → pyfll/conf/gnome_next_amd64.conf View File


pyfll/gnome_next_i386.conf → pyfll/conf/gnome_next_i386.conf View File


pyfll/gnome_xperimental_amd64.conf → pyfll/conf/gnome_xperimental_amd64.conf View File


pyfll/gnome_xperimental_i386.conf → pyfll/conf/gnome_xperimental_i386.conf View File


pyfll/kde_current_amd64.conf → pyfll/conf/kde_current_amd64.conf View File


pyfll/kde_current_i386.conf → pyfll/conf/kde_current_i386.conf View File


pyfll/kde_next_amd64.conf → pyfll/conf/kde_next_amd64.conf View File


pyfll/kde_next_i386.conf → pyfll/conf/kde_next_i386.conf View File


pyfll/kde_plasma5_current_amd64.conf → pyfll/conf/kde_plasma5_current_amd64.conf View File


pyfll/kde_plasma5_current_i386.conf → pyfll/conf/kde_plasma5_current_i386.conf View File


pyfll/kde_plasma5_next_amd64.conf → pyfll/conf/kde_plasma5_next_amd64.conf View File


pyfll/kde_plasma5_next_i386.conf → pyfll/conf/kde_plasma5_next_i386.conf View File


pyfll/kde_plasma5_xperimental_amd64.conf → pyfll/conf/kde_plasma5_xperimental_amd64.conf View File


pyfll/kde_plasma5_xperimental_i386.conf → pyfll/conf/kde_plasma5_xperimental_i386.conf View File


pyfll/kde_xperimental_amd64.conf → pyfll/conf/kde_xperimental_amd64.conf View File


pyfll/kde_xperimental_i386.conf → pyfll/conf/kde_xperimental_i386.conf View File


pyfll/lxde_current_amd64.conf → pyfll/conf/lxde_current_amd64.conf View File


pyfll/lxde_current_i386.conf → pyfll/conf/lxde_current_i386.conf View File


pyfll/lxde_next_amd64.conf → pyfll/conf/lxde_next_amd64.conf View File


pyfll/lxde_next_i386.conf → pyfll/conf/lxde_next_i386.conf View File


pyfll/lxde_xperimental_amd64.conf → pyfll/conf/lxde_xperimental_amd64.conf View File


pyfll/lxde_xperimental_i386.conf → pyfll/conf/lxde_xperimental_i386.conf View File


pyfll/lxqt_current_amd64.conf → pyfll/conf/lxqt_current_amd64.conf View File


pyfll/lxqt_current_i386.conf → pyfll/conf/lxqt_current_i386.conf View File


pyfll/lxqt_next_amd64.conf → pyfll/conf/lxqt_next_amd64.conf View File


pyfll/lxqt_next_i386.conf → pyfll/conf/lxqt_next_i386.conf View File


pyfll/lxqt_xperimental_amd64.conf → pyfll/conf/lxqt_xperimental_amd64.conf View File

@@ -114,7 +114,8 @@ build_dir = /var/cache/pyfll
114 114
 output_dir = /srv/iso/lxqt/amd64
115 115
 # build_log = #/path/to/build.log
116 116
 # media_include = /path/to/release/notes
117
-apt_preferences = pyfll/apt/xperimental
117
+apt_preferences = pyfll/apt/xperimental/preferences
118
+apt_configuration = pyfll/apt/xperimental/apt.conf
118 119
 # http_proxy =
119 120
 # ftp_proxy =
120 121
 

pyfll/lxqt_xperimental_i386.conf → pyfll/conf/lxqt_xperimental_i386.conf View File


pyfll/mate_current_amd64.conf → pyfll/conf/mate_current_amd64.conf View File


pyfll/mate_current_i386.conf → pyfll/conf/mate_current_i386.conf View File


pyfll/mate_next_amd64.conf → pyfll/conf/mate_next_amd64.conf View File


pyfll/mate_next_i386.conf → pyfll/conf/mate_next_i386.conf View File


pyfll/mate_xperimental_amd64.conf → pyfll/conf/mate_xperimental_amd64.conf View File


pyfll/mate_xperimental_i386.conf → pyfll/conf/mate_xperimental_i386.conf View File


pyfll/nox_current_amd64.conf → pyfll/conf/nox_current_amd64.conf View File

@@ -114,6 +114,7 @@ output_dir = /srv/iso/nox/amd64
114 114
 # build_log = #/path/to/build.log
115 115
 # media_include = /path/to/release/notes
116 116
 apt_preferences = pyfll/apt/preferences
117
+# apt_configuration =
117 118
 # http_proxy =
118 119
 # ftp_proxy =
119 120
 

pyfll/nox_current_i386.conf → pyfll/conf/nox_current_i386.conf View File


pyfll/nox_next_amd64.conf → pyfll/conf/nox_next_amd64.conf View File


pyfll/nox_next_i386.conf → pyfll/conf/nox_next_i386.conf View File


pyfll/nox_xperimental_amd64.conf → pyfll/conf/nox_xperimental_amd64.conf View File


pyfll/nox_xperimental_i386.conf → pyfll/conf/nox_xperimental_i386.conf View File


pyfll/rqt_current_amd64.conf → pyfll/conf/rqt_current_amd64.conf View File


pyfll/rqt_current_i386.conf → pyfll/conf/rqt_current_i386.conf View File


pyfll/rqt_next_amd64.conf → pyfll/conf/rqt_next_amd64.conf View File


pyfll/rqt_next_i386.conf → pyfll/conf/rqt_next_i386.conf View File


pyfll/rqt_xperimental_amd64.conf → pyfll/conf/rqt_xperimental_amd64.conf View File


pyfll/rqt_xperimental_i386.conf → pyfll/conf/rqt_xperimental_i386.conf View File


pyfll/siducation-full.conf → pyfll/conf/siducation-full.conf View File


pyfll/siducation-lite.conf → pyfll/conf/siducation-lite.conf View File


+ 132
- 0
pyfll/conf/steam_current_i386.conf View File

@@ -0,0 +1,132 @@
1
+[ 'sourcedistro' ]
2
+# this section is experimental, modify at your own risk
3
+#	name = debian
4
+#	codename = unstable
5
+
6
+[ 'packages' ]
7
+profile = steam
8
+
9
+i18n = """
10
+    # de_DE
11
+    # en_GB
12
+    # en_US
13
+    # it_IT
14
+    # pl_PL
15
+    # pt_BR
16
+    # ro_RO
17
+"""
18
+
19
+lang = """
20
+    de_DE
21
+    en_GB
22
+    en_US
23
+    it_IT
24
+    pl_PL
25
+    pt_BR
26
+    ro_RO
27
+"""
28
+
29
+packages = """
30
+    gfxboot-themes-siduction-indiansummer-xfce
31
+    siduction-art-xfce-indiansummer
32
+    siduction-live-settings-xfce-indiansummer
33
+    siduction-settings-xfce-indiansummer
34
+    siduction-settings-lightdm-gtk-indiansummer
35
+"""
36
+
37
+# deps = """
38
+# """
39
+
40
+# debconf = """
41
+# """
42
+
43
+[ 'archs' ]
44
+    [[ 'i386' ]]
45
+    linux = siduction-686
46
+
47
+    # [[ 'amd64' ]]
48
+    # linux = siduction-amd64
49
+
50
+[ 'repos' ]
51
+    [[ 'debian' ]]
52
+    label           = debian
53
+    uri             = http://debian.siduction.org/
54
+    suite           = unstable
55
+    components      = main
56
+
57
+    [[ 'base' ]]
58
+    label           = base
59
+    uri             = http://packages.siduction.org/base
60
+    suite           = unstable
61
+    components      = main
62
+    keyring         = siduction-archive-keyring
63
+
64
+    [[ 'base-experimental' ]]
65
+    label         = base-experimental
66
+    uri           = http://packages.siduction.org/base
67
+    suite         = experimental
68
+    components    = main
69
+
70
+    [[ 'extra' ]]
71
+    label           = extra
72
+    uri             = http://packages.siduction.org/extra
73
+    suite           = unstable
74
+    components      = main
75
+
76
+    [[ 'extra-experimental' ]]
77
+    label         = extra-experimental
78
+    uri           = http://packages.siduction.org/extra
79
+    suite         = experimental
80
+    components    = main
81
+
82
+    [[ 'fix' ]]
83
+    label           = fixes
84
+    uri             = http://packages.siduction.org/fixes
85
+    suite           = unstable
86
+    components      = main
87
+
88
+[ 'options' ]
89
+build_dir = /var/cache/pyfll
90
+output_dir = /srv/iso/xfce/i386
91
+# build_log = #/path/to/build.log
92
+# media_include = /path/to/release/notes
93
+apt_preferences = pyfll/apt/preferences
94
+# http_proxy =
95
+# ftp_proxy =
96
+
97
+# boot_cmdline = quiet
98
+# boot_timeout = 30
99
+# apt_recommends = yes
100
+bootstrapper = debootstrap
101
+# squashfs_comp = xz
102
+
103
+[ 'distro' ]
104
+FLL_DISTRO_NAME              = "siduction"
105
+FLL_DISTRO_URL               = "http://siduction.org"
106
+
107
+FLL_IMAGE_DIR                = "siduction"
108
+FLL_IMAGE_FILE               = "siduction"
109
+# FLL_IMAGE_FS               = "ext4"
110
+# FLL_IMAGE_MB               = "16384"
111
+FLL_UNION_MODULE             = "aufs"
112
+FLL_MOUNTPOINT               = "/fll/siduction"
113
+FLL_MEDIA_NAME               = "siduction.iso"
114
+FLL_LIVE_USER                = "siducer"
115
+FLL_LIVE_USER_GROUPS         = "dialout dip fuse cdrom audio video plugdev users floppy netdev powerdev scanner systemd-journal vboxusers kvm lp"
116
+
117
+FLL_WALLPAPER                = "/usr/share/wallpapers/indiansummer"
118
+FLL_FLAVOUR                  = "xfce"
119
+FLL_GFXBOOT_THEME            = "indiansummer-xfce"
120
+FLL_IRC_SERVER               = "irc.oftc.net"
121
+FLL_IRC_PORT                 = "6667"
122
+FLL_IRC_CHANNEL              = "#siduction"
123
+# FLL_CDROM_INDEX            = "siduction release notes"
124
+# FLL_CDROM_INDEX_ICON       = "release/release-notes"
125
+
126
+FLL_USE_SYSTEMD              = "YES"
127
+
128
+FLL_DISTRO_VERSION           = 14.1.0
129
+FLL_DISTRO_CODENAME_SAFE     = indiansummer
130
+FLL_DISTRO_CODENAME          = Indian Summer
131
+FLL_DISTRO_CODENAME_REV_SAFE =
132
+FLL_DISTRO_CODENAME_REV      =

pyfll/xfce_current_amd64.conf → pyfll/conf/xfce_current_amd64.conf View File


pyfll/xfce_current_i386.conf → pyfll/conf/xfce_current_i386.conf View File


pyfll/xfce_next_amd64.conf → pyfll/conf/xfce_next_amd64.conf View File


pyfll/xfce_next_i386.conf → pyfll/conf/xfce_next_i386.conf View File


pyfll/xfce_xperimental_amd64.conf → pyfll/conf/xfce_xperimental_amd64.conf View File


pyfll/xfce_xperimental_i386.conf → pyfll/conf/xfce_xperimental_i386.conf View File


pyfll/xorg_current_amd64.conf → pyfll/conf/xorg_current_amd64.conf View File


pyfll/xorg_current_i386.conf → pyfll/conf/xorg_current_i386.conf View File


pyfll/xorg_next_amd64.conf → pyfll/conf/xorg_next_amd64.conf View File


pyfll/xorg_next_i386.conf → pyfll/conf/xorg_next_i386.conf View File


pyfll/xorg_xperimental_amd64.conf → pyfll/conf/xorg_xperimental_amd64.conf View File


pyfll/xorg_xperimental_i386.conf → pyfll/conf/xorg_xperimental_i386.conf View File


pyfll/xxx_lxqt_sid_amd64.conf → pyfll/conf/xxx_lxqt_sid_amd64.conf View File


+ 31
- 0
pyfll/debian/changelog View File

@@ -50,6 +50,21 @@ pyfll (2013.02+nmu3) UNRELEASED; urgency=low
50 50
   * move alsa-utils from hwsupport-extra to hwsupport-essential, it's required
51 51
     to set up audio mixers since alsa-base is gone.
52 52
   * drop temporary init overrides, systemd is now installed without them.
53
+  * distro.postinst: stop now obsolete displaymanager dance.
54
+  * drop vbetool from hwsupport-extra.
55
+  * fix up lamp package selection.
56
+  * exclude grub_eltorito from md5sum generation, it's modified after the
57
+    fact.
58
+  * hwsupport-powermanagement: drop pm-utils, acpi-support-base
59
+  * s/kbattleship/knavalbattle/
60
+  * don't modify lvm.conf anymore, it's been a no-op for a while already.
61
+  * fix memtest86+ entry for live grub.cfg.
62
+  * drop obsolete packages.d/bootchart.
63
+  * remove support for dmsetup based rootfs.
64
+  * drop obsolete FLL_UNION_MODULE definitions.
65
+  * switch to plymouth ("details" theme) for console multiplexing.
66
+  * improve grub2 preseeding for the installed system.
67
+  * drop unused FLL_DISTRO_URL variable.
53 68
 
54 69
   [ Joaquim Boura ]
55 70
   * cleaned up xfce4-desktop-min
@@ -78,6 +93,22 @@ pyfll (2013.02+nmu3) UNRELEASED; urgency=low
78 93
   * add i386-efi to kernel command line when booted under it
79 94
   * add grub2-fll-portable-efi to extras
80 95
   * add part_gpt to built in modules for cd efi loader (for detect efi anyway)
96
+  * create /disks to reflect changed fstab_generator
97
+  * enable networkd, resolved, timesyncd (drop ntpdate and resolvconf)
98
+    - setup symlink for resolved and stop it having any fallback DNS servers
99
+  * use xorriso newer grub2 boot handling and simplify things
100
+    - drop our grub_eltorito hackery and just build a grub2 eltorito image
101
+    - drop grub_embed hackery and use existing grub_hybrid.img
102
+    - drop to single set of efis as in efi.img
103
+    - detect fromhd in grub itself
104
+    - handle uuid creation in pyfll itself not grub
105
+  * grub menu
106
+    - start hotkeys and classes
107
+    - make more editor friendly
108
+    - add local kernel command line option menu(s)
109
+    - clock always at start, lang before default (kernel)
110
+  * add internal gpthybrid
111
+  * add secondary squashfs
81 112
 
82 113
   [ Roland Engert ]
83 114
   * add initial razorqt profile 

+ 113
- 0
pyfll/doc/fll.8 View File

@@ -0,0 +1,113 @@
1
+'\" t
2
+.\"     Title: fll
3
+.\"    Author: Kel Modderman <kel@otaku42.de>
4
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5
+.\"      Date: 01/02/2015
6
+.\"    Manual: \ \&
7
+.\"    Source: \ \&
8
+.\"  Language: English
9
+.\"
10
+.TH "FLL" "8" "01/02/2015" "\ \&" "\ \&"
11
+.\" -----------------------------------------------------------------
12
+.\" * Define some portability stuff
13
+.\" -----------------------------------------------------------------
14
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15
+.\" http://bugs.debian.org/507673
16
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18
+.ie \n(.g .ds Aq \(aq
19
+.el       .ds Aq '
20
+.\" -----------------------------------------------------------------
21
+.\" * set default formatting
22
+.\" -----------------------------------------------------------------
23
+.\" disable hyphenation
24
+.nh
25
+.\" disable justification (adjust text to left margin only)
26
+.ad l
27
+.\" -----------------------------------------------------------------
28
+.\" * MAIN CONTENT STARTS HERE *
29
+.\" -----------------------------------------------------------------
30
+.SH "NAME"
31
+fll \- FULLSTORY build script for sid/siduction
32
+.SH "SYNOPSIS"
33
+.sp
34
+\fIfll \-c\fR <config file> [\-b <directory> \-o <directory> \-l <file>] [\-Bdpqv]
35
+.SH "DESCRIPTION"
36
+.sp
37
+fll(8) is a python script that provides a framework to build an ISO Image from the current repositories of sid/siduction\&.
38
+.SH "OPTIONS"
39
+.PP
40
+\-h, \-\-help
41
+.RS 4
42
+show this help message and exit
43
+.RE
44
+.PP
45
+\-a <arch>, \-\-arch=<arch>
46
+.RS 4
47
+Build architecture, overrides config file\&.
48
+.RE
49
+.PP
50
+\-b <directory>, \-\-build=<directory>
51
+.RS 4
52
+Build directory\&. A large amount of free space is required\&.
53
+.RE
54
+.PP
55
+\-B, \-\-binary
56
+.RS 4
57
+Do binary build only\&. Disable generation of URI lists\&. Default: False
58
+.RE
59
+.PP
60
+\-c <config file>, \-\-config=<config file>
61
+.RS 4
62
+Configuration file\&. This option may be used more than once to process multiple configurations\&. A configuration file must be specified\&.
63
+.RE
64
+.PP
65
+\-d, \-\-debug
66
+.RS 4
67
+Enable debug mode\&. Extra output will be to assist in development\&. Default: False
68
+.RE
69
+.PP
70
+\-l <file>, \-\-log=<file>
71
+.RS 4
72
+Log debug output to file\&. Note that when logging is enabled, output to the console is buffered\&.
73
+.RE
74
+.PP
75
+\-o <directory>, \-\-output=<directory>
76
+.RS 4
77
+Output directory, where the product of this program will be generated\&.
78
+.RE
79
+.PP
80
+\-p <profile>, \-\-profile=<profile>
81
+.RS 4
82
+Package profile, overrides config file\&.
83
+.RE
84
+.PP
85
+\-P, \-\-preserve
86
+.RS 4
87
+Preserve build directory\&. Disable automatic cleanup of the build area at exit\&.
88
+.RE
89
+.PP
90
+\-q, \-\-quiet
91
+.RS 4
92
+Enable quiet mode\&. Only high priority messages will be generated\&.
93
+.RE
94
+.PP
95
+\-v, \-\-verbose
96
+.RS 4
97
+Enable verbose mode\&. All messages will be generated, such as announcing current operation\&.
98
+.RE
99
+.SH "AUTHOR"
100
+.sp
101
+Kel Modderman <kel@otaku42\&.de>
102
+.SH "RESOURCES"
103
+.sp
104
+FULLSTORY Homepage: http://developer\&.berlios\&.de/projects/fullstory/ pyfll: git\&.siduction\&.org/?p=packages/pyfll\&.git
105
+.SH "COPYING"
106
+.sp
107
+Copyright (C) 2007 Kel Modderman\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2, or at your choice, any later version
108
+.SH "AUTHOR"
109
+.PP
110
+\fBKel Modderman\fR <\&kel@otaku42\&.de\&>
111
+.RS 4
112
+Author.
113
+.RE

+ 19
- 2
pyfll/pyfll View File

@@ -1,4 +1,4 @@
1
-#!/usr/bin/python -tt
1
+#!/usr/bin/python -t
2 2
 # -*- coding: utf-8 -*-
3 3
 
4 4
 __author__    = 'Kel Modderman'
@@ -526,6 +526,7 @@ class FLLBuilder(object):
526 526
             self.env['ftp_proxy'] = self.conf['options']['ftp_proxy']
527 527
 
528 528
         self.conf['options'].setdefault('apt_preferences', None)
529
+        self.conf['options'].setdefault('apt_configuration', None)
529 530
         self.conf['options'].setdefault('apt_recommends', 'no')
530 531
         self.conf['options'].setdefault('media_include', None)
531 532
 
@@ -661,7 +662,7 @@ class FLLBuilder(object):
661 662
 
662 663
         depfile = os.path.join(dir, 'packages.d', '999-finalize.postinst')
663 664
 
664
-	pkgs['postinst'].append(depfile)
665
+        pkgs['postinst'].append(depfile)
665 666
 
666 667
 
667 668
         self.log.debug('package summary for %s:' % arch)
@@ -1071,6 +1072,22 @@ class FLLBuilder(object):
1071 1072
                                apt_preferences)
1072 1073
                 raise FllError
1073 1074
 
1075
+
1076
+
1077
+
1078
+        apt_configuration = self.conf['options']['apt_configuration']
1079
+        if apt_configuration:
1080
+            self.log.info('importing apt configuration file')
1081
+            try:
1082
+                shutil.copy(apt_configuration, os.path.join(chroot, 'etc/apt/'))
1083
+            except IOError:
1084
+                self.log.error('apt configuration file failed to copy: %s' %
1085
+                               apt_configuration)
1086
+                raise FllError
1087
+
1088
+
1089
+
1090
+
1074 1091
         self.log.debug('removing sources.list from %s chroot' % arch)
1075 1092
         list = os.path.join(chroot, 'etc/apt/sources.list')
1076 1093
         if os.path.isfile(list):

+ 2
- 0
steam_current_i386 View File

@@ -0,0 +1,2 @@
1
+time ./pyfll/fll -vv -c ./pyfll/steam_current_i386.conf
2
+

Loading…
Cancel
Save