Changeset 1043 in MondoRescue for trunk/mindi-busybox


Ignore:
Timestamp:
Jan 8, 2007, 11:31:22 PM (17 years ago)
Author:
Bruno Cornec
Message:

merge -r978:1042 $SVN_M/branches/stable

Location:
trunk/mindi-busybox
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/mindi-busybox/ChangeLog

    r956 r1043  
    33MINDI-BUSYBOX CHANGES
    44
    5 1.2.2 (2006-11-17)
     51.2.2 (2006-12-23)
     6- mindi-busybox version is now extended with the SVN revision (Bruno Cornec)
     7- Fix a known bug for busybox where -gc-section in makefile + static for link crea tes a buggy busybox with glibc (Bruno Cornec)
    68- Updated based on busybox 1.2.2 (Bruno Cornec)
    79- Handles modules back again (Bruno Cornec)
     10- Fix bug #88 around install conflicts (Bruno Cornec)
    811
    9121.2.1 (2006-10-04)

  • trunk/mindi-busybox/Rules.mak

    r904 r1043  
    266266    CFLAGS +=-DNDEBUG
    267267    CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,)
     268ifneq ($(strip $(CONFIG_STATIC)),y)
    268269    CHECKED_LDFLAGS += $(call check_ld,$(LD),--gc-sections,)
     270endif
    269271endif
    270272

  • trunk/mindi-busybox/distributions/debian/control

    r823 r1043  
    88Package: mindi-busybox
    99Architecture: amd64 i386 ia64
    10 Depends: binutils, bzip2, module-init-tools
    1110Description: creates a busybox version suited for mindi
    1211 Mindi is a script to create boot/root disks based on your system. It uses

  • trunk/mindi-busybox/distributions/debian/rules

    r823 r1043  
    99PACKAGE_NAME = mindi-busybox
    1010
    11 configure:
    12 # Nothing to configure in this package.
     11# Don't set any compiler flags - busybox does that just fine
    1312
    14 build:
    15 # Nothing to build in this package.
     13configure: configure-stamp
     14
     15configure-stamp:
     16    dh_testdir
     17    touch configure-stamp
     18
     19# Build both architecture dependent and independent
     20build: build-stamp
     21
     22build-stamp: configure-stamp
     23    dh_testdir
     24
     25    # Compile the package.
     26    mv .config .config.sav
     27    $(MAKE) distclean
     28    mv .config.sav .config
     29    $(MAKE) oldconfig
     30    $(MAKE) busybox
     31
     32    touch build-stamp
    1633
    1734clean:
    1835    dh_testdir
    1936    dh_testroot
     37    rm -f build-stamp configure-stamp
     38    # Clean temporary document directory
     39    rm -rf debian/doc-temp
     40    # Clean up.
     41    -mv .config .config.sav
     42    -$(MAKE) distclean
     43    -mv .config.sav .config
     44    -rm -f busybox
     45
    2046    dh_clean
    2147
    22 install:
     48# Install architecture dependent and independent
     49install: build
    2350    dh_testdir
    2451    dh_testroot
    2552    dh_clean -k
    2653    dh_installdirs
    27     # Build the installation tree:
    28     ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
    2954
    30 # Build architecture-independent files here.
    31 binary-indep: install
    32 # We have nothing to do by default.
     55    # Install the package files into build directory:
     56    # - start with upstream make install
     57    $(MAKE) install PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr/lib/mindi/rootfs
     58    # - copy doc
     59    mkdir -p debian/doc-temp
     60    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO changelog svn.log debian/doc-temp
    3361
    34 # Build architecture-dependent files here.
    35 binary-arch: install
     62    dh_install -s
     63
     64# Build architecture independant packages using the common target.
     65binary-indep: build install
     66    # None
     67
     68# Build architecture dependant packages using the common target.
     69binary-arch: build install
    3670    dh_testdir
    3771    dh_testroot
    38     dh_installchangelogs ChangeLog
    3972    dh_installdocs
    40     dh_installexamples
    41     dh_link
    4273    dh_strip
    4374    dh_compress
    … …  
    4879    dh_builddeb
    4980
    50 binary: binary-indep binary-arch
     81binary: binary-arch binary-indep
    5182.PHONY: build clean binary-indep binary-arch binary install configure

  • trunk/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

    r932 r1043  
    2727src_install() {
    2828    # bundle up the symlink files for use later
    29     emake PREFIX="/usr/share/mindi/rootfs/bin" install || die
    30     rm _install/bin/busybox
    31     tar cf busybox-links.tar -C _install . || die
    32     insinto /usr/share/mindi
    33     doins busybox-links.tar || die
     29    emake PREFIX="${D}/usr/share/mindi/rootfs" install || die
    3430}
    35 
    36 pkg_preinst() {
    37     mv "${D}"/usr/share/mindi/busybox-links.tar "${T}"/ || die
    38 }
    39 
    40 pkg_postinst() {
    41     cd "${T}" || die
    42     mkdir _install
    43     tar xf busybox-links.tar -C _install || die
    44     cp -vpPR _install/* /usr/share/mindi/rootfs/bin || die "copying links for ${x} failed"
    45 
    46     echo
    47 }
Note: See TracChangeset for help on using the changeset viewer.