update infra and conf.py
This commit is contained in:
parent
38334f4eae
commit
9d885f04f2
|
|
@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
|
|||
# For information about how to configure apt package sources,
|
||||
# see the sources.list(5) manual.
|
||||
|
||||
# Main Repo - main contribnon-free non-free-firmware
|
||||
# Main Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
|
||||
# Security Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
# Security Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
|
||||
# Updates Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
# Updates Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
|
||||
# daedalus-backports, previously on backports.debian.org
|
||||
#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
|
||||
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
|
|||
# For information about how to configure apt package sources,
|
||||
# see the sources.list(5) manual.
|
||||
|
||||
# Main Repo - main contribnon-free non-free-firmware
|
||||
# Main Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
|
||||
# Security Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
# Security Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
|
||||
# Updates Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
# Updates Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
|
||||
# daedalus-backports, previously on backports.debian.org
|
||||
#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
|
||||
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
|
|||
# For information about how to configure apt package sources,
|
||||
# see the sources.list(5) manual.
|
||||
|
||||
# Main Repo - main contribnon-free non-free-firmware
|
||||
# Main Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware
|
||||
|
||||
# Security Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
# Security Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
|
||||
|
||||
# Updates Repo - main contribnon-free non-free-firmware
|
||||
#deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
# Updates Repo - main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
|
||||
|
||||
# daedalus-backports, previously on backports.debian.org
|
||||
#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
|
||||
|
||||
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -26,6 +26,19 @@ shared_setup_cmds = ('inflate_bubble.set_fusato_structure',
|
|||
'infra.boostrap_shared'
|
||||
)
|
||||
|
||||
shared_setup_loaded_cmds = ('inflate_bubble.set_fusato_structure',
|
||||
'inflate_bubble.set_general_shared',
|
||||
'inflate_bubble.set_grub_shared',
|
||||
'inflate_bubble.set_binary_shared',
|
||||
'inflate_bubble.set_lightdm',
|
||||
'infra.shared_folders',
|
||||
'infra.icons_themes',
|
||||
'infra.shared_files',
|
||||
'infra.fusato_configs_loaded',
|
||||
'infra.set_symlinks',
|
||||
'infra.boostrap_shared'
|
||||
)
|
||||
|
||||
|
||||
# Setup Desktop configs
|
||||
# Add mor as needed
|
||||
|
|
@ -40,7 +53,7 @@ setup_opb_cmds = ('inflate_bubble.set_opb',
|
|||
)
|
||||
setup_loaded_cmds = ('inflate_bubble.set_loaded',
|
||||
'infra.loaded_configs',
|
||||
'infra.loaded_folders',
|
||||
'infra.loaded_folders'
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -109,10 +122,10 @@ buildarm_opb_build = (shared_setup_cmds + setup_opb_cmds +
|
|||
)
|
||||
|
||||
#Xfce_loaded
|
||||
build64_loaded_build = (shared_setup_cmds + setup_loaded_cmds +
|
||||
setup_chroot_grub_64 + setup_binary_grub_64 +
|
||||
setup_fw_64_32
|
||||
)
|
||||
build64_loaded_build = (shared_setup_loaded_cmds + setup_loaded_cmds +
|
||||
setup_chroot_grub_64 + setup_binary_grub_64 +
|
||||
setup_fw_64_32
|
||||
)
|
||||
|
||||
### Inflate bubble section
|
||||
# Packages that are to be installed as needed per Desktop
|
||||
|
|
@ -183,6 +196,7 @@ OPENBOX_LIST = ('openbox\n'
|
|||
'qt5ct\n'
|
||||
'jgmenu\n'
|
||||
)
|
||||
|
||||
LOADED_LIST = ('xfce4\n'
|
||||
'xfce4-goodies\n'
|
||||
'xorg\n'
|
||||
|
|
@ -239,6 +253,9 @@ LOADED_LIST = ('xfce4\n'
|
|||
'ffmpegthumbnailer\n'
|
||||
'baobab\n'
|
||||
'xdg-user-dirs-gtk\n'
|
||||
'squashfs-tools\n'
|
||||
'calamares\n'
|
||||
'calamares-settings-debian\n'
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -342,7 +342,6 @@ def shared_files():
|
|||
'/plymouth/plymouthd.conf',
|
||||
#'/packages/deb-multimedia-keyring_2016.8.1_all.deb',
|
||||
# '/repo_public_key/trusted.gpg',
|
||||
|
||||
|
||||
)
|
||||
des_paths = ('/etc/skel/.bash_aliases',
|
||||
|
|
@ -356,7 +355,6 @@ def shared_files():
|
|||
'/usr/share/plymouthd.conf',
|
||||
#'/opt/pepconf/deb-multimedia-keyring_2016.8.1_all.deb',
|
||||
#'/etc/apt/trusted.gpg.d/trusted.gpg',
|
||||
|
||||
)
|
||||
# copy files to thier CHROOT Location
|
||||
src_q = collections.deque(src_paths)
|
||||
|
|
@ -394,6 +392,29 @@ def fusato_configs():
|
|||
)
|
||||
logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)
|
||||
|
||||
def fusato_configs_loaded():
|
||||
"""
|
||||
Copy specific folders in the root of fusato configs
|
||||
"""
|
||||
|
||||
logger.info("Copy Loaded Fusato Configs")
|
||||
|
||||
src_paths = ('/loaded-hooks/normal',)
|
||||
des_paths = ('/hooks/normal',)
|
||||
src_q = collections.deque(src_paths)
|
||||
des_q = collections.deque(des_paths)
|
||||
size_q = len(src_q)
|
||||
for size_length in range(size_q):
|
||||
source = src_q.popleft()
|
||||
des = des_q.popleft()
|
||||
logger.info(MSG_COPY+ HOME_FOLDER + source)
|
||||
shutil.copytree(HOME_FOLDER + source,
|
||||
HOME_FOLDER + FUSATOCONFIG + des,
|
||||
dirs_exist_ok = True
|
||||
)
|
||||
logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)
|
||||
|
||||
|
||||
def boostrap_shared():
|
||||
"""
|
||||
Copy specific folders in the boostrap location
|
||||
|
|
@ -498,15 +519,11 @@ def loaded_folders():
|
|||
logger.info("Copy loaded folders")
|
||||
|
||||
src_paths = ('/loaded-application',
|
||||
'/loaded-hooks/normal',
|
||||
'/loaded-wallpaper',
|
||||
#'/calamares_settings/branding'
|
||||
'/loaded-wallpaper'
|
||||
)
|
||||
des_paths =('/usr/share/applications',
|
||||
'/hooks/normal',
|
||||
'/usr/share/backgrounds',
|
||||
#'/etc/calamares/branding'
|
||||
)
|
||||
'/usr/share/backgrounds'
|
||||
)
|
||||
src_q = collections.deque(src_paths)
|
||||
des_q = collections.deque(des_paths)
|
||||
size_q = len(des_q)
|
||||
|
|
|
|||
Loading…
Reference in New Issue