April 2010 - openSUSE Build Service - openSUSE Mailing Lists

[opensuse-buildservice] [PATCH 1/1 for build] Support remote repos (v2)
by Yi Yang 09 Apr '10

09 Apr '10

>From effe07d4f90fc387d7bdd42db1507400e33c819f Mon Sep 17 00:00:00 2001 From: Yi Yang <yi.y.yang(a)intel.com> Date: Fri, 2 Apr 2010 14:57:59 +0800 Subject: [PATCH] Support remote repos --- build | 20 +++++++++++++++--- createrepomddeps | 24 +++++++++++++++++++++ init_buildsystem | 61 ++++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 95 insertions(+), 10 deletions(-) diff --git a/build b/build index 18f9622..b774621 100755 --- a/build +++ b/build @@ -130,6 +130,7 @@ Known Parameters: repository NAME. The repo must be refreshed with zypp so package meta data is available locally. With emtpy NAME all enabled repositories are used. + a url can specify a remote repo. --rpms path1:path2:... Specify path where to find the RPMs for the build system @@ -145,6 +146,13 @@ Known Parameters: --root rootdir Use 'rootdir' to setup chroot environment + --cachedir cachedir + Use 'cachedir' to cache remote repo's packages, the + default cache dir is /var/cache/build, every repo + given by --repository corresponds to a subdir named + as md5sum of its repo url, forx eaxmple: + /var/cache/build/3e8ea9b47808629414a0cebc33ea285e + --oldpackages oldpackagesdir Define a directory with a former build @@ -642,6 +650,10 @@ while test -n "$1"; do BUILD_ROOT="$ARG" shift ;; + *-cachedir) + CACHE_DIR="$ARG" + shift + ;; *-oldpackages) OLD_PACKAGES="$ARG" shift @@ -783,6 +795,8 @@ while test -n "$1"; do esac done +test -z "$CACHE_DIR" && CACHE_DIR=/var/cache/build + if test -n "$KILL" ; then test -z "$SRCDIR" || usage if test -n "$VM_IMAGE" -a -n "$VM_SWAP" -a -n "$VM_TYPE"; then @@ -889,7 +903,7 @@ if test -n "$LIST_STATE" ; then } for SPECFILE in $BUILD_ROOT/usr/src/packages/SPECS/*.spec ; do : ; done fi - init_buildsystem --list-state "${definesnstuff[@]}" "${repos[@]}" $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS + init_buildsystem --cachedir "$CACHE_DIR" --list-state "${definesnstuff[@]}" "${repos[@]}" $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS ERR=$? rm -rf $BUILD_ROOT cleanup_and_exit $ERR @@ -1070,7 +1084,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do if test "$DO_INIT" = true ; then # do fist stage of init_buildsystem rm -f $BUILD_ROOT/.build.success - set -- init_buildsystem --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS echo "$* ..." "$@" || cleanup_and_exit 1 check_exit @@ -1284,7 +1298,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do echo "BUILD_INCARNATION=$INCARNATION" > $BUILD_ROOT/.buildenv CREATE_BUILD_BINARIES= egrep '^#[ ]*needsbinariesforbuild[ ]*$' >/dev/null <$MYSRCDIR/$SPECFILE && CREATE_BUILD_BINARIES=--create-build-binaries - set -- init_buildsystem "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --cachedir "$CACHE_DIR" "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS echo "$* ..." "$@" || cleanup_and_exit 1 check_exit diff --git a/createrepomddeps b/createrepomddeps index 61c604a..fb2f499 100755 --- a/createrepomddeps +++ b/createrepomddeps @@ -9,6 +9,11 @@ use XML::Parser; use Data::Dumper; use Getopt::Long; use Build::Rpm; +use Digest::MD5 qw(md5 md5_hex md5_base64); +use File::Path qw(mkpath rmtree); +use File::Basename; +use LWP::UserAgent; +use URI; Getopt::Long::Configure("no_ignore_case"); my @parent = []; @@ -342,6 +347,16 @@ sub printasbuildcachefile(@) } } +sub getmetadata +{ + my $url = $_[0]; + my $dir = $_[1]; + + my $dest = $dir . "repodata"; + mkpath($dest); + system($INC[0].'/download', $dest, $url . "repodata/repomd.xml"); +} + ### main GetOptions ( @@ -378,6 +393,12 @@ for my $url (@ARGV) { } else { die "unsupported repo type: $type\n"; } + } elsif ($url =~ /^http:\/\/([^\/]*)\/?/) { + my $repoid = md5_hex($url); + my $cachedir = ($::ENV{'CACHE_DIR'} || '/var/cache/build'); + $dir = "$cachedir/$repoid/"; + getmetadata($url, $dir); + $baseurl = $url; } else { $dir = $url; $dir .= '/' unless $dir =~ /\/$/; @@ -395,6 +416,9 @@ for my $url (@ARGV) { @cursor = ([undef, $primaryparser]); my $u = $dir . $f->{'location'}; + if ($url =~ /^http:\/\/([^\/]*)\/?/) { + system($INC[0].'/download', $dir . "repodata/", $baseurl . "repodata/" . basename($u)); + } $u = 'gzip -cd ' . $u . '|' if ($u =~ /\.gz$/); # XXX my $fh; diff --git a/init_buildsystem b/init_buildsystem index efa9712..2272585 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -76,6 +76,11 @@ while test -n "$1" ; do CLEAN_BUILD="$1" shift ;; + --cachedir) + shift + CACHE_DIR="$1" + shift + ;; *) break ;; @@ -285,6 +290,9 @@ function validate_cache_file { test -z "$SRC" && SRC=`pwd` if [ "${SRC#zypp://}" != "$SRC" ]; then set -- $BUILD_DIR/createrepomddeps "$SRC" + elif [ "${SRC#http://}" != "$SRC" ]; then + mkdir -p "$(getcachedir "$SRC")" + set -- env CACHE_DIR="$CACHE_DIR" $BUILD_DIR/createrepomddeps "$SRC" elif [ ! -e "$SRC" ]; then echo "*** $SRC does not exist" >&2 cleanup_and_exit 1 @@ -336,13 +344,26 @@ fail_exit() } # modify $SRC -download_zypp() +downloadpkg() { local url="$1" - local zd="/var/cache/zypp/packages/" - SRC=$zd${url#zypp://} + local cachedir + + if [ "${url:0:7}" == "zypp://" ] ; then + cachedir="/var/cache/zypp/packages/" + SRC="$cachedir${url#zypp://}" + mkdir -p "$(dirname $SRC)" + elif [ "${url:0:7}" == "http://" ] ; then + cachedir="$(getcachedir "$url")" + local name="$(basename "$url")" + SRC="$cachedir/$name" + else + echo "Invalid url: $url" + cleanup_and_exit 1 + fi + if [ ! -e "$SRC" ]; then - local destdir="$zd/tmp" + local destdir="$cachedir/tmp" mkdir -p "$destdir" echo "downloading $url ... "; $BUILD_DIR/download "$destdir" "$url" || cleanup_and_exit 1 @@ -361,6 +382,27 @@ download_zypp() fi } +getcachedir() +{ + url=$1 + for repo in "${repos[@]}" ; do + if [ "${url:0:${#repo}}" == "$repo" ] ; then + read repoid dummy < <(echo -n "$repo" | md5sum) + echo "$CACHE_DIR/$repoid" + break + fi + done +} + +get_pkg_filename() +{ + local url="$1" + local name=$(basename $url) + local cachedir=$(getcachedir $url) + local destfile="$cachedir/$name" + echo $destfile +} + set_build_arch trap fail_exit EXIT @@ -494,8 +536,8 @@ else if [ "${SRC#/}" = "$SRC" ]; then url="$SRC" case "$url" in - zypp://*) - download_zypp "$url" + zypp://* | http://*) + downloadpkg "$url" ;; *) echo "unsupported url: $url" >&2 @@ -503,7 +545,12 @@ else ;; esac fi - ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRC##*.}" + if [ "${SRC:0:7}" == "http://" ] ; then + target_file=$(get_pkg_filename "$SRC") + ln -s "$target_file" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRC##*.}" + else + ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRC##*.}" + fi PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $PKG" done < $RPMLIST -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

