Changeset 2267
- Timestamp:
- Jul 25, 2016, 3:05:47 PM (5 years ago)
- 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 12 12 EXTRAARGS="" 13 13 EXTRAENV="" 14 DEFAULTVERSION="1609 14 15 15 16 # Define extra variables … … 182 183 183 184 if [ -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 185 189 fi 186 190 -
lliurex-maker/trunk/fuentes/new/usr/share/lliurex-maker/auto/build
r2231 r2267 40 40 cat > config/hooks/fixvmlinuz.binary <<'EOF' 41 41 #! /bin/sh 42 kernel=$(ls binary/casper/vmlinuz-* | grep -v efi | sort -r | head -1)42 kernel=$(ls binary/casper/vmlinuz-*-generic | grep -v efi | sort -r | head -1) 43 43 kernel_efi=$(ls binary/casper/vmlinuz-* | grep efi | sort -r | head -1) 44 44 if [ ! -z $kernel ]; then -
lliurex-maker/trunk/fuentes/new/usr/share/lliurex-maker/auto/config
r2192 r2267 168 168 $OPTS \ 169 169 "$@" 170 170 sed -i -e 's%^\(LB_BOOTSTRAP_INCLUDE=".*\)"$%\1 enableri386"%g' config/bootstrap 171 171 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot 172 172 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
Note: See TracChangeset
for help on using the changeset viewer.