diff options
Diffstat (limited to 'strata')
106 files changed, 969 insertions, 364 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 7a403535..5aae0c65 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,7 +11,7 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk -- name: httpd +- name: httpd-server morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd ref: 6d8e0b2fd95268fcba96326ba9dce7bb8f712c19 @@ -35,5 +35,5 @@ chunks: unpetrify-ref: 4.4.5 build-depends: - apr - - httpd + - httpd-server - mod_wsgi-metrics diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 00a614c9..ee1e537c 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -2,6 +2,7 @@ name: audio-bluetooth kind: stratum description: Components required for audio and bluetooth. build-depends: +- morph: strata/glib-common.morph - morph: strata/foundation.morph chunks: - name: libatomic_ops @@ -32,11 +33,17 @@ chunks: build-depends: - libical - alsa-lib +- name: dbus-glib + repo: upstream:dbus-glib + ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c + unpetrify-ref: dbus-glib_0.102 - name: bluez-tools morph: strata/audio-bluetooth/bluez-tools.morph repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph + build-depends: + - dbus-glib - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc @@ -64,7 +71,7 @@ chunks: morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549 - unpetrify-ref: "1.15" + unpetrify-ref: '1.15' build-depends: - mobile-broadband-provider-info - bluez @@ -81,7 +88,7 @@ chunks: - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio - ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7 + ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7 unpetrify-ref: v6.0 build-depends: - libsndfile diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph index fa183fcb..be4cb557 100644 --- a/strata/audio-bluetooth/pulseaudio.morph +++ b/strata/audio-bluetooth/pulseaudio.morph @@ -2,9 +2,11 @@ name: pulseaudio kind: chunk description: PulseAudio System build-system: autotools +pre-configure-commands: +- NOCONFIGURE=1 ./bootstrap.sh configure-commands: -- ./autogen.sh -- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system +- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple + --with-systemduserunitdir=/lib/systemd/system install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants" diff --git a/strata/bsp-armv5l-openbmc-aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed.morph index 83bb74ef..d7e1f180 100644 --- a/strata/bsp-armv5l-openbmc-aspeed.morph +++ b/strata/bsp-armv5l-openbmc-aspeed.morph @@ -1,13 +1,12 @@ name: bsp-armv5l-openbmc-aspeed kind: stratum -description: -- | +description: | The set of platform specific components required for booting armvl5-openbmc-aspeed based systems build-depends: - morph: strata/core.morph chunks: -- name: linux-armv5l-openbmc-aspeed-wedge +- name: linux-armv5l-openbmc-aspeed morph: strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph repo: upstream:linux-stable ref: 5cbce86c2115075b8054e4dba8cdf328aa6fa5b6 diff --git a/strata/bsp-armv8b64-generic.morph b/strata/bsp-armv8b64-generic.morph index a4d6645b..636e62b4 100644 --- a/strata/bsp-armv8b64-generic.morph +++ b/strata/bsp-armv8b64-generic.morph @@ -1,7 +1,6 @@ name: bsp-armv8b64-generic kind: stratum -description: -- | +description: | The set of platform specific components required for booting generic ARMv8 systems in big-endian mode, such as the 64-bit APM XGene ARM based m400 Moonshot cartridge. diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index a5edb9db..ca74dbe3 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -1,7 +1,6 @@ name: bsp-armv8l64-generic kind: stratum -description: -- | +description: | The set of platform specific components required for booting armv8l64-based systems, like the 64-bit APM XGene ARM based m400 Moonshot cartridge. diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph index 33221a70..218091f4 100644 --- a/strata/bsp-jetson/nouveau-drm.morph +++ b/strata/bsp-jetson/nouveau-drm.morph @@ -1,12 +1,14 @@ name: nouveau-drm kind: chunk build-commands: - - sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c - - cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules +- sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c +- cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules install-commands: - - cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install +- cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" + modules_install system-integration: - nouveau-drm-misc: - 00-earlyconf: - - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done) - - (cd /lib/modules && for version in *; do depmod -a "$version"; done) + nouveau-drm-misc: + 00-earlyconf: + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; + done) + - (cd /lib/modules && for version in *; do depmod -a "$version"; done) diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 41003643..05d179b5 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -3,7 +3,9 @@ kind: stratum description: The set of platform specific components required for booting a 32-bit x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -13,8 +15,8 @@ chunks: - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 799af9d2..31d8374c 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -3,7 +3,9 @@ kind: stratum description: The set of platform specific components required for booting a 64-bit x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -13,8 +15,8 @@ chunks: - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index f7212054..0d159ce6 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -3,17 +3,19 @@ kind: stratum description: The set of platform specific components required for configuring a bootable x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: nasm morph: strata/bsp-x86_both-tools/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux - ref: d715b39c0801ecea5e52f9029cea7c76320f93cf + ref: d715b39c0801ecea5e52f9029cea7c76320f93cf unpetrify-ref: baserock/morph build-depends: - nasm diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 0a6f4e68..a774e420 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -147,7 +147,7 @@ chunks: morph: strata/build-essential/stage2-busybox.morph repo: upstream:busybox ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca - unpetrify-ref: 1_23_1 + unpetrify-ref: '1_23_1' build-depends: - stage1-binutils - stage1-gcc @@ -305,7 +305,7 @@ chunks: morph: strata/build-essential/busybox.morph repo: upstream:busybox ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca - unpetrify-ref: 1_23_1 + unpetrify-ref: '1_23_1' build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index b5418bc0..1bbd97a6 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -3,14 +3,16 @@ kind: chunk configure-commands: # Busybox's default config has everything enabled. -- make defconfig +- make defconfig KCONFIG_NOTIMESTAMP=1 -- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config -- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config +- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' + -i .config +- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' + -i .config # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. -- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' - +- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' + -i .config' # We have GAWK, but in GENIVI baseline we want to get rid of it # - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config @@ -31,11 +33,16 @@ configure-commands: - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config # General features that we don't need. -- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not + set/' -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config @@ -52,19 +59,20 @@ configure-commands: # Now turn on some little bits we do need - sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config -- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config -- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config +- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' + -i .config +- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' + -i .config build-commands: -- make +- make KCONFIG_NOTIMESTAMP=1 install-commands: - | if [ "$PREFIX" = /usr ]; then PREFIX=; fi && - make CONFIG_PREFIX="$DESTDIR$PREFIX" install && + make CONFIG_PREFIX="$DESTDIR$PREFIX" KCONFIG_NOTIMESTAMP=1 install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox - # Set up man environment variables - mkdir -p "$DESTDIR"/etc - | diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph index a9d25ac1..f16b3c0e 100644 --- a/strata/build-essential/gcc.morph +++ b/strata/build-essential/gcc.morph @@ -15,8 +15,7 @@ products: # everything else gcc produces is required for compiling # this is the -devel artifact instead of -misc, since it goes in -devel # stratum artifacts by default - include: [ .* ] - + include: [.*] configure-commands: - mkdir o @@ -58,7 +57,7 @@ build-commands: install-commands: - cd o && make DESTDIR="$DESTDIR" install - ln -s gcc "$DESTDIR/$PREFIX/bin/cc" -- > +- | for fortran_alias in f77 f90 f95; do - ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias" + ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias" done diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index f820547d..54dbbd9c 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -17,7 +17,7 @@ products: include: - (usr/)?s?bin/.* - (usr/)?libexec/getconf/.* - - (usr/)?lib/libSegFault\.so(\.\d+)*$ + - (usr/)?lib(32|64)?/libSegFault\.so(\.\d+)*$ - artifact: glibc-libs include: # This is processed after bins, so bins can take libSegFault.so diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph index f76b0cc6..6418ed6a 100644 --- a/strata/build-essential/stage1-gcc.morph +++ b/strata/build-essential/stage1-gcc.morph @@ -3,7 +3,10 @@ kind: chunk configure-commands: # Workaround from LFS due GCC not detecting stack protection correctly -- sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure +- | + sed -i -e '/k prot/a \ + gcc_cv_libc_provides_ssp=yes + ' gcc/configure - mkdir o diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph index 98e4bf33..f271a40d 100644 --- a/strata/build-essential/stage2-busybox.morph +++ b/strata/build-essential/stage2-busybox.morph @@ -5,11 +5,11 @@ configure-commands: # Explicitly setting HOSTCC is required because we have a 'gcc' earlier in # the PATH supplied by the stage2-gcc chunk, which can't execute outside of # the stage 3 staging area. -- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig +- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 defconfig # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. -- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' - +- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' + -i .config' # We have GAWK. - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config @@ -30,13 +30,19 @@ configure-commands: - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config # General features that we don't need. -- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not + set/' -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config - sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config @@ -58,7 +64,7 @@ build-commands: export STAGE2_SYSROOT="$(dirname $(pwd))" export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="--sysroot=$STAGE2_SYSROOT" - make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- + make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 install-commands: # We expect to be built with a non-standard prefix in stage 2 (i.e. not @@ -68,5 +74,7 @@ install-commands: export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="--sysroot=$STAGE2_SYSROOT" make CONFIG_PREFIX="$DESTDIR$PREFIX" \ - HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install && + HOSTCC="/usr/bin/gcc" \ + CROSS_COMPILE=$TARGET_STAGE1- \ + KCONFIG_NOTIMESTAMP=1 install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph index cc954076..fa785e3c 100644 --- a/strata/ceph-service/boost.morph +++ b/strata/ceph-service/boost.morph @@ -3,6 +3,6 @@ kind: chunk configure-commands: - ./bootstrap.sh build-commands: -- ./b2 +- ./b2 install-commands: - ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph index a6b06759..56d30ead 100644 --- a/strata/ceph-service/ceph.morph +++ b/strata/ceph-service/ceph.morph @@ -3,7 +3,8 @@ kind: chunk build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops --without-libxfs +- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops + --without-libxfs build-commands: - make install-commands: diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph index bff2b87a..2b97c6e6 100644 --- a/strata/ceph-service/leveldb.morph +++ b/strata/ceph-service/leveldb.morph @@ -4,6 +4,6 @@ build-commands: - make install-commands: - mkdir -p "$DESTDIR$PREFIX"/lib -- mkdir -p "$DESTDIR$PREFIX"/include +- mkdir -p "$DESTDIR$PREFIX"/include - cp --preserve=links libleveldb.* "$DESTDIR$PREFIX"/lib - cp -r include/leveldb "$DESTDIR$PREFIX"/include diff --git a/strata/chef.morph b/strata/chef.morph index 69b495aa..b28298e0 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -71,8 +71,8 @@ chunks: unpetrify-ref: v1.2.5 build-depends: - hoe-master -- name: ipaddress-master - morph: strata/chef/ipaddress-master.morph +- name: ipaddress-0.8.0 + morph: strata/chef/ipaddress-0.8.0.morph repo: upstream:ruby-gems/ipaddress ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845 unpetrify-ref: master diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph index f15e0968..05d1a9f9 100644 --- a/strata/chef/erubis-master.morph +++ b/strata/chef/erubis-master.morph @@ -1,4 +1,3 @@ ---- name: erubis-master kind: chunk build-system: manual @@ -10,7 +9,8 @@ configure-commands: # Manually do what it seems like the 'rook' build system would do, if it worked # Values taken from 'Rookbook.props'. - find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \; -- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com all rights reserved./g' -i \{} \; +- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com + all rights reserved./g' -i \{} \; build-commands: - gem build erubis.gemspec install-commands: diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph index 9fe7ff8e..1a468789 100644 --- a/strata/chef/hoe-master.morph +++ b/strata/chef/hoe-master.morph @@ -1,4 +1,3 @@ ---- name: hoe-master kind: chunk build-system: manual diff --git a/strata/chef/ipaddress-master.morph b/strata/chef/ipaddress-0.8.0.morph index fdaa5de6..fdaa5de6 100644 --- a/strata/chef/ipaddress-master.morph +++ b/strata/chef/ipaddress-0.8.0.morph diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph index d85d1567..7a21831d 100644 --- a/strata/chef/libyajl2-1.0.1.morph +++ b/strata/chef/libyajl2-1.0.1.morph @@ -9,5 +9,5 @@ build-commands: - USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec install-commands: - mkdir -p "$DESTDIR/$(gem environment home)" -- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" - --ignore-dependencies --local ./libyajl2-1.0.1.gem +- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" + --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph index bef39f7d..7cf7cbb6 100644 --- a/strata/chef/plist-master.morph +++ b/strata/chef/plist-master.morph @@ -1,4 +1,3 @@ ---- name: plist-master kind: chunk build-system: manual diff --git a/strata/connman-common.morph b/strata/connman-common.morph index a22b7e90..fde00436 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -2,6 +2,7 @@ name: connman-common kind: stratum build-depends: - morph: strata/connectivity.morph +- morph: strata/glib-common.morph chunks: - name: connman morph: strata/connman-common/connman.morph diff --git a/strata/core.morph b/strata/core.morph index a6a9e06c..9e4fd4e1 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -32,8 +32,8 @@ chunks: - name: perl morph: strata/core/perl.morph repo: upstream:perl - ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1 - unpetrify-ref: baserock/morph + ref: 70f63a4c7dba89e8e48b44de7978faae4319e693 + unpetrify-ref: v5.22.0 build-depends: - gdbm - name: texinfo-tarball @@ -60,19 +60,44 @@ chunks: - autoconf-tarball - perl - texinfo-tarball +- name: help2man + repo: upstream:help2man + ref: 83bab7e2e8e24a380266a9a247c029c49b0de666 + unpetrify-ref: baserock/v1.46.5 + build-depends: + - autoconf-tarball + - automake +# Note: autoconf's version number must be set in autoconf's chunk morph, +# so if you update autoconf be sure to also update the version number +# in strata/core/autoconf.morph +- name: autoconf + morph: strata/core/autoconf.morph + repo: upstream:autoconf + ref: 218f9347c9c34919c2b8eef8d9a0513ac567a3c1 + unpetrify-ref: baserock/v2.69-texinfo-fix + build-depends: + - autoconf-tarball + - automake + - help2man + - texinfo-tarball - name: libtool-tarball morph: strata/core/libtool-tarball.morph repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 +- name: file + repo: upstream:file + ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 + unpetrify-ref: file-5.22 - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f unpetrify-ref: R_2_1_0 build-depends: - - autoconf-tarball + - autoconf - automake + - file - libtool-tarball - name: gettext-tarball morph: strata/core/gettext-tarball.morph @@ -93,6 +118,7 @@ chunks: unpetrify-ref: baserock/build-essential build-depends: - automake + - file - gettext-tarball - name: openssl-new morph: strata/core/openssl-new.morph @@ -113,14 +139,24 @@ chunks: unpetrify-ref: baserock/genivi/baseline build-depends: - automake +- name: libffi + morph: strata/core/libffi.morph + repo: upstream:libffi + ref: 77d4586cc47e8f4c02278afbc220145bba0d442b + unpetrify-ref: baserock/morph + build-depends: + - autoconf + - automake - name: cpython morph: strata/core/cpython.morph repo: upstream:cpython - ref: d0188e98ecf02e007d85fc34944f8be8f91b7e94 - unpetrify-ref: v2.7.9 + ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b + unpetrify-ref: v2.7.10 build-depends: - openssl-new - bzip2 + - libexpat + - libffi - sqlite3 - ncurses - readline @@ -130,30 +166,70 @@ chunks: unpetrify-ref: 0.22 build-depends: - cpython -- name: gtk-doc-stub - repo: upstream:gtk-doc-stub - ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 - unpetrify-ref: baserock/morph +# Note: bison's version number must be set in bison's chunk morph, +# so if you update bison be sure to also update the version number +# in strata/core/bison.morph +- name: bison + morph: strata/core/bison.morph + repo: upstream:bison + ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 + unpetrify-ref: baserock/v3.0.2 build-depends: - - bash + - autoconf + - automake + - flex + - gettext-tarball + - help2man + - mini-utils +# Note: patch's version number must be set in patch's chunk morph, +# so if you update patch be sure to also update the version number +# in strata/core/patch.morph +- name: patch + morph: strata/core/patch.morph + repo: upstream:patch + ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f + unpetrify-ref: baserock/v2.7.1 + build-depends: + - autoconf + - automake + - mini-utils + - bison - name: xz repo: upstream:xz ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a unpetrify-ref: v5.2.0 build-depends: - - autoconf-tarball + - autoconf - automake + - file - gettext-tarball - libtool-tarball +# Note: libtool's version number must be set in libtool's chunk morph, +# so if you update libtool be sure to also update the version number +# in strata/core/libtool.morph +- name: libtool + morph: strata/core/libtool.morph + repo: upstream:libtool + ref: 5e11a17c39a2a976a09c33a568431a9f7ad00d48 + unpetrify-ref: baserock/v2.4.6 + build-depends: + - autoconf + - automake + - file + - help2man + - patch + - texinfo-tarball + - xz - name: libxml2 repo: upstream:libxml2 ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80 unpetrify-ref: baserock/morph build-depends: - - autoconf-tarball + - autoconf - automake + - file - cpython - - libtool-tarball + - libtool - xz - name: ca-certificates morph: strata/core/ca-certificates.morph @@ -169,9 +245,10 @@ chunks: ref: 202aa9f7758636730299b86715d924f54468a908 unpetrify-ref: curl-7_38_0 build-depends: - - autoconf-tarball + - autoconf - automake - - libtool-tarball + - file + - libtool - openssl-new - ca-certificates - name: XML-Parser @@ -187,34 +264,12 @@ chunks: ref: 9874fca7122563e28d699a911404fc49d2a24f1c unpetrify-ref: v2.3.0 build-depends: - - autoconf-tarball + - autoconf - cpython - curl - gettext-tarball - libexpat - openssl-new -- name: help2man - repo: upstream:help2man - ref: 83bab7e2e8e24a380266a9a247c029c49b0de666 - unpetrify-ref: baserock/v1.46.5 - build-depends: - - autoconf-tarball - - automake -# Note: bison's version number must be set in bison's chunk morph, -# so if you update bison be sure to also update the version number -# in strata/core/bison.morph -- name: bison - morph: strata/core/bison.morph - repo: upstream:bison - ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 - unpetrify-ref: baserock/v3.0.2 - build-depends: - - autoconf-tarball - - automake - - flex - - gettext-tarball - - help2man - - mini-utils - name: gperf morph: strata/core/gperf.morph repo: upstream:gperf @@ -226,7 +281,7 @@ chunks: unpetrify-ref: baserock/morph build-depends: - XML-Parser - - autoconf-tarball + - autoconf - automake - perl - name: pkg-config @@ -235,29 +290,30 @@ chunks: ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934 unpetrify-ref: pkg-config-0.28 build-depends: - - autoconf-tarball + - autoconf - automake - - libtool-tarball + - libtool - name: attr morph: strata/core/attr.morph repo: upstream:attr ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph build-depends: - - autoconf-tarball + - file + - autoconf - automake - gettext-tarball - - libtool-tarball + - libtool - name: acl morph: strata/core/acl.morph repo: upstream:acl ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b unpetrify-ref: v2.2.52 build-depends: - - autoconf-tarball + - autoconf - automake - gettext-tarball - - libtool-tarball + - libtool - attr - name: linux-pam morph: strata/core/linux-pam.morph @@ -265,10 +321,10 @@ chunks: ref: b1521c97e73b10469f7b34c0571d51c647eca83c unpetrify-ref: Linux-PAM-1.1.8 build-depends: - - autoconf-tarball + - autoconf - automake - gettext-tarball - - libtool-tarball + - libtool - pkg-config - flex - attr @@ -279,10 +335,10 @@ chunks: ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b unpetrify-ref: baserock/morph build-depends: - - autoconf-tarball + - autoconf - automake - gettext-tarball - - libtool-tarball + - libtool - pkg-config - attr - acl @@ -290,29 +346,31 @@ chunks: - name: shadow morph: strata/core/shadow.morph repo: upstream:shadow - ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2 - unpetrify-ref: baserock/4.2 + ref: bfaa59229d61adb7fa0c570f0d94fd324c6e05aa + unpetrify-ref: upstream/4.2.1 build-depends: - - autoconf-tarball + - autoconf - automake - gettext-tarball - - libtool-tarball + - libtool - bison - attr - acl - linux-pam - libcap2 +# Note: util-linux's version number must be set in util-linux's chunk morph, +# so if you update util-linux be sure to also update the version number +# in strata/core/util-linux.morph - name: util-linux morph: strata/core/util-linux.morph repo: upstream:util-linux ref: 34760e62e0d5a25262a6aa801b2f1df61216363f unpetrify-ref: v2.26.1 build-depends: - - autoconf-tarball + - autoconf - automake - gettext-tarball - - git - - libtool-tarball + - libtool - pkg-config - linux-pam - shadow @@ -323,62 +381,16 @@ chunks: build-depends: - flex - texinfo-tarball -- name: patch - morph: strata/core/patch.morph - repo: upstream:patch - ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f - unpetrify-ref: baserock/v2.7.1 - build-depends: - - shadow - name: libxslt repo: upstream:libxslt ref: 73e08bf7c36a9145d38f51d37e66529b873c011a unpetrify-ref: master build-depends: - - autoconf-tarball - - libtool-tarball + - autoconf + - libtool - automake + - file - libxml2 -- name: gnome-common - repo: upstream:gnome-common - ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5 - unpetrify-ref: 3.14.0 - build-depends: - - autoconf-tarball - - automake -- name: libffi - morph: strata/core/libffi.morph - repo: upstream:libffi - ref: 77d4586cc47e8f4c02278afbc220145bba0d442b - unpetrify-ref: baserock/morph - build-depends: - - autoconf-tarball - - automake -- name: glib - repo: upstream:glib - ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094 - unpetrify-ref: 2.44.0 - build-depends: - - autoconf-tarball - - automake - - cpython - - gettext-tarball - - libffi - - pkg-config -- name: gobject-introspection - repo: upstream:gobject-introspection - ref: c0243e116c5e261c262dded9f4d7726a770c5a19 - unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0 - build-depends: - - autoconf-tarball - - automake - - bash - - bison - - cpython - - flex - - glib - - libffi - - pkg-config - name: e2fsprogs morph: strata/core/e2fsprogs.morph repo: upstream:e2fsprogs @@ -387,3 +399,4 @@ chunks: build-depends: - pkg-config - util-linux + - file diff --git a/strata/core/attr.morph b/strata/core/attr.morph index 46d0b9c0..d0bf6976 100644 --- a/strata/core/attr.morph +++ b/strata/core/attr.morph @@ -1,8 +1,9 @@ name: attr kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: - make configure +configure-commands: - | ./configure --prefix="$PREFIX" \ --exec-prefix="$PREFIX" \ diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.morph new file mode 100644 index 00000000..63b95ba8 --- /dev/null +++ b/strata/core/autoconf.morph @@ -0,0 +1,5 @@ +name: autoconf +kind: chunk +build-system: autotools +pre-configure-commands: +- echo "2.69" > .tarball-version diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph index b7bd9e5a..5bdb18ea 100644 --- a/strata/core/ca-certificates.morph +++ b/strata/core/ca-certificates.morph @@ -1,11 +1,12 @@ name: ca-certificates kind: chunk -build-system: autotools -configure-commands: [] -pre-install-commands: +build-system: manual +build-commands: +- make +install-commands: - mkdir -p "$DESTDIR"/usr/share/ca-certificates - mkdir -p "$DESTDIR"/usr/sbin -post-install-commands: +- make DESTDIR="$DESTDIR" install - mkdir "$DESTDIR"/etc - | cd "$DESTDIR"/usr/share/ca-certificates diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph index 6c9e4b3d..d0c80220 100644 --- a/strata/core/cpython.morph +++ b/strata/core/cpython.morph @@ -2,6 +2,10 @@ name: cpython kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --enable-shared +- | + ./configure --prefix="$PREFIX" \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi post-install-commands: - test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph new file mode 100644 index 00000000..d4465c31 --- /dev/null +++ b/strata/core/libtool.morph @@ -0,0 +1,6 @@ +name: libtool +kind: chunk +build-system: autotools +pre-configure-commands: +- echo "2.4.6" > .tarball-version +- ./bootstrap diff --git a/strata/core/patch.morph b/strata/core/patch.morph index b7f146ef..48c9c437 100644 --- a/strata/core/patch.morph +++ b/strata/core/patch.morph @@ -2,4 +2,5 @@ name: patch kind: chunk build-system: autotools pre-configure-commands: +- echo "2.7.1" > .tarball-version - ./bootstrap --skip-po diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph index c8715a7d..cdb1ff75 100644 --- a/strata/core/shadow.morph +++ b/strata/core/shadow.morph @@ -1,10 +1,12 @@ name: shadow kind: chunk build-system: autotools +pre-configure-commands: +- autoreconf -vfi configure-commands: # Installing to /bin so that they overwrite busybox login. - | - ./autogen.sh --with-selinux=no \ + ./configure --with-selinux=no \ --sysconfdir=/etc \ --with-libpam=yes \ --prefix="$PREFIX" \ diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph index eebba6f6..290283d1 100644 --- a/strata/core/util-linux.morph +++ b/strata/core/util-linux.morph @@ -1,8 +1,10 @@ name: util-linux kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: +- echo "2.26.1" > .tarball-version - ./autogen.sh +configure-commands: # Installing to /bin so that they overwrite busybox login. - | ./configure --prefix="$PREFIX" \ diff --git a/strata/devtools.morph b/strata/devtools.morph index 5fb93c1d..6b55e2f2 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -36,3 +36,8 @@ chunks: repo: upstream:git-review ref: 79262a52301c146a6b60d09a828661a83a5f5ba7 unpetrify-ref: master +- name: wget + morph: strata/devtools/wget.morph + repo: upstream:wget + ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f + unpetrify-ref: baserock/v1.16.3 diff --git a/strata/devtools/wget.morph b/strata/devtools/wget.morph new file mode 100644 index 00000000..a3a7995a --- /dev/null +++ b/strata/devtools/wget.morph @@ -0,0 +1,10 @@ +name: wget +kind: chunk +build-system: autotools +pre-configure-commands: +# rsync is needed if we want the bootstrap script to download .po files, +# we can't download into our chroot so we remove this dependency +- sed -i '/^buildreq="/,/"/ { /^rsync.*/ d }' bootstrap.conf +- ./bootstrap --no-bootstrap-sync --skip-po +configure-commands: +- ./configure --prefix="$PREFIX" --with-ssl=openssl diff --git a/strata/docutils.morph b/strata/docutils.morph new file mode 100644 index 00000000..6c5ac67b --- /dev/null +++ b/strata/docutils.morph @@ -0,0 +1,50 @@ +name: docutils +kind: stratum +description: Stuff for generating documentation +build-depends: +- morph: strata/core.morph +chunks: +- name: xml-catalog + morph: strata/docutils/xml-catalog.morph + repo: baserock:baserock/xml-catalog + ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b + unpetrify-ref: master +- name: docbook-xml + morph: strata/docutils/docbook-xml.morph + repo: upstream:docbook-xml + ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d + unpetrify-ref: docbook-xml-4.5 + build-depends: + # This is a little awkward, we don't really build-depend on xml-catalog, + # but if we don't include it as a build dependency + # then we won't have the existing xml catalog in our staging area + # which would cause this chunk to create a new catalog which would + # overwrite the catalog created by the 'xml-catalog' chunk. + # + # construction of the catalog cannot be done at system-integration time + # because we need the catalog *here* in order to build nasm complete with + # man pages. + - xml-catalog +- name: docbook-xsl + morph: strata/docutils/docbook-xsl.morph + repo: upstream:docbook-xsl + ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 + unpetrify-ref: docbook-xsl-1.78.1 + build-depends: + # Same issue as above, except this time we don't want to overwrite + # the catalog that now contains the XML DTDs. + - docbook-xml +- name: asciidoc + repo: upstream:asciidoc + ref: d3a6df0caa94edaf8180bd71bf2fc68390f56520 + unpetrify-ref: 8.6.9 + build-depends: + - docbook-xml + - docbook-xsl +- name: xmlto + repo: upstream:xmlto-tarball + ref: 6a590aba95cbcce0f184381fb19d16558e56832d + unpetrify-ref: xmlto-0.0.26 + build-depends: + - docbook-xml + - docbook-xsl diff --git a/strata/docutils/docbook-xml.morph b/strata/docutils/docbook-xml.morph new file mode 100644 index 00000000..f18acaba --- /dev/null +++ b/strata/docutils/docbook-xml.morph @@ -0,0 +1,104 @@ +name: docbook-xml +kind: chunk +build-system: manual +install-commands: +- install -v -d -m755 "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5" +- install -v -d -m755 "$DESTDIR/etc/xml" +- | + cp -v -af docbook.cat *.dtd ent/ *.mod \ + "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5" +post-install-commands: +- | + # Create (or update) and populate the "$DESTDIR/etc/xml/docbook" catalog file + if [ ! -e /etc/xml/docbook ]; then + xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook" + else + # Copy the existing catalog so we can update it + cp /etc/xml/docbook "$DESTDIR/etc/xml/docbook" + fi + +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + "$DESTDIR/etc/xml/docbook" +- | + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + "$DESTDIR/etc/xml/docbook" + +- | + # Create (or update) and populate the "$DESTDIR/etc/xml/catalog" catalog file + if [ ! -e /etc/xml/catalog ]; then + echo 'Creating new xml catalog' + xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog" + else + # Copy the existing catalog so we can update it + cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog" + fi + +- | + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" diff --git a/strata/docutils/docbook-xsl.morph b/strata/docutils/docbook-xsl.morph new file mode 100644 index 00000000..b3bf396d --- /dev/null +++ b/strata/docutils/docbook-xsl.morph @@ -0,0 +1,50 @@ +name: docbook-xsl +kind: chunk +install-commands: +- install -v -m755 -d "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1" +- | + cp -v -R VERSION common eclipse epub extensions fo highlighting html \ + htmlhelp images javahelp lib manpages params profiling \ + roundtrip slides template tests tools webhelp website \ + xhtml xhtml-1_1 \ + "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1" + +- ln -s VERSION "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl" + +- install -v -m644 -D README "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1/README.txt" +- | + install -v -m644 RELEASE-NOTES* NEWS* \ + "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1" +post-install-commands: +- if [ ! -d "$DESTDIR/etc/xml" ]; then install -v -m755 -d "$DESTDIR/etc/xml"; fi +- | + if [ ! -e /etc/xml/catalog ]; then + echo "Creating new xml catalog" + xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog" + else + cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog" + fi + +- | + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/1.78.1" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" + +- | + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/1.78.1" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" + +- | + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" + +- | + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" diff --git a/strata/virtualization/xml-catalog.morph b/strata/docutils/xml-catalog.morph index 34ba0306..34ba0306 100644 --- a/strata/virtualization/xml-catalog.morph +++ b/strata/docutils/xml-catalog.morph diff --git a/strata/enlightenment/bullet3.morph b/strata/enlightenment/bullet3.morph index 74cb097a..357e1f67 100644 --- a/strata/enlightenment/bullet3.morph +++ b/strata/enlightenment/bullet3.morph @@ -1,4 +1,4 @@ -name: bullet +name: bullet3 kind: chunk configure-commands: - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON diff --git a/strata/foundation.morph b/strata/foundation.morph index 22cb2d29..20166cf7 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -100,12 +100,6 @@ chunks: repo: baserock:baserock/tbdiff ref: 235e95c3479f96b04d33edecc684f985bda50e53 unpetrify-ref: master -- name: dbus-glib - repo: upstream:dbus-glib - ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c - unpetrify-ref: dbus-glib_0.102 - build-depends: - - dbus - name: rsync morph: strata/foundation/rsync.morph repo: upstream:rsync diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph index 4e724dc9..807a115f 100644 --- a/strata/foundation/btrfs-progs.morph +++ b/strata/foundation/btrfs-progs.morph @@ -5,5 +5,4 @@ pre-configure-commands: - ./autogen.sh configure-commands: # The change in the CFLAGS is needed to make the compilation succeed in armv5l -- export CFLAGS="-O2 $CFLAGS"; - ./configure --prefix="$PREFIX" --disable-documentation +- export CFLAGS="-O2 $CFLAGS"; ./configure --prefix="$PREFIX" --disable-documentation diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph index c3c89bcf..701d781a 100644 --- a/strata/foundation/time-zone-database.morph +++ b/strata/foundation/time-zone-database.morph @@ -7,4 +7,5 @@ install-commands: # ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get # installed. Note that tzselect from this chunk will overlap with and override # the tzselect binary from GLIBC. -- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install +- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" + install diff --git a/strata/genivi.morph b/strata/genivi.morph index 5294dc4e..f4d7d600 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -37,19 +37,19 @@ chunks: - name: genivi-common-api-runtime morph: strata/genivi/genivi-common-api-runtime.morph repo: upstream:genivi-common-api-runtime - ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c - unpetrify-ref: 2.1.6 + ref: 56d1059459c24971bcbf45adef60f6dfd0b44667 + unpetrify-ref: 3.1.2p1 - name: genivi-common-api-dbus-runtime morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime - ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f - unpetrify-ref: 2.1.6-p1 + ref: 49d0b428ca19852d49965f35328a314f22d88807 + unpetrify-ref: 3.1.2 build-depends: - genivi-common-api-runtime - name: audiomanager repo: upstream:audiomanager - ref: 00caae1e41e8891d9a1bafa76028e8119f06fd8a - unpetrify-ref: baserock/6.0 + ref: 8725157e248c6706de59a02996f869b6ccdccb13 + unpetrify-ref: "7.0" build-depends: - DLT-daemon - googletest @@ -102,8 +102,8 @@ chunks: - node-state-manager - name: node-health-monitor repo: upstream:genivi/node-health-monitor - ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0 - unpetrify-ref: baserock/1.3.3 + ref: 61f88bc9fc03c278664e05431ffb5933ff6007f1 + unpetrify-ref: baserock/1.3.5 build-depends: - node-state-manager - persistence-client-library diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph index e22e31e3..d16c42ea 100644 --- a/strata/genivi/DLT-daemon.morph +++ b/strata/genivi/DLT-daemon.morph @@ -1,4 +1,4 @@ -name: DLT-deamon +name: DLT-daemon kind: chunk build-system: cmake configure-commands: diff --git a/strata/genivi/genivi-common-api-dbus-runtime.morph b/strata/genivi/genivi-common-api-dbus-runtime.morph index 8d6cb134..fa8742a0 100644 --- a/strata/genivi/genivi-common-api-dbus-runtime.morph +++ b/strata/genivi/genivi-common-api-dbus-runtime.morph @@ -1,5 +1,3 @@ name: genivi-common-api-dbus-runtime kind: chunk -build-system: autotools -pre-configure-commands: -- ln -s . build-aux +build-system: cmake diff --git a/strata/genivi/genivi-common-api-runtime.morph b/strata/genivi/genivi-common-api-runtime.morph index 7439331a..1c4a66c2 100644 --- a/strata/genivi/genivi-common-api-runtime.morph +++ b/strata/genivi/genivi-common-api-runtime.morph @@ -1,5 +1,3 @@ name: genivi-common-api-runtime kind: chunk -build-system: autotools -pre-configure-commands: -- ln -s . build-aux +build-system: cmake diff --git a/strata/glib-common.morph b/strata/glib-common.morph new file mode 100644 index 00000000..090bdf13 --- /dev/null +++ b/strata/glib-common.morph @@ -0,0 +1,24 @@ +name: glib-common +kind: stratum +description: GLib and dependencies +build-depends: +- morph: strata/core.morph +chunks: +- name: gtk-doc-stub + repo: upstream:gtk-doc-stub + ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 + unpetrify-ref: baserock/morph +- name: gnome-common + repo: upstream:gnome-common + ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5 + unpetrify-ref: 3.14.0 +- name: glib + repo: upstream:glib + ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094 + unpetrify-ref: 2.44.0 +- name: gobject-introspection + repo: upstream:gobject-introspection + ref: c0243e116c5e261c262dded9f4d7726a770c5a19 + unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0 + build-depends: + - glib diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index c23ec829..5ba4d200 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -1,6 +1,7 @@ name: graphics-common kind: stratum build-depends: +- morph: strata/glib-common.morph - morph: strata/mesa-common.morph - morph: strata/x-common.morph chunks: diff --git a/strata/java/java-ant.morph b/strata/java/java-ant.morph index 172483ab..13c490d4 100644 --- a/strata/java/java-ant.morph +++ b/strata/java/java-ant.morph @@ -1,4 +1,4 @@ -name: ant +name: java-ant kind: chunk build-commands: - | diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index a614a831..4b0bdcc1 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -4,12 +4,14 @@ build-system: autotools pre-configure-commands: # Tegra requires a new coherent BO attribute, not currently upstream, so # patch it here - - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1 << 4)' include/drm/nouveau_drm.h + - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1 + << 4)' include/drm/nouveau_drm.h - | sed -i '/info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;/a\ if (bo->flags & NOUVEAU_BO_COHERENT)\ info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;' nouveau/abi16.c - - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' nouveau/nouveau.h + - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' + nouveau/nouveau.h configure-commands: - - NOCONFIGURE=1 ./autogen.sh - - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph index ca81b6e0..759a842c 100644 --- a/strata/libsoup-common.morph +++ b/strata/libsoup-common.morph @@ -2,9 +2,10 @@ name: libsoup-common kind: stratum build-depends: - morph: strata/core.morph +- morph: strata/glib-common.morph chunks: - name: libsoup morph: strata/libsoup-common/libsoup.morph repo: upstream:libsoup - ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e - unpetrify-ref: baserock/morph + ref: c29630a8fdb4e6997ec27da4af545bddefab35ad + unpetrify-ref: 2.48.0 diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph index 9d280062..d47d1837 100644 --- a/strata/llvm-common/llvm.morph +++ b/strata/llvm-common/llvm.morph @@ -3,6 +3,7 @@ kind: chunk description: Low Level Virtual Machine build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host + --enable-optimized --disable-assertions build-commands: - make $MAKEFLAGS diff --git a/strata/lorry.morph b/strata/lorry.morph index b3a0c779..3f5722ee 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -12,6 +12,7 @@ description: | build-depends: - morph: strata/foundation.morph - morph: strata/python-cliapp.morph +- morph: strata/pcre-utils.morph # for swig chunks: - name: bzr-tarball repo: upstream:bzr-tarball @@ -56,7 +57,7 @@ chunks: unpetrify-ref: baserock/morph build-depends: - perl-dbi-tarball -- name: libserf-tarball +- name: libserf morph: strata/lorry/libserf.morph repo: upstream:libserf-tarball ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c @@ -64,11 +65,11 @@ chunks: build-depends: - libapr - libapr-util -- name: swig-tarball - morph: strata/lorry/swig-tarball.morph - repo: upstream:swig-tarball - ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b - unpetrify-ref: baserock/morph +- name: swig + morph: strata/lorry/swig.morph + repo: upstream:swig + ref: 4e23595704d6ddffe4e50ca41bbc90e4b8893f4d + unpetrify-ref: rel-3.0.6 - name: neon morph: strata/lorry/neon.morph repo: upstream:neon @@ -77,13 +78,13 @@ chunks: - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball - ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0 - unpetrify-ref: baserock/morph + ref: bb0ef45f7c46b0ae221b26265ef98a768c33f820 + unpetrify-ref: subversion-1.8.13 build-depends: - - swig-tarball + - swig - libapr - libapr-util - - libserf-tarball + - libserf - neon - name: mercurial-tarball morph: strata/lorry/mercurial-tarball.morph @@ -105,7 +106,7 @@ chunks: - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry - ref: 4fcff82742ce3325a860c060b597ff281872c594 + ref: a55f642cd3e2d7e330cf96ff9f9eb5d03ae39192 unpetrify-ref: master build-depends: - bzr-tarball diff --git a/strata/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph index 5f34bc57..e03250e2 100644 --- a/strata/lorry/cvs-tarball.morph +++ b/strata/lorry/cvs-tarball.morph @@ -7,3 +7,4 @@ pre-configure-commands: configure-commands: - YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath + --enable-rootcommit diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig.morph index 7d16d85b..8a7d51b6 100644 --- a/strata/lorry/swig-tarball.morph +++ b/strata/lorry/swig.morph @@ -1,4 +1,4 @@ -name: swig-tarball +name: swig kind: chunk build-system: autotools pre-configure-commands: diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph index 9b4a68bf..49b5f0fc 100644 --- a/strata/lvm/lvm2.morph +++ b/strata/lvm/lvm2.morph @@ -8,7 +8,7 @@ configure-commands: # '${exec_prefix}/sbin' in the generated .service files. # # udev rules *must* go in /lib, they'll be ignored if they go in /usr/lib. -- > +- | ./configure --prefix="$PREFIX" \ --sbindir="$PREFIX"/sbin \ --with-udev-prefix=/ \ diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 58ca0db7..f5e3568a 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -36,9 +36,21 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: 2579391b05758940652a8ac5207d0137720affd1 + ref: 60c378c55d5d0ef89184b49ae95e445f8de422e3 unpetrify-ref: master build-depends: - cmdtest - pyfilesystem - pylru + +# This chunk isn't required to use Morph, but is required to do automated +# migrations within the definitions.git repo. +# +# Currently we include a forked version that includes some support for +# preserving blank lines. This is quite useful when operating on .morph files. +# The patches have been submitted upstream here: +# https://bitbucket.org/ruamel/yaml/pull-request/3 +- name: ruamel.yaml + repo: upstream:python-packages/ruamel.yaml + ref: 840b3ccdb306c6aa6d874474e621ae5596595ae4 + unpetrify-ref: baserock/sam/blank-line-preservation-1 diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index 69f3ccad..2eaedabf 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -5,12 +5,29 @@ build-depends: - morph: strata/core.morph chunks: - name: ogg - repo: upstream:ogg - ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f + repo: upstream:ogg-git + ref: 9b2ba419aecb4a1c97114545d57174593dc13111 unpetrify-ref: master - name: libvorbis - repo: upstream:libvorbis - ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 - unpetrify-ref: libvorbis-1.3.3 + repo: upstream:libvorbis-git + ref: 7187e7a48f0c3ba32cc080f6bc3d921fe4ec6cc2 + unpetrify-ref: master + build-depends: + - ogg +- name: tremor + repo: upstream:tremor + ref: b56ffce0c0773ec5ca04c466bc00b1bbcaf65aef + unpetrify-ref: master + build-depends: + - ogg +- name: flac + repo: upstream:flac + ref: 6ced857c253d5da286bf31adfd74a627aaa43c77 + unpetrify-ref: master build-depends: - ogg +- name: libmad + morph: strata/multimedia-common/libmad.morph + repo: upstream:libmad-tarball + ref: f2b21c41aef22e81b605afe96e1e6ef1bea0cfdc + unpetrify-ref: baserock/0.15.1b-gstreamer-sdk-fork diff --git a/strata/multimedia-common/libmad.morph b/strata/multimedia-common/libmad.morph new file mode 100644 index 00000000..839adc15 --- /dev/null +++ b/strata/multimedia-common/libmad.morph @@ -0,0 +1,10 @@ +name: libmad +kind: chunk +build-system: autotools +configure-commands: +- | + OPTS= + case $MORPH_ARCH in + mips64*) ARCH_FLAGS="--enable-fpm=64bit" ;; + esac + ./configure --prefix="$PREFIX" $ARCH_FLAGS diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index e9ba3cde..880371cd 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -1,14 +1,19 @@ name: networking-utils kind: stratum description: | - Stratum which contains utils to works with networks: create, enable, filter... + Stratum which contains utils to works with networks: create, enable, filter... - This stratum requires kernel config flags which are not enabled in the default - Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get - an idea of what is needed. + This stratum requires kernel config flags which are not enabled in the default + Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get + an idea of what is needed. build-depends: - morph: strata/foundation.morph chunks: +- name: ebtables + morph: strata/networking-utils/ebtables.morph + repo: upstream:ebtables + ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 + unpetrify-ref: master - name: iproute2 morph: strata/networking-utils/iproute2.morph repo: upstream:iproute2 @@ -42,7 +47,7 @@ chunks: repo: upstream:libnet ref: 05df365769597e1d64d02af931d6127762ff2658 unpetrify-ref: libnet-1.2 -- name: arping +- name: iputils morph: strata/networking-utils/iputils.morph repo: upstream:iputils ref: d25e54e25107bc7c5d14737ed65f5f52b54f1472 @@ -50,3 +55,50 @@ chunks: build-depends: - libpcap - libnet +- name: libnfnetlink + morph: strata/networking-utils/libnfnetlink.morph + repo: upstream:libnfnetlink + ref: 1166116e34af868bc814aea338c246e49a7a8748 + unpetrify-ref: libnfnetlink-1.0.1 +- name: libnetfilter_conntrack + morph: strata/networking-utils/libnetfilter_conntrack.morph + repo: upstream:libnetfilter_conntrack + ref: 5ad6ecff6edffd925022372323e42264f61e850d + unpetrify-ref: libnetfilter_conntrack-1.0.4 + build-depends: + - libnfnetlink + - libmnl +- name: libnetfilter_cthelper + morph: strata/networking-utils/libnetfilter_cthelper.morph + repo: upstream:libnetfilter_cthelper + ref: b8df12f352db62d26e5116e960d24774d5c9f3b7 + unpetrify-ref: libnetfilter_cthelper-1.0.0 + build-depends: + - libmnl +- name: libnetfilter_cttimeout + morph: strata/networking-utils/libnetfilter_cttimeout.morph + repo: upstream:libnetfilter_cttimeout + ref: 329652bef21c831dae1a9a79084b999d40b4eb5b + unpetrify-ref: libnetfilter_cttimeout-1.0.0 + build-depends: + - libmnl +- name: libnetfilter_queue + morph: strata/networking-utils/libnetfilter_queue.morph + repo: upstream:libnetfilter_queue + ref: f5d092dd3145d427c7c2ed668e3ac899875c9612 + unpetrify-ref: libnetfilter_queue-1.0.2 + build-depends: + - libnfnetlink + - libmnl +- name: conntrack-tools + morph: strata/networking-utils/conntrack-tools.morph + repo: upstream:conntrack-tools + ref: fbe3181be4f2e33509b1c20b95fd55eb3e7075d7 + unpetrify-ref: conntrack-tools-1.4.2 + build-depends: + - libnfnetlink + - libmnl + - libnetfilter_conntrack + - libnetfilter_cttimeout + - libnetfilter_cthelper + - libnetfilter_queue diff --git a/strata/networking-utils/conntrack-tools.morph b/strata/networking-utils/conntrack-tools.morph new file mode 100644 index 00000000..e0ef7234 --- /dev/null +++ b/strata/networking-utils/conntrack-tools.morph @@ -0,0 +1,4 @@ +name: conntrack-tools +kind: chunk +build-system: autotools +max-jobs: 1 diff --git a/strata/virtualization/ebtables.morph b/strata/networking-utils/ebtables.morph index a4d9fc76..a4d9fc76 100644 --- a/strata/virtualization/ebtables.morph +++ b/strata/networking-utils/ebtables.morph diff --git a/strata/networking-utils/libnet.morph b/strata/networking-utils/libnet.morph index c4f2b213..ddb2cf3e 100644 --- a/strata/networking-utils/libnet.morph +++ b/strata/networking-utils/libnet.morph @@ -8,7 +8,8 @@ pre-configure-commands: - cd libnet && ./autogen.sh configure-commands: -- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes --with-pic +- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes + --with-pic build-commands: - cd libnet && make install-commands: diff --git a/strata/networking-utils/libnetfilter_conntrack.morph b/strata/networking-utils/libnetfilter_conntrack.morph new file mode 100644 index 00000000..ef6ebb48 --- /dev/null +++ b/strata/networking-utils/libnetfilter_conntrack.morph @@ -0,0 +1,3 @@ +name: libnetfilter_conntrack +kind: chunk +build-system: autotools diff --git a/strata/networking-utils/libnetfilter_cthelper.morph b/strata/networking-utils/libnetfilter_cthelper.morph new file mode 100644 index 00000000..7f410a4a --- /dev/null +++ b/strata/networking-utils/libnetfilter_cthelper.morph @@ -0,0 +1,3 @@ +name: libnetfilter_cthelper +kind: chunk +build-system: autotools diff --git a/strata/networking-utils/libnetfilter_cttimeout.morph b/strata/networking-utils/libnetfilter_cttimeout.morph new file mode 100644 index 00000000..b2281a5b --- /dev/null +++ b/strata/networking-utils/libnetfilter_cttimeout.morph @@ -0,0 +1,3 @@ +name: libnetfilter_cttimeout +kind: chunk +build-system: autotools diff --git a/strata/networking-utils/libnetfilter_queue.morph b/strata/networking-utils/libnetfilter_queue.morph new file mode 100644 index 00000000..d2b80d38 --- /dev/null +++ b/strata/networking-utils/libnetfilter_queue.morph @@ -0,0 +1,3 @@ +name: libnetfilter_queue +kind: chunk +build-system: autotools diff --git a/strata/networking-utils/libnfnetlink.morph b/strata/networking-utils/libnfnetlink.morph new file mode 100644 index 00000000..f4fe79ab --- /dev/null +++ b/strata/networking-utils/libnfnetlink.morph @@ -0,0 +1,3 @@ +name: libnfnetlink +kind: chunk +build-system: autotools diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph index c412e1d0..8116a9f4 100644 --- a/strata/nfs/nfs-utils.morph +++ b/strata/nfs/nfs-utils.morph @@ -3,7 +3,8 @@ kind: chunk build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers +- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal + --without-tcp-wrappers install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR"/lib/systemd/system diff --git a/strata/ntpd/ntpd.morph b/strata/ntpd/ntpd.morph index 49316c14..762762c7 100644 --- a/strata/ntpd/ntpd.morph +++ b/strata/ntpd/ntpd.morph @@ -2,7 +2,7 @@ name: ntpd kind: chunk build-system: autotools configure-commands: - - ./configure --prefix="$PREFIX" --enable-linuxcaps +- ./configure --prefix="$PREFIX" --enable-linuxcaps post-install-commands: - | cat > ntpd.service << EOF @@ -13,7 +13,7 @@ post-install-commands: [Service] Type=forking - ExecStart=/usr/bin/ntpd -u ntp:ntp + ExecStart=/usr/bin/ntpd -u ntp:ntp -Ng PrivateTmp=True Restart=on-failure @@ -40,8 +40,8 @@ post-install-commands: # matching hosts # # see ntp.conf(5) for more details - restrict -4 default kod notrap nomodify - restrict -6 default kod notrap nomodify + restrict -4 default limit kod notrap nomodify + restrict -6 default limit kod notrap nomodify EOF - install -D -m 644 ntp.conf "$DESTDIR"/etc/ntp.conf system-integration: diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index da177fce..2b458cc1 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -57,6 +57,16 @@ chunks: build-depends: - cmd2 - pyparsing +- name: tablib + morph: strata/openstack-clients/tablib.morph + repo: upstream:python-packages/tablib + ref: 1cc051f3e881289a8b51133c0c1ee73683b2d6fc + unpetrify-ref: v0.10.0 +- name: cliff-tablib + morph: strata/openstack-clients/cliff-tablib.morph + repo: upstream:python-packages/cliff-tablib + ref: a83bf47d7dfbb690dd53e189c532f0859898db04 + unpetrify-ref: 1.1 - name: python-neutronclient repo: upstream:openstack/python-neutronclient ref: aa1215a5ad063b299d32ef319eb63d5210249a9b @@ -101,3 +111,29 @@ chunks: repo: upstream:openstack/python-ironicclient ref: 4390a21663de3123fac306e9860624ba7deda0e6 unpetrify-ref: 0.4.1 +# Despite argparse being part of the Python 2.7's standard library, the +# pkg_resources module used by python-openstackclient doesn't look into +# the standard library, resulting in a 'DistributionNotFound: argparse' +# error. Hence, install argparse separately. +- name: argparse + morph: strata/openstack-clients/argparse.morph + repo: upstream:argparse + ref: ec94cd429c56487e89425f226284009f78a596c6 + unpetrify-ref: r130 +# The latest release of python-openstackclient is not being used as it +# requires newer versions of glance, neutron, keystone and nova. +- name: python-openstackclient + morph: strata/openstack-clients/python-openstackclient.morph + repo: upstream:openstack/python-openstackclient + ref: 28f65e665045c1c6d0697f856f06020c7c8e656a + unpetrify-ref: 1.2.0 +- name: os-client-config + morph: strata/openstack-clients/os-client-config.morph + repo: upstream:openstack/os-client-config + ref: a0df67704ace186b18fd1ecdc220a7e56409bc6f + unpetrify-ref: 1.3.0 +- name: appdirs + morph: strata/openstack-clients/appdirs.morph + repo: upstream:python-packages/appdirs + ref: 57f2bc44a8bca99bac6c57496c8b3fdea26f94d5 + unpetrify-ref: 1.4.0 diff --git a/strata/openstack-clients/appdirs.morph b/strata/openstack-clients/appdirs.morph new file mode 100644 index 00000000..53d0e476 --- /dev/null +++ b/strata/openstack-clients/appdirs.morph @@ -0,0 +1,3 @@ +name: appdirs +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-clients/argparse.morph b/strata/openstack-clients/argparse.morph new file mode 100644 index 00000000..499df5f5 --- /dev/null +++ b/strata/openstack-clients/argparse.morph @@ -0,0 +1,3 @@ +name: argparse +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-clients/cliff-tablib.morph b/strata/openstack-clients/cliff-tablib.morph new file mode 100644 index 00000000..4b48ba14 --- /dev/null +++ b/strata/openstack-clients/cliff-tablib.morph @@ -0,0 +1,3 @@ +name: cliff-tablib +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-clients/os-client-config.morph b/strata/openstack-clients/os-client-config.morph new file mode 100644 index 00000000..13c473d2 --- /dev/null +++ b/strata/openstack-clients/os-client-config.morph @@ -0,0 +1,3 @@ +name: os-client-config +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-clients/python-openstackclient.morph b/strata/openstack-clients/python-openstackclient.morph new file mode 100644 index 00000000..a4c9fae7 --- /dev/null +++ b/strata/openstack-clients/python-openstackclient.morph @@ -0,0 +1,3 @@ +name: python-openstackclient +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-clients/tablib.morph b/strata/openstack-clients/tablib.morph new file mode 100644 index 00000000..821ceb95 --- /dev/null +++ b/strata/openstack-clients/tablib.morph @@ -0,0 +1,3 @@ +name: tablib +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 86c80107..b66d0144 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -1,8 +1,8 @@ name: openstack-common kind: stratum description: | - Stratum with the python packages needed to compile openstack - clients and services. + Stratum with the python packages needed to compile openstack + clients and services. build-depends: - morph: strata/python-common.morph - morph: strata/foundation.morph @@ -25,9 +25,10 @@ chunks: morph: strata/openstack-common/babel.morph repo: upstream:babel # Babel requires core-23.1.zip to be present when compiles -# from source, the following branch and commit add this file -# to the repository. - ref: 603e77ae0e43b6ecdb3f3a8ea7988f7e7c83e867 +# from source, the following branch adds this file to the +# repository, and stops the date being added to the version +# number when running `python setup.py install`. + ref: 1891d93b10e6c11ab08099b95001b17e88315c2a unpetrify-ref: baserock/1.3-50-g246996b build-depends: - pytz diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index 6189527f..1feb1427 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -245,7 +245,7 @@ chunks: morph: strata/openstack-services/qpid-python.morph repo: upstream:python-packages/qpid-python ref: 587b0febaf1996db1e483137ed6addb45580ee9e - unpetrify-ref: 0.30 + unpetrify-ref: '0.30' - name: simplegeneric-tarball repo: upstream:python-packages/simplegeneric-tarball ref: 601fab9b154c557dfd848d531a8969f4697d1aa2 @@ -364,7 +364,6 @@ chunks: unpetrify-ref: 0.9.0 build-depends: - oslo-context - build-depends: - oslo-messaging - posix-ipc-tarball - name: keystonemiddleware @@ -659,7 +658,7 @@ chunks: morph: strata/openstack-services/tempest.morph repo: upstream:openstack/tempest ref: 26149b612d01ad605e4d0f41a2d67280c8088cda - unpetrify-ref: "4" + unpetrify-ref: '4' build-depends: - tempest-lib - name: tftp-hpa diff --git a/strata/openstack-services/open-iscsi.morph b/strata/openstack-services/open-iscsi.morph index 9d135ab2..6a0b73b3 100644 --- a/strata/openstack-services/open-iscsi.morph +++ b/strata/openstack-services/open-iscsi.morph @@ -6,7 +6,8 @@ install-commands: # Rewrite prefix and exec_prefix which are set to "/usr" and "/" respectively - make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" install # Install iscsistart app which is not listed by default in PROGRAMS -- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart" install +- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart" + install post-install-commands: # Configure iscsi daemon # Point the startup to the installed binary diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph index 39f74f6d..53e9fd72 100644 --- a/strata/python-pygobject.morph +++ b/strata/python-pygobject.morph @@ -4,6 +4,7 @@ description: | Python GObject bindings build-depends: - morph: strata/core.morph +- morph: strata/glib-common.morph chunks: - name: pygobject morph: strata/python-pygobject/pygobject.morph diff --git a/strata/python-tools.morph b/strata/python-tools.morph index a84697af..e380530f 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -1,7 +1,7 @@ name: python-tools kind: stratum -description: "A stratum for non-essential python tools: -useful python tools that we don't want to include in core." +description: | + A stratum for useful python tools that we don't want to include in core. build-depends: - morph: strata/python-core.morph chunks: diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 192e9201..f0da65fc 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -7,5 +7,5 @@ chunks: - name: python3 morph: strata/python3-core/python3.morph repo: upstream:cpython - ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c - unpetrify-ref: v3.4.2 + ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad + unpetrify-ref: v3.4.3 diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 53d5a682..bb86d6b5 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -10,7 +10,7 @@ chunks: morph: strata/qt5-tools/qtwebkit.morph repo: upstream:qt5/qtwebkit ref: 586bdc38324dfaeec65389bf7646c82cb35db017 - unpetrify-ref: "5.4.2" + unpetrify-ref: 5.4.2 - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples diff --git a/strata/samba.morph b/strata/samba.morph new file mode 100644 index 00000000..33dcd856 --- /dev/null +++ b/strata/samba.morph @@ -0,0 +1,12 @@ +name: samba +kind: stratum +description: Simple samba server +build-depends: +- morph: strata/core.morph +- morph: strata/foundation.morph +chunks: +- name: samba + morph: strata/samba/samba.morph + repo: upstream:samba + ref: 704592c14dfedbe98e95d43860d062dc6338bca3 + unpetrify-ref: master diff --git a/strata/samba/samba.morph b/strata/samba/samba.morph new file mode 100644 index 00000000..748ee886 --- /dev/null +++ b/strata/samba/samba.morph @@ -0,0 +1,127 @@ +name: samba +kind: chunk +configure-commands: +- | + # Here are really really ugly hacks: + # + # This fixes a problem with ./configure and recent compilers + # which implement c9x by default. + sed -i "s/#define bool int//" source3/lib/util_sec.c + # + # This fixes the problem with Baserock build environments running + # as root but sandboxed, and preventing certain privileged operations + # from taking effect. eg. seteuid() + # Instead, convince it that we're not running as root so that it + # doesn't run these tests. + sed -i "s/getuid() != 0/1/" source3/lib/util_sec.c + # + # + ./configure \ + --without-ldap \ + --disable-gnutls \ + --without-ad-dc \ + --without-acl-support \ + --without-ads \ + --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --enable-fhs +build-commands: +- make +install-commands: +- make install DESTDIR="$DESTDIR" +# systemd configuration +- mkdir -p "$DESTDIR/etc/tmpfiles.d" +- install -m 644 ./packaging/systemd/samba.conf.tmp "$DESTDIR/etc/tmpfiles.d/samba.conf" +- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" +- | + cat <<EOF >"$DESTDIR/lib/systemd/system/nmb.service" + [Unit] + Description=Samba NMB Daemon + After=syslog.target network-online.target + + [Service] + Type=forking + PIDFile=/var/run/samba/nmbd.pid + EnvironmentFile=-/etc/sysconfig/samba + ExecStart=$PREFIX/sbin/nmbd \$NMBDOPTIONS + ExecReload=$PREFIX/bin/kill -HUP \$MAINPID + + [Install] + WantedBy=multi-user.target + EOF +- | + cat <<EOF >"$DESTDIR/lib/systemd/system/smb.service" + [Unit] + Description=Samba SMB Daemon + After=syslog.target network-online.target nmb.service winbind.service + + [Service] + Type=forking + PIDFile=/var/run/samba/smbd.pid + EnvironmentFile=-/etc/sysconfig/samba + ExecStart=$PREFIX/sbin/smbd \$NMBDOPTIONS + ExecReload=$PREFIX/bin/kill -HUP \$MAINPID + + [Install] + WantedBy=multi-user.target + EOF +- | + cat <<EOF >"$DESTDIR/lib/systemd/system/winbind.service" + [Unit] + Description=Samba winbind Daemon + After=syslog.target network-online.target nmb.service + + [Service] + Type=forking + PIDFile=/var/run/samba/winbindd.pid + EnvironmentFile=-/etc/sysconfig/samba + ExecStart=$PREFIX/sbin/winbindd \$NMBDOPTIONS + ExecReload=$PREFIX/bin/kill -HUP \$MAINPID + + [Install] + WantedBy=multi-user.target + EOF +- | + for i in nmb smb winbind + do + ln -s ../$i.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/$i.service" + done +- mkdir -p "$DESTDIR/var/log/samba" +# Install a sample configuration +- mkdir -p "$DESTDIR/etc/samba" +- | + cat <<EOF >"$DESTDIR/etc/samba/smb.conf" + [global] + workgroup = WORKGROUP + dns proxy = no + local master = yes + preferred master = yes + os level = 2 + log file = /var/log/samba/log.%m + max log size = 1000 + syslog = 0 + server role = standalone server + passdb backend = tdbsam + obey pam restrictions = yes + unix password sync = yes + pam password change = yes + map to guest = bad user + usershare allow guests = yes + [homes] + comment = Home Directories + browseable = no + read only = yes + create mask = 0700 + valid users = %S + ;[printers] + ;comment = All Printers + ;browseable = no + ;path = /var/spool/samba + ;printable = yes + ;guest ok = no + ;read only = yes + ;create mask = 0700 + ;[src] + ;comment = Source code + ;path = /src + ;read only = yes + ;guest ok = yes + EOF diff --git a/strata/swift.morph b/strata/swift.morph index 6045727a..6afcc832 100644 --- a/strata/swift.morph +++ b/strata/swift.morph @@ -16,6 +16,7 @@ chunks: ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc unpetrify-ref: v0.7.6 - name: liberasurecode + morph: strata/swift/liberasurecode.morph repo: upstream:liberasurecode ref: a380246762c16ea8eb7dbfccd50d296c3743b39e unpetrify-ref: v1.0.7 diff --git a/strata/swift/liberasurecode.morph b/strata/swift/liberasurecode.morph new file mode 100644 index 00000000..68839403 --- /dev/null +++ b/strata/swift/liberasurecode.morph @@ -0,0 +1,5 @@ +name: liberasurecode +kind: chunk +build-system: autotools +pre-configure-commands: +- autoreconf -ivf diff --git a/strata/test-tools/subunit.morph b/strata/test-tools/subunit.morph index b7b43a39..0d3819ed 100644 --- a/strata/test-tools/subunit.morph +++ b/strata/test-tools/subunit.morph @@ -1,3 +1,3 @@ -name: python-subunit +name: subunit kind: chunk build-system: autotools diff --git a/strata/tools.morph b/strata/tools.morph index 4128cad9..bfde546f 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -3,16 +3,13 @@ kind: stratum description: Various tools build-depends: - morph: strata/core.morph +- morph: strata/glib-common.morph chunks: - name: distcc morph: strata/tools/distcc.morph repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph -- name: file - repo: upstream:file - ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 - unpetrify-ref: file-5.22 - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb @@ -71,8 +68,6 @@ chunks: repo: upstream:ipmitool ref: be7917f9f58c8a354bc0960ed57516af5d2bd29a unpetrify-ref: IPMITOOL_1_8_14 - build-depends: - - file - name: parted morph: strata/tools/parted.morph repo: upstream:parted diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph index 808ff7d7..6f60da9e 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,4 +2,5 @@ name: gdb kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof +- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils + --disable-ld --disable-gold --disable-gprof diff --git a/strata/tools/procps-ng.morph b/strata/tools/procps-ng.morph index 69df3d4a..e030b36c 100644 --- a/strata/tools/procps-ng.morph +++ b/strata/tools/procps-ng.morph @@ -9,11 +9,11 @@ description: | build-system: autotools configure-commands: - - NOCONFIGURE=1 ./autogen.sh +- NOCONFIGURE=1 ./autogen.sh # Setting exec-prefix to /usr causes a bunch of stuff to go in /usr/usr/bin # Setting prefix to / causes files to go in /include and /share # So don't do either of those things! - - ./configure --prefix="$PREFIX" --exec-prefix=/ +- ./configure --prefix="$PREFIX" --exec-prefix=/ post-install-commands: # We need to link the binaries into /bin so that they override the Busybox diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph index 914b18e0..acb094ea 100644 --- a/strata/unionfs-fuse-group.morph +++ b/strata/unionfs-fuse-group.morph @@ -1,21 +1,20 @@ name: unionfs-fuse-group kind: stratum -description: +description: | User-space union file system. - This is used by Morph for systems which are unable to use 'overlayfs'. - It is slower than 'overlayfs', because it runs outside rather than - inside the kernel, but 'overlayfs' is only available in Linux 3.18 and - newer. + This is used by Morph for systems which are unable to use 'overlayfs'. It is slower + than 'overlayfs', because it runs outside rather than inside the kernel, but 'overlayfs' + is only available in Linux 3.18 and newer. build-depends: # Depends on foundation for 'fuse', and maybe other stuff. - morph: strata/foundation.morph chunks: - - name: unionfs.fuse - morph: strata/unionfs-fuse-group/unionfs-fuse.morph - repo: upstream:unionfs-fuse - ref: efac5b7aa91ec860f8f430a8d21060fe53a07002 - unpetrify-ref: v0.26 +- name: unionfs-fuse + morph: strata/unionfs-fuse-group/unionfs-fuse.morph + repo: upstream:unionfs-fuse + ref: efac5b7aa91ec860f8f430a8d21060fe53a07002 + unpetrify-ref: v0.26 diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph index 9b8ac2c7..98e1ce1f 100644 --- a/strata/unionfs-fuse-group/unionfs-fuse.morph +++ b/strata/unionfs-fuse-group/unionfs-fuse.morph @@ -1,8 +1,7 @@ name: unionfs-fuse kind: chunk -description: - User-space union file system. +description: User-space union file system. build-system: manual diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 548019aa..f63b3599 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -1,10 +1,10 @@ name: virtualization kind: stratum description: | - Virtualization for baserock - NOTE: this stratum requires kernel support, please see openstack bsp - kernel history to check which config are needed for openvswitch, libvirt, - or ebtables, for example. + Virtualization for baserock + NOTE: this stratum requires kernel support, please see openstack bsp + kernel history to check which config are needed for openvswitch or libvirt, + for example. build-depends: - morph: strata/libsoup-common.morph - morph: strata/python-core.morph @@ -12,17 +12,14 @@ build-depends: - morph: strata/connman-common.morph - morph: strata/lvm.morph - morph: strata/xorg-util-macros-common.morph +- morph: strata/networking-utils.morph +- morph: strata/docutils.morph chunks: - name: yajl morph: strata/virtualization/yajl.morph repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph -- name: xml-catalog - morph: strata/virtualization/xml-catalog.morph - repo: baserock:baserock/xml-catalog - ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b - unpetrify-ref: master - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq @@ -42,11 +39,6 @@ chunks: repo: upstream:dmidecode ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 unpetrify-ref: master -- name: ebtables - morph: strata/virtualization/ebtables.morph - repo: upstream:ebtables - ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 - unpetrify-ref: master - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt @@ -56,10 +48,8 @@ chunks: - libpciaccess - dnsmasq - qemu - - xml-catalog - yajl - dmidecode - - ebtables - name: pycurl repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index c1dde012..37a57c5b 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -12,7 +12,7 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7 - unpetrify-ref: 1.7.0 + ref: 60024af597b68974c451c89f960a7c11de11c33a + unpetrify-ref: 1.8.0 build-depends: - libxkbcommon diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 2925d72c..fbc5d5f1 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -10,5 +10,5 @@ chunks: - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: 322383ed469d69401b502618718a97a4e85c97d8 - unpetrify-ref: baserock/weston-1.7.0/tegra + ref: 97a6d48e725956a58afad4450c5981c42ba4aa9c + unpetrify-ref: baserock/weston-1.8.0/tegra diff --git a/strata/x-common.morph b/strata/x-common.morph index 28e04fcc..33d7b5b6 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -100,7 +100,7 @@ chunks: - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 - unpetrify-ref: "1.11" + unpetrify-ref: '1.11' - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 @@ -116,7 +116,7 @@ chunks: - name: xcb-libxcb repo: upstream:xcb-libxcb ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a - unpetrify-ref: "1.11" + unpetrify-ref: '1.11' build-depends: - xcb-proto - xorg-lib-libXau diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 0b400dff..deb9d1ec 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -1,13 +1,13 @@ name: xstatic kind: stratum description: | - Stratum with Xstatic and some xstatic libraries. + Stratum with Xstatic and some xstatic libraries. - XStatic is a packaging standard to package external static files as - a python package, so they are easily usable on all OSes. + XStatic is a packaging standard to package external static files as + a python package, so they are easily usable on all OSes. - This conflicts with the 'everything from Git' policy of Baserock, - but it is required right now for the Openstack system to work. + This conflicts with the 'everything from Git' policy of Baserock, + but it is required right now for the Openstack system to work. build-depends: - morph: strata/foundation.morph - morph: strata/python-core.morph diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 97acd2ca..483a3fde 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -1,6 +1,7 @@ name: zookeeper-server kind: stratum -description: This Stratum installs a zookeeper server and small program to populate it with default data. +description: This Stratum installs a zookeeper server and small program to populate + it with default data. build-depends: - morph: strata/zookeeper.morph chunks: diff --git a/strata/zookeeper/zookeeper-client.morph b/strata/zookeeper/zookeeper-client.morph index 591c1840..7bc99f08 100644 --- a/strata/zookeeper/zookeeper-client.morph +++ b/strata/zookeeper/zookeeper-client.morph @@ -1,17 +1,17 @@ name: zookeeper-client kind: chunk build-commands: - - mkdir -p "$DESTDIR$PREFIX"/zookeeper-client - - cp -r * "$DESTDIR$PREFIX"/zookeeper-client - - make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/ +- mkdir -p "$DESTDIR$PREFIX"/zookeeper-client +- cp -r * "$DESTDIR$PREFIX"/zookeeper-client +- make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/ post-install-commands: - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service - [unit] - Description=Zookeeper client init - [Service] - ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198 - RemainAfterExit=yes - [Install] - WantedBy=multi-user.target - EOF +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service + [unit] + Description=Zookeeper client init + [Service] + ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198 + RemainAfterExit=yes + [Install] + WantedBy=multi-user.target + EOF diff --git a/strata/zookeeper/zookeeper-server.morph b/strata/zookeeper/zookeeper-server.morph index 082c063c..502bbda3 100644 --- a/strata/zookeeper/zookeeper-server.morph +++ b/strata/zookeeper/zookeeper-server.morph @@ -1,30 +1,30 @@ name: zookeeper-server kind: chunk build-commands: - - mkdir -p "$DESTDIR$PREFIX"/zookeeper_server - - cp -r * "$DESTDIR$PREFIX"/zookeeper_server - - make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ +- mkdir -p "$DESTDIR$PREFIX"/zookeeper_server +- cp -r * "$DESTDIR$PREFIX"/zookeeper_server +- make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ post-install-commands: - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service - [unit] - Description=Zookeeper server - [Service] - ExecStart=/usr/zookeeper/bin/zkServer.sh start - RemainAfterExit=yes - [Install] - WantedBy=multi-user.target - EOF - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service - [unit] - Description=Zookeeper server init - [Service] - ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup - RemainAfterExit=no - [Install] - WantedBy=multi-user.target - EOF - - mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants - - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service - - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service + [unit] + Description=Zookeeper server + [Service] + ExecStart=/usr/zookeeper/bin/zkServer.sh start + RemainAfterExit=yes + [Install] + WantedBy=multi-user.target + EOF +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service + [unit] + Description=Zookeeper server init + [Service] + ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup + RemainAfterExit=no + [Install] + WantedBy=multi-user.target + EOF +- mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants +- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service +- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph index dbe6ccbb..db446a1b 100644 --- a/strata/zookeeper/zookeeper.morph +++ b/strata/zookeeper/zookeeper.morph @@ -1,14 +1,14 @@ name: zookeeper kind: chunk configure-commands: - - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper +- mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper build-commands: - - ant -p compile_jute - - mkdir -p "$DESTDIR$PREFIX"/zookeeper - - cp -r * "$DESTDIR$PREFIX"/zookeeper - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/ - - make -C "$DESTDIR$PREFIX"/zookeeper/src/c - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install - - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg - - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt +- ant -p compile_jute +- mkdir -p "$DESTDIR$PREFIX"/zookeeper +- cp -r * "$DESTDIR$PREFIX"/zookeeper +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/ +- make -C "$DESTDIR$PREFIX"/zookeeper/src/c +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install +- mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg +- make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt |