Merge branch '96-fix-b0rken-ebuild-for-gitlab-ce-9-1-4' into 'master'

Resolve "Fix b0rken ebuild for gitlab-ce-9.1.4"

Closes #96

See merge request !165
This commit is contained in:
Manuel Friedli 2017-05-27 17:08:31 +02:00
commit 3692ebd772
3 changed files with 3 additions and 15 deletions

View file

@ -32,8 +32,8 @@ EBUILD gitlab-ce-9.0.0_rc4.ebuild 12914 SHA256 72a4b8dfc10acbef389c4af00dcdc8012
EBUILD gitlab-ce-9.0.1-r1.ebuild 13087 SHA256 4dda1de15a8fb05d2fc5b97a99113fe93bb1feddbe46dc97ef3c945aa1715841 SHA512 1f44da05e954cbe8e50acc217e4c6f098f5e7aa5e31f0faf97e48df800e5b6d560b7911aaf0bf0e86bb1f267d7674895f93d908f2e9f4544fadab32d5d2b7e23 WHIRLPOOL b02d9d5d48a695e25fc6d422c49436b191a57807da5eb36ccff78287e4f38175d6958e9ae8a965433d42d26b84607beb833db79822068a4dd0a0d9bb4b60d463 EBUILD gitlab-ce-9.0.1-r1.ebuild 13087 SHA256 4dda1de15a8fb05d2fc5b97a99113fe93bb1feddbe46dc97ef3c945aa1715841 SHA512 1f44da05e954cbe8e50acc217e4c6f098f5e7aa5e31f0faf97e48df800e5b6d560b7911aaf0bf0e86bb1f267d7674895f93d908f2e9f4544fadab32d5d2b7e23 WHIRLPOOL b02d9d5d48a695e25fc6d422c49436b191a57807da5eb36ccff78287e4f38175d6958e9ae8a965433d42d26b84607beb833db79822068a4dd0a0d9bb4b60d463
EBUILD gitlab-ce-9.0.2.ebuild 13087 SHA256 f8705f07c62a4988b10b1c83ddb743032d1838f24b562a0f69df72ba690ed1f3 SHA512 c0cf1b1228e5499c7643811f80db010dce67d20da5aefd6a40ef2a537bb4ed7b589e8f878307a06ec1fb8d053a3e2ea00a97c66a7edb6e4845f92b493fad9b82 WHIRLPOOL 2df17352ea8ea15fbb74a10b1941b369d642f65453d10599d599925cc46d5f71e9a6149dc56acf15a501750228dc1eecceeb19d72890f3835a514c891f84dcc6 EBUILD gitlab-ce-9.0.2.ebuild 13087 SHA256 f8705f07c62a4988b10b1c83ddb743032d1838f24b562a0f69df72ba690ed1f3 SHA512 c0cf1b1228e5499c7643811f80db010dce67d20da5aefd6a40ef2a537bb4ed7b589e8f878307a06ec1fb8d053a3e2ea00a97c66a7edb6e4845f92b493fad9b82 WHIRLPOOL 2df17352ea8ea15fbb74a10b1941b369d642f65453d10599d599925cc46d5f71e9a6149dc56acf15a501750228dc1eecceeb19d72890f3835a514c891f84dcc6
EBUILD gitlab-ce-9.0.7.ebuild 13087 SHA256 68f0d2d7c8cde9b07bb280bb2f6b6d3fea4de6791571f27aaf619853940d2d30 SHA512 21545e878a2f60d082b132256fb09c72a5cc1d252115f448770432fd98becc5aeef42281f00fa55642a1a0866f41f107903b33160e52c61bc4c6d7811f5a06fe WHIRLPOOL 6ad81da17812721b94e8fcfc2328a24355a1f777d067ff2f557f0928ea2f4af55f0edb8587b8fe004f5481254cd72a520a7a77a6a601afc12315d8d37773f5c8 EBUILD gitlab-ce-9.0.7.ebuild 13087 SHA256 68f0d2d7c8cde9b07bb280bb2f6b6d3fea4de6791571f27aaf619853940d2d30 SHA512 21545e878a2f60d082b132256fb09c72a5cc1d252115f448770432fd98becc5aeef42281f00fa55642a1a0866f41f107903b33160e52c61bc4c6d7811f5a06fe WHIRLPOOL 6ad81da17812721b94e8fcfc2328a24355a1f777d067ff2f557f0928ea2f4af55f0edb8587b8fe004f5481254cd72a520a7a77a6a601afc12315d8d37773f5c8
EBUILD gitlab-ce-9.1.4.ebuild 13214 SHA256 72983da6d39625c6263e066dd4b965418e8396e3acd68fedd5ed5961e09c274b SHA512 b1b7ee8e9ccb9ee672467ef69ef74ccde04381b5135c8652d5bb030581f64e8881e31c274bcc865dac608185c5922d639f2c500b05dfdb40edbe462b337667e2 WHIRLPOOL 01554bbced8a3255ec0439c9e5352e4bf4e963daa3df36d3ac90bf6acded983c0d44bcb10fd40006b3c1ebb9a94c170b7efd63adef8272eb936954e3f344e7b2 EBUILD gitlab-ce-9.1.4-r1.ebuild 13243 SHA256 ab673fa216da6c964b7c1a49bdc4b0225f437f0e9635022c165694ef9cdb3be3 SHA512 c664cca08eb02d069878dc0d9bb03a6470164cb85e6f0f47bde566eba1ee3c829d255851f4703016415b311595257d8b4da7e22eee2a96b33a7436a8a55776d8 WHIRLPOOL a564ed0ef3c3faba21bdbe29dd7e6a0a13384a26de1addf2292e7c9069b8c19c2e573d8940603f598088b5ea44d4af38b0e9527dcfdbfb0c575dfc5919487e1b
EBUILD gitlab-ce-9.2.2.ebuild 13305 SHA256 1cd58794cc0341f4a2d9071971fdef39d79f1512c776c2c5eb4feb7f4207e0fb SHA512 cfede122bbeb45bb59efbf4a583992b872aac24be8563e5e579cd38ca8425294519a64c1b8c69d551fc3e2eb44075b09a0628e4865a432a88c210ec7e7ecfd58 WHIRLPOOL a0df27f37270bb5833de2a0fd89c8cbe6e5107a1790bf30a9d5f5f8555b2784e6c226e3f51be5da259bd8601bf9481b22e788fe431a2b6a06c4e4d8751189ef1 EBUILD gitlab-ce-9.2.2.ebuild 12988 SHA256 a1ec15fafbe7031dbb71859497f3d334d9b062d75126b4ff5e6ab4f911e816ef SHA512 ac3fb3d10dc34f07d43a700e9dc4453138e11284d5f26a93e0e1cc59160faca75fa979390f9ac293538172c97523a8fe6f99812084bc94ac5181a17fd9110483 WHIRLPOOL e1a8afacad18607af2cc2a1abf9222657d85b3694a37280c05904ded91226fdcba3c7df6a705dde8ace85bebfd6dc8e07e547469dc6616c94e12b5d21d4efb9e
EBUILD gitlab-ce-9999.ebuild 13029 SHA256 b4a010ff86baa4f2a7cf1349e74f49e763b88bb675f01acdbaf16c204597859d SHA512 6cdfdbf27a3ccec276ce06c25dc5a76cba6fb25f807650f5e2e5ed600fd03e487a60de3481719c53fffb43d3f7d2a0e8258a41dd0e461be1e82252eb59105372 WHIRLPOOL 0994bab6308ac1c466e17d53b7057f51e472b4b5cc0ca1d91b11217d0caf9448d3a69d769732c2acb4194f3eb5a94b8bb3c98441ec99ca94066900c7fe5e85ac EBUILD gitlab-ce-9999.ebuild 13029 SHA256 b4a010ff86baa4f2a7cf1349e74f49e763b88bb675f01acdbaf16c204597859d SHA512 6cdfdbf27a3ccec276ce06c25dc5a76cba6fb25f807650f5e2e5ed600fd03e487a60de3481719c53fffb43d3f7d2a0e8258a41dd0e461be1e82252eb59105372 WHIRLPOOL 0994bab6308ac1c466e17d53b7057f51e472b4b5cc0ca1d91b11217d0caf9448d3a69d769732c2acb4194f3eb5a94b8bb3c98441ec99ca94066900c7fe5e85ac
MISC ChangeLog 17848 SHA256 d57ce2fbafb6a62a30a4bf02feff9c37f33b94f8158f6b50c87053d8422307b2 SHA512 3b83ca4c32949ff08d1d59131388f3f59497c7831c5b09d1fd10a36445f1c383dbf04e91ddeff6c9b6c5131578450afb354b03819ddba80f7249b0ddd0b4f2e9 WHIRLPOOL d5ab8749e2c7d6a18adf2d63a7c7a69b40d93357d3e5714f131ec7cacca6008ca41f23a2c2bb8ece1ba10aaebf47b5f1363a2c4a29bbbe45672d06904e82f614 MISC ChangeLog 17848 SHA256 d57ce2fbafb6a62a30a4bf02feff9c37f33b94f8158f6b50c87053d8422307b2 SHA512 3b83ca4c32949ff08d1d59131388f3f59497c7831c5b09d1fd10a36445f1c383dbf04e91ddeff6c9b6c5131578450afb354b03819ddba80f7249b0ddd0b4f2e9 WHIRLPOOL d5ab8749e2c7d6a18adf2d63a7c7a69b40d93357d3e5714f131ec7cacca6008ca41f23a2c2bb8ece1ba10aaebf47b5f1363a2c4a29bbbe45672d06904e82f614
MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6

