Changeset b4524c6


Ignore:
Timestamp:
Nov 12, 2010 4:04:27 AM (10 years ago)
Author:
HungryHobo <HungryHobo@…>
Branches:
master
Children:
c3aa84f9
Parents:
11b69ee
Message:

Make separate i386 and amd64 packages, this fixes the arch-independent-package-contains-binary-or-object lintian error

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r11b69ee rb4524c6  
    934934        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
    935935            <arg value="-I_MTN" />
     936            <arg value="-ai386" />
     937        </exec>
     938        <!-- rather than doing a complete new build, recreate debian/tmp by calling the "build" target in debian/rules -->
     939        <delete dir="debian/tmp" />
     940        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
     941            <arg value="-I_MTN" />
     942            <arg value="-Tbuild" />
     943            <arg value="-aamd64" />
     944            <env key="MAKEFLAGS" value="-B" />
     945        </exec>
     946        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
     947            <arg value="-I_MTN" />
     948            <!-- don't clean so the previous package isn't deleted -->
     949            <arg value="-nc" />
     950            <arg value="-aamd64" />
    936951        </exec>
    937952    </target>
  • debian/control

    r11b69ee rb4524c6  
    77
    88Package: i2p
    9 Architecture: all
     9Architecture: i386 amd64
    1010Section: net
    1111Priority: optional
  • debian/rules

    r11b69ee rb4524c6  
    44SOURCEURL=http://mirror.i2p2.de/i2psource_${VERSION}.tar.bz2
    55
     6DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
     7ifeq ($(DEB_HOST_ARCH),i386)
     8wrapperpath = installer/lib/wrapper/linux
     9else ifeq ($(DEB_HOST_ARCH),amd64)
     10wrapperpath = installer/lib/wrapper/linux64
     11# other architectures could be supported by using runplain.sh
     12endif
     13
    614build:
     15        echo Target Architecture is $(DEB_HOST_ARCH)
     16ifndef wrapperpath
     17        @echo "Architecture not supported: $(DEB_HOST_ARCH)"
     18        exit 1
     19endif
    720        ant preppkg-linux-only
    821        mkdir -p debian/tmp/usr/lib
     
    1023        cp -a debian/scripts/init debian/tmp/etc/init.d/i2p
    1124        cp -a pkg-temp debian/tmp/usr/lib/i2p
    12         chmod +x debian/tmp/usr/lib/i2p/postinstall.sh
    1325        sed 's|$$INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/wrapper.config > debian/tmp/usr/lib/i2p/a
    1426        sed 's|$$SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/wrapper.config
     
    1729        mv debian/tmp/usr/lib/i2p/a debian/tmp/usr/lib/i2p/eepget
    1830        ln -s /usr/lib/i2p/eepget debian/tmp/usr/bin/eepget
     31        chmod +x debian/tmp/usr/lib/i2p/eepget
    1932        sed 's|%INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/runplain.sh > debian/tmp/usr/lib/i2p/a
    2033        sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/runplain.sh
     
    2235        sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/i2prouter
    2336        ln -s /usr/lib/i2p/i2prouter debian/tmp/usr/bin/i2prouter
     37        chmod +x debian/tmp/usr/lib/i2p/i2prouter
    2438        rm debian/tmp/usr/lib/i2p/a
    2539        touch debian/build
    2640        mkdir -p debian/tmp/usr/share/doc/i2p
     41       
     42        @# copy wrapper files
     43        cp ${wrapperpath}/libwrapper.so debian/tmp/usr/lib/i2p/lib/
     44        cp ${wrapperpath}/wrapper.jar debian/tmp/usr/lib/i2p/lib/
     45        cp ${wrapperpath}/i2psvc debian/tmp/usr/lib/i2p/
     46        chmod +x debian/tmp/usr/lib/i2p/i2psvc
    2747
    28         # Create the Debian copyright file, move the licenses dir,
    29         # and delete all license files that are already in /usr/share/common-licenses/
     48        @# Create the Debian copyright file, move the licenses dir,
     49        @# and delete all license files that are already in /usr/share/common-licenses/
    3050        cat debian/copyright.part1 LICENSE.txt > debian/tmp/usr/share/doc/i2p/copyright
    3151        mv debian/tmp/usr/lib/i2p/licenses debian/tmp/usr/share/doc/i2p
     
    3555        rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-LGPLv2.1.txt
    3656
    37         # changelog
     57        @# changelog
    3858        gzip -9c history.txt > debian/tmp/usr/share/doc/i2p/changelog.gz
    3959        gzip -9c debian/changelog > debian/tmp/usr/share/doc/i2p/changelog.Debian.gz
  • debian/scripts/postinst

    r11b69ee rb4524c6  
    1111update-rc.d i2p defaults
    1212
    13 cd $I2P
    14 su $I2PUSER ./postinstall.sh
    15 
    16 chmod 755 /usr/lib/i2p/eepget
    17 chmod 755 /usr/lib/i2p/i2prouter
    18 chmod 755 /usr/lib/i2p/i2psvc
    19 
    2013invoke-rc.d i2p start
  • debian/scripts/prerm

    r11b69ee rb4524c6  
    88update-rc.d -f i2p remove
    99
    10 # dpkg doesn't know about these files, created by postinstall.sh
    11 I2P=/usr/lib/i2p
    12 rm -f $I2P/i2psvc $I2P/lib/libwrapper.so $I2P/lib/wrapper.jar
    13 # copied out of jbigi.jar by the router
     10# dpkg doesn't know about these files, they were copied out of jbigi.jar by the router
    1411rm -f $I2P/libjbigi.so $I2P/libjcpuid.so
    1512
Note: See TracChangeset for help on using the changeset viewer.