3 5

[opensuse-buildservice] obs-worker and NAT
by Troy Telford 09 Apr '10

09 Apr '10

Quick question: Does the obsworker function through NAT, or does the obs server have to be able to route to the worker nodes? I ask because my build cluster is (currently) on the other side of a NAT vs. my OBS server. I hope to change this in the near future, but I wanted to check if I'm right that OBS doesn't transverse NATs unless port forwarding is explicitly done. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

2 1

[opensuse-buildservice] Using LDAP Authentication
by Andrew Heagle 09 Apr '10

09 Apr '10

Hi, We use OpenLDAP as a centralized authentication source for our company, and I configured the build service I setup to use LDAP. Authenticating against the LDAP server works, so I can use my username and password to login and then go assign the appropriate roles in the API afterwards. However, the scripts do not seem to pickup my email address or my name. In /srv/www/obs/api/config/environments/production.rb I have this set: LDAP_SEARCH_ATTR = "uid" LDAP_NAME_ATTR="cn" LDAP_MAIL_ATTR="mail" But it always shows my email address to be: fake(a)email.ldap Which I see is the default setting in the /srv/www/obs/api/lib/active_rbac_mixins/user_mixins.rb script. Here's the pertinent information about me in LDAP: ldapsearch -LLLx uid=aheagle mail cn dn: uid=aheagle,ou=People,dc=work,dc=TLD cn: Andrew Heagle mail: aheagle(a)ca.work.TLD Log Entries: ==> ../../log/obs-api-access.log <== ::ffff:10.10.32.38 obsapi.tor.work-int.TLD - [09/Apr/2010:02:41:51 +0000] "GET /person/aheagle HTTP/1.1" 200 417 "-" "buildservice-webclient/0.3" ==> ../../log/production.log <== [I|# 5323] Processing PersonController#userinfo (for ::ffff:10.10.32.38 at 2010-04-09 02:41:51) [GET] [I|# 5323] Parameters: {"login"=>"aheagle"} [D|# 5323] AUTH: BasicYWhlYWdsZTpuaWNldHJ5IQ== [D|# 5323] Using LDAP to find aheagle [D|# 5323] Looking for aheagle using ldap [D|# 5323] Connecting to ops-kerberos.int.work.TLD as '' [D|# 5323] Bound as [D|# 5323] Search for (uid=aheagle) [D|# 5323] Connecting to ops-kerberos.int.work.TLD as 'uid=aheagle,ou=People,dc=work,dc=TLD' [D|# 5323] Bound as uid=aheagle,ou=People,dc=work,dc=TLD [D|# 5323] login success = fake(a)email.ldapaheagle [D|# 5323] User Load (0.5ms) SELECT * FROM `users` WHERE (login = 'aheagle') LIMIT 1 [D|# 5323] USER found: aheagle [D|# 5323] User aheagle initialised [D|# 5323] User's source backend <:> [D|# 5323] Generating for user from parameter aheagle [D|# 5323] User Load (0.2ms) SELECT * FROM `users` WHERE (`users`.`login` = 'aheagle') LIMIT 1 [I|# 5323] Rendering person/userinfo [D|# 5323] SQL (0.2ms) SELECT count(*) AS count_all FROM `watched_projects` WHERE (`watched_projects`.bs_user_id = 13) [D|# 5323] WatchedProject Load (0.1ms) SELECT * FROM `watched_projects` WHERE (`watched_projects`.bs_user_id = 13) [I|# 5323] Completed in 47ms (View: 3, DB: 1) | 200 OK [http://obsapi.tor.work-int.TLD/person/aheagle] [I|# 5323] Processing PersonController#userinfo (for ::ffff:10.10.32.38 at 2010-04-09 02:41:51) [GET] [I|# 5323] Parameters: {"login"=>"aheagle"} [D|# 5323] AUTH: BasicYWhlYWdsZTpuaWNldHJ5IQ== [D|# 5323] Using LDAP to find aheagle [D|# 5323] Looking for aheagle using ldap [D|# 5323] Connecting to ops-kerberos.int.work.TLD as '' [D|# 5323] Bound as [D|# 5323] Search for (uid=aheagle) [D|# 5323] Connecting to ops-kerberos.int.work.TLD as 'uid=aheagle,ou=People,dc=work,dc=TLD' [D|# 5323] Bound as uid=aheagle,ou=People,dc=work,dc=TLD [D|# 5323] login success = fake(a)email.ldapaheagle [D|# 5323] User Load (0.5ms) SELECT * FROM `users` WHERE (login = 'aheagle') LIMIT 1 [D|# 5323] USER found: aheagle [D|# 5323] User aheagle initialised [D|# 5323] User's source backend <:> [D|# 5323] Generating for user from parameter aheagle [D|# 5323] User Load (4.0ms) SELECT * FROM `users` WHERE (`users`.`login` = 'aheagle') LIMIT 1 [I|# 5323] Rendering person/userinfo [D|# 5323] SQL (7.8ms) SELECT count(*) AS count_all FROM `watched_projects` WHERE (`watched_projects`.bs_user_id = 13) [D|# 5323] WatchedProject Load (0.2ms) SELECT * FROM `watched_projects` WHERE (`watched_projects`.bs_user_id = 13) [I|# 5323] Completed in 194ms (View: 3, DB: 12) | 200 OK [http://obsapi.tor.work-int.TLD/person/aheagle] -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

1 0

[opensuse-buildservice] upcoming osc release
by Marcus Hüwe 08 Apr '10

08 Apr '10

Hi, I just updated the osc package in the openSUSE:Tools:Unstable project. So this is your last chance to report bugs before the 0.126 release:) Here's a small summary about the user visible changes: 0.126 - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy - "osc cat" & "osc ls" now auto-expands through link. - fixed "osc add" after "osc delete". - fix "osc patchinfo" command (crashed before) - fixed SSL proxy support - fixed meta attribute create and set calls - osc remotebuildlog supports a buildlogurl - Allow --prefer-pkgs to parse repodata - new "osc build --no-service" option to skip source service update - fix linktobranch apiurl usage - "maintained package" search is telling relevant projects now * requires OBS 1.7.2 or 2.0 - added "osc chroot" command - fixed #547005 ("osc co could show download progress") - added "--interactive" option to "osc request" - store commit message so it doesn't get lost on failure - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" - added "osc localbuildlog" command - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot - verify files using rpm bindings and keys supplied by buildservice - added "--exclude-target-project <prj>" option to "osc rq list" - added "--message" option to "osc branch" - added "osc config" command to set/get/delete a config option - added "--binary" and "--baseproject" options to "osc search" Thanks to everyone who contributed to osc! Marcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

