Check-in [3b8c1a6846]
Overview
SHA1:3b8c1a68465e021e3fa61db44237e30379f62d09
Date: 2016-02-15 08:36:41
User: rkeene
Comment:Updated to create better Debian package (untested)
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-02-15
08:44
[37a5c34d9f] Fixed issue with test library not including the appropriate libs (user: rkeene, tags: trunk)
08:36
[3b8c1a6846] Updated to create better Debian package (untested) (user: rkeene, tags: trunk)
08:31
[ecd7178afb] Updated to print an error in debug mode if we run across compressed certificates without zlib support available (user: rkeene, tags: trunk)
Changes

Modified build/rpm2deb from [b2cfeaf6b7] to [374de8e6fe].

    29     29   
    30     30   # Extract files
    31     31   (
    32     32   	cd "${WORKDIR}/root" || exit 1
    33     33   
    34     34   	cpio -i --no-absolute-filenames --quiet --make-directories < "${TMPCPIOFILE}"
    35     35   ) || exit 1
           36  +
           37  +# Rename "lib64" directory for Debian-based distributions
           38  +(
           39  +	cd "${WORKDIR}/root" || exit 1
           40  +
           41  +	if [ -d usr/lib64 ]; then
           42  +		mv usr/lib64 usr/lib || exit 1
           43  +	fi
           44  +
           45  +	if [ -d lib64 ]; then
           46  +		mv lib64 lib || exit 1
           47  +	fi
           48  +
           49  +	exit 0
           50  +) || exit 1
    36     51   
    37     52   # Create control files
    38     53   (
    39     54   	cd "${WORKDIR}/root" || exit 1
    40     55   
    41     56   	## Create MD5 Sums
    42     57   	find . -type f | xargs md5sum > "${WORKDIR}/control/md5sums"
................................................................................
    54     69   # Create debian-binary
    55     70   echo '2.0' > "${WORKDIR}/deb/debian-binary"
    56     71   
    57     72   # Create Data archive
    58     73   (
    59     74   	cd "${WORKDIR}/root" || exit 1
    60     75   
    61         -	cpio -i --list --quiet < "${TMPCPIOFILE}" > "${WORKDIR}/rpm-filelist"
           76  +	find . -type f > "${WORKDIR}/out-filelist"
    62     77   
    63         -	tar --files-from "${WORKDIR}/rpm-filelist" -cf - | tardy -User root -Group root | gzip -9c > "${WORKDIR}/deb/data.tar.gz" 
           78  +	tar --files-from "${WORKDIR}/out-filelist" -cf - | tardy -User root -Group root | gzip -9c > "${WORKDIR}/deb/data.tar.gz" 
    64     79   ) || exit 1
    65     80   
    66     81   # Create Debian package
    67     82   (
    68     83   	cd "${WORKDIR}/deb" || exit 1
    69     84   
    70     85   	ar rcu "${WORKDIR}/tmp.deb" debian-binary control.tar.gz data.tar.gz
    71     86   )
    72     87   
    73     88   cp "${WORKDIR}/tmp.deb" "${DEBFILE}"
    74     89   
    75     90   rm -rf "${WORKDIR}"