Changeset 7522 for isomaker


Ignore:
Timestamp:
Jun 25, 2018, 9:03:03 AM (14 months ago)
Author:
kbut
Message:

sync with git repository

Location:
isomaker/trunk/fuentes
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • isomaker/trunk/fuentes/Deps

    r7177 r7522  
    11reprepro
     2curl
    23live-build
    34snapd
     5syslinux
     6squashfs-tools
     7genisoimage
     8lzma
    49xorriso
    510node-marked-man
     11livecd-rootfs
  • isomaker/trunk/fuentes/debian/changelog

    r7177 r7522  
    1 isomaker (0.4) bionic; urgency=medium
    2 
    3   * gfdsaf
    4 
    5  -- Raul Rodrigo Segura <raurodse@gmail.com>  Wed, 04 Apr 2018 12:19:59 +0200
    6 
    71isomaker (0.3) bionic; urgency=medium
    82
    9   * asdf
     3  * Add script to get last kernel and last initrd
    104
    11  -- Raul Rodrigo Segura <raurodse@gmail.com>  Tue, 03 Apr 2018 14:23:07 +0200
     5 -- Raul Rodrigo Segura <raurodse@gmail.com>  Tue, 19 Jun 2018 14:18:23 +0200
    126
    137isomaker (0.2) bionic; urgency=medium
  • isomaker/trunk/fuentes/debian/control

    r7177 r7522  
    99Package: isomaker
    1010Architecture: all
    11 Depends: ${shlibs:Depends}, ${misc:Depends}, live-build, curl, reprepro, syslinux, syslinux-themes-ubuntu-xenial, gfxboot-theme-ubuntu, syslinux-utils, squashfs-tools, livecd-rootfs, genisoimage, xorriso, lzma (>=9.22-2ubuntu2)
     11Depends: ${shlibs:Depends}, ${misc:Depends}, live-build, curl, reprepro, syslinux, syslinux-themes-ubuntu-xenial, gfxboot-theme-ubuntu, syslinux-utils, squashfs-tools, livecd-rootfs, genisoimage, xorriso, lzma (>=9.22-2ubuntu2), python-apt
    1212Description:
    1313 <insert long description, indented with spaces>
  • isomaker/trunk/fuentes/defaultsettings

    r7177 r7522  
    99ISO_VOLUME="Ubuntu $SUITE $(date +%Y%m%d-%H:%M)"
    1010
    11 SYSLINUX_THEME="ubuntu-$SUITE"
     11SYSLINUX_THEME="ubuntu-xenial"
    1212
    1313COMPONENTS="main restricted universe multiverse"
    1414
    15 ARCH="${ARCH}:=amd64"
     15ARCH="amd64"
    1616
    1717BINARY_REMOVE_LINUX=:
  • isomaker/trunk/fuentes/docs/man.md

    r7177 r7522  
    33## SYNOPSIS
    44
    5 `isomaker` `[build|configure]` DISTRO FLAVOUR [`-i`|`--interactive`] [`-a` ARCH ] [ `-m` URL ] [ `-k` KERNEL ] [`-p` PPA:PINNING ] [ `-e` SOURCE ]
     5`isomaker` `[build|configure]` DISTRO FLAVOUR [`-i`|`--interactive`] [`-a` ARCH ] [ `-m` URL ] [ `-k` KERNEL ] [`-p` PPA:PINNING ] [ `-e` SOURCE ] [ `-u` SOURCE ]
    66`isomaker` `[clean]`
    77
     
    3636                        deb http://archive.ubuntu.com/ubuntu bionic main restricted universe multiverse
    3737
     38        -u
     39                Append untrusted mirror on chroot step . Mirror will be formatted as :
     40                        deb [trusted=yes] http://archive.ubuntu.com/ubuntu bionic main restricted universe multiverse
     41
    3842## CREATE NEW DISTRO CONFIG
    3943
     
    4246        final_apt
    4347
     48## Files
    4449       
     50        /usr/share/doc/variables_template
     51
     52       
  • isomaker/trunk/fuentes/isomaker

    r7177 r7522  
    99MIRROR=""
    1010EXTRA_MIRRORS=""
     11EXTRA_MIRRORS_UNTRUSTED=""
    1112EXTRA_PPAS=""
    1213
     
    3637        echo -e ""
    3738        echo -e "\t * EXTRAOPTIONS:"
    38         echo -e "\t    -a ARCH | --arch=ARCH"
    39         echo -e "\t    -m MIRROR | --mirror=MIRROR"
    40         echo -e "\t    -k KERNEL | --kernel=KERNEL"
    41         echo -e "\t    -p PPA[:Pining_Number] | --ppa=PPA[:Pining_Number]"
    42         echo -e "\t    -e url | --extramirror=url"
     39        echo -e "\t    -a ARCH"
     40        echo -e "\t    -m MIRROR"
     41        echo -e "\t    -k KERNEL"
     42        echo -e "\t    -p PPA[:Pining_Number]"
     43        echo -e "\t    -e url"
     44        echo -e "\t    -u url"
    4345        echo -e "\t    -i | --interactive"
    4446        echo -e "\t "
     
    126128                        -p)
    127129                                EXTRA_PPAS="${EXTRA_PPAS} $2"
     130                                shift
     131                        ;;
     132                        -u)
     133                                EXTRA_MIRRORS_UNTRUSTED="${EXTRA_MIRRORS_UNTRUSTED} $2"
    128134                                shift
    129135                        ;;
     
    186192fi
    187193
     194if [ "${EXTRA_MIRRORS_UNTRUSTED}" != "" ]; then
     195        addExtraMirrorUntrusted ${EXTRA_MIRRORS_UNTRUSTED}
     196fi
     197
     198
    188199if [ "$ACTION" = "configure" ]; then
    189200        exit 0
  • isomaker/trunk/fuentes/libs/IsoMakerUtils

    r7177 r7522  
    6969        done
    7070}
     71
     72addExtraMirrorUntrusted(){
     73        for extra_mirror in $@; do
     74                echo "deb [trusted=yes] $extra_mirror @DISTRIBUTION@ main restricted universe multiverse" >> config/archives/extra-ppas.list.chroot
     75        done
     76}
  • isomaker/trunk/fuentes/scripts/build

    r7177 r7522  
    168168        sed -i -e 's%^lb binary_disk ${\*}%./custom_binary_disk ${*}%g' custom_binary
    169169        # Fixing disk/info
    170         sed -i -e 's%Ubuntu%${DISTRIBUTION_NAME}%g' custom_binary_disk
     170        sed -i -e "s%Ubuntu%${DISTRIBUTION_NAME}%g" custom_binary_disk
    171171
    172172        sed -i -e 's%^lb binary_iso ${\*}%auto/custombuildiso ${*}%g' custom_binary
Note: See TracChangeset for help on using the changeset viewer.