4 4

[opensuse-buildservice] [patch] Make sure hermes get the right data for requests
by Vincent Untz 08 Apr '10

08 Apr '10

Hi, Here are two patches to make sure hermes gets the right data for requests. The first patch handles change_devel requests, and the second patch makes the unused paramaters undefined so that they don't get accidently used in the hermes templates later on (this can at least happen if there are multiple actions in one request -- we'd get a weird mix there). Cheers, Vincent -- Les gens heureux ne sont pas pressés.

2 1

[opensuse-buildservice] [PATCH 0/4] Cleanup VM worker disk setup options
by Jan-Simon Möller 08 Apr '10

08 Apr '10

Hi all! This series of patches cleans up code after changes went into 'build'. If nobody has objections, i'd commit it tomorrow. Best, Jan-Simon -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

1 0

[opensuse-buildservice] [PATCH 1/4] Cleanup VM worker disk setup options
by dl9pf＠gmx.de 08 Apr '10

08 Apr '10

From: Jan-Simon Möller <jsmoeller(a)linuxfoundation.org> Signed-off-by: Jan-Simon Möller <jsmoeller(a)linuxfoundation.org> --- dist/obsworker | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dist/obsworker b/dist/obsworker index d7a77c2..0c2e2b0 100644 --- a/dist/obsworker +++ b/dist/obsworker @@ -105,27 +105,11 @@ if [ -n "$OBS_VM_KERNEL" -a "$OBS_VM_KERNEL" != "none" ] ; then fi fi -if [ "$OBS_VM_DISK_AUTOSETUP" = "yes" ]; then - # actual autosetup is in 'build' code - so 'osc build' can use it, too - # this can later also be used for reprovisioning workers - if [ -n "$OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE" -a -n "$OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE" ]; then - VMDISK_ROOT_FILESIZE="--vmdisk-rootsize ${OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE}" - VMDISK_SWAP_FILESIZE="--vmdisk-swapsize ${OBS_VM_DISK_AUTOSETUP_SWAP_FILESIZE}" - VMDISK_AUTOSETUP="--vmdisk-autosetup" - if [ -n "$OBS_VM_DISK_AUTOSETUP_FILESYSTEM" ]; then - VMDISK_FILESYSTEM="--vmdisk-filesystem ${OBS_VM_DISK_AUTOSETUP_FILESYSTEM}" - fi - else - echo "Warning: OBS_VM_DISK_AUTOSETUP is set to \"yes\" but either" - echo " OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE or " - echo " OBS_VM_DISK_AUTOSETUP_SWAP_FILESIZE are not set." - echo "" - echo "Disabling automatic VM disk setup!" - fi -fi [ -z "$OBS_INSTANCE_MEMORY" ] && OBS_INSTANCE_MEMORY=256 +vmopt= + if [ -n "$OBS_VM_TYPE" -a "$OBS_VM_TYPE" != "auto" ] ; then if [ "$OBS_VM_TYPE" != "none" ] ; then vmopt="--$OBS_VM_TYPE" @@ -136,6 +120,24 @@ elif [ -e /sys/hypervisor/type ] && grep -q xen /sys/hypervisor/type; then vmopt=--xen fi +if [ -n "$vmopt" ]; then + # we start up in VM mode, check for the worker disk options + if [ -n "$OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE" -a -n "$OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE" ]; then + VMDISK_ROOT_FILESIZE="--vmdisk-rootsize ${OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE}" + VMDISK_SWAP_FILESIZE="--vmdisk-swapsize ${OBS_VM_DISK_AUTOSETUP_SWAP_FILESIZE}" + if [ -n "$OBS_VM_DISK_AUTOSETUP_FILESYSTEM" ]; then + VMDISK_FILESYSTEM="--vmdisk-filesystem ${OBS_VM_DISK_AUTOSETUP_FILESYSTEM}" + fi + else + echo "Warning: VM build enabled but either" + echo " OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE or " + echo " OBS_VM_DISK_AUTOSETUP_SWAP_FILESIZE are not set." + echo "" + echo "Worker startup failed" + exit 1 + fi +fi + rc_reset case "$1" in start) -- 1.6.4.2 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

