Peppermint
/
bubbles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update infra and conf.py

This commit is contained in:
manuel 2024-03-28 13:05:56 -01:00
parent 38334f4eae
commit 9d885f04f2
5 changed files with 78 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
iso_configs/calamares_settings/dev_32/sources-final
View File

@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
# For information about how to configure apt package sources, # For information about how to configure apt package sources,
# see the sources.list(5) manual. # 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 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 # 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 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 deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
# Updates Repo - main contribnon-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 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 deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
# daedalus-backports, previously on backports.debian.org # daedalus-backports, previously on backports.debian.org
#deb 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 deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
EOF EOF

20
iso_configs/calamares_settings/dev_64/sources-final
View File

@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
# For information about how to configure apt package sources, # For information about how to configure apt package sources,
# see the sources.list(5) manual. # 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 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 # 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 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 deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
# Updates Repo - main contribnon-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 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 deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
# daedalus-backports, previously on backports.debian.org # daedalus-backports, previously on backports.debian.org
#deb 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 deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
EOF EOF

20
iso_configs/calamares_settings/dev_arm/sources-final
View File

@ -13,21 +13,21 @@ cat << EOF > $CHROOT/etc/apt/sources.list
# For information about how to configure apt package sources, # For information about how to configure apt package sources,
# see the sources.list(5) manual. # 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 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 # 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 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 deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware
# Updates Repo - main contribnon-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 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 deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware
# daedalus-backports, previously on backports.debian.org # daedalus-backports, previously on backports.debian.org
#deb 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 deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware
EOF EOF

27
python_modules/conf.py
View File

@ -26,6 +26,19 @@ shared_setup_cmds = ('inflate_bubble.set_fusato_structure',
'infra.boostrap_shared' '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 # Setup Desktop configs
# Add mor as needed # Add mor as needed
@ -40,7 +53,7 @@ setup_opb_cmds = ('inflate_bubble.set_opb',
) )
setup_loaded_cmds = ('inflate_bubble.set_loaded', setup_loaded_cmds = ('inflate_bubble.set_loaded',
'infra.loaded_configs', 'infra.loaded_configs',
'infra.loaded_folders', 'infra.loaded_folders'
) )
@ -109,10 +122,10 @@ buildarm_opb_build = (shared_setup_cmds + setup_opb_cmds +
) )
#Xfce_loaded #Xfce_loaded
build64_loaded_build = (shared_setup_cmds + setup_loaded_cmds + build64_loaded_build = (shared_setup_loaded_cmds + setup_loaded_cmds +
setup_chroot_grub_64 + setup_binary_grub_64 + setup_chroot_grub_64 + setup_binary_grub_64 +
setup_fw_64_32 setup_fw_64_32
) )
### Inflate bubble section ### Inflate bubble section
# Packages that are to be installed as needed per Desktop # Packages that are to be installed as needed per Desktop
@ -183,6 +196,7 @@ OPENBOX_LIST = ('openbox\n'
'qt5ct\n' 'qt5ct\n'
'jgmenu\n' 'jgmenu\n'
) )
LOADED_LIST = ('xfce4\n' LOADED_LIST = ('xfce4\n'
'xfce4-goodies\n' 'xfce4-goodies\n'
'xorg\n' 'xorg\n'
@ -239,6 +253,9 @@ LOADED_LIST = ('xfce4\n'
'ffmpegthumbnailer\n' 'ffmpegthumbnailer\n'
'baobab\n' 'baobab\n'
'xdg-user-dirs-gtk\n' 'xdg-user-dirs-gtk\n'
'squashfs-tools\n'
'calamares\n'
'calamares-settings-debian\n'
) )

35
python_modules/infra.py
View File

@ -342,7 +342,6 @@ def shared_files():
'/plymouth/plymouthd.conf', '/plymouth/plymouthd.conf',
#'/packages/deb-multimedia-keyring_2016.8.1_all.deb', #'/packages/deb-multimedia-keyring_2016.8.1_all.deb',
# '/repo_public_key/trusted.gpg', # '/repo_public_key/trusted.gpg',
) )
des_paths = ('/etc/skel/.bash_aliases', des_paths = ('/etc/skel/.bash_aliases',
@ -356,7 +355,6 @@ def shared_files():
'/usr/share/plymouthd.conf', '/usr/share/plymouthd.conf',
#'/opt/pepconf/deb-multimedia-keyring_2016.8.1_all.deb', #'/opt/pepconf/deb-multimedia-keyring_2016.8.1_all.deb',
#'/etc/apt/trusted.gpg.d/trusted.gpg', #'/etc/apt/trusted.gpg.d/trusted.gpg',
) )
# copy files to thier CHROOT Location # copy files to thier CHROOT Location
src_q = collections.deque(src_paths) src_q = collections.deque(src_paths)
@ -394,6 +392,29 @@ def fusato_configs():
) )
logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des) 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(): def boostrap_shared():
""" """
Copy specific folders in the boostrap location Copy specific folders in the boostrap location
@ -498,15 +519,11 @@ def loaded_folders():
logger.info("Copy loaded folders") logger.info("Copy loaded folders")
src_paths = ('/loaded-application', src_paths = ('/loaded-application',
'/loaded-hooks/normal', '/loaded-wallpaper'
'/loaded-wallpaper',
#'/calamares_settings/branding'
) )
des_paths =('/usr/share/applications', des_paths =('/usr/share/applications',
'/hooks/normal', '/usr/share/backgrounds'
'/usr/share/backgrounds', )
#'/etc/calamares/branding'
)
src_q = collections.deque(src_paths) src_q = collections.deque(src_paths)
des_q = collections.deque(des_paths) des_q = collections.deque(des_paths)
size_q = len(des_q) size_q = len(des_q)