View file

@ -183,6 +183,7 @@ all_ruby_install() {
# install the rest files # install the rest files
# using cp 'cause doins is slow # using cp 'cause doins is slow
cp -Rl * "${D}/${dest}"/ cp -Rl * "${D}/${dest}"/
cp -Rl .??* "${D}/${dest}"/
# install logrotate config # install logrotate config
dodir /etc/logrotate.d dodir /etc/logrotate.d

View file

@ -350,7 +350,6 @@ pkg_config() {
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_rake yarn:install exec_rake yarn:install
# exec_yarn install
einfo "Cleaning old precompiled assets ..." einfo "Cleaning old precompiled assets ..."
exec_rake gitlab:assets:clean exec_rake gitlab:assets:clean
@ -372,7 +371,6 @@ pkg_config() {
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_rake yarn:install exec_rake yarn:install
# exec_yarn install
fi fi
einfo "Precompiling assests ..." einfo "Precompiling assests ..."
@ -415,14 +413,3 @@ exec_rake() {
${command}" \ ${command}" \
|| die "failed to run rake $@" || die "failed to run rake $@"
} }
#exec_yarn() {
# local command="yarn $@ --${RAILS_ENV}"
#
# echo " ${command}"
# su -l ${MY_USER} -c "
# export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
# cd ${DEST_DIR}
# ${command}" \
# || die "failed to run yarn $@"
#}