Changeset 2267


Ignore:
Timestamp:
Jul 25, 2016, 3:05:47 PM (3 years ago)
Author:
kbut
Message:

wip

Location:
lliurex-maker/trunk/fuentes/new/usr
Files:
6 added
3 edited

Legend:

Unmodified
Added
Removed

  • lliurex-maker/trunk/fuentes/new/usr/bin/lliurex-maker

    r2245 r2267  
    1212EXTRAARGS=""
    1313EXTRAENV=""
     14DEFAULTVERSION="1609
    1415
    1516# Define extra variables
    … …  
    182183
    183184if [ -e "binary.hybrid.iso" ]; then
    184         mv binary.hybrid.iso lliurex-${FLAVOUR}-${ARCH}.iso
     185        [[ ${ARCH} = "i386" ]] && ARCHLABEL="32bits" || ARCHLABEL="64bits"
     186        DATELABEL=`date +%Y%m%d`
     187        VERSIONLABEL=`cat config/lliurexversion || echo $DEFAULTVERSION`
     188        mv binary.hybrid.iso lliurex-${FLAVOUR}_${ARCHLABEL}_${VERSIONLABEL}_${DATELABEL}.iso
    185189fi
    186190

  • lliurex-maker/trunk/fuentes/new/usr/share/lliurex-maker/auto/build

    r2231 r2267  
    4040        cat > config/hooks/fixvmlinuz.binary <<'EOF'
    4141#! /bin/sh
    42 kernel=$(ls binary/casper/vmlinuz-* | grep -v efi | sort -r | head -1)
     42kernel=$(ls binary/casper/vmlinuz-*-generic | grep -v efi | sort -r | head -1)
    4343kernel_efi=$(ls binary/casper/vmlinuz-* | grep efi | sort -r | head -1)
    4444if [ ! -z $kernel ]; then

  • lliurex-maker/trunk/fuentes/new/usr/share/lliurex-maker/auto/config

    r2192 r2267  
    168168        $OPTS \
    169169        "$@"
    170 
     170sed -i -e 's%^\(LB_BOOTSTRAP_INCLUDE=".*\)"$%\1 enableri386"%g' config/bootstrap
    171171echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
    172172echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
Note: See TracChangeset for help on using the changeset viewer.