1 3

[opensuse-buildservice] Marketing for OBS V2.0
by Sascha 'saigkill' Manns 07 Apr '10

07 Apr '10

Hello Mates, today inside the Marketing Session psankar and i have got the Task to do the Marketing for OBS V2.0. This means, that we're publishing Infos about the OBS. First we're writing an Article about what OBS is (for that ppl who not knowing that). After that we would like to making an regular Screenshot and publishing that. For that an good Documentation from OBS Maintainers is needed. So please give us an weekly report in this List with the actual Stat, implemented features or other stuff. If anything is unclear, please let us know. -- Sincerely yours Sascha Manns openSUSE Community & Support Agent openSUSE Marketing Team Blog: http://saigkill.wordpress.com Web: http://www.open-slx.de (openSUSE Box Support German) Web: http://www.open-slx.com (openSUSE Box Support English) -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

4 4

[opensuse-buildservice] rpmlint unicode errors
by Michal Čihař 07 Apr '10

07 Apr '10

Hi builds of some mine packages started to fail recently with following error: 7 packages and 0 specfiles checked; 0 errors, 44 warnings. Traceback (most recent call last): File "rpmlint.py", line 352, in <module> File "rpmlint.py", line 194, in main File "Filter.py", line 107, in printAllReasons File "Filter.py", line 31, in __print UnicodeDecodeError: 'ascii' codec can't decode byte 0xc4 in position 68: ordinal not in range(128) Is there something I'm doing wrong or there is just a bug in rpmlint used in Factory? -- Michal Čihař | http://cihar.com | http://blog.cihar.com

2 4

[opensuse-buildservice] F12 kernel compile errors
by Enor MOZ 07 Apr '10

07 Apr '10

Hello, I am trying to compile a F12 kernel via OBS. Here is my build log http://pastie.org/904842 . I am getting several "Warning: spec file parser line 462: can't expand %(...)" messages. It then fails later with "ERROR: Patch linux-2.6-build-nonintconfig. patch not listed as a source patch in specfile". If I comment out the part that checks for that patch it compile but does not display the "buildid" when finished. I believe this is due to the "can't expand" warning earlier since the "buildid" is called with a macro that cant expand. The spec file is basically a clone of the original F12 kernel srpm from the F12 repo. There where two things I changed; 1, compile firmware and removed PAE from i686 build. Link to spec file. https://build.opensuse.org/package/view_file?file=kernel.spec&package=netbo… Any help would be appreciated !! -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

2 1